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 A8E40C3ABDD for ; Fri, 16 May 2025 06:49:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A68D86B00BD; Fri, 16 May 2025 02:49:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C6256B00BE; Fri, 16 May 2025 02:49:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 868726B00BF; Fri, 16 May 2025 02:49:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6606D6B00BD for ; Fri, 16 May 2025 02:49:32 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9D1DCE3879 for ; Fri, 16 May 2025 06:49:33 +0000 (UTC) X-FDA: 83447845026.29.E8966E8 Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) by imf16.hostedemail.com (Postfix) with ESMTP id E0952180003 for ; Fri, 16 May 2025 06:49:31 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=wABxfM9x; spf=pass (imf16.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747378172; a=rsa-sha256; cv=none; b=RigU2DL2qw88WonVN8lfIJrR/11uNLwm1oxCS7JtR/Iny0jLQPjIVsuZHuJUvdwcyUc3wx YfJDeY2b1+8jWKnNr34mJANz7/Zuv+Ilk4mjxAra4sagxYyD9GSTIUmthOrDypzHUb0Q/W vnRdoUr8TleNp1oqVa9P5dJwgiuFVlc= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=wABxfM9x; spf=pass (imf16.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=1747378172; 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=IzHgteX+DiRHg0P96tNBM3iI8xKb/ZAbEXKlmYyzoHo=; b=TaoGqFH6dKKpks9RjM+/mLwuE+ZJbP3GhVSa0IDhEvOKyJDr0PFpVZk1AXKqIoLaVAFfMI 4JiEEfkoqW2RgH/B4Lr8hUWtHgJFAglaqVUBNESHDYWU+VDykdbwP9oBpb0E6nTLg54HoC +FTIlzUJF9pHvINpZS1cSVGvfa33ZL0= 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=1747378169; 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=IzHgteX+DiRHg0P96tNBM3iI8xKb/ZAbEXKlmYyzoHo=; b=wABxfM9xp6FgM9v7ejZlbjDnAnjdGnnbgbCx0VXaexVniB7dq1QHA/LwEkFWZ2av2p6uch Y7ipUI4zAY5p+Gx5upGd0zVpPwPO7iKgevbaZ/Asg1fGjb5XE2IlI2TQDykpYvV6YNXEk/ YbXBrcuLYceHt0ut41nZtsrfUbe3YS8= 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 , bpf@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH 1/5] memcg: disable kmem charging in nmi for unsupported arch Date: Thu, 15 May 2025 23:49:08 -0700 Message-ID: <20250516064912.1515065-2-shakeel.butt@linux.dev> In-Reply-To: <20250516064912.1515065-1-shakeel.butt@linux.dev> References: <20250516064912.1515065-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: E0952180003 X-Stat-Signature: 13zqkgb7wxdbw5wfsnxjxcc1qcyittp7 X-HE-Tag: 1747378171-87686 X-HE-Meta: U2FsdGVkX1/zt0/Pgbl/zKFKglP4cVTyfRMbG3KEyC0RdlLUwwTnK+ouFl5FxeX47CD1B/l1bAO6l/GEkCf3biiXinDo/bSUOg0c4aA7Qy2KutHx7WQ078LmJ1uzUp7A+kd/31777ZLqm4vqjsdnIeegoqGk1COalWWjmZqzvL4B0ViNisDzqph7NRnHyE5sPPPBwI4vhQkbKoyFJ/2/AprWXmf8YNoAVod5/4VtSahU4pmXyUqjc5R1VcY/PtufOu+Twz0zoM5TT561uzwxS8vHOB6zQJNitavfIvi7vWMRgnpmfs0rbTMfokWTBmZ5rP28Ip5paI9cklwsk39lvs3xsgVGdaSmoTsBCHPje52zIcE/9R8XCuG6Upog7rHMDhZ7kygscfRJoEXWxeSGP2DBuLacUVw6/FyC24v0nZ2Ryrt4B+L1mPIdTEEd/icMM8bF80pJ1zIzkbZO6FPYuM+C+SVHYVNCYRRz8qeELeRByu5Sx7inbNkEgbxF/mhmko3TFz0s2EPVhhDwRBfEOi/JpSYg995ajh59IO8AXuEvwlJ9WWGo6/4caFyZo7RsBCB9Hst2WeDA4Qzfdf5+nVdt9M8LcK3SFnYHQhrGdNeExpizS0CUOGlP6ck1Uk92jNwuNC/ydDM0sOAVvemobCRxR+yKJPhueHXlUnmWFsZFBc2OV7Rx5ad/jcQtLrtD4BardGejK8gli0GhpidtzQHyvQlyLLqbffSK3xttMskBjE5FBwhkcOPMbePKby01tJhFzH7dhwsX45umy7yF/IMKJw0qeAWK9Ep2TCSI3v/23hIXG4Jnw5U0pXCohIVIYQC95JwGg9zD5FuaaCGT78lRNaLj4pb6VKoOi/jU8VPrjQ1PAL8Ep55agIAvIbpUIMlbt+TCWqBZ3jl0bAh9sUCtcLl91W6dmlc13RZc6u/XPOf/DM8TtOTcq/HOcAdJW0aJT/6qJG9lPSUaOTP rGwPAfA/ yul06mXCeZFYbFAnrKWAxZSvom0v8f4xW3tO+BkRy20QrbJAisyf48vWo3eTXuH9zQ2ZLhqQ0iyH/60FFuzzPKmq9/WMBysNgU03TGjUcXamqs8QHDL8bym63D0llptJA5uCc0OZbsnGpmFYzQT6CB/oSj+5hS2oF7TgHu18AiMJTFts= 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 --- 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..dface07f69bb 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 (in_nmi() && !nmi_charging_allowed()) + return NULL; + if (in_task()) { memcg = current->active_memcg; if (unlikely(memcg)) -- 2.47.1