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 727BDC49ED7 for ; Mon, 16 Sep 2019 10:15:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AF8A2067D for ; Mon, 16 Sep 2019 10:15:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728662AbfIPKPj (ORCPT ); Mon, 16 Sep 2019 06:15:39 -0400 Received: from m9784.mail.qiye.163.com ([220.181.97.84]:1982 "EHLO m9784.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727945AbfIPKPj (ORCPT ); Mon, 16 Sep 2019 06:15:39 -0400 Received: from localhost.localdomain (unknown [123.59.132.129]) by m9784.mail.qiye.163.com (Hmail) with ESMTPA id 42D14419DC; Mon, 16 Sep 2019 18:15:35 +0800 (CST) From: wenxu@ucloud.cn To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH net] net/sched: cls_api: Fix nooffloaddevcnt counter in indr block call success Date: Mon, 16 Sep 2019 18:15:34 +0800 Message-Id: <1568628934-32085-1-git-send-email-wenxu@ucloud.cn> X-Mailer: git-send-email 1.8.3.1 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZSVVJQ0pCQkJDSU1PSEpJTFlXWShZQU lCN1dZLVlBSVdZCQ4XHghZQVk1NCk2OjckKS43PlkG X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6ORw6Ejo4Gjg0TCsRCBZRFRZJ Cg0KFEhVSlVKTk1DTUlDQkhOSENJVTMWGhIXVQweFQMOOw4YFxQOH1UYFUVZV1kSC1lBWUpJSFVO QlVKSElVSklCWVdZCAFZQUhCSE83Bg++ X-HM-Tid: 0a6d39920a772086kuqy42d14419dc Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: wenxu When a block bind with a dev which support indr block call(vxlan/gretap device). It can bind success but with nooffloaddevcnt++. It will fail when replace the hw filter in tc_setup_cb_call with skip_sw mode for checkout the nooffloaddevcnt and skip_sw. 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 --- net/sched/cls_api.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index efd3cfb..8a1e3a5 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -766,10 +766,10 @@ void tc_indr_block_cb_unregister(struct net_device *dev, } EXPORT_SYMBOL_GPL(tc_indr_block_cb_unregister); -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 tc_indr_block_cb *indr_block_cb; struct tc_indr_block_dev *indr_dev; @@ -785,7 +785,7 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev, indr_dev = tc_indr_block_dev_lookup(dev); if (!indr_dev) - return; + return -ENOENT; indr_dev->block = command == FLOW_BLOCK_BIND ? block : NULL; @@ -793,7 +793,10 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev, indr_block_cb->cb(dev, indr_block_cb->cb_priv, TC_SETUP_BLOCK, &bo); - 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) @@ -849,14 +852,14 @@ static int tcf_block_offload_bind(struct tcf_block *block, struct Qdisc *q, if (err) return err; - tc_indr_block_call(block, dev, ei, FLOW_BLOCK_BIND, extack); return 0; no_offload_dev_inc: if (tcf_block_offload_in_use(block)) return -EOPNOTSUPP; - block->nooffloaddevcnt++; - tc_indr_block_call(block, dev, ei, FLOW_BLOCK_BIND, extack); + err = tc_indr_block_call(block, dev, ei, FLOW_BLOCK_BIND, extack); + if (err) + block->nooffloaddevcnt++; return 0; } @@ -866,8 +869,6 @@ static void tcf_block_offload_unbind(struct tcf_block *block, struct Qdisc *q, struct net_device *dev = q->dev_queue->dev; int err; - 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); @@ -876,7 +877,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); } static int -- 1.8.3.1