From patchwork Wed May 24 01:19:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peilin Ye X-Patchwork-Id: 13253190 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 55EB2ED5 for ; Wed, 24 May 2023 01:19:23 +0000 (UTC) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49974139; Tue, 23 May 2023 18:19:21 -0700 (PDT) Received: by mail-qt1-x834.google.com with SMTP id d75a77b69052e-3f6c0d651adso5380031cf.2; Tue, 23 May 2023 18:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684891160; x=1687483160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kk5Fbp1XDe1Iwik6nOEtU3rLxoAf3ax2ERfkaCeUvsg=; b=OPUEswG9EUu6RwEkbOrd4uxrF/03QDQsRiIQBb/h+o4SSpw49e243AraXpmv2Y/N2v X/tr0xbtzYRrrg0+dYo14ypY3LD9P18XH/15tFFKEjyZCpTVwHlro62EhZ/xGpq3T26Y 2ZoDL5OTAw7uFvqFBqtJSCo/MZgn5LPSeOqKcu+vHFP0lAdxZw9W5gvZHtE4C6GpbSSW 3+oBQ8uoHBqVxv6sIW+C/kEQFHWh+QrmbbnWyHeCETkbNFlvxoflfSQhZspke83T2yuq RjSTp4365coJTuxm1cb4jWDEJb426TEULx4X4SrI22kWVWPCaPzLNwhEwkpKU1aZLwjw GQ6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684891160; x=1687483160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kk5Fbp1XDe1Iwik6nOEtU3rLxoAf3ax2ERfkaCeUvsg=; b=MsbVaiTGfaHhxV43P1C1Osl83iav4v49sqbzJgS5SEzLUyMExrA3PkT5NIB41CdD4A 12Io25SfIz2yBexUD6JmqD2db/ZtLN8wyIRtj61tt6nikBPYbFcQjgkSxboi0zOP/YcB zCby1aQ3z4TRbQG5t6IU4eNQp/7Ud/3AcBY5bvw9inNm4h03aHB6JkVAZ1lDAoMVnMoS NB//uPKtfHMXKg75YeRv137cG6VuVctUQUOaeZvqDuaAGEd8AMohLCh8GmdJwyZGct+c /gc8MM2EZdMvpAdYdnhzF7XM9B9VIO2An3FHwbEwTZBMpIJaaqPzVJCLc8Gbe9wlcIrH DoRQ== X-Gm-Message-State: AC+VfDzWrabRkzgO2+wcdXEVK2QGeYULPLHgay9yAPXegUTRBPydUtmd vVw/A17R18odwYBmrUDsmA== X-Google-Smtp-Source: ACHHUZ6cRC/LzSWJp/RtlNL890BtziHBgtcbTUcy9lDYbgreANgHq42Lr9NbGm8szYm4ZGUsK6UTuQ== X-Received: by 2002:a05:622a:1115:b0:3f5:1f9c:5b35 with SMTP id e21-20020a05622a111500b003f51f9c5b35mr25002785qty.63.1684891160401; Tue, 23 May 2023 18:19:20 -0700 (PDT) Received: from C02FL77VMD6R.bytedance.net ([2600:1700:d860:12b0:c32:b55:eaec:a556]) by smtp.gmail.com with ESMTPSA id r6-20020ac85c86000000b003f6b22de8f8sm1815119qta.91.2023.05.23.18.19.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2023 18:19:20 -0700 (PDT) From: Peilin Ye X-Google-Original-From: Peilin Ye To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jamal Hadi Salim , Cong Wang , Jiri Pirko Cc: Peilin Ye , Daniel Borkmann , John Fastabend , Vlad Buslov , Pedro Tammela , Hillf Danton , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Cong Wang , Peilin Ye Subject: [PATCH v5 net 3/6] net/sched: Reserve TC_H_INGRESS (TC_H_CLSACT) for ingress (clsact) Qdiscs Date: Tue, 23 May 2023 18:19:08 -0700 Message-Id: <9815766bb41f8413d90c14936974a528870044fa.1684887977.git.peilin.ye@bytedance.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org From: Peilin Ye Currently it is possible to add e.g. an HTB Qdisc under ffff:fff1 (TC_H_INGRESS, TC_H_CLSACT): $ ip link add name ifb0 type ifb $ tc qdisc add dev ifb0 parent ffff:fff1 htb $ tc qdisc add dev ifb0 clsact Error: Exclusivity flag on, cannot modify. $ drgn ... >>> ifb0 = netdev_get_by_name(prog, "ifb0") >>> qdisc = ifb0.ingress_queue.qdisc_sleeping >>> print(qdisc.ops.id.string_().decode()) htb >>> qdisc.flags.value_() # TCQ_F_INGRESS 2 Only allow ingress and clsact Qdiscs under ffff:fff1. Return -EINVAL for everything else. Make TCQ_F_INGRESS a static flag of ingress and clsact Qdiscs. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Fixes: 1f211a1b929c ("net, sched: add clsact qdisc") Reviewed-by: Jamal Hadi Salim Acked-by: Jamal Hadi Salim Signed-off-by: Peilin Ye Tested-by: Pedro Tammela --- change in v3, v4: - add in-body From: tag net/sched/sch_api.c | 7 ++++++- net/sched/sch_ingress.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index fdb8f429333d..383195955b7d 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1252,7 +1252,12 @@ static struct Qdisc *qdisc_create(struct net_device *dev, sch->parent = parent; if (handle == TC_H_INGRESS) { - sch->flags |= TCQ_F_INGRESS; + if (!(sch->flags & TCQ_F_INGRESS)) { + NL_SET_ERR_MSG(extack, + "Specified parent ID is reserved for ingress and clsact Qdiscs"); + err = -EINVAL; + goto err_out3; + } handle = TC_H_MAKE(TC_H_INGRESS, 0); } else { if (handle == 0) { diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index 35963929e117..e43a45499372 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c @@ -140,7 +140,7 @@ static struct Qdisc_ops ingress_qdisc_ops __read_mostly = { .cl_ops = &ingress_class_ops, .id = "ingress", .priv_size = sizeof(struct ingress_sched_data), - .static_flags = TCQ_F_CPUSTATS, + .static_flags = TCQ_F_INGRESS | TCQ_F_CPUSTATS, .init = ingress_init, .destroy = ingress_destroy, .dump = ingress_dump, @@ -281,7 +281,7 @@ static struct Qdisc_ops clsact_qdisc_ops __read_mostly = { .cl_ops = &clsact_class_ops, .id = "clsact", .priv_size = sizeof(struct clsact_sched_data), - .static_flags = TCQ_F_CPUSTATS, + .static_flags = TCQ_F_INGRESS | TCQ_F_CPUSTATS, .init = clsact_init, .destroy = clsact_destroy, .dump = ingress_dump,