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 74461C3ABC9 for ; Fri, 16 May 2025 18:32:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 567F86B0096; Fri, 16 May 2025 14:32:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C7E16B0099; Fri, 16 May 2025 14:32:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36B7A6B009A; Fri, 16 May 2025 14:32:43 -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 1680D6B0096 for ; Fri, 16 May 2025 14:32:43 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 2DEEA141113 for ; Fri, 16 May 2025 18:32:44 +0000 (UTC) X-FDA: 83449617048.03.6913F72 Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) by imf23.hostedemail.com (Postfix) with ESMTP id 77F61140008 for ; Fri, 16 May 2025 18:32:42 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=g9Xud4nU; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.182 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747420362; 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=2t99xT19g/7qy5mAbIT4AWoGMrbj8qhuG2xvxaCqjsc=; b=6SlH06JKyUnABQUl1fjJeg8/AsypNlwtvizqejqCI5WJXxkyIeTdkgt3WLRAGtrzg0NK99 VDYevSdTL3vxkLwASe7HJ9W4ulw3jIR026oY+1VARiRZ8NtJLqhAZenLJK+5mcs4HiWCh6 QFVIM0UvkqmQcb1V6ypr9jIsABGDSfQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747420362; a=rsa-sha256; cv=none; b=72rFPNlB7j2xvzNgmWEkoNViVLeswxGVIQtdsjavqH3g7tjC6pnf3X/kSbt5UMVBG9HORD AfecNwn4J14rynXZ+KccjyVmvMG+cu+acmWapu00WzNi5EdVVPYU8fIGywIfmlLQ7mQseo DgOdL6hol4NAFjaMAajXLNsUJo/4Om4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=g9Xud4nU; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.182 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1747420360; 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=2t99xT19g/7qy5mAbIT4AWoGMrbj8qhuG2xvxaCqjsc=; b=g9Xud4nUZSS+w16AXeSr86eISPm8z0RnsTRYEC0O7EG0WtZS2ILoi8kVtrFW57WBpTaSIi XBqNB77YOyqqJWg9yZW3MXM4KdQYrg+GewqdNyW3Kvx7LqNRJDuu4v9Pqd/pDno4e1MYoR X7yvh6M5HH3crF/7viXSJSX1y4rogok= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Vlastimil Babka , Alexei Starovoitov , Sebastian Andrzej Siewior , Harry Yoo , Yosry Ahmed , Peter Zijlstra , Mathieu Desnoyers , Tejun Heo , bpf@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH v3 1/5] memcg: disable kmem charging in nmi for unsupported arch Date: Fri, 16 May 2025 11:32:27 -0700 Message-ID: <20250516183231.1615590-2-shakeel.butt@linux.dev> In-Reply-To: <20250516183231.1615590-1-shakeel.butt@linux.dev> References: <20250516183231.1615590-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 77F61140008 X-Stat-Signature: 4xoix8i3kcj4qyqtdsy4cuu3rr6wi6of X-Rspam-User: X-HE-Tag: 1747420362-267392 X-HE-Meta: U2FsdGVkX1/Uca/EQuXe+MEtbWfN90HJYQSRMr66ZDqyMejxIOz10kE1KH1GJKBVrmFVzmpXxllzGfb/a18zOxQlAcwhibmB8c7qtMIWWSDNY8vIpKVo6OPqoxILANmdjISh+Dgw9/pwcPWY0soOWQY1EOYCYYjxGTrUeGLCipUh8frnyxg1NgiIdYn3ylFCYbWz+atG1CwfOscMb+YQ0WMqDloDRFM4Gc9rMelVLU610YTfsjL3sphYz6AEdZcPksceRL5ifHj40IWOKlnfAukz0/PuSP6dbLEb82QXYqJRUJSnIWQ/zElGU4DaPbwYi7GIdqLN+GOWFvW6v/jB3m+n0GJOo1I2TMiJwcMS5tliuOYS713CKsxPG3/N00FLN4OOvffgM4Xeh8+jaI8KW1xMIdmKut5/1sFEizkapMY8O5h+m2WN0NS1LIcACt+LozD4lGpWaqr0ymtP4YrfgE4OHK3yN+cd7ls7gkOUiOGaiBMFAPH1dKuUoq+hH0T7JEESHSsGRp9wIUOTCxAn/JoHQ16HZVyhnhz5RE2gfstWqQlXjDEJurBZZ85HTYbwIzyPJWVEKyFwJIONpxUVLVeJ85kKUjzSHi9Fz3nhV3A44ISxpCARMJyLJ9uK+2WZfdnyXGQ+Htt2KzhbmTzNw4fwG5RNeRfCkxCktbog9VOPrFuQOMLUxIDmc2tnTCXo9tYzFti9dmgPDlWKTrSVYw0tpqvuuwz+c1+qKCBx05YJlPY0+JwwdRuBebQKG8XQStexbZBhBOBrCG92eawU0CqoHRJRMTBysF3dC+YIjdRVXW2XJWwzgAwhZU1wVqBoUsIebFCoVBEukByUZslpdu0TGexKYD19a+sFJ2FRck/EFkdrjpI2/wDD9WZumEQzfCw4fIg8Gy2x+n381/r7YOn+rionnqDG26OII95nll0t2Nhuvr2iMMBceCnighvDi1ZKTUqpb4GhexKf3pz C1DhmHyS K7+tcBv2r+TmIytgl+c3moil+LN5mxdtaCiW/OcEWEoCdENOBtxuOS5XElzoZxwo6ayQUddp9SFTdvbxPeDEdo/VkVckT/DU4CUtVi+4t2/UyJJGiTvPpprhtwDOKPKOGSrtjOkAO7gMXboMCOOEGAZxJBBS/nqdTxGVq3JHM76eolL4= 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: The memcg accounting and stats uses this_cpu* and atomic* ops. There are archs which define CONFIG_HAVE_NMI but does not define CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS and ARCH_HAVE_NMI_SAFE_CMPXCHG, so memcg accounting for such archs in nmi context is not possible to support. Let's just disable memcg accounting in nmi context for such archs. Signed-off-by: Shakeel Butt --- Changes since v2: - reorder the in_nmi() check as suggested by Vlastimil include/linux/memcontrol.h | 5 +++++ mm/memcontrol.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index f7848f73f41c..53920528821f 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -62,6 +62,11 @@ struct mem_cgroup_reclaim_cookie { #ifdef CONFIG_MEMCG +#if defined(CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS) || \ + !defined(CONFIG_HAVE_NMI) || defined(ARCH_HAVE_NMI_SAFE_CMPXCHG) +#define MEMCG_SUPPORTS_NMI_CHARGING +#endif + #define MEM_CGROUP_ID_SHIFT 16 struct mem_cgroup_id { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e17b698f6243..0f182e4a9da0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2647,11 +2647,26 @@ static struct obj_cgroup *current_objcg_update(void) return objcg; } +#ifdef MEMCG_SUPPORTS_NMI_CHARGING +static inline bool nmi_charging_allowed(void) +{ + return true; +} +#else +static inline bool nmi_charging_allowed(void) +{ + return false; +} +#endif + __always_inline struct obj_cgroup *current_obj_cgroup(void) { struct mem_cgroup *memcg; struct obj_cgroup *objcg; + if (!nmi_charging_allowed() && in_nmi()) + return NULL; + if (in_task()) { memcg = current->active_memcg; if (unlikely(memcg)) -- 2.47.1