From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 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 12AFBC3A5A6 for ; Thu, 19 Sep 2019 08:37:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E16B8217D6 for ; Thu, 19 Sep 2019 08:37:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388340AbfISIhR (ORCPT ); Thu, 19 Sep 2019 04:37:17 -0400 Received: from m9784.mail.qiye.163.com ([220.181.97.84]:61405 "EHLO m9784.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387617AbfISIhQ (ORCPT ); Thu, 19 Sep 2019 04:37:16 -0400 Received: from localhost.localdomain (unknown [123.59.132.129]) by m9784.mail.qiye.163.com (Hmail) with ESMTPA id 73D0241AA6; Thu, 19 Sep 2019 16:37:13 +0800 (CST) From: wenxu@ucloud.cn To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH net v3] net/sched: cls_api: Fix nooffloaddevcnt counter when indr block call success Date: Thu, 19 Sep 2019 16:37:12 +0800 Message-Id: <1568882232-12847-1-git-send-email-wenxu@ucloud.cn> X-Mailer: git-send-email 1.8.3.1 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZSVVJQ0tCQkJDQkNCSktOSVlXWShZQU lCN1dZLVlBSVdZCQ4XHghZQVk1NCk2OjckKS43PlkG X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6MzI6Dhw4Izg8PSkNMwojFgki FxUwCRlVSlVKTk1DQ0NJSUhITkhJVTMWGhIXVQweFQMOOw4YFxQOH1UYFUVZV1kSC1lBWUpJSFVO QlVKSElVSklCWVdZCAFZQU9LTUw3Bg++ X-HM-Tid: 0a6d48ab108d2086kuqy73d0241aa6 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: wenxu A vxlan or gretap device offload through indr block methord. If the device successfully bind with a real hw through indr block call, It also add nooffloadcnt counter. This counter will lead the rule add failed in fl_hw_replace_filter-->tc_setup_cb_call with skip_sw flags. In the tc_setup_cb_call will check the nooffloaddevcnt and skip_sw flags as following: if (block->nooffloaddevcnt && err_stop) return -EOPNOTSUPP; So with this patch, if the indr block call success, it will not modify the nooffloaddevcnt counter. Fixes: 7f76fa36754b ("net: sched: register callbacks for indirect tc block binds") Signed-off-by: wenxu --- v3: rebase to the net net/sched/cls_api.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 32577c2..c980127 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -607,11 +607,11 @@ static void tc_indr_block_get_and_ing_cmd(struct net_device *dev, tc_indr_block_ing_cmd(dev, block, cb, cb_priv, command); } -static void tc_indr_block_call(struct tcf_block *block, - struct net_device *dev, - struct tcf_block_ext_info *ei, - enum flow_block_command command, - struct netlink_ext_ack *extack) +static int tc_indr_block_call(struct tcf_block *block, + struct net_device *dev, + struct tcf_block_ext_info *ei, + enum flow_block_command command, + struct netlink_ext_ack *extack) { struct flow_block_offload bo = { .command = command, @@ -621,10 +621,15 @@ static void tc_indr_block_call(struct tcf_block *block, .block_shared = tcf_block_shared(block), .extack = extack, }; + INIT_LIST_HEAD(&bo.cb_list); flow_indr_block_call(dev, &bo, command); - tcf_block_setup(block, &bo); + + if (list_empty(&bo.cb_list)) + return -EOPNOTSUPP; + + return tcf_block_setup(block, &bo); } static bool tcf_block_offload_in_use(struct tcf_block *block) @@ -681,8 +686,6 @@ static int tcf_block_offload_bind(struct tcf_block *block, struct Qdisc *q, goto no_offload_dev_inc; if (err) goto err_unlock; - - tc_indr_block_call(block, dev, ei, FLOW_BLOCK_BIND, extack); up_write(&block->cb_lock); return 0; @@ -691,9 +694,10 @@ static int tcf_block_offload_bind(struct tcf_block *block, struct Qdisc *q, err = -EOPNOTSUPP; goto err_unlock; } + err = tc_indr_block_call(block, dev, ei, FLOW_BLOCK_BIND, extack); + if (err) + block->nooffloaddevcnt++; err = 0; - block->nooffloaddevcnt++; - tc_indr_block_call(block, dev, ei, FLOW_BLOCK_BIND, extack); err_unlock: up_write(&block->cb_lock); return err; @@ -706,8 +710,6 @@ static void tcf_block_offload_unbind(struct tcf_block *block, struct Qdisc *q, int err; down_write(&block->cb_lock); - tc_indr_block_call(block, dev, ei, FLOW_BLOCK_UNBIND, NULL); - if (!dev->netdev_ops->ndo_setup_tc) goto no_offload_dev_dec; err = tcf_block_offload_cmd(block, dev, ei, FLOW_BLOCK_UNBIND, NULL); @@ -717,7 +719,9 @@ static void tcf_block_offload_unbind(struct tcf_block *block, struct Qdisc *q, return; no_offload_dev_dec: - WARN_ON(block->nooffloaddevcnt-- == 0); + err = tc_indr_block_call(block, dev, ei, FLOW_BLOCK_UNBIND, NULL); + if (err) + WARN_ON(block->nooffloaddevcnt-- == 0); up_write(&block->cb_lock); } -- 1.8.3.1