From patchwork Thu Feb 15 16:04:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= X-Patchwork-Id: 201629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp507032dyb; Thu, 15 Feb 2024 08:14:25 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWQ9jiHi9OmWsW8SsMxBvUSznjDyyxaBQXM64RiTrMPA25e9azDIXVbicUATc5oeUuPzwEqDlsYiUeMld1h2nJEw/x0Kw== X-Google-Smtp-Source: AGHT+IHmZaWg6ZekLJjCJVBlXsgnORow55CLb4uO8rPgFPKkiVGwBOQ/4+HtlJqXHpxfWvkMmMW3 X-Received: by 2002:a17:90a:eb0b:b0:298:a701:aacc with SMTP id j11-20020a17090aeb0b00b00298a701aaccmr1784707pjz.47.1708013664986; Thu, 15 Feb 2024 08:14:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708013664; cv=pass; d=google.com; s=arc-20160816; b=r/LNqnWSRVENDEBO9ftZGEqWEJeyYR65ER/BLUCWfs5wFWDhX/wKZ6+l8Equ7JtsRQ zu7N9m0Ax6pvoLYCauJgWsb0PhjdM0U26B+/L3xFrcVoj1pU7+1dro2JpA04PCzC12tD ABIXOTHA4pgJ1w9b/kspdltaRjdA8zUpHXV3j/O+Zo9uCCgAh6jqS5ZdkioRu/lHtaQh SvFb1GFmp55HO8VOptFANt5/9rJ6rsSFQvBqy7BWJkKFg+jRt91vUcmrqyoLm+I8hwnt h85IUeyPuXC67vJn4VjDyhwsa5nBRSQAK7LcCqVTFRatu8oclKREnCcQIvAY4ZixonOJ ZIng== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=KeMP8SmCe5eKL109ZTAKbfiLHJ2qZ7p4SvBszrclqa4=; fh=qwn0ZN7d/LlgLhwKKJFblL2+CYxSTOyA+LLcZtnY3QM=; b=kD1XMmoqyNUV7xjZj/jSydi3HXF8xe+9peqNyjScp86pyMq9LKxQN5Ts0kvz2g4gsO Qm/Xw5EOsLQd65XhE1sNAen8r9rGtS5EWCOMUp9c3R+hib85cvNmJhawkBmtCtmzyfg2 VG4BT2F7vw7clnsmAl3BvJs0VulMzB9TX525ik3CuFzxQl27B8E7g/qb20ddgLzl7+P/ 6D2EnT4igauEI86nNbXxnzZzjAXjAcQJeOYeXagFQyuJvUPyKIhofsmaA1TTNXvks6cz 3PVjUtifuNlmC3Pl1v6D7beV6ExiPPc8rSajdRTR8TaYrLussY5UcTtjTkxcIwsMG7/V 2TAA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@fiberby.net header.s=202008 header.b=rbUByrVn; arc=pass (i=1 spf=pass spfdomain=fiberby.net dkim=pass dkdomain=fiberby.net dmarc=pass fromdomain=fiberby.net); spf=pass (google.com: domain of linux-kernel+bounces-67283-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67283-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fiberby.net Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id mu4-20020a17090b388400b00296fcd007d2si1464301pjb.29.2024.02.15.08.14.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 08:14:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67283-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@fiberby.net header.s=202008 header.b=rbUByrVn; arc=pass (i=1 spf=pass spfdomain=fiberby.net dkim=pass dkdomain=fiberby.net dmarc=pass fromdomain=fiberby.net); spf=pass (google.com: domain of linux-kernel+bounces-67283-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67283-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fiberby.net Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id DB3C72886FE for ; Thu, 15 Feb 2024 16:13:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6A66F136671; Thu, 15 Feb 2024 16:06:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b="rbUByrVn" Received: from mail1.fiberby.net (mail1.fiberby.net [193.104.135.124]) (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 2FF9E1350EF; Thu, 15 Feb 2024 16:06:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.104.135.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708013203; cv=none; b=gf9jPSVJv32Ub2NG/ctW5jlq4Z8isxm3PbQxbHuBpsg+6HdNmW9vvWcRJCmQ4F7pOt02Mc/G7/7qsC57fvKsw3y44s/oT7sEa4CF1XHnFAj7tPzCScjJsimwQFpfB4lUVERoloVDMtV+cwiMktaxogCzjSmaAEoUmRVfFIVlBak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708013203; c=relaxed/simple; bh=t0ya6U+qD8pjYYUmzKIRrk3nGKiLV2qy6SQI597Ey+w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pM/nrEoXRHavbbcXMozXRI3JbM5LJelHahWDJ2VkwSGWdzajC5GF0sufzKWJzHlRm50O7GqxpkJXtNlngFxVDlZ5utFn589IijLEJ4c6ilM/0cB9aF2k3wv7tYy9ySFExBnnda2SojA1zIR20LcjwZZfI+8iGN736SOyneFYEo4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net; spf=pass smtp.mailfrom=fiberby.net; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b=rbUByrVn; arc=none smtp.client-ip=193.104.135.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fiberby.net Received: from x201s (193-104-135-243.ip4.fiberby.net [193.104.135.243]) by mail1.fiberby.net (Postfix) with ESMTPSA id 16B146030D; Thu, 15 Feb 2024 16:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fiberby.net; s=202008; t=1708013196; bh=t0ya6U+qD8pjYYUmzKIRrk3nGKiLV2qy6SQI597Ey+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rbUByrVnqY8YTE//qqwdPG4bnQFVSAdKCo8Traw3RFyTZECAbA7ctkxh7FwUIGfH0 S7hFBo6u4joMnyTssavePgnyQ2y8JycQpdJKNLMP8jsJry3zvBZllHuiU+H+nWQJuS 7y2IxzBvn3unD2g3rLOhAGh6Lx5Smk7CluembziXNRqtdV5Xio3vv/aP3zpinqjIIk kHNziVXD5EQ7wwoC2Es3mH+olgafCJViHDUHHsOFm5dHr5gjon3P0PPSIc9opSd7ij 6V885E1IMH4lA264/ZFMkBv104wMYZNpk028gmx2rO21tI3l6HAErYWsmhM6U6WHHS vyeWpxheLC5Ag== Received: by x201s (Postfix, from userid 1000) id C8A24205B9D; Thu, 15 Feb 2024 16:05:50 +0000 (UTC) From: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= To: Jamal Hadi Salim , Cong Wang , Jiri Pirko Cc: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= , Daniel Borkmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, llu@fiberby.dk Subject: [PATCH net-next 2/3] net: sched: cls_api: add filter counter Date: Thu, 15 Feb 2024 16:04:43 +0000 Message-ID: <20240215160458.1727237-3-ast@fiberby.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240215160458.1727237-1-ast@fiberby.net> References: <20240215160458.1727237-1-ast@fiberby.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790982136666598818 X-GMAIL-MSGID: 1790982136666598818 Maintain a count of filters per block. Counter updates are protected by cb_lock, which is also used to protect the offload counters. Signed-off-by: Asbjørn Sloth Tønnesen --- include/net/sch_generic.h | 2 ++ net/sched/cls_api.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 46a63d1818a0..7af0621db226 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -427,6 +427,7 @@ struct tcf_proto { */ spinlock_t lock; bool deleting; + bool counted; refcount_t refcnt; struct rcu_head rcu; struct hlist_node destroy_ht_node; @@ -476,6 +477,7 @@ struct tcf_block { struct flow_block flow_block; struct list_head owner_list; bool keep_dst; + atomic_t filtercnt; /* Number of filters */ atomic_t skipswcnt; /* Number of skip_sw filters */ atomic_t offloadcnt; /* Number of oddloaded filters */ unsigned int nooffloaddevcnt; /* Number of devs unable to do offload */ diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 397c3d29659c..c750cb662142 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -411,11 +411,13 @@ static void tcf_proto_get(struct tcf_proto *tp) } static void tcf_chain_put(struct tcf_chain *chain); +static void tcf_block_filter_cnt_update(struct tcf_block *block, bool *counted, bool add); static void tcf_proto_destroy(struct tcf_proto *tp, bool rtnl_held, bool sig_destroy, struct netlink_ext_ack *extack) { tp->ops->destroy(tp, rtnl_held, extack); + tcf_block_filter_cnt_update(tp->chain->block, &tp->counted, false); if (sig_destroy) tcf_proto_signal_destroyed(tp->chain, tp); tcf_chain_put(tp->chain); @@ -2364,6 +2366,7 @@ static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n, err = tp->ops->change(net, skb, tp, cl, t->tcm_handle, tca, &fh, flags, extack); if (err == 0) { + tcf_block_filter_cnt_update(block, &tp->counted, true); tfilter_notify(net, skb, n, tp, block, q, parent, fh, RTM_NEWTFILTER, false, rtnl_held, extack); tfilter_put(tp, fh); @@ -3478,6 +3481,23 @@ int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts) } EXPORT_SYMBOL(tcf_exts_dump_stats); +static void tcf_block_filter_cnt_update(struct tcf_block *block, bool *counted, bool add) +{ + lockdep_assert_not_held(&block->cb_lock); + + down_write(&block->cb_lock); + if (*counted != add) { + if (add) { + atomic_inc(&block->filtercnt); + *counted = true; + } else { + atomic_dec(&block->filtercnt); + *counted = false; + } + } + up_write(&block->cb_lock); +} + static void tcf_block_offload_inc(struct tcf_block *block, u32 *flags) { if (*flags & TCA_CLS_FLAGS_IN_HW)