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 D78EAC0015E for ; Tue, 11 Jul 2023 12:42:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3CBD86B0074; Tue, 11 Jul 2023 08:42:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 356EB6B0075; Tue, 11 Jul 2023 08:42:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21CC56B0078; Tue, 11 Jul 2023 08:42:42 -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 12E4C6B0074 for ; Tue, 11 Jul 2023 08:42:42 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D2DC61A01C5 for ; Tue, 11 Jul 2023 12:42:41 +0000 (UTC) X-FDA: 80999294922.23.2F89A9D Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by imf11.hostedemail.com (Postfix) with ESMTP id 034D84000A for ; Tue, 11 Jul 2023 12:42:39 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=PfObz486; spf=pass (imf11.hostedemail.com: domain of wuyun.abel@bytedance.com designates 209.85.210.180 as permitted sender) smtp.mailfrom=wuyun.abel@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689079360; 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=WF8p9HwwgSPuKR34SMZuqSQ7aAssq/odh5sAxqcKAUo=; b=siW4yNDZefbCi9qxJyI2sKHuTo+MHDj+3U0l+Iihs2IsU3bOz1H2QKbfKBGaoGaqY8Vh0x dcL5+fx1NVY3nn2Tas+R+Q+9RBXyDu33fQ76Yh4iAKQIqLylFX6PqPptpNH0OOL739DN3u +hTMmPB/QIhFNUENmSY/CdTH7dXC8Wk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689079360; a=rsa-sha256; cv=none; b=S6eUq8EK7/FXwn+4yWYNaXdaWBxA6Ho4qFnfjJ+3zMGOF0QFtoLRYdddZxKT6JAjSafN7N 4QJ8wEF1uK+pvr25ThOAgWetuO1Pbu01+wDMw5yHLc45fODlxY+993xMAlwml0UDO6F5xR /v3eAosKp2VSdHljwW8xwdVHIzvP334= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=PfObz486; spf=pass (imf11.hostedemail.com: domain of wuyun.abel@bytedance.com designates 209.85.210.180 as permitted sender) smtp.mailfrom=wuyun.abel@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-666683eb028so3038990b3a.0 for ; Tue, 11 Jul 2023 05:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1689079359; x=1691671359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WF8p9HwwgSPuKR34SMZuqSQ7aAssq/odh5sAxqcKAUo=; b=PfObz486Wz+B8XCRMJmNpdOHd0bdAenCGoIFIrS0nn6pqgOGHIHHLLi/E7y4xelPQs oV1L5cDtGQ4gFHo4+itEHIwzUsNI9UXysv8UU/Pza3CLcUbZHUcxkt1As11YdvxnX8RF H17ZVvTu4nrEDSvdfN39NUxyIGNfeoTwnjdkSADFNYnqT8BI11t6wbWjHwH7o/9kadrH e5S5yw3IMsz3lksjyY+6iOF1Q4m7p0LVb07p4UTqbAdR2d9VI1K3CWAVsuHGT4SgzzBo xLZVs2ZfUmoYmSJPyCtnkjpSavzGDmGYFi8eCIFGc6qahboTah/quQSujY0SX5PCPa3e hfRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689079359; x=1691671359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WF8p9HwwgSPuKR34SMZuqSQ7aAssq/odh5sAxqcKAUo=; b=lLHBxcRGFWCXt/SvNJGFNhq7yWyVt/BJMoNGZ/DXXWEgsF386qlDo9gCdd7VtW2LxP qQHqkTrq2vwWB5VBDsKCIu5Qr+P2y0qUvMNi+8tIjAwffvfK56cVuhwoKdEr8CNw4g9C w4/7FMFGMAwg237e7TsKlDSP6QhElAVNtA4xNLOGKZqVrrvK1NSUr1iAABkdukyTeF0c nry6bQt6XN93eYihynK21yCh9quAVdHhzxDW7Bia9VJjZu3heffgZWQKIFAB+HIrTgeI Mvt8LfU9imo9qkY8m/yEakBSQnyNOQ6YiUcosRS/u94Km6FBrOOCVpGHgkrzXiGarUcZ W+MA== X-Gm-Message-State: ABy/qLa44fjBktTn8V8TqIS69zr4OJdVfLKmOi3rrxC2ygG+b3O8S2Gy 2Zl5A9/fQdbv58ERQ0/86V2puQ== X-Google-Smtp-Source: APBJJlF8Ng7++YijKQqg29ZCVWXJRwBhX6TmRTz/uJVTeJyWO9yu17EmSQrDts1Z+LLhsS5GxNFl2g== X-Received: by 2002:a05:6a20:1456:b0:12d:d17d:c811 with SMTP id a22-20020a056a20145600b0012dd17dc811mr13827670pzi.21.1689079358984; Tue, 11 Jul 2023 05:42:38 -0700 (PDT) Received: from C02DV8HUMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id d27-20020a63735b000000b0055c0508780asm1512222pgn.73.2023.07.11.05.42.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 05:42:38 -0700 (PDT) From: Abel Wu To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , David Ahern , Yosry Ahmed , "Matthew Wilcox (Oracle)" , Yu Zhao , Abel Wu , Yafang Shao , Kefeng Wang , Kuniyuki Iwashima , Martin KaFai Lau , Alexander Mikhalitsyn , Breno Leitao , David Howells , Jason Xing , Xin Long Cc: Michal Hocko , linux-kernel@vger.kernel.org (open list), netdev@vger.kernel.org (open list:NETWORKING [GENERAL]), cgroups@vger.kernel.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)), linux-mm@kvack.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)) Subject: [PATCH RESEND net-next 2/2] net-memcg: Remove redundant tcpmem_pressure Date: Tue, 11 Jul 2023 20:41:44 +0800 Message-Id: <20230711124157.97169-2-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230711124157.97169-1-wuyun.abel@bytedance.com> References: <20230711124157.97169-1-wuyun.abel@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 034D84000A X-Rspam-User: X-Stat-Signature: r44zjdp9fcsdpp36b1gufnatiau1okg1 X-Rspamd-Server: rspam03 X-HE-Tag: 1689079359-330237 X-HE-Meta: U2FsdGVkX1/OMkpdupFFtFfkUOlTEyqComXCXvshbDLQwPeA6x5C+3PJGAFDkOjHbhkJG/dPKeC0472/Uw7z9RRSzftn0b41iPqwTKZ4Ajya3N5kyn1L5tPmfHKc5DluPev7tJHsZ0fRtaBuxEzvXF42ADt+YL5+JQzkFWl251YCBLJausMT1Q3vthbu4ca4vVV5jOr9D97GOyZL0EomyAYJDSOK8aZaf3LFfW6Jw6TrnGOhxym40Jx2vxDtTqCAlLDuSJCQff+GMdy4dTQ/54eNMOlKBxaTFcde96csp037lob4trly5DLQnCIqUXnQXn+P+OtVtiiL/Kzwi2SRKMymjPrAOLmpbCXYkQ5DSsVyPgh83LYqk6YozeZnxyXbUMKETmTws6uPH4r/j8+ieetzsvFqXl4XGmohE/Q6UDU1oLSm5/uioyvR6pFm8dq2b9QNXyEltWO+HGYIx6nLAukAM24u0NQryesfovKqk2RWmdqQ7a3SyXbktFY/KDeMPl6jIPn8h/O3nk8XvOVxg2cCPKmgG8E57ihxfm8mm/liR4mPvvotqbGGSg8oM01b7g/eb+Jel1KjpLWdM57QdgmPDBSEm6N4pzBSafSjsv3hQ2DehigYGVYaIOqDvk6x3DALjJaPBKIhuFd3trTpN3hJzr702yievCs3C5ovQr+JxMtHb6WrghBAgUA3afgI7+mqdOItv2lJdkGmHqKmEtBAZTgRgs6Bkvd28j7uMesLa1PJMfpT3C+ugyUn4l/8CAbpMgZ/o/ZpXaTl1MhoSYrx2i7mDDlZBE83h/uox8QBTUv8hcZ+w8nvyRHU1uAEGVts6KTc1MPnJMWOV18LHKUPMrENZuyujdyf0UVB6fcg0+VfbNB/JMm0D3sA2qlcqCRmuObkxRlG0aQ7BQtLqTknBk0TuNxxI5q92FMFyAL5/TSXlr0LpvUB7/DVA3iMa7HYYAkFBBz/bJmEVX/ T5NE5Ntm g/EkYmSeNvdatYSrRfd0zvR9mK5yiE/5irNVT/TlfdiECY3nalGKhtDJeJbThdL5ryY3uYT6+fcW9E1mf3bjxXSBvRi5bXv5+4gaqjOVvkFXX3XbPzCZqIqkLixJH1BmTrVFh1NIMZyNQkZKI+wXnJQbCusXHh9y5fhXO0NwpkkP8XSON9Av/HU37lIjFFJvbx+N+kVoSON+jXnXR0OCTvOnMIt/lMCPexgBRD+xtmxfwDXk6t9boxI9mWZkIMT7uwv6+ttnlYul9827qPsoHYSvW9jnESRaXglFEhzVLBAZdAxCqnqUJ6RQRIt4r+s/o1aoVFSwWKWBjLD2m4I9bt48o8Rd9r+L4A8tXIxv2fNQyDY91Wpm06TjqgsWaba0XJa8AeqvLaAvUqecHBtbj/EdL1PhBzjVBWelowVFqUXBNhZx3MHHlRIPhpEdv7Zhjiog1wB+3/P4hGnJPS2IZ0kwyjGRw6yWsBetDQGKmqWJ0X4s9Qa385lvpF8l1NAmnbxPgbEfRCDAK4OMlD0rrjZI/KaAaP4zFj03cXUurwwWdJCcn8gY4G+FPAZfpdmRtXtBpBpUDEfzDPVI7FOCUpdaIEeXxw03A5mQoit9NxOqXopvNsP4caNVJXyHmq1A30Y+P3sHC6hXuw1XLRp4xi2KDEVoYcpeR5rH0JujSqD2QFggCHjOuPIK2HtZQyHsg8+Qn8nEuEZzxZPfbqqNXR6CrpUPOzRr3pGLgEXJArQOTahMm+/RPFcggp9cOif0g7nWi6OYhR7iYN7HLnWzW994tHT10WOgB5799Y0MIPXxKyflyvkzZBmdMsliBXZUt1BgA7fAmNbr9aFFSNzZftXFc1Y9y4Jgkjia030oyiLgayN29hIpdr/UkAuXVQSUoIwvAb9o83G317TT/QHMCyji95Mbpv8PVuMYnHqLO7sLt24TBf7BbzgiWhgnNSW5Ydebsla1gK8MgSczUjlS9V9ahJEy2 Vt03DMJ/ MCMNTJXuNc8xyu4SvExewW7KE9ppBbXl50ukmsOzp0R67KzrYWWnKvkzNITc6FjA2HogekNRAcaWScsmKIaUAW2UCjYO44vAumy5VXGaCEg6LrO//POSkh/raOYXIiiG6+QUaLSOpTgXy+QpO1lVTqRQybMPRJ6xM8W+QRnqxx2i4JUO+r5+TvO654oxBL/WYYocP0/fI3oTnskYx5tObnBj016vqBeFZFTmPE44KjzQcsnuLcAMcZ4zA1uexUdXqo303ysOYz4pb5ajZzEJ/U1X4NwD+YAklYiTUsD+eFZ1NOD9iOIjqKL5dvz0ib/3ccAfMIaAIW9FzGDs92+9r2+mUz+WNEgkducRFyjQ1nNnpIDrSiRqrjWMHgrR+aab1yNajb1Te4N1gOG978hpKQ/rWKlMjnhzc0rvt2jdmfg= 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: As {socket,tcpmem}_pressure are only used in default/legacy mode respectively, use socket_pressure instead of tcpmem_pressure in all kinds of cgroup hierarchies. Signed-off-by: Abel Wu --- include/linux/memcontrol.h | 3 +-- mm/memcontrol.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 5860c7f316b9..341d397186ff 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -288,7 +288,6 @@ struct mem_cgroup { /* Legacy tcp memory accounting */ bool tcpmem_active; - int tcpmem_pressure; #ifdef CONFIG_MEMCG_KMEM int kmemcg_id; @@ -1728,7 +1727,7 @@ void mem_cgroup_sk_free(struct sock *sk); static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg) { if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) - return !!memcg->tcpmem_pressure; + return !!memcg->socket_pressure; do { if (time_before(jiffies, READ_ONCE(memcg->socket_pressure))) return true; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e8ca4bdcb03c..e9e26dbd65b5 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7292,10 +7292,10 @@ bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages, struct page_counter *fail; if (page_counter_try_charge(&memcg->tcpmem, nr_pages, &fail)) { - memcg->tcpmem_pressure = 0; + memcg->socket_pressure = 0; return true; } - memcg->tcpmem_pressure = 1; + memcg->socket_pressure = 1; if (gfp_mask & __GFP_NOFAIL) { page_counter_charge(&memcg->tcpmem, nr_pages); return true; -- 2.37.3