From patchwork Sat Feb 22 02:44:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13986516 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 20199C021B3 for ; Sat, 22 Feb 2025 02:44:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A366E280004; Fri, 21 Feb 2025 21:44:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 998EC280002; Fri, 21 Feb 2025 21:44:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 812FF280004; Fri, 21 Feb 2025 21:44:53 -0500 (EST) 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 60D0E280002 for ; Fri, 21 Feb 2025 21:44:53 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 21A8350A79 for ; Sat, 22 Feb 2025 02:44:53 +0000 (UTC) X-FDA: 83146038066.09.AFEF81E Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf16.hostedemail.com (Postfix) with ESMTP id 44A10180014 for ; Sat, 22 Feb 2025 02:44:51 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=lCZaFuxc; spf=pass (imf16.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740192291; 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=v3GSE8xL4BCDC6o3OqMQgPMvNv4GpRTdC8gwhotmjF4=; b=UOirDdi/u3tIarYVJTmMJA9+3cUsriX7KkBrwgUwSHoL/9RkgjE9RXGUxbtyws+BLTpaI3 cblyVMlgQwEpojc+U0rhxXUG6FyOr/25bv/wxFfPp0U7v5MpLi0Ga1ti/K6UOfDBqLoVDj FaIct8xnMgV+DTaUGFbaNk0SY42+kpw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=lCZaFuxc; spf=pass (imf16.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740192291; a=rsa-sha256; cv=none; b=3ImQKYUtKmmV6uXPClrU14M3O+JPm9Vg8/gdHCQ1W2cUzncntDNMMruAisDJ5rb1jJdiBD 1OkYkAWYv+65eAM6bvojwx10BvVnXA/S/EFqpcOZ/5ZdLVFEKNk/1F5fJN9JcZzCHe08nB CcD85U9CjV8ee41eOrkJwTONQXiRCa8= Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2fcc99efe9bso4381989a91.2 for ; Fri, 21 Feb 2025 18:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740192290; x=1740797090; darn=kvack.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; bh=v3GSE8xL4BCDC6o3OqMQgPMvNv4GpRTdC8gwhotmjF4=; b=lCZaFuxcIZGzYu+2Ik59QEZ12+N6pS6VRXl8TzuUHu5ASu8606jbVU7IwSVOJ8vtqs 4h38JejinEp70z1piU93Luu8DGbZtLyBe97iOS5QkBbc4oj0NUr6DVT/Vebci7AbF4L0 ZsxBz0e4SL3hr3/DDUPsn4DxfCU8O8mmOYeqdDW/xITl/RZda2sZ8vqtZAibnAixdJ7i iizvKpGiQsmMJ7EoO2PDGC/ax1a6FLocT9YTdzScfcXjpb3a9qTBnGKUtv0c29isd4Cv qLR3VZo3arPDfGFhmIWSk7VBmOVgbFFxRCSD4plaqjDF2K4s7FTYRKGP2YshjEhyj5uC GdLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740192290; x=1740797090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v3GSE8xL4BCDC6o3OqMQgPMvNv4GpRTdC8gwhotmjF4=; b=ZIcZ0rYrU9qjqppAKj0WKs3+IYk9P2M/rifCZI1gVTCZXViHVSaQruQsdR5fOYWEFf h2W00ggf2hwhSZYjGXKFkWsUCJj2DZ4Rvh0KSuSoL4ihySNcnySP+unl8gWNT4kh4MQ9 XowiBYfXQjEvDeJFbLETRYwEcuFsvViiuZi7lM9s3yi0N4OZ/qywyLckAToPUYGWUKK1 JDfv8OREaS6Kjok/r9zJNXSnjtrJ4UzPGtS/Mjl9PIzmbiPLOCrKC02CoF8aNTc2dYD8 va/wbufXpePbiFxdrwvmGFqRBJ5secz3vJcWClwUby7FkbmzFrbDDI5YxWqUZmMeZlwD Oa3w== X-Forwarded-Encrypted: i=1; AJvYcCVeN2MAMwQmB/v/fASgdsg+XQs9CyUtX40TorYMlnYDNG6ZTWwh4WU78oqSmHWbgb6p0wMjOoN1Bg==@kvack.org X-Gm-Message-State: AOJu0YxufsN0MO1wfC7910I63++nHn1GaLUJ94DOe2Y0ohkro/2yKBQD 1v8YCiKho1Q1IJG5Q5+YgPwt1iMZVyhoCH1OwXeKWEL3yu/02hxQ X-Gm-Gg: ASbGncvJoJJN+QjxyEGTmsdC/dWnRJ99We/oXV+a0UtvTbRALVYH10cf+4MSb4XOmU+ nHMnqBHymiCJNxdaPxFFDBA1dQoNkB0Op08MuNRLFTDWoefjP2tDsjomUwV5CCg1E+V1QAlmkxZ eYH4jetanU+85n7GtWlleH/JecZrlceUpTY1iaqqp/8NtvstdO6svKKiVTJ14HK69N8IdpMSM4h El4m5WDwS66h1pMbDRPz6sMI8anzuIq5jIf8AIlZxPfSZM01hl06qQ9twj+9bHWALFLiwovL4gP pMFcyYizYbH4qSKwk6xw188Ygto5eZemn03Wjibi2wXQ/swmr63u3g== X-Google-Smtp-Source: AGHT+IFLGHpgxyBxSlJviOmokWQ79A/ZPTGdiqZO1+sWjAAQ8SXex0TBGIOGdCqxJtQew4NhBBCvqg== X-Received: by 2002:a17:90b:2e8c:b0:2ee:d024:e4e2 with SMTP id 98e67ed59e1d1-2fce868cc3bmr9200563a91.7.1740192290163; Fri, 21 Feb 2025 18:44:50 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:fd1b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fceb0a0ab7sm2122738a91.47.2025.02.21.18.44.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 18:44:49 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: andrii@kernel.org, memxor@gmail.com, akpm@linux-foundation.org, peterz@infradead.org, vbabka@suse.cz, bigeasy@linutronix.de, rostedt@goodmis.org, houtao1@huawei.com, hannes@cmpxchg.org, shakeel.butt@linux.dev, mhocko@suse.com, willy@infradead.org, tglx@linutronix.de, jannh@google.com, tj@kernel.org, linux-mm@kvack.org, kernel-team@fb.com Subject: [PATCH bpf-next v9 4/6] memcg: Use trylock to access memcg stock_lock. Date: Fri, 21 Feb 2025 18:44:25 -0800 Message-Id: <20250222024427.30294-5-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250222024427.30294-1-alexei.starovoitov@gmail.com> References: <20250222024427.30294-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: k74jwyyaziyasbndx3bc51ncs7rntxtn X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 44A10180014 X-HE-Tag: 1740192291-608449 X-HE-Meta: U2FsdGVkX1/58bstEGA5zpkv70USyGPJlihnCno5Vud5GqilbaAQkwp98IipEvqCMcaox7bisMM/kLicOsUzqbJthyGnmQBQ9QhG6feSO804aagqnUIquHvPBD2HLRy5jRqVsFz+ydpbE4PbfLfWPiqrijy/d9MsGsMZsda/s9xHUfcr+eO3+jXiCI99LS7ycW33zJwl/lxO97YwKCRHhJpvw+EA+h8vNh83YGCVP2oPu3vNJNM3uuFrtpxihpXEbglJUbTykNghHjFr7yROx7X9Dj7bi0efzJSvzirzN8MesuQ3Zp9f/S9ArZt+v3MUc3ChmIYzRxP8v2P9Lr+rKDU3EHfIt+9HNGI8E/ipoIQizMDoXVbKcLoowM4vHOZKj2cGz76WeQ5rRPDuZQaaEkar27DPkroSiIcqSierkPh8pYFL8icCT2pstb+069767QpcAqwjjnauEdv5hTuI2mMtSmBh14DgIf04uYbvDWVY0Rlf7d1EOoY8wwAdGY0yBFXErEMSrdJ7FwE0J2zGy1BAOBAlXiQxXqHZKBTcS3hqlWHMN+Lol3HXLsQXhXGuM5dPrR3XgIK5qYysFl4tGG2h6Iy6f/xXVSgXkxF/90IH/2Be0oLhvFIgd84Jz9g6VuTEDPB7IbKX0d06Gc7sfuBkFuV3v5vruPbzitnbDK3qG/QTFwVck16ScdrCD9GnjT7+Zcyhe98+9w3EEWzxEdRHJ0g+wiOa4Vy1Vn1QKpEmiNtOlVKaBEbGEesxBIBNG6E8tkIB0LhNIIYb6piyKLdwFiV8PaVDW84r/uUyxeqGdJS1Tj8SRAjGwaspEtG2tXIF3BZXKGBE4zPYPNwBcjPJqlBP13Dj4Rr6x/4sJ6LzL1xyQvLuSqhlfevF/T2V1ONUPcyVFiUamEKSJrHDk74RcbLjk/NQEUGXwszkPxQ7LHCZcpqagYNbexxeqRn1HPo3kvy8dPF38TW9/SV OZtKjyRI gMBCDf+NvsEbJ6AsvTUFFBi5MYbs/uXEOcbU3HzVS1aqpGCbdPrUhVhULYhlslbChBC3vNVqQjeM6fgNlSkgg5TlMVTDnEitbQOabTRS4pL7cdQzgtHawp9xN1Q/FU6cH8v3xSuywmOXQu6UL4KR3DRE8VUktvJc7yfpx4wFqSsVEzifzQ4msUsr3C5RbauvtDxG1//hiHWOHTCl+A9f541iaWwZvkZiqj/1V0q2cv/jQiB7iLiV5GSBir4WisqJdOWFLbPO1XX+40Gz1g1BH5psuEMKBSwVOx5fpqDBBMrSApXbxR9hN1HbbDAu4NmtZw81DwGWunrCRcBKdl8NKUE0682ZVyWALnCEWoFRpDM8FKEnTY7mLwoDXXkweRDUb6/iqm2UlNFSYkQL72I/LSwWBdSlkVSOKFzOhJDJ4bYL3tF5HVA0Pr4ciiZb1gyV3p8rHPsZSlP5S1UTMKG7s6b6rGZZw9AT4KTAfQGVPS9afzcWC49IMa+TRvqJvEgrPNH5BdR2vhFHbUuHLUSApZPQ0ckrpmVOHxygo6zElmeE7BuSxXeKbNXYc4g== 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: From: Alexei Starovoitov Teach memcg to operate under trylock conditions when spinning locks cannot be used. localtry_trylock might fail and this would lead to charge cache bypass if the calling context doesn't allow spinning (gfpflags_allow_spinning). In those cases charge the memcg counter directly and fail early if that is not possible. This might cause a pre-mature charge failing but it will allow an opportunistic charging that is safe from try_alloc_pages path. Acked-by: Michal Hocko Acked-by: Vlastimil Babka Acked-by: Shakeel Butt Signed-off-by: Alexei Starovoitov --- mm/memcontrol.c | 52 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 4de6acb9b8ec..97a7307d4932 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1739,7 +1739,7 @@ void mem_cgroup_print_oom_group(struct mem_cgroup *memcg) } struct memcg_stock_pcp { - local_lock_t stock_lock; + localtry_lock_t stock_lock; struct mem_cgroup *cached; /* this never be root cgroup */ unsigned int nr_pages; @@ -1754,7 +1754,7 @@ struct memcg_stock_pcp { #define FLUSHING_CACHED_CHARGE 0 }; static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock) = { - .stock_lock = INIT_LOCAL_LOCK(stock_lock), + .stock_lock = INIT_LOCALTRY_LOCK(stock_lock), }; static DEFINE_MUTEX(percpu_charge_mutex); @@ -1773,7 +1773,8 @@ static bool obj_stock_flush_required(struct memcg_stock_pcp *stock, * * returns true if successful, false otherwise. */ -static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages) +static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages, + gfp_t gfp_mask) { struct memcg_stock_pcp *stock; unsigned int stock_pages; @@ -1783,7 +1784,11 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages) if (nr_pages > MEMCG_CHARGE_BATCH) return ret; - local_lock_irqsave(&memcg_stock.stock_lock, flags); + if (!localtry_trylock_irqsave(&memcg_stock.stock_lock, flags)) { + if (!gfpflags_allow_spinning(gfp_mask)) + return ret; + localtry_lock_irqsave(&memcg_stock.stock_lock, flags); + } stock = this_cpu_ptr(&memcg_stock); stock_pages = READ_ONCE(stock->nr_pages); @@ -1792,7 +1797,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages) ret = true; } - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + localtry_unlock_irqrestore(&memcg_stock.stock_lock, flags); return ret; } @@ -1831,14 +1836,14 @@ static void drain_local_stock(struct work_struct *dummy) * drain_stock races is that we always operate on local CPU stock * here with IRQ disabled */ - local_lock_irqsave(&memcg_stock.stock_lock, flags); + localtry_lock_irqsave(&memcg_stock.stock_lock, flags); stock = this_cpu_ptr(&memcg_stock); old = drain_obj_stock(stock); drain_stock(stock); clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags); - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + localtry_unlock_irqrestore(&memcg_stock.stock_lock, flags); obj_cgroup_put(old); } @@ -1868,9 +1873,20 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) { unsigned long flags; - local_lock_irqsave(&memcg_stock.stock_lock, flags); + if (!localtry_trylock_irqsave(&memcg_stock.stock_lock, flags)) { + /* + * In case of unlikely failure to lock percpu stock_lock + * uncharge memcg directly. + */ + if (mem_cgroup_is_root(memcg)) + return; + page_counter_uncharge(&memcg->memory, nr_pages); + if (do_memsw_account()) + page_counter_uncharge(&memcg->memsw, nr_pages); + return; + } __refill_stock(memcg, nr_pages); - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + localtry_unlock_irqrestore(&memcg_stock.stock_lock, flags); } /* @@ -2213,9 +2229,13 @@ int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, unsigned long pflags; retry: - if (consume_stock(memcg, nr_pages)) + if (consume_stock(memcg, nr_pages, gfp_mask)) return 0; + if (!gfpflags_allow_spinning(gfp_mask)) + /* Avoid the refill and flush of the older stock */ + batch = nr_pages; + if (!do_memsw_account() || page_counter_try_charge(&memcg->memsw, batch, &counter)) { if (page_counter_try_charge(&memcg->memory, batch, &counter)) @@ -2699,7 +2719,7 @@ static void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgdat, unsigned long flags; int *bytes; - local_lock_irqsave(&memcg_stock.stock_lock, flags); + localtry_lock_irqsave(&memcg_stock.stock_lock, flags); stock = this_cpu_ptr(&memcg_stock); /* @@ -2752,7 +2772,7 @@ static void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgdat, if (nr) __mod_objcg_mlstate(objcg, pgdat, idx, nr); - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + localtry_unlock_irqrestore(&memcg_stock.stock_lock, flags); obj_cgroup_put(old); } @@ -2762,7 +2782,7 @@ static bool consume_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes) unsigned long flags; bool ret = false; - local_lock_irqsave(&memcg_stock.stock_lock, flags); + localtry_lock_irqsave(&memcg_stock.stock_lock, flags); stock = this_cpu_ptr(&memcg_stock); if (objcg == READ_ONCE(stock->cached_objcg) && stock->nr_bytes >= nr_bytes) { @@ -2770,7 +2790,7 @@ static bool consume_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes) ret = true; } - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + localtry_unlock_irqrestore(&memcg_stock.stock_lock, flags); return ret; } @@ -2862,7 +2882,7 @@ static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes, unsigned long flags; unsigned int nr_pages = 0; - local_lock_irqsave(&memcg_stock.stock_lock, flags); + localtry_lock_irqsave(&memcg_stock.stock_lock, flags); stock = this_cpu_ptr(&memcg_stock); if (READ_ONCE(stock->cached_objcg) != objcg) { /* reset if necessary */ @@ -2880,7 +2900,7 @@ static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes, stock->nr_bytes &= (PAGE_SIZE - 1); } - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + localtry_unlock_irqrestore(&memcg_stock.stock_lock, flags); obj_cgroup_put(old); if (nr_pages)