From patchwork Thu Jan 17 19:51:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1028591 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="TW/ehPSw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43jpyC2qm4z9sD4 for ; Mon, 21 Jan 2019 22:20:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728139AbfAULUt (ORCPT ); Mon, 21 Jan 2019 06:20:49 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:43469 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727287AbfAULUr (ORCPT ); Mon, 21 Jan 2019 06:20:47 -0500 Received: by mail-pl1-f194.google.com with SMTP id gn14so9690842plb.10 for ; Mon, 21 Jan 2019 03:20:47 -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=33i0CQOOZHv6ILdLBNaq5bX6Ire8eNTuN0341iUoKH8=; b=TW/ehPSwJtgYefTmbkQJgBNdJ3cvcuXrLxKmNh46fMgPV3vsx+7N5A76h4DreAGyGK N3BnxYzrgFeKd6l912D1pRcPUC56PfJ5Q/9bN6iX0+YhhiA7hs/+ONfLDCcaiKBeeGDA 6g1EUePE7A8i3DlnhCHQveRvxJc2vE9F1VaYcKcagoKouUvhj+4tbtsehSQ45/pLe252 c0ixSaOv6WpwUTNEvzh6r3XTJfA+t7WfUknZ5COude8ITtCsG8HIUK520ZoABHD6/eIa pUsM++s+9YMynrKH1OYZOBsFe0m0IqxFr1DuGMHrp0o+THPhjgiDCDxJv23g9SNRLpjz CHmQ== 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=33i0CQOOZHv6ILdLBNaq5bX6Ire8eNTuN0341iUoKH8=; b=m9IueJIJa+fCb75+3DHFvW+P6QzpD/qlE48cgraJ7XZdSFihoP3QfVgiO2OYqZSrV2 AYSjBg+9CNmbQoXeBaqr3krj4nBDa3tAol4Qg+SPZ9Ul+I5ejIQAnIR+3nWe9B76cxUV e9GHf2Prws8vcTMSYswRA0KDH41Z8Mufd0uzSSrALhQFNyWrNm/v1nltUvrDi6xU66AA O1WvbsAQOJdtInSL1w6rV/sUA3J6dAiY/74ZPsQiaWcHc8W2iX4XsJR8X9JTlslbN2ky jtz34Fbwb2nsLp9+sMWDXLaZ8R6+yW6wgxtBK+Pox7FxtK1aOhQN7VvLirija+KR4iFD JFSg== X-Gm-Message-State: AJcUukegt/DbAiF3faJxTuYMfQ//VJHaU0O5GcEjZpns2+6w5mxZ70bl luLjvIMhymr0tS8xHKq+QQ4= X-Google-Smtp-Source: ALg8bN7KffXHzTTUwcJou+kU21vn1iaqYGsaMCiRBerodNcvE0M2lSqiRlhP0j9LnS/PApyQU0WPPg== X-Received: by 2002:a17:902:e18d:: with SMTP id cd13mr29803547plb.262.1548069646702; Mon, 21 Jan 2019 03:20:46 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id c7sm17675514pfh.18.2019.01.21.03.20.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 03:20:46 -0800 (PST) From: xiangxia.m.yue@gmail.com To: saeedm@mellanox.com, gerlitz.or@gmail.com Cc: netdev@vger.kernel.org, Tonghao Zhang , Hadar Hen Zion Subject: [PATCH net-next v2 1/2] net/mlx5e: Update hw flows when encap source mac changed Date: Thu, 17 Jan 2019 11:51:21 -0800 Message-Id: <1547754682-49662-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 --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 ++++ drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 1 + 3 files changed, 6 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..156b2b3 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 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;