From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 235103E0227 for ; Mon, 25 May 2026 09:07:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779700075; cv=none; b=J454jrIGNgdwkwh6jkOxal1R2qFVeea0xw/QaJd/dukKQP2C25nx6ZREWhLE8VjunoHLLN7eIlwQqBzamLGioKCRoYdQICgRpYBIZM7i97VRY6Fz2q/cW3b3TRT8Ac8nUeNEBaWo8I3vablckMjwc7sLigUSa75nnKybkloqT+E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779700075; c=relaxed/simple; bh=pJdx2xij+cxLMzXfJM2Aq01QHnppLs9Fm+DnOtJadtM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=P4jcSEKnjn57IrZOES+9guI8VJHtldU73CmqBNQl2QvFDcH5niNe0TElQH2rukvABxmzaInpcBXQix6ToyM4brypmWX5ohHaFZJajtybG/b12mRXjSJyuJmpVqZpB7i4qPVZR2Jl9dfMvlbMg+Im9a3yPCaCq2zUTIvlZ5M4MHg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=YheZVrb8; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="YheZVrb8" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso80491805e9.2 for ; Mon, 25 May 2026 02:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1779700072; x=1780304872; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=RKeRa75/JRbjnQhRaK29cTWmGYwVkcNGukeCupRKFx4=; b=YheZVrb8Xs/qRQAmHcZqtapMj/pzno/xFFhyGmd4OldCxWJ73U4iGJFtuVIurKyBcd krN0vcOhPJFCq6S3Ll1JzasFDCr5dGJvkSZlhz28OjFhklF01J4BH5GHiPVjF3m+gSL6 LMCr9ucCr2RiM2uaiBtjcio94Q/ONfr/xd7dDdI+7xDEolOpkP4kQT/6xU1PMoMO4rR4 aa07upXiQdQqjOBOtVhNe66TuHG2EPGtyjfXCQH9Xr8bjjgKHMHRnNTPD0nF3BIV3x/v LXdBFtuYWp5nWCeIu35E63zffD/gdfCiH6NPnxtQHC71pKyXqXEZyxzLGL9D/FzqYv6F Lc1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779700072; x=1780304872; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RKeRa75/JRbjnQhRaK29cTWmGYwVkcNGukeCupRKFx4=; b=HPPcx8GJAy+/5Pyvdlm8DVriDRFgRBKB9dHe6H+Ce+a3dyyOBnQIFgmwRSedn3jkhw bu2bLmTp1K2hF1aUCzWgEkfP+XCzswosIw+bHhBZyb9Xu86IAVTtI/Du/j0ZMaJn5XxI 9Sae8EKpkMuQ8a0uawMXU/VoVrT8wYaiv9MeDRP75GlZcJvYxeKJs0tqpKw+2jFnx73I XXUtyvKk87YyXm17XWCnnr5rnEXvWgXdhQlWCIjD94FuQ+SPJqI8rsCj+Nb2aR+r3Dn/ 672hYRCIlg/ezsXhTvXHQG0OjttWmRxF2fSOi0TJJLDpuy2yRB2VuUm0hk6T35WD55VB V37g== X-Forwarded-Encrypted: i=1; AFNElJ9bMHJTBDA2JmPrPnkl+pQhDRv9lVfhNEmX+fx1DO8fWM+E6Oncetvr7r+/LmRCaiM9f/1DNRSNUpoS8mk=@vger.kernel.org X-Gm-Message-State: AOJu0Yzu3oXGlrhOvdNtL2wP6uq8u4OUHQH7logJkh7RqidsBqOVPuRf DzVJD06DaaPHzq3uGMO29z9t5rFaaVrhX44kKQQzA/ev54EP+G0e2H72t5ISgZB332k= X-Gm-Gg: Acq92OHhfKCGBJglEIxdvc56sWV4bHQaAaiD2y8BB7Zx4eEOXPTmbguWRlVemVW7w1W tDpC+inTx+HYd3r5aQdvcDdnl/+ztY39hBcgeJ18EEJ4FBpvDDBtn8ZpIfj24CD4z3r7IR2xb1F oZhazHQmMuN9MroT5wVnpDN/V86Cz2nVg/XbQzv7d7NuSnpm2g9CVTiSSn4B4kVgPulOi0wUVH1 GQ9qextFinGmKfv0xROIBVS/OF7CdzMVU7Y1gAUg3EOhDcodpg33S8+kql/ABZAR81uegMU4dxk ZKyDUHiv4Bi3Qa3xqR4/7fbmrre/bUPlXgd9LqU33wkndpU9xfDMX1AgneT5NFtpkfE8efkwM3h TDNxkje/agdD1/vHOay3W4xD3aBp+5nF3r+P30hLyAR2a3AlRvRPEy5qCrhX7PKqSrah8QbScFg 4isxAhOaIFo3C3DQfJreg57MbNCVcVmjeC/sAa X-Received: by 2002:a05:600c:3d96:b0:490:5429:1513 with SMTP id 5b1f17b1804b1-49054291bbamr145600515e9.6.1779700072522; Mon, 25 May 2026 02:07:52 -0700 (PDT) Received: from localhost (109-81-80-247.rct.o2.cz. [109.81.80.247]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d5e484sm24638766f8f.30.2026.05.25.02.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 May 2026 02:07:52 -0700 (PDT) Date: Mon, 25 May 2026 11:07:50 +0200 From: Michal Hocko To: Shakeel Butt Cc: Andrew Morton , Johannes Weiner , Roman Gushchin , Muchun Song , Harry Yoo , Meta kernel team , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] memcg: use round-robin victim selection in refill_stock Message-ID: References: <20260521223751.3794625-1-shakeel.butt@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260521223751.3794625-1-shakeel.butt@linux.dev> On Thu 21-05-26 15:37:51, Shakeel Butt wrote: > Harry Yoo reported that get_random_u32_below() is not safe to call in > the nmi context and memcg charge draining can happen in nmi context. > > More specifically get_random_u32_below() is neither reentrant- nor > NMI-safe: it acquires a per-cpu local_lock via local_lock_irqsave() on > the batched_entropy_u32 state. An NMI that lands on a CPU mid-update of > the ChaCha batch state and recurses into the random subsystem would > corrupt that state. The memcg_stock local_trylock prevents re-entry > on the percpu stock itself, but cannot protect an unrelated > subsystem's per-cpu lock. > > Replace the random pick with a per-cpu round-robin counter stored in > memcg_stock_pcp and serialized by the same local_trylock that already > guards cached[] and nr_pages[]. No atomics, no random calls, no extra > locks needed. > > Fixes: f735eebe55f8f ("memcg: multi-memcg percpu charge cache") > Reported-by: Harry Yoo > Closes: https://lore.kernel.org/4e20f643-6983-4b6e-b12d-c6c4eb20ae0c@kernel.org/ > Signed-off-by: Shakeel Butt Acked-by: Michal Hocko Thanks! > --- > mm/memcontrol.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 0eb50e639f0a..6392a2704441 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2031,6 +2031,7 @@ struct memcg_stock_pcp { > > struct work_struct work; > unsigned long flags; > + uint8_t drain_idx; > }; > > static DEFINE_PER_CPU_ALIGNED(struct memcg_stock_pcp, memcg_stock) = { > @@ -2214,7 +2215,9 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > if (!success) { > i = empty_slot; > if (i == -1) { > - i = get_random_u32_below(NR_MEMCG_STOCK); > + i = stock->drain_idx++; > + if (stock->drain_idx == NR_MEMCG_STOCK) > + stock->drain_idx = 0; > drain_stock(stock, i); > } > css_get(&memcg->css); > -- > 2.53.0-Meta -- Michal Hocko SUSE Labs