Received: by 2002:ab2:b82:0:b0:1f3:401:3cfb with SMTP id 2csp1080044lqh; Fri, 29 Mar 2024 06:47:43 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWxQ1j98Bd6IECkwthoreN7PXq7yKVb/3fRJNQd8WU0BPKJN2arvvt6IV/LzLCxWqpTbuDOZufy2IiuFHukG/5WN5JewCE9hR4rrWdrDA== X-Google-Smtp-Source: AGHT+IGUfWX513ovXlk0Or7a1XcRHMXitrpGgk0168OgfTKlwC556etTMM5xcnINnxCMl0poXb/2 X-Received: by 2002:a05:6870:2199:b0:22e:dce:39b6 with SMTP id l25-20020a056870219900b0022e0dce39b6mr349693oae.48.1711720063217; Fri, 29 Mar 2024 06:47:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711720063; cv=pass; d=google.com; s=arc-20160816; b=o5+GoSal8328IdwCS6n6MMYmewhDVoB4EYgCZDEMIBWPNjyigLyRHW63hUcxpijL7K SMX5J2jUFg08/4fuqfzpQl+yyzyGmK1i1Nxb1ve+oru8eA/KHeaGcbqSu0HfrnKjDg6O ZJcD8e/6+su2zSPR4fqJMysI8Nf9V57S990XMLP4h0YMC7+6csNrvS5otz97d8K6TaO6 qtMdZYKEtoZiSGDVOBwBiTyD4e0wnDQ3+4vFvDB/fTXZPtmcWt0WjcE+DbJc84PamSlQ 7HU6y8Pr9Uvkx7oWBgx8XHkoTz7rovsnO0aj12FWwl2MWnakk5FS4Sc9BKU6CkW/J4vf 9wfw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=PJ3uUQmtCQBk+4jw8UTM4DR6qkCzv/M71/HzMhUwUpg=; fh=M2JM/MLai9FRDzHFHaavaFFP3VA27wt11UKUEfbcNqg=; b=KVuRnLaQGunwWiI7JicgtM22+xRjVTddw2Cj4rFmfJt9CLCbAUwIrppvuO9mEYAuvg sHf6RR2QTiN1ZS20OzZV6MZFxrWYcTCPkpQjc0FCIIw2f9aKusA1QwxdB2m9IDjWby4E eMaBTDb2ciMhodK0vPAJczt1XjJc+LHpTT+vsSOJFqwNzlsDErOZR3De/ak6bE+5umNM Jrn7dhuVoZvHAFAJDbRZcwnOT3/3hvghjD2AH8HxF0xuB6Fkk2K+2vCB4GVPJweyPyal onuXCm5JH/GfHrrvMl/J/byiPLEpckZ+TdbOvL+bYIpAlJD/5FgifY4eRyGZl7VJFBrx 8kOQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r3+fm6XY; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-124749-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-124749-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id h31-20020a63211f000000b005f0919c5533si1622899pgh.855.2024.03.29.06.47.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 06:47:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-124749-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r3+fm6XY; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-124749-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-124749-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 99169289217 for ; Fri, 29 Mar 2024 13:41:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5C12117BB36; Fri, 29 Mar 2024 12:41:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="r3+fm6XY" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 60D8F17B50C; Fri, 29 Mar 2024 12:41:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716074; cv=none; b=sccdh99OMC55j8RtDJqkBpErNwwnfcNNko43VWNVqXP8v8mvxiPDN49QdmXxgedu+tkzlm8jrSHgd+RwQ9vfpDnQzoqu7LyujIZ6zLSwxKf42iH/YV7fuT6DWZatfbI/2s1gue/ZLKC7OaTY3CwTtU0vvINqJ8gzVzbGoEAuv/M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716074; c=relaxed/simple; bh=M5KWR1kOnUHwDGq3v++7oLxZFhzioC3ac36tmPcpu1M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DTljm5IgYR1EiHXNOKX3IHo8wnKJ8a1knfBSclus7UW3rFOsM2CtYeLxuwR71HFiZKuFI4c6r9nJ1D5Qgr2GbIYoX0Kn2dUTRK1vjGTZDqofsWNPlUZJdWMX571QFVMN1SmiXpyefRPZxpeANz9mgID8qahcIedLoQHlQFKGovQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=r3+fm6XY; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1727BC43394; Fri, 29 Mar 2024 12:41:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711716074; bh=M5KWR1kOnUHwDGq3v++7oLxZFhzioC3ac36tmPcpu1M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r3+fm6XYf2ML0iUAlJWRDGcdrspBN7Zmeaw20VuTfdSosOsjSmihCyCkMwkPR6rgm wl4L2AuBblasqnC+DPX/cOpe/NS1YL4vo8BxjKdG1fd6OW3ppNHcmHUW1nfacFoUUw xorcaocq23N7oV4BX3JE8qGnjYRsjXE3K+ttg1ujfJc+Jmum5l0fzK0PFMfBysGD0f 7hFFPFFyI9gAQ/GA9y2V/CKzBdnHjIa/xD+TtS4tE/NffiuyX3zXYP5hH941N3F/qD Doe7/Kolq/S8eY2bq9cr/x+0DV3/h6JySpSNJQ4ThxqWg3EztmvLiXWmMagLBJ5K0z jBdoDL521vKTQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zqiang , Joel Fernandes , Frederic Weisbecker , "Paul E . McKenney" , Boqun Feng , Sasha Levin , quic_neeraju@quicinc.com, josh@joshtriplett.org, rcu@vger.kernel.org Subject: [PATCH AUTOSEL 6.8 40/98] rcu/nocb: Fix WARN_ON_ONCE() in the rcu_nocb_bypass_lock() Date: Fri, 29 Mar 2024 08:37:11 -0400 Message-ID: <20240329123919.3087149-40-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329123919.3087149-1-sashal@kernel.org> References: <20240329123919.3087149-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.8.2 Content-Transfer-Encoding: 8bit From: Zqiang [ Upstream commit dda98810b552fc6bf650f4270edeebdc2f28bd3f ] For the kernels built with CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y and CONFIG_RCU_LAZY=y, the following scenarios will trigger WARN_ON_ONCE() in the rcu_nocb_bypass_lock() and rcu_nocb_wait_contended() functions: CPU2 CPU11 kthread rcu_nocb_cb_kthread ksys_write rcu_do_batch vfs_write rcu_torture_timer_cb proc_sys_write __kmem_cache_free proc_sys_call_handler kmemleak_free drop_caches_sysctl_handler delete_object_full drop_slab __delete_object shrink_slab put_object lazy_rcu_shrink_scan call_rcu rcu_nocb_flush_bypass __call_rcu_commn rcu_nocb_bypass_lock raw_spin_trylock(&rdp->nocb_bypass_lock) fail atomic_inc(&rdp->nocb_lock_contended); rcu_nocb_wait_contended WARN_ON_ONCE(smp_processor_id() != rdp->cpu); WARN_ON_ONCE(atomic_read(&rdp->nocb_lock_contended)) | |_ _ _ _ _ _ _ _ _ _same rdp and rdp->cpu != 11_ _ _ _ _ _ _ _ _ __| Reproduce this bug with "echo 3 > /proc/sys/vm/drop_caches". This commit therefore uses rcu_nocb_try_flush_bypass() instead of rcu_nocb_flush_bypass() in lazy_rcu_shrink_scan(). If the nocb_bypass queue is being flushed, then rcu_nocb_try_flush_bypass will return directly. Signed-off-by: Zqiang Reviewed-by: Joel Fernandes (Google) Reviewed-by: Frederic Weisbecker Reviewed-by: Paul E. McKenney Signed-off-by: Boqun Feng Signed-off-by: Sasha Levin --- kernel/rcu/tree_nocb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/rcu/tree_nocb.h b/kernel/rcu/tree_nocb.h index 4efbf7333d4e1..d430b4656f59e 100644 --- a/kernel/rcu/tree_nocb.h +++ b/kernel/rcu/tree_nocb.h @@ -1383,7 +1383,7 @@ lazy_rcu_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) rcu_nocb_unlock_irqrestore(rdp, flags); continue; } - WARN_ON_ONCE(!rcu_nocb_flush_bypass(rdp, NULL, jiffies, false)); + rcu_nocb_try_flush_bypass(rdp, jiffies); rcu_nocb_unlock_irqrestore(rdp, flags); wake_nocb_gp(rdp, false); sc->nr_to_scan -= _count; -- 2.43.0