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 X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4F1AC43457 for ; Mon, 12 Oct 2020 14:00:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F1AC20878 for ; Mon, 12 Oct 2020 14:00:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20150623.gappssmtp.com header.i=@cmpxchg-org.20150623.gappssmtp.com header.b="kdD+EQ/d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389358AbgJLOA1 (ORCPT ); Mon, 12 Oct 2020 10:00:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388795AbgJLN76 (ORCPT ); Mon, 12 Oct 2020 09:59:58 -0400 Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7AFDC0613D0 for ; Mon, 12 Oct 2020 06:59:57 -0700 (PDT) Received: by mail-qt1-x843.google.com with SMTP id c23so13651946qtp.0 for ; Mon, 12 Oct 2020 06:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=LiRTK1pn0r+YX72HhN94UTqVGuwvK727gErKq+9p5co=; b=kdD+EQ/dal5vV717URB/8INdiZStUkziLF+UP1/oTSbkc1xgOTizbXO5c7UxoZEPEW ciXRZScy5HT82Nv+OD2jUtLvQ9ZQUcBf5lQFSVG840aSBl/RscDr0IFlx4mq7nv7MQ35 qKKeS7bNKo7We6dmI+xlw49U9Yldi1thKV+okEC746kq4DMa7X461pF8ef+CffG9QZHZ P4KVdg4bG0zObRLP2mgNLOg61igdJOJIBA0f9nLPUnjww4ZBDnQ2ZQq2sYhk6myWpyxs kMjev9XtTo/GbPHtFljwhoUpLw1Rj5mPbkW6NIMYdXRlfoGwcEQJYFL0k3Ft/+QUy2a5 zMxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=LiRTK1pn0r+YX72HhN94UTqVGuwvK727gErKq+9p5co=; b=sbZY0o7LHahO9/14GuJhnEKDOxz5zLDe0PUSoPhODR764vznuHEHGGNeqqQKKqsl3N cZmX34HdkCa6siVPVqX5Os2t00wSaJxBZb1bOy41hahsPm+r5ibSs1mAee+Qmfn9WW30 PqmnLDS/3si9a8TXPawR/ns6kLjhy1q+I/0vd4/ZDXpCvapwVKmJpf5begToMpTy7MGC 2MCBuprjZn8f8nQzF057tD+/xJsVFow70zrG9/hIGLkZKanSeV0C0KhuKZ9kbzSWob7H LBfB7zLbGHRnYEYwAGLshBn1FD9K+1F1/fWk14sujCf+uTROvQxmW1xH8F6ZEST/+IsZ 6iGg== X-Gm-Message-State: AOAM533HOp2PZ6k0P38YEm7C/cwrOeooKqqn4OnMe8y+8q/uKA3cFe0b awrMB8SeHnrHxBOCH5A0k+xNFQ== X-Google-Smtp-Source: ABdhPJxAX5eynIShuux1RfN6TNFMLHG9rFliYB7ohOz/eT70FOqxANA48CGA9a+dB8RWZqnIBpu8UQ== X-Received: by 2002:ac8:5b8d:: with SMTP id a13mr9846698qta.209.1602511197075; Mon, 12 Oct 2020 06:59:57 -0700 (PDT) Received: from localhost (pool-96-232-200-60.nycmny.fios.verizon.net. [96.232.200.60]) by smtp.gmail.com with ESMTPSA id r16sm6844790qkm.1.2020.10.12.06.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 06:59:56 -0700 (PDT) Date: Mon, 12 Oct 2020 09:58:23 -0400 From: Johannes Weiner To: Muchun Song Cc: davem@davemloft.net, kuba@kernel.org, edumazet@google.com, mhocko@kernel.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, shakeelb@google.com, guro@fb.com, iamjoonsoo.kim@lge.com, laoar.shao@gmail.com, chris@chrisdown.name, daniel@iogearbox.net, kafai@fb.com, ast@kernel.org, jakub@cloudflare.com, linmiaohe@huawei.com, keescook@chromium.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH] mm: memcontrol: localize mem_cgroup_sockets_enabled() check Message-ID: <20201012135823.GA188876@cmpxchg.org> References: <20201010104521.67262-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201010104521.67262-1-songmuchun@bytedance.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Oct 10, 2020 at 06:45:21PM +0800, Muchun Song wrote: > Move the mem_cgroup_sockets_enabled() checks into memcg socket charge > or uncharge functions, so the users don't have to explicitly check that > condition. > > This is purely code cleanup patch without any functional change. But > move the sk_memcg member of the sock structure to the CONFIG_MEMCG > scope. > > Signed-off-by: Muchun Song > --- > include/linux/memcontrol.h | 78 ++++++++++++++++++++++++++------- > include/net/sock.h | 5 ++- > include/net/tcp.h | 3 +- > mm/memcontrol.c | 43 +++++++++++++----- > net/core/sock.c | 15 +++---- > net/ipv4/inet_connection_sock.c | 6 +-- > net/ipv4/tcp_output.c | 3 +- > 7 files changed, 111 insertions(+), 42 deletions(-) Hm, this is almost 3 times as much code. The sk_memcg saving on !CONFIG_MEMCG is somewhat nice, but it's not clear how many users would benefit here. And it adds ifdefs in code. Also memcg code now has to know about struct sock. I'm not quite sure that this is an overall improvement.