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 11097C02185 for ; Fri, 17 Jan 2025 17:36:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CF5F280004; Fri, 17 Jan 2025 12:36:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 675ED280001; Fri, 17 Jan 2025 12:36:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FAB7280004; Fri, 17 Jan 2025 12:36:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2F3FF280001 for ; Fri, 17 Jan 2025 12:36:57 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id CD38AA0857 for ; Fri, 17 Jan 2025 17:36:56 +0000 (UTC) X-FDA: 83017649232.22.AC94DF7 Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by imf07.hostedemail.com (Postfix) with ESMTP id A63AC40003 for ; Fri, 17 Jan 2025 17:36:54 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=Ld3NEfcg; spf=pass (imf07.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.178 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1737135414; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7Rb8h7iwsxGtB2Jxx9CB8AY9s5fwogb7DDAbIS4Jt8Q=; b=oKyc86t7QU4iwrKJkuzRFoA1IvQpB5FT6d8BNsR4Sy4FaOXEIwUeJLYA8L/mhqb1KoY0mg YmNNfyb3wedsGzT/1ZHlZQ6mXA9+jYgVUiIJAi3gqx6rBTltxoTJbExFpKyDgidB6MZBmA 0egnH3/1SwQfwm+MdgE+rFEKWezmNc0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1737135414; a=rsa-sha256; cv=none; b=0pe5mTO1ChRDyLcRL6Afps0Ou/X5t2R9Mny11gkWskQwxkXgk8zCjw3htEHhB9HiAhd2cy SkuJF7+kQgEO9L6C8ks53TKAP/77Yil2RUvhYh9/0ggihge4RenLgZvJUegY9dpga70R5E Qb+ed9pCYWz26m5YOilOuQ2EyI3gdFY= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=Ld3NEfcg; spf=pass (imf07.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.178 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-467a6ecaa54so22070631cf.0 for ; Fri, 17 Jan 2025 09:36:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1737135413; x=1737740213; darn=kvack.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=7Rb8h7iwsxGtB2Jxx9CB8AY9s5fwogb7DDAbIS4Jt8Q=; b=Ld3NEfcgR9Z4PYBgPZYsKVHAfkPmbCfrOrbOkuaJ5lanW3oslGuC4UeJW19vSf3W1V SZ86vFOc6QhJvFztW/anl6XRJwLXA5INZ7YkNcIwTjdHtl3jVXGP2TgAKshTa2qXE4B0 j0JKkHicZZZgge1TVzUbzclkg8Q8sDx83MYgRqw7iSwGgY3lAkeH9qQB1MHY9UlTuhJr VgF9k8dSbWLuwF942YGg9IRMCdQqqMHrkGQc2o3+fkHzDgkKhNELJglPMW9P467qDuFy aWQKbM5urtXP/qsJhcPzY1pnKOCQbwDdO7XT+45Ovu0aObsfEkhowhmWHKBeHK5eYSnV vluA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737135413; x=1737740213; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7Rb8h7iwsxGtB2Jxx9CB8AY9s5fwogb7DDAbIS4Jt8Q=; b=T8yPUGIEv7U31j5Lua1wbuvbO+g5lbT6Siabs33Xj1iSVDnGEzeeBUSdXPAgyPJrsh t93BSxRwhSBctbI0eHNIpBxj0HcGWIN4XKU4CkpI9bVfOXhMXEW7cbOwMfDXjk8AeCrI tEZYByZVruH4fiHcSFw0C8rs3JVKxFxKUIYDl5ub4/S84kNJdNsiwM6sPC69X2qWtti9 CwltZ1iQMTZWWwGksTFNKzVf527IuNy0tDzs1AHNfkEkTNEjr8yk9mOrJhqJyfptnE2p nU/DOqL2Yh6zifS2SXvQ4GO3XWkhoRzaEenajghEKCLxwRD9BI0LKcR2EXZTgqrgOQGe znOQ== X-Forwarded-Encrypted: i=1; AJvYcCUSrlkWmyiYa2XiTh5zG+QV7VsW3BKVb/aDBf77Tnm3ZYofF8K7kLxsl+wXNhZrNGoQCFBSPevp5Q==@kvack.org X-Gm-Message-State: AOJu0YwmtXibLqjIzu0P958d6BHrzpkIA4u/aFEpWQjWI+TIbBd+QAPk 9Qve+ADohrWWpr/bK3ifSNeov7APzuTYq0+8yeSDOBSTrEgjz8T7ZeKozz515/k= X-Gm-Gg: ASbGnct884PZRxm9BHsrTga4IhVuORB0bAGixvqVZ4VG1JCY0jR0qDIKWoQNDdLkS7+ Ay6IQJiz6HrcWxKbDEHLy/buHB4vYcyAN+myflsADblgkvJyfZDf/qEVN1pKjppqK8NVaRh5xj1 ghpNUHLgow2x1p1Y39D8zfd/v0N72HIl2tijcqgGMUxducOW6smJy76QI/gGwqB6UZRhycTL9MN bhYC38lYYPcZBsWWyrL2MubECjsetA9rJ9l0kAD1Rli6raxvqEmEO0= X-Google-Smtp-Source: AGHT+IFP0vyEHf5uMK9mcP5ikvQCVxFQj9kliA9F6BCDOqUWAwOXEM0bkwrK3Boz183wkDpCcShmlw== X-Received: by 2002:ac8:5fc4:0:b0:467:5734:d08b with SMTP id d75a77b69052e-46e12abc7dbmr62165531cf.31.1737135413585; Fri, 17 Jan 2025 09:36:53 -0800 (PST) Received: from localhost ([2603:7000:c01:2716:f0c4:bf28:3737:7c34]) by smtp.gmail.com with UTF8SMTPSA id d75a77b69052e-46e102fc99asm13531981cf.29.2025.01.17.09.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 09:36:52 -0800 (PST) Date: Fri, 17 Jan 2025 12:36:49 -0500 From: Johannes Weiner To: Joshua Hahn Cc: Alexei Starovoitov , Shakeel Butt , Muchun Song , Andrew Morton , SeongJae Park , "open list:CONTROL GROUP (CGROUP)" , linux-mm , bpf , Andrii Nakryiko , Kumar Kartikeya Dwivedi , Peter Zijlstra , Vlastimil Babka , Sebastian Sewior , Steven Rostedt , Hou Tao , Michal Hocko , Matthew Wilcox , Thomas Gleixner , Jann Horn , Tejun Heo , Kernel Team Subject: Re: [PATCH bpf-next v5 4/7] memcg: Use trylock to access memcg stock_lock. Message-ID: <20250117173649.GH182896@cmpxchg.org> References: <20250116200736.1258733-1-joshua.hahnjy@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250116200736.1258733-1-joshua.hahnjy@gmail.com> X-Stat-Signature: gr8baoncbdmntx9a5bho8rcr8r5ecdgu X-Rspam-User: X-Rspamd-Queue-Id: A63AC40003 X-Rspamd-Server: rspam03 X-HE-Tag: 1737135414-400182 X-HE-Meta: U2FsdGVkX192oaRvr9dVIqJ9qQGWUhWBafxgTN9rLgteOBwFwIxnUeFFFqe4Dn8h4Sw4xESw+irNrB2GQSrrqL9cnRj6k3XDNO0TguH0XHYtz6dyM0NyHSRTeCMjnWpZzT/7wYvSapQ9c+zPtuZHbg1L0Kh8Reo1PfEbLNYhTXM7fbpexi2+Yi8qVU1J7zE6BF6c3RMf5VqKM6E4hUgIS/jJg/my2H0cCkEbQGYop1vB9xNZGTwGy/irZZ5l/QTY1DHOGtSLUXiZUEcD91VWwcc5UbLXRMfeHvRu/k1M+IGNljVVviywWsUZH04bz05vOXJiuDVgl1MpsIumelL4fsxgQpunAj2wpFRztOWL7oxlLxUr4PHGW6iX4g41DTXTsDwMOljxqhPvk615RKmlEpm79DaVjxB5S/Wb3de6EWIW1f7279FKnIjHjjvhTyoozPb5Q8NlRcy5s4NmyzWeomsVFQfiMz3SVOWhejsIQrsDwJPgF3w2NygFNiBw4JniiqAu4y26oJlvYhSaP5gYkcNlayPBRhkHRaCzdxOmajzhjO2ytrs9w0/KI/VksxwNr08y8L9w/gtCu4NVzmR45YIMGK9vO/bpcY09wtpXi2MOFLZsNIQQk0mhw901w2imI6Tv1kLtqQZYQwVfwar2B7ZGGP/L4OaQvFFmo+OSPSgUiBirvQCi9g5Q5IuXHPPeqhlR/x4rhcOdFqzbbhWSIOBEvpxCFyiUjn/UJxl3qetE2us70kq7ay0onzjPhP9rYF5cymvXMxgn8qLDqONtUvKvYKA9EcakAi5cSqmGMYXSdl9bp1YfEKHcE+7KtJ1lQvvzaOLYM14Td768k0qZHm/HLmvaJuClSTvpBhYKlDX5VdZvXWv/7+muhimfnXzB46YSsKD0rNAnpZeV4we58Yd0F5ASnTI0jPXOREXdWzKGaND2TlVt5tpJF8iABU71UdzUyz6rULwPhj8XoB4 zGG88vfS m3LHpmYXLt63qK/5ZEr8DQrESq72dJfkJXpK7RaKYveuxqbuiU8L8RMrvqZWRdFg0el/5iT4auQZRc5OKlbmCh5KTkdGuA3ICwXDiGVLqYE3CmEAEdEri7TrHE0oIe5X2OirPpPqcVIVtlw2XHYrRrccWkjxsuI38YtHX1c7K49s+Cz/yw8RlO4OCiv+7YowEEeHrbnGJKIv5hRoxVj/+F8eel+edaO/3SBq7Mm1uALLhdbrnPToSOHLI0PhJSOoEMNQ+4GJQYNONOFH5YaWz2pPZ+uM4ps/zUO+2JxWMwKjjBPFmVIOSEdcrht0Gv4pixgGAhEFnEtBN5SnjnKVWvPGUDd15c50vjBEZKEq/CD1Z7ksU5hB+QupEt4znEHAriHLCXOd7g0/kCQng9mHfD7A768vf9nZlTMAwvJ2jI4qhTeeYrDUORngUf7txShl5rEUwVF/0LIOzmfnmnmB3RbiAecSTvXm99/ooFdgH+OhBz43OkzbJMvC4IVUDuDB0ugZCpuCTKWYZdv/qvshT+C+8vQPyM+uttow5z2mt22auqULNg0YTh1IWIpSQSey6g3ctnoXUIIhmlLaScWCtpoKKlplKtRSsShwU4pqnwIn+ruiJR7ZsYktsXNR8L6hiZcIDPC5KyhwDIs3DAq5pxYF/Cw== 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: On Thu, Jan 16, 2025 at 12:07:28PM -0800, Joshua Hahn wrote: > On Wed, 15 Jan 2025 18:22:28 -0800 Alexei Starovoitov wrote: > > On Wed, Jan 15, 2025 at 4:12 PM Shakeel Butt wrote: > > > On Tue, Jan 14, 2025 at 06:17:43PM -0800, Alexei Starovoitov wrote: > > > > @@ -1851,7 +1856,14 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > > > > { > > > > unsigned long flags; > > > > > > > > - local_lock_irqsave(&memcg_stock.stock_lock, flags); > > > > + if (!local_trylock_irqsave(&memcg_stock.stock_lock, flags)) { > > > > + /* > > > > + * In case of unlikely failure to lock percpu stock_lock > > > > + * uncharge memcg directly. > > > > + */ > > > > + mem_cgroup_cancel_charge(memcg, nr_pages); > > > > > > mem_cgroup_cancel_charge() has been removed by a patch in mm-tree. Maybe > > > we can either revive mem_cgroup_cancel_charge() or simply inline it > > > here. > > > > Ouch. > > > > this one? > > https://lore.kernel.org/all/20241211203951.764733-4-joshua.hahnjy@gmail.com/ > > > > Joshua, > > > > could you hold on to that clean up? > > Or leave mem_cgroup_cancel_charge() in place ? > > Hi Andrew, > > I think that the patch was moved into mm-stable earlier this week. > I was wondering if it would be possible to revert the patch and > replace it with this one below. The only difference is that I leave > mem_cgroup_cancel_charge untouched in this version. Let's not revert. This is a bit of a weird function to keep around without the rest of the transaction API. It doesn't need to be external linkage, either. Alexei, can you please just open-code the two page_counter calls?