From patchwork Thu Jun 11 16:52:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wenxu X-Patchwork-Id: 217833 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C36F1C433E0 for ; Thu, 11 Jun 2020 17:03:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FBFA206DC for ; Thu, 11 Jun 2020 17:03:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726686AbgFKRDo (ORCPT ); Thu, 11 Jun 2020 13:03:44 -0400 Received: from m9785.mail.qiye.163.com ([220.181.97.85]:2032 "EHLO m9785.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726672AbgFKRDl (ORCPT ); Thu, 11 Jun 2020 13:03:41 -0400 Received: from localhost.localdomain (unknown [123.59.132.129]) by m9785.mail.qiye.163.com (Hmail) with ESMTPA id A59565C167D; Fri, 12 Jun 2020 00:52:07 +0800 (CST) From: wenxu@ucloud.cn To: pablo@netfilter.org Cc: netdev@vger.kernel.org Subject: [PATCH net v3 2/2] flow_offload: fix incorrect cb_priv check for flow_block_cb Date: Fri, 12 Jun 2020 00:52:07 +0800 Message-Id: <1591894327-11915-2-git-send-email-wenxu@ucloud.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591894327-11915-1-git-send-email-wenxu@ucloud.cn> References: <1591894327-11915-1-git-send-email-wenxu@ucloud.cn> X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZVkpVS0hPQkJCQk1NTUlKT1lXWShZQU lCN1dZLVlBSVdZDwkaFQgSH1lBWR0yNQs4HDgjQgMUSCIeMR4UCS0KOhxWVlVOSklKKElZV1kJDh ceCFlBWTU0KTY6NyQpLjc#WVdZFhoPEhUdFFlBWTQwWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6MCo6Nxw5Ajg1TjA0IwscLxA6 IxBPFBBVSlVKTkJKQ0JPSElMTE1PVTMWGhIXVQweFQMOOw4YFxQOH1UYFUVZV1kSC1lBWUpJSFVO QlVKSElVSklCWVdZCAFZQU9JTko3Bg++ X-HM-Tid: 0a72a44bc1852087kuqya59565c167d Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: wenxu In the function __flow_block_indr_cleanup, The match stataments this->cb_priv == cb_priv is always false, the flow_block_cb->cb_priv is totally different data from the flow_indr_dev->cb_priv. Store the representor cb_priv to the flow_block_cb->indr.cb_priv in the driver. Fixes: 1fac52da5942 ("net: flow_offload: consolidate indirect flow_block infrastructure") Signed-off-by: wenxu --- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 2 +- drivers/net/ethernet/netronome/nfp/flower/offload.c | 1 + include/net/flow_offload.h | 1 + net/core/flow_offload.c | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c index ef7f6bc..042c285 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c @@ -1918,6 +1918,7 @@ static int bnxt_tc_setup_indr_block(struct net_device *netdev, struct bnxt *bp, flow_block_cb_add(block_cb, f); list_add_tail(&block_cb->driver_list, &bnxt_block_cb_list); + block_cb->indr.cb_priv = bp; break; case FLOW_BLOCK_UNBIND: cb_priv = bnxt_tc_indr_block_cb_lookup(bp, netdev); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c index a62bcf0..187f84c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c @@ -447,7 +447,7 @@ static void mlx5e_rep_indr_block_unbind(void *cb_priv) } flow_block_cb_add(block_cb, f); list_add_tail(&block_cb->driver_list, &mlx5e_block_cb_list); - + block_cb->indr.cb_priv = rpriv; return 0; case FLOW_BLOCK_UNBIND: indr_priv = mlx5e_rep_indr_block_priv_lookup(rpriv, netdev); diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c index 28de905..ca2f01a 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/offload.c +++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c @@ -1687,6 +1687,7 @@ void nfp_flower_setup_indr_tc_release(void *cb_priv) flow_block_cb_add(block_cb, f); list_add_tail(&block_cb->driver_list, &nfp_block_cb_list); + block_cb->indr.cb_priv = app; return 0; case FLOW_BLOCK_UNBIND: cb_priv = nfp_flower_indr_block_cb_priv_lookup(app, netdev); diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h index 3a2d6b4..ef4d8b0 100644 --- a/include/net/flow_offload.h +++ b/include/net/flow_offload.h @@ -450,6 +450,7 @@ struct flow_block_indr { struct net_device *dev; enum flow_block_binder_type binder_type; void *data; + void *cb_priv; void (*cleanup)(struct flow_block_cb *block_cb); }; diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c index b288d2f..6614351 100644 --- a/net/core/flow_offload.c +++ b/net/core/flow_offload.c @@ -380,7 +380,7 @@ static void __flow_block_indr_cleanup(void (*release)(void *cb_priv), list_for_each_entry_safe(this, next, &flow_block_indr_list, indr.list) { if (this->release == release && - this->cb_priv == cb_priv) { + this->indr.cb_priv == cb_priv) { list_move(&this->indr.list, cleanup_list); return; }