From nobody Thu Dec 18 07:13:14 2025 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) (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 E75D319B586 for ; Fri, 14 Mar 2025 06:15:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741932957; cv=none; b=WudkiI/q+nfwdOE3xVLA71VT94nHbrW9oqqNiPio4NRZLi+ZLFqm2wTbOezxQ0llhPAFpaQQOXmL6gCVUh67Y6BZBSY3u5j3zu+I6pAOBzk3Xbdd6VZc0dZcVls4BgM0t/FrKDNyV+S4cQ5C25cNFcw3JqI53vRJtLxODMGZBl4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741932957; c=relaxed/simple; bh=0zD7s3jtU8T0QnDwNFPVi23rov59ZSfE8r2niGUwTpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F4d8nJq6Sjr2fmGJuPeG6IxvlfQaLgYzE+TnvjOlkyr7P+9VlsOoZjEqYUJRu/KymwQ13mS0ytGC09Or6jglhWivPjmBcAi3aCIpdkvvM2KqDJ2mdFuv3hARzKggVWktSiYKKP9pQmXs7xI7KKLgwhOuHI8h5lCVKRg5+x7po5c= 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=kEdIKGlD; arc=none smtp.client-ip=91.218.175.177 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="kEdIKGlD" 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=1741932952; 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: in-reply-to:in-reply-to:references:references; bh=MpyYup93rtdpPqOazjOWpUMNns5c+BBQgx0og/O/C6c=; b=kEdIKGlDaWDMSsPANjgdCoWUUq9Aqr4mi5OYIz7rsALJ4sjMBJg3BQ1uxepzQ2QiLXHTeS rgI7A3Z1vT15uePUZX+pSwvZjlpzip9/HvgWyN0cmiA5TbQ+zAeduhWHSB0dERoJH14Q2S Fot0pjHwPM3UuiKee4avcxnTc57xAL0= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Vlastimil Babka , Sebastian Andrzej Siewior , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [RFC PATCH 09/10] memcg: trylock stock for objcg Date: Thu, 13 Mar 2025 23:15:10 -0700 Message-ID: <20250314061511.1308152-10-shakeel.butt@linux.dev> In-Reply-To: <20250314061511.1308152-1-shakeel.butt@linux.dev> References: <20250314061511.1308152-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-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" To make objcg stock functions work without disabling irq, we need to convert those function to use localtry_trylock_irqsave() instead of localtry_lock_irqsave(). This patch for now just does the conversion and later patch will eliminate the irq disabling code. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c803d2f5e322..ba5d004049d3 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2764,7 +2764,11 @@ static void mod_objcg_state(struct obj_cgroup *objcg= , struct pglist_data *pgdat, unsigned long flags; int *bytes; =20 - localtry_lock_irqsave(&memcg_stock.stock_lock, flags); + if (!localtry_trylock_irqsave(&memcg_stock.stock_lock, flags)) { + __mod_objcg_mlstate(objcg, pgdat, idx, nr); + return; + } + stock =3D this_cpu_ptr(&memcg_stock); =20 /* @@ -2822,7 +2826,8 @@ static bool consume_obj_stock(struct obj_cgroup *objc= g, unsigned int nr_bytes) unsigned long flags; bool ret =3D false; =20 - localtry_lock_irqsave(&memcg_stock.stock_lock, flags); + if (!localtry_trylock_irqsave(&memcg_stock.stock_lock, flags)) + return ret; =20 stock =3D this_cpu_ptr(&memcg_stock); if (objcg =3D=3D READ_ONCE(stock->cached_objcg) && stock->nr_bytes >=3D n= r_bytes) { @@ -2918,7 +2923,10 @@ static void refill_obj_stock(struct obj_cgroup *objc= g, unsigned int nr_bytes, unsigned long flags; unsigned int nr_pages =3D 0; =20 - localtry_lock_irqsave(&memcg_stock.stock_lock, flags); + if (!localtry_trylock_irqsave(&memcg_stock.stock_lock, flags)) { + atomic_add(nr_bytes, &objcg->nr_charged_bytes); + return; + } =20 stock =3D this_cpu_ptr(&memcg_stock); if (READ_ONCE(stock->cached_objcg) !=3D objcg) { /* reset if necessary */ --=20 2.47.1