mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Abel Wu <wuyun.abel@bytedance.com>
To: "David S . Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Glauber Costa <glommer@parallels.com>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	Abel Wu <wuyun.abel@bytedance.com>
Subject: [PATCH v2 4/4] sock: Remove redundant cond of memcg pressure
Date: Mon, 22 May 2023 15:01:22 +0800	[thread overview]
Message-ID: <20230522070122.6727-5-wuyun.abel@bytedance.com> (raw)
In-Reply-To: <20230522070122.6727-1-wuyun.abel@bytedance.com>

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 <wuyun.abel@bytedance.com>
---
 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 size, int amt, int kind)
 	if (sk_has_memory_pressure(sk)) {
 		u64 alloc;
 
-		if (!sk_under_memory_pressure(sk))
+		if (!sk_under_global_memory_pressure(sk))
 			return 1;
 		alloc = 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) +
-- 
2.37.3


  parent reply	other threads:[~2023-05-22  7:06 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-22  7:01 [PATCH v2 0/4] sock: Improve condition on sockmem pressure Abel Wu
2023-05-22  7:01 ` [PATCH v2 1/4] sock: Always take memcg pressure into consideration Abel Wu
2023-05-22  7:01 ` [PATCH v2 2/4] sock: Fix misuse of sk_under_memory_pressure() Abel Wu
2023-05-22 12:50   ` Simon Horman
2023-05-22  7:01 ` [PATCH v2 3/4] sock: Consider memcg pressure when raising sockmem Abel Wu
2023-05-22 12:53   ` Simon Horman
2023-05-25  1:22   ` Shakeel Butt
2023-05-29 11:58     ` Abel Wu
2023-05-29 21:12       ` Shakeel Butt
2023-05-30  9:58         ` Abel Wu
2023-05-22  7:01 ` Abel Wu [this message]
2023-05-22 12:54   ` [PATCH v2 4/4] sock: Remove redundant cond of memcg pressure Simon Horman
2023-05-23  3:04     ` Abel Wu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230522070122.6727-5-wuyun.abel@bytedance.com \
    --to=wuyun.abel@bytedance.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=glommer@parallels.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®