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 85135C71155 for ; Fri, 20 Jun 2025 15:24:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 29C8F6B0098; Fri, 20 Jun 2025 11:24:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 24CE06B0099; Fri, 20 Jun 2025 11:24:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13B926B009A; Fri, 20 Jun 2025 11:24:02 -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 F2DCC6B0098 for ; Fri, 20 Jun 2025 11:24:01 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B721C5D593 for ; Fri, 20 Jun 2025 15:24:01 +0000 (UTC) X-FDA: 83576149482.23.9203E7F Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf23.hostedemail.com (Postfix) with ESMTP id 3051014000A for ; Fri, 20 Jun 2025 15:24:00 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZuDPDV0N; spf=pass (imf23.hostedemail.com: domain of frederic@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=frederic@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750433040; 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=VIcHFrC2aKek+myIiC8k7qQ26Id/k/mR68drkuME3T0=; b=p9SJgJ8f7bxsGCL940KrJFqquGE8vOJ9E5Yx+GEsi732Xp4ftvJfj9/WhYDCsfZ6ygPotQ xxFMbTiMJRaTou658TlDzJW97Udm28xJ8z6XGIMyPsC4tUjqU56ML4+0GWHCHdlldD5VOt 1gWQqFr0IlkeeV9+BNh3uHTMzp+3THQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750433040; a=rsa-sha256; cv=none; b=V64tJP2DU+qQWUFWtspyBrTzJ6KyIUruL7geS7BEtrc8Mjh1ha38BdHdJo5r06o41KqEwt 4fy3om1TkMRPU4NzJYG2z/zm+BUT3tYH55CyrsW4XgiqlZlpPK8WkSS1l7nsHNNu9n2B6A KL8QBKjBpGFqA7fu3D0CWFOq0GH2TIs= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZuDPDV0N; spf=pass (imf23.hostedemail.com: domain of frederic@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=frederic@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 5A1926250A; Fri, 20 Jun 2025 15:23:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EBFDC4CEE3; Fri, 20 Jun 2025 15:23:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750433039; bh=puBcn1RLjuMlGziYQtO8T9w0Hol7ZIDbbn6QvjDV/zQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZuDPDV0NqIta2HyKRSmvefpltNr5OQmlAiOy9JNjBp+KZ7zcKekZkV7tLDeT3G9FC B/xYcs9tQuK3L5hIeu3TK7veaQeloAMkKamwtfMv9j3wyItFJ4Jeyumk+lanosdVam h6v8DnSe9cqMa2epNROFZmS3FTYQlORrrO5dSX6Oe6zjXsdM5PHYt0SJEddqQSwRhM r8oWPFNNGOLwoy1BcwIn1UxB2q+NCo+QdxAzjbG01MEn7Q0JYWLL6RMd8XkyVh3qW2 MUtEaCFkMso3v8JTsxk5WyijDJMv3M/XMPmcVJo1eyD/+QqlZ8A2cFCJu/fzktD0hH lFIS1EL3Rqvvw== From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Andrew Morton , Ingo Molnar , Johannes Weiner , Marco Crivellari , Michal Hocko , Michal Hocko , Muchun Song , Peter Zijlstra , Roman Gushchin , Shakeel Butt , Tejun Heo , Thomas Gleixner , Vlastimil Babka , Waiman Long , cgroups@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 16/27] sched/isolation: Flush memcg workqueues on cpuset isolated partition change Date: Fri, 20 Jun 2025 17:22:57 +0200 Message-ID: <20250620152308.27492-17-frederic@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250620152308.27492-1-frederic@kernel.org> References: <20250620152308.27492-1-frederic@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 3051014000A X-Stat-Signature: cozdqyd1mzc4rd5gapigcjgidtr8boaz X-Rspam-User: X-HE-Tag: 1750433040-154248 X-HE-Meta: U2FsdGVkX1+5HM0V7GcgWJqHpWnkZFPKaP8phGZVfKRJ9HHn1TNAh8rrlZTzMsK/ckYT/sXAKlhUhajpQQtb+ZEBAy0RDSEH/rvbnsQF3ZNzch4fwz2z5kwjDKSfeB5LM7xrafnpcExwb7ZXyFDowV5umgi3q8ksZRq+0l8C/Tw+99iHcK70oKQlr+UD5W5N/T15BsgHDL/CZmhF8n4jKg8xZIFTYJDFHu7hch+JzCkhL8uh5qryqZKjlGzhtGyufjAaEdmFqvwsxzPHP3t6SbK+pCy7VkaN7K5c6qKG0sdDg2K3Pkno4J+6Jsur9yYi2cOIns9AURPNyUVxLaBQtbzZMU7zBswYqihEJroU9cUMqVlFHQFEgSmsYa6PgRg6pnpopmlg8DzJaIjLKr+iOIPtpqBXJs/vO3nqO9ASdg0sk3nqVPRbhufan4VNyQJMDACNxkl6qomHCGjZb57HRPtheBAD5l4NpG06RnVTPzDtuFM6TbZg9WokFbpKp9lSXsGjnsoZ8lSLPTn+L6WDX0ikfUSU4JWc/vSfO+DpyOD0MveCzpBDuGBBxaVrlHCscgRoG9wFOLmwK2iuKN0QJ4d3FODvvP8Tww+NXtxcC33zsHD4yJwoTBzpOYL6ng57ZzuC+8jT74rNJdIQmS01Wrv4oglahgGLONX9djfzX87Y2Yjm6NU2QIgZM9B6R798QCtrlly2EDfY+eLltAHklO7w/f+HLLu41bkXwGEZvwpMlZGdomq8NH5r4L4LXMnHz8USarz901snTIumqK+ZaeL5HRUss9CZKFT5YQps9097bT6SyvFknuEBtCAZe+Wa9pDv9yiYFtlxvCsaD5BM9ua8o8fVfnNY7Fo4Xc56nfza/NCd3WhU6/iFeMt0bE9LQRgaIlPFfP5gw7CFQo6//KpmaLCZ9jm4Wu9UC4/Go4koUMNZwyOnG4++DhdFr8kMUKJ5tM+1DHXqFrrs5Sc M0w4CQU9 2pCqUc7i2eBKt1VmKyyYCNUWxCT2vJgRMdGmtuCWnlzrW2g3XHCF1kv7Gasq4Ya0bUTcKTQF/2JE9Y/B/936Xc7XJ2ChfFJGlG8jD/S6iyFYDxz4kmISSiVk+rhGCZXCaS7TBWaY+1C12znfnzILNgOk7Nfo31f4pyteM0+rH+p1CiUOPHRqg8WOFVHwwWB4qwQuvYjjyn9LcFNw4nUK3nVCOCUcC0xnXvgsoIHaxHuCyWIuDvRi+RC2Cm0QexuukjCinJPRI6ACEqfo= 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 HK_TYPE_DOMAIN housekeeping cpumask is now modifyable at runtime. In order to synchronize against memcg workqueue to make sure that no asynchronous draining is still pending or executing on a newly made isolated CPU, the housekeeping susbsystem must flush the memcg workqueues. However the memcg workqueues can't be flushed easily since they are queued to the main per-CPU workqueue pool. Solve this with creating a memcg specific pool and provide and use the appropriate flushing API. Signed-off-by: Frederic Weisbecker --- include/linux/memcontrol.h | 4 ++++ kernel/sched/isolation.c | 2 ++ kernel/sched/sched.h | 1 + mm/memcontrol.c | 12 +++++++++++- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 87b6688f124a..ef5036c6bf04 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1046,6 +1046,8 @@ static inline u64 cgroup_id_from_mm(struct mm_struct *mm) return id; } +void mem_cgroup_flush_workqueue(void); + extern int mem_cgroup_init(void); #else /* CONFIG_MEMCG */ @@ -1451,6 +1453,8 @@ static inline u64 cgroup_id_from_mm(struct mm_struct *mm) return 0; } +static inline void mem_cgroup_flush_workqueue(void) { } + static inline int mem_cgroup_init(void) { return 0; } #endif /* CONFIG_MEMCG */ diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c index 7814d60be87e..6fb0c7956516 100644 --- a/kernel/sched/isolation.c +++ b/kernel/sched/isolation.c @@ -140,6 +140,8 @@ int housekeeping_update(struct cpumask *mask, enum hk_type type) synchronize_rcu(); + mem_cgroup_flush_workqueue(); + kfree(old); return 0; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 04094567cad4..53107c021fe9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 29d44af6c426..928b90cdb5ba 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -96,6 +96,8 @@ static bool cgroup_memory_nokmem __ro_after_init; /* BPF memory accounting disabled? */ static bool cgroup_memory_nobpf __ro_after_init; +static struct workqueue_struct *memcg_wq __ro_after_init; + static struct kmem_cache *memcg_cachep; static struct kmem_cache *memcg_pn_cachep; @@ -1979,7 +1981,7 @@ static void schedule_drain_work(int cpu, struct work_struct *work) { housekeeping_lock(); if (!cpu_is_isolated(cpu)) - schedule_work_on(cpu, work); + queue_work_on(cpu, memcg_wq, work); housekeeping_unlock(); } @@ -5140,6 +5142,11 @@ void mem_cgroup_uncharge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages) refill_stock(memcg, nr_pages); } +void mem_cgroup_flush_workqueue(void) +{ + flush_workqueue(memcg_wq); +} + static int __init cgroup_memory(char *s) { char *token; @@ -5182,6 +5189,9 @@ int __init mem_cgroup_init(void) cpuhp_setup_state_nocalls(CPUHP_MM_MEMCQ_DEAD, "mm/memctrl:dead", NULL, memcg_hotplug_cpu_dead); + memcg_wq = alloc_workqueue("memcg", 0, 0); + WARN_ON(!memcg_wq); + for_each_possible_cpu(cpu) { INIT_WORK(&per_cpu_ptr(&memcg_stock, cpu)->work, drain_local_memcg_stock); -- 2.48.1