From patchwork Mon Jan 28 23:28:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1032951 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="htV3KcAS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43pvYF2jcCz9sBZ for ; Wed, 30 Jan 2019 05:05:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728751AbfA2SFU (ORCPT ); Tue, 29 Jan 2019 13:05:20 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42396 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727907AbfA2SFT (ORCPT ); Tue, 29 Jan 2019 13:05:19 -0500 Received: by mail-pf1-f193.google.com with SMTP id 64so10008847pfr.9 for ; Tue, 29 Jan 2019 10:05:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=r2V46+GOCWU8y6KKCzf3heZHYZVbmMjvLyAi1Jt4FKc=; b=htV3KcASQIltQZE8wmfZaA1tvXgH2yqKUztYO+pxm7VWblIqpXhXVC6+cKYX5pB1fz Z147fH3JCP4m5fNFObLQ41hYXCRwHiwLdxRtzvJ5JzAUT7RiYY1GG5wqncnSKEQ02J7w Dl+ihKZSb71Ty7qFX/ocH00lDnNEL0fbE6Ry11FTaHaHQPWdLI8RSxm4SY2Rv8Xr8KBJ f8FkS0yQ7O08//hm/JbuYPRvQ5oAYc+xweGrfI3ALaN4/kI6/Erz1wP5hAPNArBqTaJu y0u5/CMWep2LLEJUhPMgKdXblJCZJqZRc6eY0uvYcGPp2BOLAp9XCOGS/zIqhdy8XX3R bS5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=r2V46+GOCWU8y6KKCzf3heZHYZVbmMjvLyAi1Jt4FKc=; b=ROnhsD1ABJqaNAQ47Kk+M17+PAmIXgBo/4MEt3jiGjfwmbNHHcsB8vbcZydScVBzep lsmNJ14U3jJcr1i2K7qdzQoSOotK7lpPa9BAlNLigc6kQXypf59H1+TVdgBZy1iNTAOs L+wFgYaqfxOfipN3Wns6+QYh6sTqRq06ky2me1dC10D3ihOQcMX6S90OKB+9BIBRog1V udz7wSH2HDk1gpzO2ddLiNorY+IUspR354obk2hUgAkzbcuAvEzd6ah63cOf7bCxPoWh JesTs80dt2KBpPzGbfQcFjcFBk2ZlE4l5cr7OmPooaSvnin+RycPG6tRMSvT+uvyPmJ2 rtPA== X-Gm-Message-State: AJcUukfV00dO7ACJOGhOpzWz8MbShCvTyOzBQEJMBChzourECZREdMlY wmPfCCvx9MCzgIq6zqxCrJI= X-Google-Smtp-Source: ALg8bN452g+777RDQHBlfEjStuNliKLEPeYCyQCxEgYd8vQpMH/Nn+sXVOyd0WwQbzgBtzGSG6YKBA== X-Received: by 2002:a63:d655:: with SMTP id d21mr24605348pgj.280.1548785119266; Tue, 29 Jan 2019 10:05:19 -0800 (PST) Received: from local.opencloud.tech.localdomain ([106.120.33.223]) by smtp.gmail.com with ESMTPSA id b2sm65284351pfm.3.2019.01.29.10.05.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 10:05:18 -0800 (PST) From: xiangxia.m.yue@gmail.com To: saeedm@mellanox.com, gerlitz.or@gmail.com, davem@davemloft.net Cc: netdev@vger.kernel.org, Tonghao Zhang , Hadar Hen Zion Subject: [PATCH net v5 1/2] net/mlx5e: Update hw flows when encap source mac changed Date: Mon, 28 Jan 2019 15:28:05 -0800 Message-Id: <1548718086-20924-1-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang When we offload tc filters to hardware, hardware flows can be updated when mac of encap destination ip is changed. But we ignore one case, that the mac of local encap ip can be changed too, so we should also update them. To fix it, add route_dev in mlx5e_encap_entry struct to save the local encap netdevice, and when mac changed, kernel will flush all the neighbour on the netdevice and send NETEVENT_NEIGH_UPDATE event. The mlx5 driver will delete the flows and add them when neighbour available again. Fixes: 232c001398ae ("net/mlx5e: Add support to neighbour update flow") Cc: Hadar Hen Zion Signed-off-by: Tonghao Zhang Reviewed-by: Or Gerlitz Acked-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 ++++ drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 1 + 3 files changed, 7 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c index 046948e..114e0a2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -256,6 +256,7 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv, e->m_neigh.family = n->ops->family; memcpy(&e->m_neigh.dst_ip, n->primary_key, n->tbl->key_len); e->out_dev = out_dev; + e->route_dev = route_dev; /* It's important to add the neigh to the hash table before checking * the neigh validity state. So if we'll get a notification, in case the @@ -369,6 +370,7 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, e->m_neigh.family = n->ops->family; memcpy(&e->m_neigh.dst_ip, n->primary_key, n->tbl->key_len); e->out_dev = out_dev; + e->route_dev = route_dev; /* It's importent to add the neigh to the hash table before checking * the neigh validity state. So if we'll get a notification, in case the diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 96cc0c6..c4b9073 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -594,6 +594,10 @@ static void mlx5e_rep_update_flows(struct mlx5e_priv *priv, if (neigh_connected && !(e->flags & MLX5_ENCAP_ENTRY_VALID)) { ether_addr_copy(e->h_dest, ha); ether_addr_copy(eth->h_dest, ha); + /* Update the encap source mac, in case that we delete + * the flows when encap source mac changed. + */ + ether_addr_copy(eth->h_source, e->route_dev->dev_addr); mlx5e_tc_encap_flows_add(priv, e); } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h index edd7228..36eafc8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h @@ -148,6 +148,7 @@ struct mlx5e_encap_entry { unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ struct net_device *out_dev; + struct net_device *route_dev; int tunnel_type; int tunnel_hlen; int reformat_type;