From nobody Sun May 4 20:37:08 2025
Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com
[95.215.58.174])
(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 282D02EAF7
for <linux-kernel@vger.kernel.org>; Tue, 1 Apr 2025 17:09:49 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=95.215.58.174
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743527391; cv=none;
b=sSY/jaWs8wpwoSScWC3EjCl2EVqp3oAHqnwRnABE6oTQOd5a8BF1ZJnWbnwJEP8j/U438hb1Uk9eWxAxJOYA9mQCna6fWI+C21fHVBUQNABY0Gd/W0zdr4APCi4ZvCJ/wlxB70Km4IaG9nT0asx0Js5IOWviKyW3oANC6l1gDx4=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743527391; c=relaxed/simple;
bh=Vri8e4TPoGXUdzdKBijDhIyZkGhoJPzEHWiKCLNhT3E=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version;
b=U/YQ0xJ9dOZS73V0LlXk3WXK3QylOJ+dgrNpaX74EArSupidUjgscSYXT+gioDj4wh4ryFKdLnGiD8DrGOcn5rX9x//9NI4ZJmDdP0+Llnib7ud1n9bPTOqui8a4e8bNO+glYUZmG0+OE7Ctv9Ds3R3thvKNuqi3RL9ano9lies=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linux.dev;
spf=pass smtp.mailfrom=linux.dev;
dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev
header.b=VJ18IaoB; arc=none smtp.client-ip=95.215.58.174
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linux.dev
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=linux.dev
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev
header.b="VJ18IaoB"
X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and
include these headers.
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1;
t=1743527378;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding;
bh=kBnwje6boVgUJxbB8QyKCSQJNJwRZTVBfAi5NgyEuuA=;
b=VJ18IaoBTFLbEqhjH/GJqSFX0CUSbMuXtCDIkqBd9RlIgYodyDWiMcVSRWvX9/mEIMTqyU
7qRcv7bLgfI+skHZYiqcEdbVNUjEHKMFcfkzvuV2wWmXNE5z9OInfX6RpUMJgef/FRBClH
RGpUIO8Q8JqC+eZyfJOcA3UM72wPBF4=
From: Shakeel Butt <shakeel.butt@linux.dev>
To: Tejun Heo <tj@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
=?UTF-8?q?Michal=20Koutn=C3=BD?= <mkoutny@suse.com>,
Yosry Ahmed <yosry.ahmed@linux.dev>,
linux-mm@kvack.org,
cgroups@vger.kernel.org,
linux-kernel@vger.kernel.org,
Meta kernel team <kernel-team@meta.com>,
Jakub Kicinski <kuba@kernel.org>,
Breno Leitao <leitao@debian.org>,
Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Subject: [PATCH] cgroup: rstat: call cgroup_rstat_updated_list with
cgroup_rstat_lock
Date: Tue, 1 Apr 2025 10:09:12 -0700
Message-ID: <20250401170912.2161953-1-shakeel.butt@linux.dev>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Migadu-Flow: FLOW_OUT
Content-Type: text/plain; charset="utf-8"
The commit 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and
locking") during cleanup accidentally changed the code to call
cgroup_rstat_updated_list() without cgroup_rstat_lock which is required.
Fix it.
Fixes: 093c8812de2d ("cgroup: rstat: Cleanup flushing functions and locking=
")
Reported-by: Jakub Kicinski <kuba@kernel.org>
Reported-by: Breno Leitao <leitao@debian.org>
Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Closes: https://lore.kernel.org/all/6564c3d6-9372-4352-9847-1eb3aea07ca4@li=
nux.ibm.com/
Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
Reviewed-by: Yosry Ahmed <yosry.ahmed@linux.dev>
Tested-by: Breno Leitao <leitao@debian.org>
---
kernel/cgroup/rstat.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c
index 4bb587d5d34f..b2239156b7de 100644
--- a/kernel/cgroup/rstat.c
+++ b/kernel/cgroup/rstat.c
@@ -318,10 +318,11 @@ __bpf_kfunc void cgroup_rstat_flush(struct cgroup *cg=
rp)
=20
might_sleep();
for_each_possible_cpu(cpu) {
- struct cgroup *pos =3D cgroup_rstat_updated_list(cgrp, cpu);
+ struct cgroup *pos;
=20
/* Reacquire for each CPU to avoid disabling IRQs too long */
__cgroup_rstat_lock(cgrp, cpu);
+ pos =3D cgroup_rstat_updated_list(cgrp, cpu);
for (; pos; pos =3D pos->rstat_flush_next) {
struct cgroup_subsys_state *css;
=20
--=20
2.47.1