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 4BC28C7EE23 for ; Tue, 30 May 2023 11:40:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CFD556B0078; Tue, 30 May 2023 07:40:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CADCB900002; Tue, 30 May 2023 07:40:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B75DD6B007D; Tue, 30 May 2023 07:40:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A56E56B0078 for ; Tue, 30 May 2023 07:40:49 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 77E8D1601A2 for ; Tue, 30 May 2023 11:40:49 +0000 (UTC) X-FDA: 80846729418.08.0E0D87E Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by imf08.hostedemail.com (Postfix) with ESMTP id 85FD216000A for ; Tue, 30 May 2023 11:40:46 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=MLCKl3On; spf=pass (imf08.hostedemail.com: domain of wuyun.abel@bytedance.com designates 209.85.210.169 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=1685446846; 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=RMeJmdZ3LE5akFulN2YKZF3yDR93Nfz5GrpK/FAs6Mo=; b=NQIoCZbwXlm+6bzxFwKDHqrw8Pcc2NSgF6Nj5ODXYs2Jm7+Ps/UOLnMs08D5qvBX+mVFvK 3ZtD1wlUK2DJwjQChvo9U4Tm+opAA/G8F885tncWTWL6NOsL1h71ISiRw7xQ46LNIOK4EQ z+64JNBbJwvy5nF5aW9PRC1KZpZgAAs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685446846; a=rsa-sha256; cv=none; b=7Zi1VFkuULCBdOq2lvztqaywMe1yEMmIW7Ghbl3H4rDJBqK+Okvz/HQSMzI6iqAUsrPOLp /zBZL1lGSTkbdbwAVq0PpSH6CICeVZcdlQzTtQZC+qThSGdJoRaWTboCNnH7QT+LwiqEoU mZ2UzgC2sv9luCU+YJBbY7/Z3QQUMDo= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=MLCKl3On; spf=pass (imf08.hostedemail.com: domain of wuyun.abel@bytedance.com designates 209.85.210.169 as permitted sender) smtp.mailfrom=wuyun.abel@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-64d3e5e5980so5033371b3a.2 for ; Tue, 30 May 2023 04:40:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1685446845; x=1688038845; 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=RMeJmdZ3LE5akFulN2YKZF3yDR93Nfz5GrpK/FAs6Mo=; b=MLCKl3OnqWHHyXcRdZaVayKCzY/Bl9wft7bDvD2wXODqoMTB/13VogpAknl5CPMsXy wPBLqktlL943IhkSBca1F/4EKfZGosHuGtUVdAkmBtNQRexyuge61JELuTrFyQTGDioc F0+b378M/Xr6NaH/X+q+yQL1JQ/nwwtFEKWza3rDI41G736sUwtprZHvXv+Sux07oy6G fAZMZSW2ZMmZCDiyKMZRxpfS15mP7ANNqmo2OSU7cqlFHCIbN4eBKRCfszo0suTUZ7wg rjPsmbI5Fxu5tY3g9Zhpc4nPO8DVN9OKcwpkE9piTLUZvZs5e+AEoecTNY5JWmxU1rCO 9ANw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685446845; x=1688038845; 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=RMeJmdZ3LE5akFulN2YKZF3yDR93Nfz5GrpK/FAs6Mo=; b=Rr4ltJ+6F7/kq1uIENtfvDfRTdpSaHvH6oEGgCuM0Nn+fQ0eVKxKWWJfQP7uYzdGME tPyObWo3qrJO1Ljll/1a+1+l5Hpu51QIhUD/9ihlTzKTLfrE0f7rpH5sy38El4CNDwrx t91W1Clrb2J5RKQgyu0HMxBcN4cxIBkCwyEfuP9oEhlYYo/Kp060g5u0K493c/ahXDS5 xrBSXJByjTveesdHjBBa7iEZ7/Wf3Easal2I2y1ZpEMixQQJGXz+qGTixxeMDfPhgzdi BmZJ1/FUHhiyn7Onfz7nUO22AWmoqttwNR43oJ/bMtv9oP2VBeOksz4GGSxnB025b+yz buRQ== X-Gm-Message-State: AC+VfDzwpVTSu2Iyc6YSdj9HOSsXjsanah0qUOEAXONBmJR1AQDQgUlk o7LutdcRg1wYUJ/IKSDYd5lB5g== X-Google-Smtp-Source: ACHHUZ4FxxxoqYMoybqsRIkoNDdsA2hhrYAf6bOI8yODoZkUkDER+ZRyPtG6yvCay1gYPFhUPVfCzQ== X-Received: by 2002:a05:6a20:bea6:b0:10c:3cf3:ef7e with SMTP id gf38-20020a056a20bea600b0010c3cf3ef7emr1747230pzb.42.1685446845141; Tue, 30 May 2023 04:40:45 -0700 (PDT) Received: from C02DV8HUMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j20-20020aa78dd4000000b00642ea56f06fsm1515103pfr.0.2023.05.30.04.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 04:40:44 -0700 (PDT) From: Abel Wu To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Johannes Weiner , Michal Hocko , Vladimir Davydov , Shakeel Butt , Muchun Song Cc: Simon Horman , netdev@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Wu Subject: [PATCH v4 3/4] sock: Fix misuse of sk_under_memory_pressure() Date: Tue, 30 May 2023 19:40:10 +0800 Message-Id: <20230530114011.13368-4-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230530114011.13368-1-wuyun.abel@bytedance.com> References: <20230530114011.13368-1-wuyun.abel@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 85FD216000A X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: r43rz7qdidukwrw9ezya6so59dir4akj X-HE-Tag: 1685446846-462224 X-HE-Meta: U2FsdGVkX1/niC3ZHH3566r3Ut7R5isbsxgDWkOztrJGVSqhrVCm39UFlIsWdnR+UOtjND3Jlr9qH6oO01zF2o5qxvElLSY8nFBLzkKauyabWC4kS71CUleC55uClHemTCD2D8hMAXdS9nUGtn+3BlWC12s65Wi0E2O/lTc01dk139zqhw/k0MaXvjccOM594xQhnJWin0G16HKn+ESodpehjUbwO0xsOlfQgrNLXnvE6YMYsreRwiBUobK8++MxX0iWJxXcLhbZ2zGiWuaEvCmIEGHBXh7j/FNQr1GkPtR9tRFTapm6WD2XzrLnyrZIeBevsfguu0bIffpZ21Rtv1ctOQHBgnCYroA74RvKcjDn/YJS/GD8k2GAVWucRss8kY8hwVTG2GoWj2x4svzE3xmry2pI/znT6dEMIy1hfEvIHV3aEbBXffSaR4jccLps+jfHLhuQ4bU1iQZUuEDYcLRddUsRM1UY3fC9Scx/Z5HdeMdJKymB93EcsetiTiKRJUbhTJftGZ+YglOW0/1I1rmdqZM7jVXJUMo4OzU/vgJIGA8NfHiNjVMpwGR+YywvzmPQkviai/u4DoV0IkoSSKomUY4uU0xpRxOrJ0oTii7pyangE7i3OuJojn7GImaEq1OpkJV50+SgOwZS/6InxlbtOKTOD/6zQ4Aw8/MH9c896kYNKbqQ0CJlnyAS+1omxBhH9Lz3oFHGF5PRem5p8ljspSvrzQKvMOV5sOOYR8Ch+r7TciHHo3ucyB7qgkjfyaoPCJj3DtrZO2+F2jVeY0whSHgMcE3A1xo0MbWXC7fvJA0WY0shrrUQIDhprNQgJT1AjyNL28TfPOO69Ujk0yPqoOLObn1FeYHgav2GmhsaR+DqzGRMRBCA0ifucQDg+bxJ3NruVxg54ZtlRKcgBMwKlFw/2aAFCcxfP7EK4isllT2N6nkWI3M0P32PadzhSc0jYZa9FmXAzLZZf4x 6WcWooWW PFgK6Hu5UqbGGmiArK6Ub3/hgOEilLNQIhSd8QDvouziXnv94AZ9QL9KJKegsHfDhOHBhu22uOgWvjp1XYSs5JDM6jnB/cIOf0n9ShP4Km8bLMwk0xkQJGMAClQIiXAMjf+T/Yx5WyAFCkj1oTyUYoXB8paKg+quwzAdkj6+4TvYKgMsP/nt4QH1ZSy4ec9R+RXAWaGYDqSyXHqYIUutlVR0TjQWegQbuUelyke/gCF7IEjcO/fE8U/On/iBPXTvtS2UVWQsX8ccJmlR6bM7SFFa2Kg/O692Yp8/ZWmjw+em8ZgfHkzHK3KjviamSofnfqFWTqmiVoBgqZS2NTud10dOFXD16AbtmMfKT8+q7USrzlfEir01CBXKgIbD5C9TMzDhoNF0yAHXu7qBBkw7I1bVm87n4YHM7yXvE1ZjScueIPHxWoFJiQbnDjKRSNvfby5HU9zConLfQAL826tYqh6SkbEkTkzvuNRaSZP4hYJTQfxQzd6MuKBU7Y3XtgckDq/Rc4ucG4WKy0nwvGqL+pl6VoCuBiEbYwyhc0UJHcC8rPkxfqxIlJ6Uqygdh82qPvW+sZlBt1X8u5EcFhulLEI1yDiSJlAzroZOB9ZAWmSzix/o= 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: The status of global socket memory pressure is updated when: a) __sk_mem_raise_allocated(): enter: sk_memory_allocated(sk) > sysctl_mem[1] leave: sk_memory_allocated(sk) <= sysctl_mem[0] b) __sk_mem_reduce_allocated(): leave: sk_under_memory_pressure(sk) && sk_memory_allocated(sk) < sysctl_mem[0] So the conditions of leaving global pressure are inconstant, which may lead to the situation that one pressured net-memcg prevents the global pressure from being cleared when there is indeed no global pressure, thus the global constrains are still in effect unexpectedly on the other sockets. This patch fixes this by ignoring the net-memcg's pressure when deciding whether should leave global memory pressure. Fixes: e1aab161e013 ("socket: initial cgroup code.") Signed-off-by: Abel Wu --- include/net/sock.h | 9 +++++++-- net/core/sock.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index b0e5533e5909..257706710be5 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1409,13 +1409,18 @@ static inline bool sk_has_memory_pressure(const struct sock *sk) return sk->sk_prot->memory_pressure != NULL; } +static inline bool sk_under_global_memory_pressure(const struct sock *sk) +{ + return sk->sk_prot->memory_pressure && + *sk->sk_prot->memory_pressure; +} + static inline bool sk_under_memory_pressure(const struct sock *sk) { if (mem_cgroup_under_socket_pressure(sk->sk_memcg)) return true; - return sk->sk_prot->memory_pressure && - *sk->sk_prot->memory_pressure; + return sk_under_global_memory_pressure(sk); } static inline long diff --git a/net/core/sock.c b/net/core/sock.c index 5440e67bcfe3..801df091e37a 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3095,7 +3095,7 @@ void __sk_mem_reduce_allocated(struct sock *sk, int amount) if (mem_cgroup_sockets_enabled && sk->sk_memcg) mem_cgroup_uncharge_skmem(sk->sk_memcg, amount); - if (sk_under_memory_pressure(sk) && + if (sk_under_global_memory_pressure(sk) && (sk_memory_allocated(sk) < sk_prot_mem_limits(sk, 0))) sk_leave_memory_pressure(sk); } -- 2.37.3