From nobody Mon Feb 9 02:58:14 2026 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D919E13C3D3; Thu, 9 May 2024 03:33:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715225609; cv=none; b=tik+SwUmOhTtLULMC8f+IhPErKo2DLQkDSvLKF2XScXo5WXP++MCc7VLzANTyxOHqBm/DA3CTi7nt5pABBUHe8MOrBSFK29vkT5nqpFW1XmAVlLK7gfmrpX1vOreu85ixL78e+5XGAhIqSZ+Adh/DALlWjtH1QThfcokhkfeQOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715225609; c=relaxed/simple; bh=pd7bAii/qeFuRcjl+QTgSWHftIrkr1j19A+devePA/w=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=d4sa6ajOmHUcxZMJJwa0yM1qMC7iHxeQmWlA2Fy65RTbXc2eM1VNZqrJdagP3/Iuz+FoabF+KgP/e5r76wDhFikJSu2P9gML0yh7q5pPG0a/pFXw+lx93+PbLUxKGxpbYeK+fBJSWaa6ssvMe080mS+2IHUO9tlQgqpRYZKMDJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500023.china.huawei.com (7.185.36.114) Content-Type: text/plain; charset="utf-8" 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 Acked-by: Michal Hocko Acked-by: Shakeel Butt Reviewed-by: Roman Gushchin --- 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 { =20 #ifdef CONFIG_MEMCG struct mem_cgroup *memcg_in_oom; - gfp_t memcg_oom_gfp_mask; - int memcg_oom_order; =20 /* 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 =3D memcg; - current->memcg_oom_gfp_mask =3D mask; - current->memcg_oom_order =3D order; } return false; } --=20 2.34.1