From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (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 C7410175A70 for ; Mon, 2 Mar 2026 09:14:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772442887; cv=none; b=gRZ+07UfQC6FeQtowkqsL5KOH7hlF6uFg28UeDWgpPAevJk2MD6BlSU9lsTkHw5fF82XPLxzWGbOFUgA05y1nEeoVnzMEt2w5L2IL8jsPzlgocbttHLWJKxe2jEmqjmrbM7vo9VhNWVh0UXApFXvgMR82zQsq0bOSGzmGWhx2WA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772442887; c=relaxed/simple; bh=jkHaHLPHXNUp5xINEGydB1QE2vGw3qTz1fuWgd/pyQU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=kCDx6dxxqHJFIGiR37sqvftiaemy6Qo9xkeT+KDUiWZgiH/xeulDOio65kuGUKSxK2e0WFS2R8g3mHm0B+2lqFMdYOu48W73HdbYSPMkPYJQOaxXtyfaMghCAMGiCSKpZ5kiIMwk1XvqcbkqGIHJ2LgEE+QcowAmOnXFkoXIN7U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=d6QJSAel; arc=none smtp.client-ip=209.85.215.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d6QJSAel" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-c7103601c8cso1856005a12.2 for ; Mon, 02 Mar 2026 01:14:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772442886; x=1773047686; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=s6eLhm2/d8jded2I+Y9ZlUdy+WuZDx9ghyfh4XuLKOk=; b=d6QJSAelivUQNw5zWa0tMzeLCF/sdQShzIC9MIoV/I3bTo1KKASUQhceHdWCXXqY/W DiMxl8sRE17YHpy8SRTYnMyq0NSnKW8/iWKjcVDhcnXRzftJgqln6oXuN1X+TiZtI7nJ ikoaqG4vlBbJ/M7pVHlKMkkUTfpeRLwEGrGhzKr1EP6ofYUx2y4bS2I0BYivYJ/ck4Ic nRL8IujY82P54byU6UWIndwW9tg9UjQpDQq8iRwtxESBVnbk8uEgJJG9C3LwoOaW29gC EnLot/ughvnjVkyADH2uHmDrG+Dyic5skTBjclPTq64qZcCwZtVhZLDi+parXqTDeCQE CaDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772442886; x=1773047686; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=s6eLhm2/d8jded2I+Y9ZlUdy+WuZDx9ghyfh4XuLKOk=; b=o+ILZOGsRWkJMyj9dG4GJHutTCOy4s6kss8r3/hlv9HGZk+bg0FW8sQqJ0dZwnjPAt LBqKKYvwnb2AZN3myu61mUA3Jf8uW/vBqjesqr1ilwUdJLU9WUcIfGfuxt1FTs5WLUiJ bLgH4L/yvdPfpRASOjDi73cHBE0+L4ZwB9HRkHEBRxWsQQLwzn64cePWwH08KOpC8tGJ aYHeyHJXmH1ir1bWzP3VuVu29PWF3BOwFgXNpTqVpIsLAs4xqQkZM6wZL5NrhXdAhlH0 SI8+R1MwZQ89RqBmrdi1MMCW8ddXUo6Z+Kbvp5bKLrjMS/WAKhUhAWRzfrd4u1UPdGb7 d4Sg== X-Gm-Message-State: AOJu0YyQIfjI1wnGkAmDYY4Em4rk3a2WysttND1HxQ45IS6uCyF/zsvD dGmRNB8Q7fw2pAeIfQOkFrI3mtrYGVTXxzkkp99hXw2mmgOa1rYq46ls X-Gm-Gg: ATEYQzyeDfx1T15rSNKweqgpmau3sFpaGPki8dYNqyx2iL3gt4wR78gBLxy8rSNKhc8 1bE9V3x/khlAAyHoyoON5TOnCN5UYcuMMky/TfTXtHmInzUmgSwo8zz5DRywvZvXYO+wFWK6XhU W+GsrD5KGNSW4lvdrSf6fpJTYMk53YbRXp+Lza40yKrqZqOGkbGfOBwhPALHxbQqswBO2Y9iUn/ b2xf4BQOqYQM2zx2l83ul3qmYF4TjbPsJeM0cJxxuktgJg64seCFBn6hCi4OSCNlSML6260+qjJ FPf68TnTwaRbTa8ksAy0hHXBAoZN00qk73I4WAHlvESZnH0xQlrkES2/3v8lru6ZDtKrFt7oiKd F0QieeGw02ARLDFtlOBJ53qKqmx+SiM6NPbsC8Wd0SB3dpBsi6M1YD930lrmUrEnFT8kgqhjQQj BGIzL4/cyrZsaDty0JSXMtaRjJNUV/eMQkk1fLfPK8pZUgmo2emSAVvwIEJ30qBg6HC+0qggMEK KPR X-Received: by 2002:a17:902:e806:b0:2ae:5a70:476b with SMTP id d9443c01a7336-2ae5a704bf1mr4858395ad.15.1772442886053; Mon, 02 Mar 2026 01:14:46 -0800 (PST) Received: from mi-HP-ProDesk-680-G6-PCI-Microtower-PC.mioffice.cn ([43.224.245.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae496470d3sm39729525ad.15.2026.03.02.01.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 01:14:45 -0800 (PST) From: zhidao su To: sched-ext@lists.linux.dev Cc: linux-kernel@vger.kernel.org, tj@kernel.org, void@manifault.com, arighi@nvidia.com, changwoo@igalia.com, peterz@infradead.org, mingo@redhat.com, zhidao su Subject: [PATCH 1/2] sched_ext: Use READ_ONCE() for the read side of dsq->nr update Date: Mon, 2 Mar 2026 17:14:39 +0800 Message-ID: <20260302091440.3973220-1-soolaugust@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: zhidao su scx_bpf_dsq_nr_queued() reads dsq->nr via READ_ONCE() without holding any lock, making dsq->nr a lock-free concurrently accessed variable. However, dsq_mod_nr(), the sole writer of dsq->nr, only uses WRITE_ONCE() on the write side without the matching READ_ONCE() on the read side: WRITE_ONCE(dsq->nr, dsq->nr + delta); ^^^^^^^ plain read -- KCSAN data race The KCSAN documentation requires that if one accessor uses READ_ONCE() or WRITE_ONCE() on a variable to annotate lock-free access, all other accesses must also use the appropriate accessor. A plain read on the right-hand side of WRITE_ONCE() leaves the pair incomplete and will trigger KCSAN warnings. Fix by using READ_ONCE() for the read side of the update: WRITE_ONCE(dsq->nr, READ_ONCE(dsq->nr) + delta); This is consistent with scx_bpf_dsq_nr_queued() and makes the concurrent access annotation complete and KCSAN-clean. Signed-off-by: zhidao su --- kernel/sched/ext.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index 136b01950a62..718401f4ff2a 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -972,8 +972,12 @@ static bool scx_dsq_priq_less(struct rb_node *node_a, static void dsq_mod_nr(struct scx_dispatch_q *dsq, s32 delta) { - /* scx_bpf_dsq_nr_queued() reads ->nr without locking, use WRITE_ONCE() */ - WRITE_ONCE(dsq->nr, dsq->nr + delta); + /* + * scx_bpf_dsq_nr_queued() reads ->nr without locking. Use READ_ONCE() + * on the read side and WRITE_ONCE() on the write side to properly + * annotate the concurrent lockless access and avoid KCSAN warnings. + */ + WRITE_ONCE(dsq->nr, READ_ONCE(dsq->nr) + delta); } static void refill_task_slice_dfl(struct scx_sched *sch, struct task_struct *p) -- 2.43.0