From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 C86BC4D90AE for ; Mon, 5 Oct 2026 17:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791220631; cv=none; b=K6FQTwxUbrw6oo5ryScNQH8cHVH6HT6NYQjnB2p1Yl6PUDk0CPE4m0dxuL5VYQ+gv+1UcDoiqtj+GnuR1XwDlcKurnzIrnHSeujkQ7M3BW7xSvctsKsOHut3cZPWzn144mLeHZjqf0lRkQGyZRhA84XPXNOSCVlB3bLpW8okOIc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791220631; c=relaxed/simple; bh=qSkRi8XlT4WUuuM/Vrnlxa70Aiw5xHXCcH5kKxR3bV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h16bHZUaCyBrk1umYzAMGO8hA3RoWvtCX7/g5wuSh4evaD+QQWe1ZIIgDjISp71JttfP9nw/cAUbEaSxcdIir0J1PuLDwfj87z54eLcE72NqyhFrAdKr70pcjU5+lLlzWQbjfrkVCe7VfUjNSJDSvqymi4Io3Nuvdz6uxO9zkmw= 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=ZaloghTp; arc=none smtp.client-ip=209.85.215.172 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="ZaloghTp" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-cc502d509c0so691812a12.2 for ; Mon, 05 Oct 2026 10:17:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791220629; x=1791825429; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Qdf2Dycggm4mT6sPheIXdhrke0YZJhuYFMLF05Xnp3s=; b=ZaloghTpme6lwdDuJficWeiRQ3uXolA+P2wbeidCD2xxCgyMi9oCq2INMnDLZJUek2 9Em+3UL4sJUgRhB5STMKCWxf9GvORO5cPgoHOMQuSORmdhRpMR9i8JLkg+zCdkOaGm5B 2IlIAm2+6NO5iolLBaVn4vcPJ80U/uFuXELgwh6m6Q+fgGvqkI8wM5un7TFTY7P8juaz CU3vL346gPuzwa4F1zMxANmtut4d6n3vNq+Aq9krtmVOs0OrR9JyOAud3nhXQ71Weba/ YLSus2wqXzBXF3jkni1+RBNz6kYfLwOEWm1yONbQyI6d6dYFwETDDwRVxXC8Q5pJgsIp f0Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791220629; x=1791825429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Qdf2Dycggm4mT6sPheIXdhrke0YZJhuYFMLF05Xnp3s=; b=vRYtBZmyqIZNEvz20fBJDZ4QphX95NfJQjaYpMiV+Rtj9oppchtgDoRqI/aD0T59Id yRtWR/39eqqF7w16dYD6iaYY0nu7B9Jecxj0s6iDVWSFp3TMkIczFjeLiXs18bhmFNbp LXIKWiBGzlYCzaYTPgVZbLSVrZlazMY01l++0gSmZoJ5D9Fw1hTGKHj912UV/ayeJlK/ 1LMU0l5sRayNGKb8zbpDvkqbOS1CflHrbeSunYIINfY3VPb2dZ4TPGV1bOUepw3sRupP vbOG5nF+S8msUpI8+Ect1UcRn/6nkK/hDEyrINWaCKc7AOReGyoirC3gkJ9unijxhkY2 3YOQ== X-Forwarded-Encrypted: i=1; AKwUvBycESATvPNv5nCOi5eOdBkM+ZdpROwnj0xV9YYlUZ98xUmZ1nJj6ucQysMgJjCL2b8f71cmGeFjAHcr@vger.kernel.org X-Gm-Message-State: AFq9FYLKFm8k3alS218sATDXfiGkWyXFXwX1qQi0SmBtU40yOr9dVe90 XJXX4iwtbaLooeMDm2qQp247TB76p1/jxTsCmzUg0gpkmWMlRVPuIq0n X-Gm-Gg: AYBFou3iZGzAxrn0zyA3nJRMcL8zuVn2797scKQ6u917NGRyH7HOxsOUK2CiAd4VUz2 qZ2JLqdrgzs1s6frJmEKto9/t9C1VR81cH3Gyvwhj6HBT6qDW7mmEe5BOQpvlz45BPO71s4NnXo I/MTzweoN5t1knABPWdqGenG6j4jKjQ17rXc5eWC3K7Sz3cAd7X99q/iR0b1cNw/R4/2Dnky/Ii SKfLFzmap+5b13zBNP4+QlUFOqxrzh7qDhwg0CQHQxDXjcGFxzRnfs9rs1k43kZm3zJfRf0GJiF 0SG4wnSQ90/6wbIUEU99hjYsco/WIFdKH1FuQFZS96DoO/ujexL47l4bIAoxhT4JPW+NG39OdDg 1aIoLCxFY+OCa+ZpFNIDvmE+9XG7hHuY38EwuE0cfCubA6f18v0MaHneJCCEqPUVTjvKpyyKG19 k5CSTbaF0hlGlGt1eAh2qfDtlYZDfjz9FdmVtGyswi6MRXxhHS0vXB2dTm1cdSJk/E0wXVfxoLc EDf03icELd00srYBoij44Ah+QVi8g== X-Received: by 2002:a17:90b:5870:b0:3a8:32f2:f4a5 with SMTP id 98e67ed59e1d1-3a832f2f5e2mr1648236a91.53.1791220628556; Mon, 05 Oct 2026 10:17:08 -0700 (PDT) Received: from kernel.tail6741c6.ts.net ([216.195.201.24]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a853cafddesm406910a91.10.2026.10.05.10.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2026 10:17:08 -0700 (PDT) From: Kunwu Chan To: paulmck@kernel.org, corbet@lwn.net, mingo@redhat.com, frederic@kernel.org, neeraj.upadhyay@kernel.org, josh@joshtriplett.org, urezki@gmail.com, dave@stgolabs.net, lianux.mm@gmail.com Cc: stern@rowland.harvard.edu, parri.andrea@gmail.com, will@kernel.org, peterz@infradead.org, boqun@kernel.org, npiggin@gmail.com, dhowells@redhat.com, j.alglave@ucl.ac.uk, luc.maranget@inria.fr, akiyks@gmail.com, dlustig@nvidia.com, joelagnelf@nvidia.com, skhan@linuxfoundation.org, rdunlap@infradead.org, longman@redhat.com, rostedt@goodmis.org, mathieu.desnoyers@efficios.com, jiangshanlai@gmail.com, qiang.zhang@linux.dev, kunwu.chan@gmail.com, brads@mainlining.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, lkmm@lists.linux.dev, linux-doc@vger.kernel.org, rcu@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH RFC v3 06/15] hazptr: elide redundant first drain pass Date: Tue, 6 Oct 2026 01:15:20 +0800 Message-ID: <20261005171529.1378809-7-kunwu.chan@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261005171529.1378809-1-kunwu.chan@gmail.com> References: <20261005171529.1378809-1-kunwu.chan@gmail.com> Precedence: bulk X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Each scan cycle drained both wildcard generations: the unpublished "other" generation (pass 1) and the pre-flip current generation (pass 2). Pass 1 is not needed for correctness, so flip the wildcard first and drain only the old generation while building the Bloom filter. An acquire that read the old wildcard before the flip may publish it into its slot after the drain has passed that slot. Such a straggling acquire cannot have loaded the pre-unpublish pointer; see the following LKMM test for the ordering argument. Signed-off-by: Kunwu Chan --- kernel/hazptr.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/kernel/hazptr.c b/kernel/hazptr.c index 799784f698ed..86336f229f57 100644 --- a/kernel/hazptr.c +++ b/kernel/hazptr.c @@ -365,24 +365,19 @@ static bool hazptr_scan_walk(void *watch, struct hazptr_bloom *bloom) } /* - * Wait until no per-CPU slot or overflow-list slot holds @wc. - * Callers must ensure that the wildcard value in use by new acquires - * differs from @wc, so that the set of slots holding @wc only - * shrinks, which guarantees forward progress. - */ -static void hazptr_drain_wildcard(void *wc) -{ - while (hazptr_scan_walk(wc, NULL)) - cond_resched(); -} - -/* - * Move pending waiters to ->scanning and perform a two-phase - * wildcard scan shared by all waiters. + * Move pending waiters to ->scanning, flip the wildcard, then + * drain the old generation while collecting observed addresses + * into the Bloom filter. New acquires use the new generation, + * so old-generation slots normally only drain. + * + * An acquire that read the old wildcard before the flip may + * publish it after the scanner has passed its slot, but cannot + * have loaded the pre-unpublish pointer. See + * Documentation/litmus-tests/hazptr/hazptr-wildcard-flip-escape.litmus. */ static void hazptr_scan_do_cycle(void) { - void *scan_wildcard, *old_wildcard; + void *old_wildcard; struct hazptr_waiter *w, *n; LIST_HEAD(done); @@ -397,16 +392,11 @@ static void hazptr_scan_do_cycle(void) return; } - /* Pass 1: drain the unpublished wildcard. */ - scan_wildcard = flip_wildcard(READ_ONCE(hazptr_wildcard)); - hazptr_drain_wildcard(scan_wildcard); - - /* Flip so new acquires use the new generation. */ - WRITE_ONCE(hazptr_wildcard, scan_wildcard); - old_wildcard = flip_wildcard(scan_wildcard); + old_wildcard = READ_ONCE(hazptr_wildcard); + WRITE_ONCE(hazptr_wildcard, flip_wildcard(old_wildcard)); /* - * Pass 2: drain the old wildcard while collecting observed + * Drain the old wildcard while collecting observed * addresses into the Bloom filter. */ while (hazptr_scan_walk(old_wildcard, &hazptr_scan.bloom)) -- 2.43.0