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 C80CCC2D0CD for ; Mon, 19 May 2025 06:32:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ACAE06B0089; Mon, 19 May 2025 02:32:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A7C7B6B008A; Mon, 19 May 2025 02:32:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 96B0E6B008C; Mon, 19 May 2025 02:32:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 74A846B0089 for ; Mon, 19 May 2025 02:32:10 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B693E1CF979 for ; Mon, 19 May 2025 06:32:14 +0000 (UTC) X-FDA: 83458687788.01.6346934 Received: from out-178.mta1.migadu.com (out-178.mta1.migadu.com [95.215.58.178]) by imf18.hostedemail.com (Postfix) with ESMTP id F05FB1C0005 for ; Mon, 19 May 2025 06:32:12 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LOpPqdGw; spf=pass (imf18.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.178 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LOpPqdGw; spf=pass (imf18.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.178 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=1747636333; 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=N4FZldpF4GqktzniwkIkdN9+wQAuTiNO6J7GT2TDHJM=; b=gh7HQxNezHNzx/7Cj9hge2lw1lwGczv39TgxOTGC0JHB2z5gn1/TU3jTwrKk96i3A9MM3y N9zISjQEajWSi+WycefZ5ORuIhHwb/RCAEb5pX1/zMeI4KK+ezDVONBX4oDL+kyxWX5hyO 3Q0zdq+preBnufEE/1CUj57gxFarMYI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747636333; a=rsa-sha256; cv=none; b=kiuam5AC3LWwXPQ2CwubpsjWMT5RA6LP4tRRH2fejOe3yAKUqDcEsRW8YSjab9ktu5aHaB CS1n+FVtMDkPNbDfMwsPLoAuKUZewgLtU/BWSxgaUN297hGC6apJUAwFSqrrG4EGj1VhhW +gDPAxseJ6EdgrTAxwuclNag9/RXs+0= 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=1747636329; 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=N4FZldpF4GqktzniwkIkdN9+wQAuTiNO6J7GT2TDHJM=; b=LOpPqdGwVTtIP0zbqyv0THgRp28es+d9NT9WIwpXgEYTvlXV4mQIB6Qk+B83teJozFhY72 zuoQHmP1oW5upj8znNJGuMDX4O2BCkgKW4snGWa7YoRSAUKeXZFt7ej9Qungt/YyTUGtPq jQE+hdenHiYUJ/jG03tvDzsaE8s385s= 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 v4 1/5] memcg: disable kmem charging in nmi for unsupported arch Date: Sun, 18 May 2025 23:31:38 -0700 Message-ID: <20250519063142.111219-2-shakeel.butt@linux.dev> In-Reply-To: <20250519063142.111219-1-shakeel.butt@linux.dev> References: <20250519063142.111219-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: F05FB1C0005 X-Stat-Signature: y8w46foeq87rgy43eb5rpk59ogke1sx6 X-Rspam-User: X-HE-Tag: 1747636332-743055 X-HE-Meta: U2FsdGVkX1/UQa0jZUFuqbrsxWCUMISEZHiDa6vT5zXogUBQ7lO8O5M2mhXA/avKD2PRBZsEULhhaD9C137bnylEuFd7gjI1gc3raWoT7jsZxUwVnvx5+5cX5PQnCb9oLl6RiInKcYBRwZ+vqnjHEkZrDGXFr9a7edgtqbbED2QkSJsGpYWLss/sOo0VupTNJrvawO0FWHYJiCpw6LjDwzRcjrBZ/Yx2O8Gy3X1ma92ARmhGfhZNXPrcGNiy+xC715BjXyCS5glwXM3+J2N5Sg4cesIiStgXkje9PTvEs/USEDqns6rANBaWgk0LjwY6MxbxR+bumHXzvL57HpOE39PYjSjwGKoU4iEighBh7MswW+9XB1Cs6O/rHrE1Sx6p76gF27+zSR0gNVnIM4nbBoAVEGfMj80brD9CXPZPocJPWFG7mis/xlkQ8ymbmO2S2tvkWiM1puLIdq9luqv8oupjlCGDJoW8iyIJCqLKHvhcRYbgJ5SLRvuHBz9bjCyL5ThLMGW9TvLfBuT3WITY1mt2nWDfAeM0vo14beXGavFG8EuPPR8X3+TRkwiD3RBzBSiB+7rRBFsl8RkxfuMCa4jECqPO9bOuuUrDjhHHecOp87wpdqDEB24PaZqebeHeN+txI2VqMGZs42VZM2cbji6nPtArmnOq9RsZXCVQ1P69m9rqs5xLT5r5oyHYFzDF38OJ5eE/Eld3nT6tXYFpZYp0OOYC22RFI2YS4cnCaHS9kUkQu9V4L2z+gIgYNr0z7+THkgXGngSaqjznJU7Nlanp3TFkm9mDT61NKCnwQy+lcocyWAAm1WL4Xf8HxPKBO34/cMQwG8cZjzxbZnFI1rkZUE/m4ro4lPWTrcDVGylb6KxMIKpNq4wfJhy2VuKfLph1l6fMcmHpQeWYmbZqyD9SiQZg80wFz1zhMZCBuzb9Ljx7cRcFu5r4hQYSJnwhHvpCL/kQEjugnwoa/0H ZMLkNZXC Cmj6XICdlJSJPKprkzeHTqUi/gfgTK9AZFEFNWQdOpuTv2iZLSh8KwJ6z0dwlZm+c6UmUZ+HOOO2n8Ef2Xg7TIT5BZLOJFde1+cOKJoOQMe9I/wHHVXYJB3qdD5YVYiB7iPk2MCXeHZr61VfYpjgaMK8BJVTQIxjjGtw7mzJfJ+fAljk= 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 --- init/Kconfig | 7 +++++++ mm/memcontrol.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/init/Kconfig b/init/Kconfig index 4cdd1049283c..a2aa49cfb8bd 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1006,6 +1006,13 @@ config MEMCG help Provides control over the memory footprint of tasks in a cgroup. +config MEMCG_NMI_UNSAFE + bool + depends on MEMCG + depends on HAVE_NMI + depends on !ARCH_HAS_NMI_SAFE_THIS_CPU_OPS && !ARCH_HAVE_NMI_SAFE_CMPXCHG + default y + config MEMCG_V1 bool "Legacy cgroup v1 memory controller" depends on MEMCG diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e17b698f6243..532e2c06ea60 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2652,6 +2652,9 @@ __always_inline struct obj_cgroup *current_obj_cgroup(void) struct mem_cgroup *memcg; struct obj_cgroup *objcg; + if (IS_ENABLED(CONFIG_MEMCG_NMI_UNSAFE) && in_nmi()) + return NULL; + if (in_task()) { memcg = current->active_memcg; if (unlikely(memcg)) -- 2.47.1