From patchwork Thu May 9 03:26:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiu Jianfeng X-Patchwork-Id: 13659407 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 4BAB2C10F1A for ; Thu, 9 May 2024 03:33:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 82A0B6B0085; Wed, 8 May 2024 23:33:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B2396B0088; Wed, 8 May 2024 23:33:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 652CE6B0089; Wed, 8 May 2024 23:33:31 -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 430BC6B0085 for ; Wed, 8 May 2024 23:33:31 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E49C5A1FC5 for ; Thu, 9 May 2024 03:33:30 +0000 (UTC) X-FDA: 82097437380.18.EE5F33D Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf28.hostedemail.com (Postfix) with ESMTP id 5D8D2C000F for ; Thu, 9 May 2024 03:33:27 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of xiujianfeng@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=xiujianfeng@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715225609; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=9qvBItEcek0GZx/q+gQXe1ZS2/EXBxxMeZZ/NDtUQkc=; b=P7jJKioA5nNxvjdJhlqfoEjwS25/lHW7JQ6kQHnLlRxC0swTON0nVCMuRZ+BKeJCEQ5oJt u3dFFWoLpCCz8r71OtPg/4Pb9reu0bSTl/tH2znIfFkxQC7QhtvoASKnQzhgHOcK7kMqNM k417xdpGl+w0z6pO/uXjQL9v9HiJzW8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of xiujianfeng@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=xiujianfeng@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715225609; a=rsa-sha256; cv=none; b=nisb/xA0sFODU4fH50aiYkPtQOWo7LNnUik070hWAwzrO5eUvMbnV/HE3q+ylDNyI+WXYh g63NA/P+5iV/6lmVBsbvzeKuEj0VVVcmiQFcLbTKdDDakjS/X5Bx0PUJCP7YOofBSTBqFN KRsc/urcXUw3/K+E8NnaV1VFIVTHy5s= Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4VZcvJ09hCzYnBp; Thu, 9 May 2024 11:29:32 +0800 (CST) Received: from dggpeml500023.china.huawei.com (unknown [7.185.36.114]) by mail.maildlp.com (Postfix) with ESMTPS id C49D5180080; Thu, 9 May 2024 11:33:23 +0800 (CST) Received: from hulk-vt.huawei.com (10.67.174.26) by dggpeml500023.china.huawei.com (7.185.36.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 9 May 2024 11:33:23 +0800 From: Xiu Jianfeng To: , , , , , , , , , , , , , , , CC: , , Subject: [PATCH -next] memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order Date: Thu, 9 May 2024 03:26:28 +0000 Message-ID: <20240509032628.1217652-1-xiujianfeng@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.67.174.26] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500023.china.huawei.com (7.185.36.114) X-Rspamd-Queue-Id: 5D8D2C000F X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: bzeht8jcs7zihqczw7mh7qk88sj97mi7 X-HE-Tag: 1715225607-830458 X-HE-Meta: U2FsdGVkX18sdRGoMx/Z5+Vyxbbsp259ZjR+/DbTq1Xk/nmWmX1TdqLR5WWZlnvYJ4cPphL42YDqnOA6J/1in/LDI6POOUc3FyY0iYR6FM/cOyGaQCWBiTFXLeciAhabvWA3qYNyvIGA6T44pr5MyBx+1MbjQN3SqhYmLptIxk0cbNfzVec0iAGsnxqjHjiSXAWzvejUqH4GzDaAIu/qTsirAuw+EnWbeGvh6o0W3hH6Aj3kojjlWMt6y60d1wC2VTuOCwgBS+Ey3HdH7V9utfoVbiQ5Se+t/Dm2BVJmmQn2AwTGx6Aan8142HhqtJo2ftCWywjJ1V7E1GL4Vnxid8ehadPZz1Mb1cmU6I8i1s3pTVRmDY+mfMPmvPXHuLKZhn7Kqa/etCFdSO6Cla2pPA+M2mHAQqmo2SYA4LYu4LnKWKg6dcyGFHqaUFm7j5qPJ/XillYUjGxm6QAPcLzPbcvMFXepB9gV3E+6Pn6c+1T0j+m4Mz8W67ykQv+EJfM8eFP8uL3GKzGgr1rn9+ma3Bk62rOsipLyzZjRu/TT8+ZFYm5CcCeA+YIk5FV3X+VUPBGWh7OjJnjO8LtGK6LeEIwT/+G6PP5462gqjWda7/rLlaBiVo5ij2BCKjiQQN2WkUJnqBthZX1Sfjf7N8ah6uK0Jh8T1WgG3eprWiTwS6mQXHAAepZScHf3k/96uSYwHVUV8T5mAzDIO61AFOnYfH4WeuqN49eBr8XHxE3UeuPAs+tORrYpCnwhdvip1jkiezDBYaLMXY0n0cVSoGgCRu4B5E0Y6T5f/L7gtQWeTfHooL9sD1xw+6zA6kgGxMUlVqPmTM5bzIHSPFhUInqDDWQjwDXfacJVzSK6wQ0LwtNz8LcGhWPGoU9FURjXLuknhGlJDD6n3+nuOK9KYcE6lDBLiK2Fj0YdKKOSa7XkELJg0CBRJAgZcHKG5IoN0x45FQ3vkeby8XJWRXhyonI JMqWzaoV 2i0aeccF0EBOT+F4go1CMWUFp6zIeWY+kd5rTcneJjZ7BGr4R2xqhLFUh/Oa7tjKM23O3pV29FEKrgRLFUvE81Iyj7DtO4MG8SDOdbE1JGRGprRHBMpFUJfaCk0uDK0pgcmOzzCylR9cntdJQU+4+bdfTDldkMokMCaTv3VzXcQQ+cIzDKliaqASrwqMzGsaGaz8T 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: Since commit 857f21397f71 ("memcg, oom: remove unnecessary check in mem_cgroup_oom_synchronize()"), memcg_oom_gfp_mask and memcg_oom_order are no longer used any more. Signed-off-by: Xiu Jianfeng Reviewed-by: Roman Gushchin Acked-by: Shakeel Butt Acked-by: Michal Hocko --- include/linux/sched.h | 2 -- mm/memcontrol.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 8d1cf672ac4c..61591ac6eab6 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1449,8 +1449,6 @@ struct task_struct { #ifdef CONFIG_MEMCG struct mem_cgroup *memcg_in_oom; - gfp_t memcg_oom_gfp_mask; - int memcg_oom_order; /* Number of pages to reclaim on returning to userland: */ unsigned int memcg_nr_pages_over_high; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5d4da23264fa..d127c9c5fabf 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2192,8 +2192,6 @@ static bool mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order) if (current->in_user_fault) { css_get(&memcg->css); current->memcg_in_oom = memcg; - current->memcg_oom_gfp_mask = mask; - current->memcg_oom_order = order; } return false; }