From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E83C3C6619 for ; Wed, 8 Apr 2026 12:56:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775652990; cv=none; b=YNFwatQOW6ouXy/DuYa4l49HtZlenr01OIDNlOWCgucCWMMFeUDs5xthMJgiR0+UB1ZidM3Dw08j6bFwqyohXLv1MdArfIz5B7/GhjMvkAJt/dfYNHCy4lYazahy4FUVksGUced0A/6ipuLlGhcoy2jA50NMB376CtnxY6x5iQU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775652990; c=relaxed/simple; bh=NLlOCX8azWcJx65h66z85wsmonxZA2LSWRD6jzZ1lQo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MJVPQkWE0jTw5bphtAWEG5MJpVVuMk+tO776X9UpjIbdQwzyWD8ZzuhNt54LLKjQCi3JjB2TBAw2BCSsgxceWRvvZS92WEqk97H8jCCmNMjalV9DqrlGy/pk3w6HXZdKPVz+Iec8+srOTv1s+2O8l0RZxzL71BoF9+WPWtIkW6w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=wCXqwxLx; arc=none smtp.client-ip=209.85.222.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wCXqwxLx" Received: by mail-qk1-f201.google.com with SMTP id af79cd13be357-8d5b5d607d1so951556585a.3 for ; Wed, 08 Apr 2026 05:56:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775652988; x=1776257788; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Ge1KbPtPse9CG3yxMaUrV47O0RjfiawbyUAvHe0Yefw=; b=wCXqwxLxdv9XFRiV4gt1gfoBVkySpR4lo9XIhamYin/AqlLLzO7+hrzcWojo0r5eyG 7foVoYFFCrgMkT9xk6RmZBB8+8DroJT6i2+8kvQ+LwfVTWiWJavAj6ao4J0NsTKbR00J flXhJtD1beh961zf+P9uc/MLKUBpBV5Y9oc683eWdeK1y2tNqDTu9VXaXdUid2KkpIh7 onk7Bd2xoTSyrab9mnvJvEfYtXY4rWcNIT8smShOD+a0OC1e13qxiS54wcnJLEehZ6d6 ouGqcLjc5pJPplPrrU7aVvqGKQTy4v0whyx9SDk4h44yLiiJu5xS0uNYYhvVjGC1fpoT FgPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775652988; x=1776257788; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ge1KbPtPse9CG3yxMaUrV47O0RjfiawbyUAvHe0Yefw=; b=MmrMIsEZj5rFh5OMQn2eI2zbXiqxKxzdvi4YxsKfnoqP1lJy+5yQtuFX93Ok5RVs5e L5CGqT7lUvB3x4EeJM8jwBYj/ek0AR4vVbxeA59VSU2gFRGXPJ4AaoIidhoJYJW3J8YX euqykfTwR1PiU/AuQbNB8c6s0k9Yz9MHV6WP0BI09JOp7qGWY4pV6tWN5tf75oT6gCx8 yhBvmE0YcRxHb3Nzwgyp/uF9TktoMdt80jDL8BSunS/AS3apMWaf9nOOk6aLprTuSSpF y3YSUjt4KxrFyIeggTJ+Ht8RpzJyO+mtXQdhccdy/RtdqDNHOskie0k4RM8M8cEYzfYh +7vg== X-Forwarded-Encrypted: i=1; AJvYcCUzrI07angd/jTDbzgvcaNR66wib6KwTwFg7oeiHG70ag3GYmokN1AuWo8qYOJxfgbbxCVNMc4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9zBbLvN+Qbgf73rW/Kaiw5CUZYnPY5WotJ5JF/i9TkGni7s7l 30Z/7iCTz0Z2XFdBtFvgESNRtpR8i+CIVQwUdVkUzbehXVDOO4h21BDsl7CBik1fOhpcfdfb7qX QPFPjuMhnMBGPhA== X-Received: from qkpa10.prod.google.com ([2002:a05:620a:438a:b0:8d4:1ac0:34ec]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:620a:201b:b0:8d5:bb98:f3ce with SMTP id af79cd13be357-8d5bb98f6f6mr1883595885a.60.1775652988175; Wed, 08 Apr 2026 05:56:28 -0700 (PDT) Date: Wed, 8 Apr 2026 12:56:04 +0000 In-Reply-To: <20260408125611.3592751-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260408125611.3592751-1-edumazet@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260408125611.3592751-9-edumazet@google.com> Subject: [PATCH net-next 08/15] net/sched: sch_fq_codel: remove data-races from fq_codel_dump_stats() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , Jamal Hadi Salim , Jiri Pirko , Kuniyuki Iwashima , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Content-Type: text/plain; charset="UTF-8" fq_codel_dump_stats() acquires the qdisc spinlock a bit too late. Move this acquisition before we fill st.qdisc_stats with live data. Fixes: edb09eb17ed8 ("net: sched: do not acquire qdisc spinlock in qdisc/class stats dump") Signed-off-by: Eric Dumazet --- net/sched/sch_fq_codel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c index 5c88278a30b3cd92ae525d1a88eb692ff0e296e0..db5cf578cbd63e842381cb147ced145fed4cca3e 100644 --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c @@ -586,6 +586,8 @@ static int fq_codel_dump_stats(struct Qdisc *sch, struct gnet_dump *d) }; struct list_head *pos; + sch_tree_lock(sch); + st.qdisc_stats.maxpacket = q->cstats.maxpacket; st.qdisc_stats.drop_overlimit = q->drop_overlimit; st.qdisc_stats.ecn_mark = q->cstats.ecn_mark; @@ -594,7 +596,6 @@ static int fq_codel_dump_stats(struct Qdisc *sch, struct gnet_dump *d) st.qdisc_stats.memory_usage = q->memory_usage; st.qdisc_stats.drop_overmemory = q->drop_overmemory; - sch_tree_lock(sch); list_for_each(pos, &q->new_flows) st.qdisc_stats.new_flows_len++; -- 2.53.0.1213.gd9a14994de-goog