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 48FACCA0FE6 for ; Fri, 1 Sep 2023 06:23:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F7788D001A; Fri, 1 Sep 2023 02:23:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A7238D0002; Fri, 1 Sep 2023 02:23:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46F698D001A; Fri, 1 Sep 2023 02:23:52 -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 35C738D0002 for ; Fri, 1 Sep 2023 02:23:52 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0375A14013B for ; Fri, 1 Sep 2023 06:23:51 +0000 (UTC) X-FDA: 81187037904.08.294C65F Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf18.hostedemail.com (Postfix) with ESMTP id 337B71C002A for ; Fri, 1 Sep 2023 06:23:49 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=J0XMr6sO; spf=pass (imf18.hostedemail.com: domain of wuyun.abel@bytedance.com designates 209.85.210.172 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=1693549430; 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=1QWm8cF6bkJper87bKNGM7pspfj+5pss/cTqDVG6VeI=; b=PZTp2WvtlsaUFr8UX2ASRpRHtp+TC4GzQTbiTauArz0x5UVfJZA8kDm+1qoNQ9JSxSLStD m3LPE0yVaFMERxrB2OElQl/CqOe1LTAh3eQorj4nzrKSzAVfkO4v87cIOXtcItj0m4DLfZ F+NmIv/8e405jQJxo5WOQid7ph4smm4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693549430; a=rsa-sha256; cv=none; b=dLaVxvwTk5Hhuj9yiDWpA3SfibUqDvAHAiuPmNZ8J7NkBF6003rPl5023/tw6ZK8nAQVjY MPIZUkfsUjGUvLLk38EhpBtFBXKE3bnOkHSFZlchHyeoDRQOGnH0hxGXsqayd4uPOMBPnL J90xLkSbI6ERdf79t0KcGzBBLlv1jH4= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=J0XMr6sO; spf=pass (imf18.hostedemail.com: domain of wuyun.abel@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=wuyun.abel@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-68c0d262933so1373265b3a.0 for ; Thu, 31 Aug 2023 23:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1693549429; x=1694154229; darn=kvack.org; 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=1QWm8cF6bkJper87bKNGM7pspfj+5pss/cTqDVG6VeI=; b=J0XMr6sO8WzyXpvwDsX5JdRnXmlU6aP6ayqD8Y3kOW3LQY5/AWEYzEdFkHdKWCETUY ZMM44VTdgzyhIUzovIZkRRPSWh7YhwDsELEZVNTb+wBIxOH1J0Ysn2ttnnz6Drx5K80Y g1y5zDddm/l4rqwpOPlAWTEv13lmvnQX37/yk6COsYJBheOtO7bbzZ/p9ARFs3Mbi1kq Nn0RwQavkRUjntQdBbegIoa0WByNIkNVl5biuTMbq3yn2HgpdEHABkLDgZ13kY9FGVnx n1Tkkn1FU4WEmAVB1X86U+vVq25yxbF9qkqnPX7/StjTdLxT/337oO04rnAiiGZOd6wS 1VTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693549429; x=1694154229; 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=1QWm8cF6bkJper87bKNGM7pspfj+5pss/cTqDVG6VeI=; b=WVz+bJf8o0Wekdz/GyTqev4+0sqjCOvHBl9ZsIF3GQ6CV0ipLqY54bYMWWJpyNtKv/ Retw94yKj7yuafdCOrCikuK1YZtPocFbJmfoRb/qJeJInkRW7G8F9BGIZE7o3oDUtW5r dGXrMjtFQJc1Im+D41p4zSc+VTMFPBRPh+8cNqzvUrus+OYoqaZnJBAG/FSn3mYRjgp7 Pdt3BrL5YqBGjl6awqLx1MOn3mqgcdOpCF54imWs4RXaB87VFTFOX6/LymjzWd6KIP24 wJ/L4epJhys0T0a1cPGj8hVwy0xbL3rkKLj8yBDOtGW3Jd+PsaQKZxBxALXIznPhSxAq 8KOQ== X-Gm-Message-State: AOJu0YzFxAjVCV2YOkoxwvMGIzSGNh83/7OyKE/MlqVUFMoJhixkBkWc MHfvWgnXzbzc2M+rgP5mvKMynQ== X-Google-Smtp-Source: AGHT+IH317txsPuj8MBF7exknVZRvNNzVT02jeLJY4AHeJlruKWwnuwX34akxA/Zq54dUriHM27EIg== X-Received: by 2002:a05:6a20:1019:b0:148:1e47:345e with SMTP id gs25-20020a056a20101900b001481e47345emr1722651pzc.49.1693549428921; Thu, 31 Aug 2023 23:23:48 -0700 (PDT) Received: from C02DV8HUMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id fm19-20020a056a002f9300b0068c1ac1784csm2223265pfb.59.2023.08.31.23.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 23:23:48 -0700 (PDT) From: Abel Wu To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Morton , Shakeel Butt , Roman Gushchin , Michal Hocko , Johannes Weiner , Yosry Ahmed , Yu Zhao , "Matthew Wilcox (Oracle)" , Abel Wu , Yafang Shao , Kefeng Wang , Kuniyuki Iwashima , Martin KaFai Lau , Breno Leitao , Alexander Mikhalitsyn , David Howells , Jason Xing Cc: linux-kernel@vger.kernel.org (open list), netdev@vger.kernel.org (open list:NETWORKING [GENERAL]), linux-mm@kvack.org (open list:MEMORY MANAGEMENT) Subject: [RFC PATCH net-next 1/3] sock: Code cleanup on __sk_mem_raise_allocated() Date: Fri, 1 Sep 2023 14:21:26 +0800 Message-Id: <20230901062141.51972-2-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230901062141.51972-1-wuyun.abel@bytedance.com> References: <20230901062141.51972-1-wuyun.abel@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: oukn3w4gwn1h7bdftm4kgar65zbujop1 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 337B71C002A X-Rspam-User: X-HE-Tag: 1693549429-161443 X-HE-Meta: U2FsdGVkX1/rskRH3DGTr6etqyA2NlAeidIUrOMqEXIxqj+wsfjBHSCl6lRinUnKyjtsI3K1J9YS5g7+vc3uPdx+OPeyGH6ztbu9W/gQDBG3T6nKrtbuodqoH240sqmVWon6nAbpZh56NKk54gy5KMtrPzQLrepTo3El8oivQ7Gkd+tcHR+GJru/RoXryiRJrkqDl1BqD4W0hYCX8oFIYez9R2tggpZWAU451aYKLCOYMlFfhW3yyWjcWqY8mGKMedG61JGpP6jQzkKn2jwdqWaXrblKdmMdroduS+YHHqvzJ6xnB71gY+uigmyGv7+P2e56OFx51WBrLyv+Pf7wzsUB65bvXZg/drGrOy0BTizHIgPaVkbRh2pgmRw+3Jhn8D6qssPInn9vjd0JkfGIJ65b+eHFNvRGlyPGDHYzdZKw3AlYsD0FnWynf/4GO28lvBR4XwCkZqLIbGqA2ZtpUSr0K/yPljfREPYDIQBTaNExY/ttLDx0+2ss57bs1F+ZKIuRnnKECU2ZSVrRNGm3tOM5iihSzyQpW6el+UYYriJRBznvELZ9SMJ9k8kBh/OALjeHOb0QdmdsSVlnqOB0EYvDaKWOvrwqDdQqf9oBVDg3H1j47jLQ3ty21pnp1MKJVOeoJG0H+mGrir8M4mN7HkTYED2a3BmS9Zr54wkRnDmw5pwlACrU+5txBkjzzSH1vJZRinaKA2nr3LDz9wUP0+ZIZ9727b+8dAcEtemcfgStVnkR5Y0Njg6qvhFo9afIylphVC/zPmQkiAV4LrapYIj6zNW4Fs2ohzYvCIqp2qQnJ3DU+lOi1nnNGFCMFgMcSdXuZ4OsVFkrBKLyT5hLAxHApbP6Yi/hgyEq/rYhTNqbEMySwOFtWo5DQmUBt5OWEti2ftLbyxw8mX8L3So2WKjx67AYN+cognd6/QNY5mCcDC8XxV7hqVNCx8nYi3znKXYrISA+v6jS86eUMtP FeHoFsxZ lTxLwhOPD5nGyRhJLpDIXPrZYQA4teW5ubOkJxUOHf0SUPfJd0FqHLgxvDJDCtMNuIOfyWU1d++GckHOX3XV5r66NIQozoXaIfGekOMBJOWnoXQRX1Blyq7JETbNMfLsKYl/HwRVeqD3gjI5rGc8ib1AsEjoJd4a6kbiQIGnBJH9XNFMdJ6k8ntlwE+Psd6I/DRH0VmaElPqekrabzKaubDW5cYT0emXZBwMrTG6F7k3h8q0kPeNTEgStH0ovOmfVupBBxfs+i3Yf4BH5qLkwydXGe1LYtrN2hp5VQoRxm//F5R78QrinGVo8SR5dmB6uuq3BZXB28f+qA0OrFAek1KAoKcuTTxmbWm8LeIBIDbH4JzDDrAk1mR1RWdXjlRD/+G+/tB2Q+Mp/2LtOC8Ty0SIZWSVV2L7w50ai17rBlwdGN6RewtfPX4jUf/nvDpcLK/fuEmYMNyMIkCi0B4yeCoAomEcT5WWgHzXAwhGruM6EqKtkm1BVQ3O+P12H/5l5BJwwJtwQMn+aVCGt9Bxozsbe0acRoehGuFMfBqrq67Gs24cYIj8rEBfwIxkqfxcNkaMb 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: Code cleanup for both better simplicity and readability. No functional change intended. Signed-off-by: Abel Wu --- net/core/sock.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 666a17cab4f5..af778fc60a4d 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3040,17 +3040,19 @@ EXPORT_SYMBOL(sk_wait_data); */ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) { - bool memcg_charge = mem_cgroup_sockets_enabled && sk->sk_memcg; + struct mem_cgroup *memcg = mem_cgroup_sockets_enabled ? sk->sk_memcg : NULL; struct proto *prot = sk->sk_prot; - bool charged = true; + bool charged = false; long allocated; sk_memory_allocated_add(sk, amt); allocated = sk_memory_allocated(sk); - if (memcg_charge && - !(charged = mem_cgroup_charge_skmem(sk->sk_memcg, amt, - gfp_memcg_charge()))) - goto suppress_allocation; + + if (memcg) { + if (!mem_cgroup_charge_skmem(memcg, amt, gfp_memcg_charge())) + goto suppress_allocation; + charged = true; + } /* Under limit. */ if (allocated <= sk_prot_mem_limits(sk, 0)) { @@ -3105,8 +3107,8 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) */ if (sk->sk_wmem_queued + size >= sk->sk_sndbuf) { /* Force charge with __GFP_NOFAIL */ - if (memcg_charge && !charged) { - mem_cgroup_charge_skmem(sk->sk_memcg, amt, + if (memcg && !charged) { + mem_cgroup_charge_skmem(memcg, amt, gfp_memcg_charge() | __GFP_NOFAIL); } return 1; @@ -3118,8 +3120,8 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) sk_memory_allocated_sub(sk, amt); - if (memcg_charge && charged) - mem_cgroup_uncharge_skmem(sk->sk_memcg, amt); + if (charged) + mem_cgroup_uncharge_skmem(memcg, amt); return 0; } -- 2.37.3