From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D68DC28B2F for ; Fri, 14 Mar 2025 06:15:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FBA128000D; Fri, 14 Mar 2025 02:15:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 982E328000A; Fri, 14 Mar 2025 02:15:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C2AF28000D; Fri, 14 Mar 2025 02:15:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 409F228000A for ; Fri, 14 Mar 2025 02:15:55 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0D6821C9172 for ; Fri, 14 Mar 2025 06:15:56 +0000 (UTC) X-FDA: 83219145912.04.BD5118E Received: from out-180.mta0.migadu.com (out-180.mta0.migadu.com [91.218.175.180]) by imf03.hostedemail.com (Postfix) with ESMTP id 5468C20010 for ; Fri, 14 Mar 2025 06:15:54 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=kEdIKGlD; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf03.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.180 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741932954; a=rsa-sha256; cv=none; b=zMrpPZDhMSMwatNeJnbWt0ZkHdbx7JrovfBAzyd1K+O+BE4YjMHCqzP8pWe2AjUgdB9xc9 IlGFb0tlzQqdqLVviAOC/VX2rgbFAUOtfp8gYIkWCEor4qG3vrxqQEuXL8HmMFG+gS0FST 0awE0xgdMYO7qVgLV1avTyKI3JHM7s4= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=kEdIKGlD; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf03.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.180 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741932954; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=MpyYup93rtdpPqOazjOWpUMNns5c+BBQgx0og/O/C6c=; b=tyY3VoiXCCSA3uGWn74BkESIKo9/0Mg2MniVEt7xMxecGJX3GR9DZ/XVvOAnkS0UkIhv/c CjojPwXebuyR/5znrcraqS12XGkvj5m53KkAiPRb4YSKDtgwnmsTiqytcZpCAMclS1Ad9L P8x7qVnt8Il5kj7QsUoA5FJi84jpHik= 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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Queue-Id: 5468C20010 X-Rspamd-Server: rspam05 X-Stat-Signature: mrd1emwaeas5fwjxswnxgj4d5batqxt1 X-HE-Tag: 1741932954-690825 X-HE-Meta: U2FsdGVkX1+5BSlc59VUKbJmKRc+3FQQ0NzooZgt10L7X74nIk8Gt+PdU7gEGc7ALq5SjoIThGWEo/HMIitDkz9hZWtsCgk7DIJu4jE+76X7Uy8YBYwoq7YTTwd83DgxQCKppqoHzTgaqpRv8fxXP71RDnWNhAv26woFmNTNJNja+83hhxcsidxrVlbkX9Vwjqc5C8TgdGr6/r6C0S/ESz9lQnzyH4mxRD5h76OBczqp44OW+PWpQwDkRztRDI5+AunjcbhQcJ02wWRS4GKBI3fAP/jRL/FoUk7Ann7WKDqMQgQsltXhmt06i9qkBTVGGV9nYk5glN2k39vixJy2OUWexw4JsBnec7UNdPa9yLpmq3TZ29sts5sS69eqvxD/fIcVOE+cn5NWDq3dTOOkdb4nmMb+dt+W+d+ZElXKO/+dLz0jaCc6QWUbLgo8KC7sGYjHvaIRrmjiygD7XKkWLM8/hwpTXWX01JnS+hP2JvrBRae2+tDOrBK2StDr4q2yCuJLtP0FZ0gsQLbikaWnaN8q8fLNaxXjOYdhuDWzfIoj6Rc4+CyYX8YG3FxGK2oDI/EP9n+Lr2PkPbWYa01l99rhZXxyyQAV/eu4Lja6M5yLAfdWyWwNGM8dtwLru6i8w1Dua62rD2Zp2Ipks8YCWm87bdnDOL+l7YxZQGdrL3912nNuAYQgFlfHroR246TqeIY5CUAI+K1HuNfxBNqri9RV7nqmdVlqaSU0oHX1WhJeMOyuLKSxz/Q2Zo2rIcRVnKGLbtPWBE4SRjB4rw6VgJeFoLsoAdEzpu7CBRODnMsi1oB6cc1s7MRy0axkI7Br9FxaDrFv/bE37AXVKUQ0lCIMXgMhPpqzIC7H+LzPzBCKLkoOLEyRLb6ZMdeKELHHdAktsEPDcF/PYU2DWsKZPBOk6H8O9M/S1BCESw8P9dPNOD7s7rHYh8RrJNqOSxutcbm4cid4+LIipB5uu5v m7hOg2zw 2N11Lz1i/l13T0JUts8bcZxX9kCMSP7EHLYnNibyyYnMXlgzXiVliPxEVBDlyx9DFs0Vrs3pG7tqbsIPqG0fuMLHMjg8e3T4fQUYmpZkw9g5KlAO26cAZBzFDtKBNMO3OcNmYXx1urTi7MpI99k7hYLQwplJ5et4y0obsipbD8dEJJzA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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; - 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 = this_cpu_ptr(&memcg_stock); /* @@ -2822,7 +2826,8 @@ static bool consume_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes) unsigned long flags; bool ret = false; - localtry_lock_irqsave(&memcg_stock.stock_lock, flags); + if (!localtry_trylock_irqsave(&memcg_stock.stock_lock, flags)) + return ret; stock = this_cpu_ptr(&memcg_stock); if (objcg == READ_ONCE(stock->cached_objcg) && stock->nr_bytes >= nr_bytes) { @@ -2918,7 +2923,10 @@ static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes, unsigned long flags; unsigned int nr_pages = 0; - 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; + } stock = this_cpu_ptr(&memcg_stock); if (READ_ONCE(stock->cached_objcg) != objcg) { /* reset if necessary */ -- 2.47.1