From nobody Sun Feb 8 10:03:47 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D654DC77B73 for ; Mon, 22 May 2023 07:05:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232132AbjEVHFy (ORCPT ); Mon, 22 May 2023 03:05:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231997AbjEVHFV (ORCPT ); Mon, 22 May 2023 03:05:21 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 050CD1BCA for ; Mon, 22 May 2023 00:01:50 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-64d3491609fso1928825b3a.3 for ; Mon, 22 May 2023 00:01:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684738907; x=1687330907; 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=bAQinShNGu83yZk3rp1RX6U81r/+0AkNU5ra2AmWYPc=; b=R6qQVs8Q1EC7za9C0/4qceRDywImj4defA+/MxD5u5cL6DHOsp8Fo7zRfkA3tL3j4D lNyjLVK9jTeCzqt/i4lcpUIX1xMtpu2n5MLzkWz0bmtuupHIhPGlQ3LrsbHgIiH+zGar GyFrcO5kZ90L8eXWQXvpl4AB9adbMG7raaVldlWWmBkSrPEvinkkSxojT5/qC6t1JoBC ZXFTp6y2KVlqqWOOjQkm668oAE21GsEVSwMZ4j3C2GwxiUCk1a8zYaCJIaes7V48eFmG osdXJSikN8/mo9c59yhD/vAZbZDI3aqEtXB1hsd2HTjTEjgpJVNe2C1o1N9raWiK4Zwo m3Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684738907; x=1687330907; 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=bAQinShNGu83yZk3rp1RX6U81r/+0AkNU5ra2AmWYPc=; b=Ius/QlJfFrggDjattNgXh6o+LzrCG3qJurH8evDwtg+OudU3+IuN3JrKO8HQPjoK35 DMJcqk2Soqa/vS4mM65IhQaOQVp0CMclEjImV26G5VdVpw76sY9lNqRMj+5Ac8BYoy3f 4ggIPJR1LBgtKoDdFNYe3gRLamDDcWeM4OXfyyRDOAnXFLqzVCMm3JpupReagLxxRvLr cDSQQwrV6dY4XCP4Qv9ISjj5SLz1K4TdJcQFm8hkqzCmBa16cbFLaHN90fpJ9nC4OPLl NhYVY2qLeIRlZKmumBNiTTz2iUnE60YrfHdmUNU6d2d2jMm79gZ1UQHmQl+UX2o/xaEB 5l/g== X-Gm-Message-State: AC+VfDxTQOyGC/Kcp1NfVyy3wbKoVtgzeC6TVDVb2BSFCIh0mw1qZW6t yH9D99eN+i8jpsNr2fhffZGCCw== X-Google-Smtp-Source: ACHHUZ5KWE6uNrz9B0dQhspuvs0CqmLb5hN3tWINo/EwRjj/SHAKsnFFjJrmCEAnGpvQaQbH8Q0wZQ== X-Received: by 2002:a05:6a00:10c4:b0:63b:1708:10aa with SMTP id d4-20020a056a0010c400b0063b170810aamr12715822pfu.34.1684738907531; Mon, 22 May 2023 00:01:47 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.251]) by smtp.gmail.com with ESMTPSA id d27-20020a630e1b000000b0052cbd854927sm3687505pgl.18.2023.05.22.00.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 00:01:46 -0700 (PDT) From: Abel Wu To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Glauber Costa , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Wu Subject: [PATCH v2 1/4] sock: Always take memcg pressure into consideration Date: Mon, 22 May 2023 15:01:19 +0800 Message-Id: <20230522070122.6727-2-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230522070122.6727-1-wuyun.abel@bytedance.com> References: <20230522070122.6727-1-wuyun.abel@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The sk_under_memory_pressure() is called to check whether there is memory pressure related to this socket. But now it ignores the net- memcg's pressure if the proto of the socket doesn't care about the global pressure, which may put burden on its memcg compaction or reclaim path (also remember that socket memory is un-reclaimable). So always check the memcg's vm status to alleviate memstalls when it's in pressure. Signed-off-by: Abel Wu --- include/net/sock.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 8b7ed7167243..c73d9bad7ac7 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1411,14 +1411,12 @@ static inline bool sk_has_memory_pressure(const str= uct sock *sk) =20 static inline bool sk_under_memory_pressure(const struct sock *sk) { - if (!sk->sk_prot->memory_pressure) - return false; - if (mem_cgroup_sockets_enabled && sk->sk_memcg && mem_cgroup_under_socket_pressure(sk->sk_memcg)) return true; =20 - return !!*sk->sk_prot->memory_pressure; + return sk->sk_prot->memory_pressure && + *sk->sk_prot->memory_pressure; } =20 static inline long --=20 2.37.3 From nobody Sun Feb 8 10:03:47 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FD06C77B73 for ; Mon, 22 May 2023 07:06:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232350AbjEVHGF (ORCPT ); Mon, 22 May 2023 03:06:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232261AbjEVHF1 (ORCPT ); Mon, 22 May 2023 03:05:27 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 091EA1BF0 for ; Mon, 22 May 2023 00:01:59 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-64d41d8bc63so1737164b3a.0 for ; Mon, 22 May 2023 00:01:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684738911; x=1687330911; 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=sgzO2oS5bCjgkGEKcuzpbbehzv1fqa08++GJhHZGJnk=; b=B9OMUnv33tNdd4xn/p1rnp8gpM96UCeXIDdHTzof5dEwYWX67z6JpdsyQaZPSH7fYP 0xl2BymrQyLxgojJyRmIBKH64o8K6wqmHipT3fNNM8HjCm30OCRTAFhRZnQETqcP5thx P5yO6NgOVwy8MwNho2m98VZV1UY7rWaamv2fjlUEUnhCVpFhLcvZ7dp3OIYtosvdeWZc jfnYzwwptrztNkN3CdKh1BIIyb5WkJiJzBO9KXXNBx/b4FdN5Af3B47IgPO7hW9tXQNA 4UA5fFW/5Os2QHbMchluOHsxg1m1u7Pl0bZEh6iuGfbBnVDFKNYDbK9/BDiwQbwl5uGz Ugwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684738911; x=1687330911; 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=sgzO2oS5bCjgkGEKcuzpbbehzv1fqa08++GJhHZGJnk=; b=ksSGbONxIcAXsEPdNborxmPnvu7A95xukMzeiSr/chPrvFCKDkR4N+8CDVCvqcquZ3 8wieOnbZA3P0UojDkZiPToguRthttfb2tJ1LImEAhTSUnlamioqTJNDwsgcaLTi3ob63 UTxe0McThgj56oAOjA7GIvNuxIIOwz0L3J1vgCYSMB7cozlXZcXmw+EX1WkD7RALedc8 hZIizPp1BNEwUtscsRRkakramVdlxdIce3VLwIk2xOLIZGBBi2GE9GJHiQUTjcLlkLdZ fLFVY6LGLBb+hS8ewQu9pQrDqMf5ajxwaRGFfK7fr5yh0HEEWQ7npbhabTkQEQnqsFN1 S3IQ== X-Gm-Message-State: AC+VfDwz59QduTGTRkMK29iUdW5TdACennx2hPiOK3bfS9zbs73/fRzn tPy4dvTpWMNX5vPgGDLA3thzbw== X-Google-Smtp-Source: ACHHUZ4ZJe5qP97101KavMhYgetzTkIyNddrBs0aAl/z7IHiyA0QOaL7RwH6lY3RFknmPsPuiBa9nA== X-Received: by 2002:a05:6a20:7fa8:b0:101:9344:bf82 with SMTP id d40-20020a056a207fa800b001019344bf82mr11034569pzj.15.1684738911283; Mon, 22 May 2023 00:01:51 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.251]) by smtp.gmail.com with ESMTPSA id d27-20020a630e1b000000b0052cbd854927sm3687505pgl.18.2023.05.22.00.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 00:01:50 -0700 (PDT) From: Abel Wu To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Glauber Costa , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Wu Subject: [PATCH v2 2/4] sock: Fix misuse of sk_under_memory_pressure() Date: Mon, 22 May 2023 15:01:20 +0800 Message-Id: <20230522070122.6727-3-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230522070122.6727-1-wuyun.abel@bytedance.com> References: <20230522070122.6727-1-wuyun.abel@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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) <=3D 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 c73d9bad7ac7..bf930d4db7f0 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1409,14 +1409,19 @@ static inline bool sk_has_memory_pressure(const str= uct sock *sk) return sk->sk_prot->memory_pressure !=3D NULL; } =20 +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_sockets_enabled && sk->sk_memcg && mem_cgroup_under_socket_pressure(sk->sk_memcg)) return true; =20 - return sk->sk_prot->memory_pressure && - *sk->sk_prot->memory_pressure; + return sk_under_global_memory_pressure(sk); } =20 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 a= mount) if (mem_cgroup_sockets_enabled && sk->sk_memcg) mem_cgroup_uncharge_skmem(sk->sk_memcg, amount); =20 - 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); } --=20 2.37.3 From nobody Sun Feb 8 10:03:47 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCE00C77B73 for ; Mon, 22 May 2023 07:05:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232285AbjEVHF2 (ORCPT ); Mon, 22 May 2023 03:05:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232208AbjEVHFG (ORCPT ); Mon, 22 May 2023 03:05:06 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 070991FC0 for ; Mon, 22 May 2023 00:02:03 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-25345ca8748so4721626a91.1 for ; Mon, 22 May 2023 00:02:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684738915; x=1687330915; 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=y1oOKoVyoIUj8JPcN8+63Cdo8i/cPI1zhOYlcZa0hSM=; b=enaay0xaoWLn/utKosxoWRmovCC2iDOPsViPWAcSu4/JYlpa61g+2mofypwr36XV6P 5J3FltcUkPLQkIl0AZJuYxAJtrS6Ks0D8MuZLcveqzNcyyAJqnubyinFllJt+2ys+NkJ 68YlViqxi2UvNOTwFFXFpMSMLyiRimLE2iWipptXmQyAZXdKBmKATAFkFEQgja08ESC7 2bKN4+w6r38j+xphjcn508J/X8RhzgKuNcSOUxWHrnOH3iClosHDqVgE0Fl8TVP7ywoO W8xflpGtFM3isY8piNeZ98x693UPRt6aX4eeOCZnFll7sC9O0u1+a2pAmnLNHXwULg9U pJVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684738915; x=1687330915; 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=y1oOKoVyoIUj8JPcN8+63Cdo8i/cPI1zhOYlcZa0hSM=; b=R7WQFwWcuS5cmBFz6wLXaA+WW4chfu9Hm8PviGUUd7TzxZiC6GwXn59InlBH0I4NM1 KtVYaWfL76xXFAxnGnTPeRM8m/u0nmv9ddmmzYLWiymAWG+NZrfVL+M7OOPf5BYEn0Qn giTfNcf5ADrDbDCEpS1H5JjqRNXGx8L6IW1jcP8fqRnRztgnjYrY+mrwvwWkSUAmx9pf zYtOF3VTbqer2LIpM2Jc3zgsU7XCwAWghFBJy5QP7P0/y3l5AjzcgQl1rx1fNT51yBGL sHjdUuv63uulu9xbRX4zkdJoXc7n060OVAte774Juso6hsheJo+c5x2XPc/VVqOlSttx nVZQ== X-Gm-Message-State: AC+VfDywZwGyNDDekHtkrUgt2w6KkgXWUvJKb4H6i3dVo9RYM+u9I8fj Mv/klHMDKpdtGQrNfN2Ju+/CYg== X-Google-Smtp-Source: ACHHUZ4o2D5U9H7O9EVzembFmHB5vNmURPTxvA+5i11/ATadoYPSFYWcOfJ9V/84ql5EYbtBEo1FuA== X-Received: by 2002:a17:90b:1d0c:b0:255:67e3:98a with SMTP id on12-20020a17090b1d0c00b0025567e3098amr2054678pjb.11.1684738915145; Mon, 22 May 2023 00:01:55 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.251]) by smtp.gmail.com with ESMTPSA id d27-20020a630e1b000000b0052cbd854927sm3687505pgl.18.2023.05.22.00.01.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 00:01:54 -0700 (PDT) From: Abel Wu To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Glauber Costa , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Wu Subject: [PATCH v2 3/4] sock: Consider memcg pressure when raising sockmem Date: Mon, 22 May 2023 15:01:21 +0800 Message-Id: <20230522070122.6727-4-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230522070122.6727-1-wuyun.abel@bytedance.com> References: <20230522070122.6727-1-wuyun.abel@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" For now __sk_mem_raise_allocated() mainly considers global socket memory pressure and allows to raise if no global pressure observed, including the sockets whose memcgs are in pressure, which might result in longer memcg memstall. So take net-memcg's pressure into consideration when allocating socket memory to alleviate long tail latencies. Signed-off-by: Abel Wu --- net/core/sock.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 801df091e37a..7641d64293af 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2977,21 +2977,30 @@ int __sk_mem_raise_allocated(struct sock *sk, int s= ize, int amt, int kind) { bool memcg_charge =3D mem_cgroup_sockets_enabled && sk->sk_memcg; struct proto *prot =3D sk->sk_prot; - bool charged =3D true; + bool charged =3D true, pressured =3D false; long allocated; =20 sk_memory_allocated_add(sk, amt); allocated =3D sk_memory_allocated(sk); - if (memcg_charge && - !(charged =3D mem_cgroup_charge_skmem(sk->sk_memcg, amt, - gfp_memcg_charge()))) - goto suppress_allocation; + + if (memcg_charge) { + charged =3D mem_cgroup_charge_skmem(sk->sk_memcg, amt, + gfp_memcg_charge()); + if (!charged) + goto suppress_allocation; + if (mem_cgroup_under_socket_pressure(sk->sk_memcg)) + pressured =3D true; + } =20 /* Under limit. */ - if (allocated <=3D sk_prot_mem_limits(sk, 0)) { + if (allocated <=3D sk_prot_mem_limits(sk, 0)) sk_leave_memory_pressure(sk); + else + pressured =3D true; + + /* No pressure observed in global/memcg. */ + if (!pressured) return 1; - } =20 /* Under pressure. */ if (allocated > sk_prot_mem_limits(sk, 1)) --=20 2.37.3 From nobody Sun Feb 8 10:03:47 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E579CC77B73 for ; Mon, 22 May 2023 07:06:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232306AbjEVHGI (ORCPT ); Mon, 22 May 2023 03:06:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232347AbjEVHF1 (ORCPT ); Mon, 22 May 2023 03:05:27 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3859C94 for ; Mon, 22 May 2023 00:02:06 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-64d604cc0aaso756561b3a.2 for ; Mon, 22 May 2023 00:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684738919; x=1687330919; 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=YKnhyBNVHnSoKN/wGLElGxvEFyvxXF8SFNAoMlqNKrY=; b=ZmZuiA9chQo3zzFy1MN/j1tmB3q9BwCEWejSH0Rw60P8CaMT86ntqYQ03QfwrZEVwq FkbNnm6pV+w/CbkyNpQ+JIfm6QmwN+qoKl+h+4+1xWAYo+xx2dS5AKRsDAhmXzTm3riv 6Yo7TWV0fJGX3G/KMzwrWpCBq6ukeZdBlNENLcrA8ScMItzQjo6RKpDunzDs2oanPBXD bT6lMxF4eYBiZGA4Lw23kjUspUGRjpSUqS+8SDubOpIx/Nv5FJzFWf0+MgMdaFfeddqZ lv86fX/pMhyqLJO8qog2FKOhcCKTrmCQUbQsEEaaKowuWMks0r3LIMi2U5OtkHIU1Vd4 ihOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684738919; x=1687330919; 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=YKnhyBNVHnSoKN/wGLElGxvEFyvxXF8SFNAoMlqNKrY=; b=CXB4z2UTHpHNxTt67WzIZ00IRNwFM+KGPQ8h8GSNbO6ob8+1dfg8YRGDr7bT69HYl1 qDHMe8XVZaZ07Zq3KJIdd/r/49yRnjnQj8ieLXwR0tOJ+fjjghXjGNM7Xvf7TB+p/c0x e1MI5w24AdJna1cLpai15YytZkavrcRDv9hlI7ngyLxF7f8kAtN+G+czeTbow20kexzD cUrcEyoqSI0Bv9/pxUCeydi7LDkBrf/MdZ2liRQ+sdCEiGWfrxUmVKavONxcBE7rPBS5 akA7Ex9z+IRs+2B55tTkI3CixqTsBuozQ/vjCJyhK4Y2A4fqNTWrzzK3cr9dqLiiIqPH d2Ng== X-Gm-Message-State: AC+VfDyl/XXWLxr6VRYRFkoncGBgdh4RwOWulcJZtsh+BUAp/HMawPlb rRGDX4ItZ2zUpyxc2EIzcrHr4A== X-Google-Smtp-Source: ACHHUZ4B/jsyzL/apdJ3kEiN7e27Upz2uNormul3H87UZR7L7LeAxfmRdG+5Y/bM8xTdHdg7t8zukg== X-Received: by 2002:a05:6a21:918c:b0:106:3b67:b5db with SMTP id tp12-20020a056a21918c00b001063b67b5dbmr9275449pzb.18.1684738919559; Mon, 22 May 2023 00:01:59 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.251]) by smtp.gmail.com with ESMTPSA id d27-20020a630e1b000000b0052cbd854927sm3687505pgl.18.2023.05.22.00.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 00:01:58 -0700 (PDT) From: Abel Wu To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Glauber Costa , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Wu Subject: [PATCH v2 4/4] sock: Remove redundant cond of memcg pressure Date: Mon, 22 May 2023 15:01:22 +0800 Message-Id: <20230522070122.6727-5-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230522070122.6727-1-wuyun.abel@bytedance.com> References: <20230522070122.6727-1-wuyun.abel@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Now with the preivous patch, __sk_mem_raise_allocated() considers the memory pressure of both global and the socket's memcg on a func- wide level, making the condition of memcg's pressure in question redundant. Signed-off-by: Abel Wu --- net/core/sock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/core/sock.c b/net/core/sock.c index 7641d64293af..baccbb58a11a 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3029,9 +3029,14 @@ int __sk_mem_raise_allocated(struct sock *sk, int si= ze, int amt, int kind) if (sk_has_memory_pressure(sk)) { u64 alloc; =20 - if (!sk_under_memory_pressure(sk)) + if (!sk_under_global_memory_pressure(sk)) return 1; alloc =3D sk_sockets_allocated_read_positive(sk); + /* + * If under global pressure, allow the sockets that are below + * average memory usage to raise, trying to be fair among all + * the sockets under global constrains. + */ if (sk_prot_mem_limits(sk, 2) > alloc * sk_mem_pages(sk->sk_wmem_queued + atomic_read(&sk->sk_rmem_alloc) + --=20 2.37.3