From patchwork Tue May 23 09:46:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Wu X-Patchwork-Id: 97947 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2023969vqo; Tue, 23 May 2023 03:08:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6myMra9btwCCOehygnAxKwzWVYiFxt/ecSxgUwwDpZOLbDVlVdkrsew54AJmhzM3P+n6iO X-Received: by 2002:a05:6a00:1487:b0:64f:3fc8:5d26 with SMTP id v7-20020a056a00148700b0064f3fc85d26mr2585182pfu.9.1684836529948; Tue, 23 May 2023 03:08:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684836529; cv=none; d=google.com; s=arc-20160816; b=qUQotYLOQP0vO0xTnKzjTO7rDIbTbIbLwbJLSH0r6RQl2HDVkZylpgIoUwFfD4BVMc K8Zc4JzPDf5Qr0VR8+Uv6/pVyMdWTB+aRkC5lZx7jpse9OCa6VbdTMFin/2HAiv0iqNP uD9rAp+5JDuavchEfaNq29n9cXlKj+UWDK8VgaijlI3uxpGBmePjCMFn/xfKuhnFsh4s vHKm+Yu5kx5ZnIaM0OHfPW2JutL/YfMZuxbvvA/CtGfoYa+Hgl8eUekS5so7tqKQEwfC IYzZdjMjVen1yF5Al2icyWjq0proDhQAmH2eOvbHYSaakL8AUape1IFQMMT767Ab69gb h06g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bJNRFp1URkkAv14Fvh/BUBB9PNFK79930mw7UGuUDQY=; b=M6yZGRBT+ylyu2284H55jbOIrClkcn7TGbQGkGALfrwhJxYlnJYA7S50y0s663B47a eLkNXAv5K8PUY/kyd5n7IpWrDLTjXqDKxkuVE+EyOZJqzBZfGNwYKZy2pjRhb3STlfHE /mTyRf7HPP+ogIfjo+VTozlbACOOmtRAtNdZhAxppcCUhFBxUTcBpb/h0ZPtOQS8fJAu gMWTX9F7tGNppHqCi8NoGx5liU4yfh5t6FCpZBu8S1mtNNw/I4Pq6s8fni+cQ1jvzPRb 9EgnwAUlmExTFwfVRNluTz+M9KVFrspyRo2Mq6A8yaJOwphEuNLQsVKWnT3jUWTZwpcF ZxHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=U4Qt34Z6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bs184-20020a6328c1000000b005073e3342eesi1086578pgb.143.2023.05.23.03.08.34; Tue, 23 May 2023 03:08:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=U4Qt34Z6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234741AbjEWJrg (ORCPT + 99 others); Tue, 23 May 2023 05:47:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235897AbjEWJra (ORCPT ); Tue, 23 May 2023 05:47:30 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12EDB130 for ; Tue, 23 May 2023 02:47:29 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-64d2c865e4eso3772268b3a.0 for ; Tue, 23 May 2023 02:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684835248; x=1687427248; 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=bJNRFp1URkkAv14Fvh/BUBB9PNFK79930mw7UGuUDQY=; b=U4Qt34Z6pN6W4AL25USGqBadP06Vqhmo9JSJfVQCZc70CiJ7M0OKga9craqFE0GnI8 NLMJIANE63+DHnEOMIxX7DO2qCdEbewRVqGS/O5pO5br4bfTrc3uDxLszVxc0OgolxnV aTa3JwnkdYOcbk3XEh+RIbsrLWwrH+lxONrUG5XwpcLq7ppOwFzilXmbro7u+yhFVsMP EN7fQjzet+Sv/Ubmgtxp0XjM+pbLUo9GrvYaHYWEq6DDhhD4nRGmFih1fAPFp9SgP5jG tRmJMdYXzqa4ezGKi45YbtXY94ukxpsPSM9JKp5hSByxj0OnJRYdhlAJFFui19XBhUR6 1qkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684835248; x=1687427248; 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=bJNRFp1URkkAv14Fvh/BUBB9PNFK79930mw7UGuUDQY=; b=hW6dRd/mOd4RyxpNiooF/LZ2bnnHjWk8by+2jvzbWuKPodQENA8FlLewZjcB3Kr6MU NSUBwmJ6SVNrq2ZoXfmHGBOUpyXuBRPgskoWmntBUTIOxZDgKiYtILdWi6uXa+ydctTH BTGVePVPnurlQMfCBywy4G6k9BjBLl9615CJBy9yZWbdYXP1aSm+iQ3wzj+tr1sCcR3/ O/9MEIC1INWd6zzQYgg3BxxonPYabtnVdMBgj6W0Li8XWXEUXY5xvDe6GqUo6akrVBbJ tZq08e5qz7k+ZNQz73hdp68SU/ZFWis93U9QLJtGY8PFc0PntJCVmVrr0iBzm8Vlo4te J/xQ== X-Gm-Message-State: AC+VfDz6eG2q1gGfE1rJjJn1gJnEOapHsQp3GAj05tPArThQZT478bN6 wQaEYcn08g0Ymn3Jfuc13iEPSg== X-Received: by 2002:a05:6a20:3d09:b0:10a:cbe6:69f0 with SMTP id y9-20020a056a203d0900b0010acbe669f0mr11156449pzi.10.1684835248601; Tue, 23 May 2023 02:47:28 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.230]) by smtp.gmail.com with ESMTPSA id 22-20020aa79116000000b0063b898b3502sm5457216pfh.153.2023.05.23.02.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 02:47:28 -0700 (PDT) From: Abel Wu To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Wu Subject: [PATCH v3 5/5] sock: Remove redundant cond of memcg pressure Date: Tue, 23 May 2023 17:46:52 +0800 Message-Id: <20230523094652.49411-6-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230523094652.49411-1-wuyun.abel@bytedance.com> References: <20230523094652.49411-1-wuyun.abel@bytedance.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766679149325661418?= X-GMAIL-MSGID: =?utf-8?q?1766679149325661418?= Now with the previous 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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/core/sock.c b/net/core/sock.c index b899e0b9feda..b2deffb81c86 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3029,9 +3029,15 @@ 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) +