All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Dumazet <edumazet@google.com>
To: "David S . Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	 Paolo Abeni <pabeni@redhat.com>
Cc: "Jamal Hadi Salim" <jhs@mojatatu.com>,
	"Simon Horman" <horms@kernel.org>,
	"Toke Høiland-Jørgensen" <toke@redhat.com>,
	"Cong Wang" <xiyou.wangcong@gmail.com>,
	"Jiri Pirko" <jiri@resnulli.us>,
	netdev@vger.kernel.org, eric.dumazet@gmail.com,
	"Eric Dumazet" <edumazet@google.com>
Subject: [PATCH v2 net-next 11/14] net_sched: sch_hfsc: implement lockless accesses to q->defcls
Date: Thu, 18 Apr 2024 07:32:45 +0000	[thread overview]
Message-ID: <20240418073248.2952954-12-edumazet@google.com> (raw)
In-Reply-To: <20240418073248.2952954-1-edumazet@google.com>

Instead of relying on RTNL, hfsc_dump_qdisc() can use READ_ONCE()
annotation, paired with WRITE_ONCE() one in hfsc_change_qdisc().

Use READ_ONCE(q->defcls) in hfsc_classify() to
no longer acquire qdisc lock from hfsc_change_qdisc().

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 net/sched/sch_hfsc.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 4e626df742d7a937c219ae9755816f099b6f0680..c287bf8423b47b7ca022fc2e6ca19b77f3ec13a0 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -1174,7 +1174,8 @@ hfsc_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
 	}
 
 	/* classification failed, try default class */
-	cl = hfsc_find_class(TC_H_MAKE(TC_H_MAJ(sch->handle), q->defcls), sch);
+	cl = hfsc_find_class(TC_H_MAKE(TC_H_MAJ(sch->handle),
+				       READ_ONCE(q->defcls)), sch);
 	if (cl == NULL || cl->level > 0)
 		return NULL;
 
@@ -1443,9 +1444,7 @@ hfsc_change_qdisc(struct Qdisc *sch, struct nlattr *opt,
 		return -EINVAL;
 	qopt = nla_data(opt);
 
-	sch_tree_lock(sch);
-	q->defcls = qopt->defcls;
-	sch_tree_unlock(sch);
+	WRITE_ONCE(q->defcls, qopt->defcls);
 
 	return 0;
 }
@@ -1525,7 +1524,7 @@ hfsc_dump_qdisc(struct Qdisc *sch, struct sk_buff *skb)
 	unsigned char *b = skb_tail_pointer(skb);
 	struct tc_hfsc_qopt qopt;
 
-	qopt.defcls = q->defcls;
+	qopt.defcls = READ_ONCE(q->defcls);
 	if (nla_put(skb, TCA_OPTIONS, sizeof(qopt), &qopt))
 		goto nla_put_failure;
 	return skb->len;
-- 
2.44.0.683.g7961c838ac-goog


  parent reply	other threads:[~2024-04-18  7:33 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-18  7:32 [PATCH v2 net-next 00/14] net_sched: first series for RTNL-less qdisc dumps Eric Dumazet
2024-04-18  7:32 ` [PATCH v2 net-next 01/14] net_sched: sch_fq: implement lockless fq_dump() Eric Dumazet
2024-04-18 13:55   ` Simon Horman
2024-04-18  7:32 ` [PATCH v2 net-next 02/14] net_sched: cake: implement lockless cake_dump() Eric Dumazet
2024-04-18 13:57   ` Simon Horman
2024-04-18 15:20   ` Toke Høiland-Jørgensen
2024-04-18  7:32 ` [PATCH v2 net-next 03/14] net_sched: sch_cbs: implement lockless cbs_dump() Eric Dumazet
2024-04-18  7:32 ` [PATCH v2 net-next 04/14] net_sched: sch_choke: implement lockless choke_dump() Eric Dumazet
2024-04-18 13:58   ` Simon Horman
2024-04-18  7:32 ` [PATCH v2 net-next 05/14] net_sched: sch_codel: implement lockless codel_dump() Eric Dumazet
2024-04-18  7:32 ` [PATCH v2 net-next 06/14] net_sched: sch_tfs: implement lockless etf_dump() Eric Dumazet
2024-04-18  7:32 ` [PATCH v2 net-next 07/14] net_sched: sch_ets: implement lockless ets_dump() Eric Dumazet
2024-04-18  7:32 ` [PATCH v2 net-next 08/14] net_sched: sch_fifo: implement lockless __fifo_dump() Eric Dumazet
2024-04-18 15:04   ` Simon Horman
2024-04-18  7:32 ` [PATCH v2 net-next 09/14] net_sched: sch_fq_codel: implement lockless fq_codel_dump() Eric Dumazet
2024-04-18  7:32 ` [PATCH v2 net-next 10/14] net_sched: sch_fq_pie: implement lockless fq_pie_dump() Eric Dumazet
2024-04-18  7:32 ` Eric Dumazet [this message]
2024-04-18 15:04   ` [PATCH v2 net-next 11/14] net_sched: sch_hfsc: implement lockless accesses to q->defcls Simon Horman
2024-04-18  7:32 ` [PATCH v2 net-next 12/14] net_sched: sch_hhf: implement lockless hhf_dump() Eric Dumazet
2024-04-18  7:32 ` [PATCH v2 net-next 13/14] net_sched: sch_pie: implement lockless pie_dump() Eric Dumazet
2024-04-18  7:32 ` [PATCH v2 net-next 14/14] net_sched: sch_skbprio: implement lockless skbprio_dump() Eric Dumazet
2024-04-18 15:04   ` Simon Horman
2024-04-18 10:23 ` [PATCH v2 net-next 00/14] net_sched: first series for RTNL-less qdisc dumps Jamal Hadi Salim
2024-04-18 15:08   ` tdc [Was: Re: [PATCH v2 net-next 00/14] net_sched: first series for RTNL-less] " Simon Horman
2024-04-18 23:05     ` Jamal Hadi Salim
2024-04-19  7:18       ` Simon Horman
2024-04-19 14:24         ` Jamal Hadi Salim
2024-04-22 18:34           ` Simon Horman
2024-04-19 10:40 ` [PATCH v2 net-next 00/14] net_sched: first series for RTNL-less " patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240418073248.2952954-12-edumazet@google.com \
    --to=edumazet@google.com \
    --cc=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=horms@kernel.org \
    --cc=jhs@mojatatu.com \
    --cc=jiri@resnulli.us \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=toke@redhat.com \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.