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 D24F9C32771 for ; Wed, 21 Sep 2022 06:47:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 67A066B0072; Wed, 21 Sep 2022 02:47:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 629C96B0073; Wed, 21 Sep 2022 02:47:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F184940007; Wed, 21 Sep 2022 02:47:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3D92D6B0072 for ; Wed, 21 Sep 2022 02:47:23 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1032CAAB4D for ; Wed, 21 Sep 2022 06:47:23 +0000 (UTC) X-FDA: 79935161166.17.FC4D9DD Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf24.hostedemail.com (Postfix) with ESMTP id 9506618000C for ; Wed, 21 Sep 2022 06:47:21 +0000 (UTC) Received: by mail-pl1-f175.google.com with SMTP id t3so4718904ply.2 for ; Tue, 20 Sep 2022 23:47:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=YKmiNCL23WE57xBpMjvetlOGzH6dcSznAfjUp/F/KjI=; b=S/OWLpu8/5jFvci3PF6KKFjZAWV8sfpD6EB2HvvJtYHmbS1wDhf2tqEqrHhsxPdznr 7Xl63Ro2rdWamL1oT8uEx/ZrWq2QnonCQijnSrGXJjznTUy+kMnvk5GmBUWryYjemC/T iF7482K53z7grnG8c8F87VkM0VIX164G7R7/xsKj6HuMAhwa4+0vM7D9+TCKrltHyEWx HLWv/DHgAtI6Sp9HJH6wCX/sjVQkaPS6sn99HM23MxS8s3XiJY15q1EaTL8YqK21MBsw Xr6SIM+1oU7JDT1DQiyRAewiPqdocLGFYdjYpzNi/PrqNFsKD8jowDT8NWtIiKLW4gaX Jy7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=YKmiNCL23WE57xBpMjvetlOGzH6dcSznAfjUp/F/KjI=; b=x/1At0NF9f/2NCwygL+n1huHJs31F6WmtuGjzbKFMS+8NgLAI58+SEMV0a6XAOMCsA 32WFRifJUTB20ev/hX4lccR4A2Sd4M4OYuoE+w2Ym0cCysBmE7OXGlncKEY+mzCNeoVV 3pCzqXsGiu/RSdogZh3chZ5fCjdzSk4+cVZZ6gNk5tqaJ4pOaKpliz8B6k8B9S+rI/h/ 0G6GtptmIWrG6m07NtK4/2B6H7LE6TcaEz8FDA/fTZHvLw2+YHTFqZMrbkighXmbr5TO iHYtE9OeiL/3TJVSfe04LUNgf0oLShNXb0kpnqV12Vd+vxXIP7DMp9nUEZoGnKWOpzQJ cS9A== X-Gm-Message-State: ACrzQf37Yc/uD3Gi6kMHIVY7L0IccsBnMOZ2+Uolzzl9Yz9iffM54fCq uf5cwJdY8CEl34Phi5x9sjl++g== X-Google-Smtp-Source: AMsMyM6IYXtcl8JigvWFGHGaYTLwP/VPUq1AhrmnirNeyBBNcQK9GdMREOc7AKVTMzq+4eU0rtnu4A== X-Received: by 2002:a17:90b:3811:b0:202:9e26:bc00 with SMTP id mq17-20020a17090b381100b002029e26bc00mr7971482pjb.223.1663742840298; Tue, 20 Sep 2022 23:47:20 -0700 (PDT) Received: from C02FT5A6MD6R.bytedance.net ([139.177.225.238]) by smtp.gmail.com with ESMTPSA id l6-20020a170902d34600b0017825ab5320sm1067802plk.251.2022.09.20.23.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 23:47:19 -0700 (PDT) From: Gang Li To: Zefan Li , Tejun Heo , Johannes Weiner , Andrew Morton Cc: Gang Li , Michal Hocko , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v1] mm: oom: introduce cpuset oom Date: Wed, 21 Sep 2022 14:47:09 +0800 Message-Id: <20220921064710.89663-1-ligang.bdlg@bytedance.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663742842; 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:references:dkim-signature; bh=YKmiNCL23WE57xBpMjvetlOGzH6dcSznAfjUp/F/KjI=; b=vMpobTqz/LJwr0Ly34E4g7UUyZj2p7s6pXPz9HABLWxGN4GyB+Gxw8UZ361fYH9uQJbNiS Cid3jw3BSu83Bdb9Rig/eER8OnlsXP9+ToLuFe5Ue+iawJF8OLQCEUNCLgbkoGqSEi3aoE U2otMgyLZPtK2hTZ2OYPTq0tVCC+VWM= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b="S/OWLpu8"; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf24.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663742842; a=rsa-sha256; cv=none; b=UPcOR5KICsCkAUoQi69KfLD63v8B15LTuoOxjypDGSuhWZHeOUqCR3VxojrgitD7qxh6i2 7Jxf9XQDR12ST+OF3NYbDZxrqE2xGiGxCCTupI75tVJZiFiRu0c5PPXeRmJJvtOS+9b6gK gSOZ6yMG1GyajLGMhs3I/GBgeMTjj9s= Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b="S/OWLpu8"; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf24.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com X-Rspam-User: X-Rspamd-Server: rspam01 X-Stat-Signature: peqkrppebfcrszb9tj9pysoft6ik8bhd X-Rspamd-Queue-Id: 9506618000C X-HE-Tag: 1663742841-904259 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: cpuset confine processes to processor and memory node subsets. When a process in cpuset triggers oom, it may kill a completely irrelevant process on another numa node, which will not release any memory for this cpuset. It seems that `CONSTRAINT_CPUSET` is not really doing much these days. Using CONSTRAINT_CPUSET, we can easily achieve node aware oom killing by selecting victim from the cpuset which triggers oom. Suggested-by: Michal Hocko Signed-off-by: Gang Li --- This idea comes from a previous patch: mm, oom: Introduce per numa node oom for CONSTRAINT_MEMORY_POLICY https://lore.kernel.org/all/YoJ%2FioXwGTdCywUE@dhcp22.suse.cz/ Any comments are welcome. --- include/linux/cpuset.h | 6 ++++++ kernel/cgroup/cpuset.c | 17 +++++++++++++++++ mm/oom_kill.c | 4 ++++ 3 files changed, 27 insertions(+) diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h index d58e0476ee8e..7475f613ab90 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -178,6 +178,8 @@ static inline void set_mems_allowed(nodemask_t nodemask) task_unlock(current); } +int cpuset_cgroup_scan_tasks(int (*fn)(struct task_struct *, void *), void *arg); + #else /* !CONFIG_CPUSETS */ static inline bool cpusets_enabled(void) { return false; } @@ -299,6 +301,10 @@ static inline bool read_mems_allowed_retry(unsigned int seq) return false; } +static inline int cpuset_cgroup_scan_tasks(int (*fn)(struct task_struct *, void *), void *arg) +{ + return 0; +} #endif /* !CONFIG_CPUSETS */ #endif /* _LINUX_CPUSET_H */ diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index b474289c15b8..1f1238b4276d 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -3943,6 +3943,23 @@ void cpuset_print_current_mems_allowed(void) rcu_read_unlock(); } +int cpuset_cgroup_scan_tasks(int (*fn)(struct task_struct *, void *), void *arg) +{ + int ret = 0; + struct cgroup *cgrp; + struct css_task_iter it; + struct task_struct *task; + + rcu_read_lock(); + css_task_iter_start(&(task_cs(current)->css), CSS_TASK_ITER_PROCS, &it); + while (!ret && (task = css_task_iter_next(&it))) + ret = fn(task, arg); + css_task_iter_end(&it); + rcu_read_unlock(); + + return ret; +} + /* * Collection of memory_pressure is suppressed unless * this flag is enabled by writing "1" to the special diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 46e7e073f137..8cea787b359c 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -367,6 +367,8 @@ static void select_bad_process(struct oom_control *oc) if (is_memcg_oom(oc)) mem_cgroup_scan_tasks(oc->memcg, oom_evaluate_task, oc); + else if (oc->constraint == CONSTRAINT_CPUSET) + cpuset_cgroup_scan_tasks(oom_evaluate_task, oc); else { struct task_struct *p; @@ -427,6 +429,8 @@ static void dump_tasks(struct oom_control *oc) if (is_memcg_oom(oc)) mem_cgroup_scan_tasks(oc->memcg, dump_task, oc); + else if (oc->constraint == CONSTRAINT_CPUSET) + cpuset_cgroup_scan_tasks(dump_task, oc); else { struct task_struct *p; -- 2.20.1