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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3F39C77B75 for ; Tue, 23 May 2023 03:04:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230460AbjEWDEe (ORCPT ); Mon, 22 May 2023 23:04:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229639AbjEWDEa (ORCPT ); Mon, 22 May 2023 23:04:30 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8FF690 for ; Mon, 22 May 2023 20:04:28 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1ae8ecb4f9aso25986325ad.1 for ; Mon, 22 May 2023 20:04:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684811068; x=1687403068; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=XFNNihuBrXSC701L37bPlsyjHuGUOLaLQwRdUI1QSrM=; b=IYn1Lsfyd0/h3pNjHVrIaDJ1pbFjPR3XxctiNvG+P4ElqouoVNhCq8TIGhxSB4tn2+ +8azudD9VJeI98Lm3g+ir7kOQ+kn3GpOasu2KHaoGvq4MUnahgXyYdcN5oAZ3E9f3l2P wG/HiJ61SGhzQxT3nEuEF2kvJA+IEfTnQgMXonzZLr7jRdo4KsGHbtoPYm6TtOj3cHhz 7wnKRMIFEl0cgsPqrgxuvVlvybyMfNY51vgnE9aR1fI8+JBAXg2ETQ6x2jWk3ufts7fD r6skFVysonK39GJ54Oovn2lad4/lpSh84YMgxC6r8Je4lGcQJVhnyAdJwiVJnBAwir7g Xkzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684811068; x=1687403068; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XFNNihuBrXSC701L37bPlsyjHuGUOLaLQwRdUI1QSrM=; b=VYlpufZ5JZJ/lKLX9K1QEPnTH6CRdhlftEu5PjIrBsacF7mjnelUBe36ciU2fIFB7X 1k/SXVp/ROl5GNsjDk3qgZRd22cjG4lLgD25xTqo6Jdezq5cBjoLoY1EiK8K5tsFb/GU d476nB6ZKMijutRQy50ulT/C52jsBonjv+KtqqolKOqzWoVXJRdjy4vHLhoEHWguxh2V WX/t+F3hh8Oe+fJKJA5+asglIQQyEcUB7TvwJQlLy50JWx/SiI7NVn12CPQO7SeC2JwF YBmgNGwpvFrBvKIaX0xPnExNs7dH7y+axpb4+Kn18suXMkqqre7cN4R5erNX7Rm3wpLD ybGQ== X-Gm-Message-State: AC+VfDwvtFdXp4H9xNU95ZStDS+wD6nikc/MlF+JIP42ZztU8P0Aa9EU zfVR0W/dGpoB1LBsRHxAKL4DDIvVv35BDY1SXpA= X-Google-Smtp-Source: ACHHUZ6yQU7ZG8zePTbfq80ocZHL60v6iyIxrqH8T42ih7vJQB9zJJk4bGKeFrDgtNX3xO3GkT31lQ== X-Received: by 2002:a17:902:e80b:b0:1ae:62ed:9630 with SMTP id u11-20020a170902e80b00b001ae62ed9630mr16141107plg.15.1684811068270; Mon, 22 May 2023 20:04:28 -0700 (PDT) Received: from [10.255.25.150] ([139.177.225.230]) by smtp.gmail.com with ESMTPSA id ji6-20020a170903324600b001a804b16e38sm5550294plb.150.2023.05.22.20.04.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 May 2023 20:04:27 -0700 (PDT) Message-ID: <59a250f6-d38d-9fae-8835-4fd1c501d913@bytedance.com> Date: Tue, 23 May 2023 11:04:22 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: Re: Re: [PATCH v2 4/4] sock: Remove redundant cond of memcg pressure To: Simon Horman Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Glauber Costa , netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20230522070122.6727-1-wuyun.abel@bytedance.com> <20230522070122.6727-5-wuyun.abel@bytedance.com> Content-Language: en-US From: Abel Wu In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Simon, thanks for reviewing! I will fix the coding style issues next version! Thanks, Abel On 5/22/23 8:54 PM, Simon Horman wrote: > On Mon, May 22, 2023 at 03:01:22PM +0800, Abel Wu wrote: >> Now with the preivous patch, __sk_mem_raise_allocated() considers > > nit: s/preivous/previous/ > >> 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 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. >> + */ > > nit: > /* Multi-line comments in networking code > * look like this. > */ > >> if (sk_prot_mem_limits(sk, 2) > alloc * >> sk_mem_pages(sk->sk_wmem_queued + >> atomic_read(&sk->sk_rmem_alloc) + >> -- >> 2.37.3 >> >>