From patchwork Sat Jan 12 04:28:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1023844 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="q349DazB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43c6Dv3Hjzz9s55 for ; Sat, 12 Jan 2019 15:28:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726437AbfALE2i (ORCPT ); Fri, 11 Jan 2019 23:28:38 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34839 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726376AbfALE2i (ORCPT ); Fri, 11 Jan 2019 23:28:38 -0500 Received: by mail-pl1-f193.google.com with SMTP id p8so7664676plo.2 for ; Fri, 11 Jan 2019 20:28:37 -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=pwxTBpeqOayQL9bPo07C3tiu/9mb50Qni+8euP0MJ0w=; b=q349DazBCFOqV3E7KrMOyVCnE8B2F20jv0kIVrqtLEyCg/khGrS9TZIlPvIpry0Aa7 +G3KDazExPJv8jJrFLxtrBg7JFAjwYCRNqvfPAAglxkgE5yLF8rDy0kzmqHPrsgfrs4y q17iXu8/7oV1QjVzD1qi1QnQP2SGn3YyPflKOAwhRasZxhhfAZyCWnxu6QMlj7Y0bP+/ 090Ei7Pj3K03fTSntPQvfe9DesnceIyfMhNmCak4sTiPPin/i26xWfykmKiOUz3jwocG 4IhQaSg3nh/2PKRm1H9Gp+moekMrMOuZacj1syXl9//E6YAjgSw34VhTDxb3w7WtWPs8 sEAA== 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=pwxTBpeqOayQL9bPo07C3tiu/9mb50Qni+8euP0MJ0w=; b=pGuonOINrIYtAaowJ86cZe9pU3ACZpMV8Q+XbYL64Hk+yNahUd2uC3Kp2jIBWTFAma h6WNahe7HC44VyjQWezzG35onzJsuOSaShTUvFddSz9YU06BrJcwdwY8i9+PWZ0MDJSg +IGR0VIPuHkWdCncHLofvbFwQU7MPB9RQ3vYKY7KTl2f8uArz0Yu5U06br/KetXYoNBV 24HufuiWAtrEYb0a2rhfWL3+4MUWnsdeRFWbZcR459lPhZjMYaJxldW8uSBW8wxGXmZq sogBPw+IFID5oScG1VU/lxqP1FCJzx1BW0VLyaJtUblqw15dMDApjVZh+mXO+Nxr5U2S GoyQ== X-Gm-Message-State: AJcUukeIHosGU6p2OAvRms+mkDZd+SqmPrgffnM0wD1wA8EMo2OCicHP r64cQMbWlRdr1/MJaSgrdBI= X-Google-Smtp-Source: ALg8bN58VFa7g2xerG1aSazQ6OdAPemzZVcumuX12d7Lj/PX/gg7dbCwWPmYlPKUuIfQbJiZcIOykA== X-Received: by 2002:a17:902:8541:: with SMTP id d1mr17542727plo.205.1547267317463; Fri, 11 Jan 2019 20:28:37 -0800 (PST) Received: from local.opencloud.tech.localdomain ([1.202.68.9]) by smtp.gmail.com with ESMTPSA id l22sm134202585pfj.179.2019.01.11.20.28.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 20:28:36 -0800 (PST) From: xiangxia.m.yue@gmail.com To: saeedm@mellanox.com, leonro@mellanox.com, xiyou.wangcong@gmail.com Cc: netdev@vger.kernel.org, Tonghao Zhang , Hadar Hen Zion Subject: [PATCH v2] net: mlx5: update hw flows when encap source mac changed Date: Fri, 11 Jan 2019 20:28:24 -0800 Message-Id: <1547267304-4400-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. Fixs: 232c00139 ("net/mlx5e: Add support to neighbour update flow") Cc: Hadar Hen Zion Signed-off-by: Tonghao Zhang --- v2: simply the implement --- 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;