From patchwork Wed Jun 27 20:41:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 10492607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E2A7460375 for ; Wed, 27 Jun 2018 20:41:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D98E42012F for ; Wed, 27 Jun 2018 20:41:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC7EA28DFA; Wed, 27 Jun 2018 20:41:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4911B2012F for ; Wed, 27 Jun 2018 20:41:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA1946B0003; Wed, 27 Jun 2018 16:41:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C51206B0006; Wed, 27 Jun 2018 16:41:57 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B69326B0007; Wed, 27 Jun 2018 16:41:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f72.google.com (mail-pg0-f72.google.com [74.125.83.72]) by kanga.kvack.org (Postfix) with ESMTP id 777136B0003 for ; Wed, 27 Jun 2018 16:41:57 -0400 (EDT) Received: by mail-pg0-f72.google.com with SMTP id b9-v6so1379898pgq.17 for ; Wed, 27 Jun 2018 13:41:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=OkwLo9YxvKe085egdShSLIguaqYgQrkn5A3f36HdP0M=; b=skSdZtwT3BP6SUp3N1xv+Zqr65dVuXVE1mpJkerOk879pV4YDOhQZT3WCytzhoKT6f wVqYEH0H4PX4g3d2SVFni/mVMYxN9nILoGT7xQ9OaV2QAYJfTgzdUw6FDf3iAddpB3NA jZLMSeYo9Eul+ambZZovYdVn7fsPB/nJWaMSHyIPxszJJQZVkDR2xKYSvv8LS3L/a3cL RMv2brjbE/L2/q+37hZRrbzZzMQv1KQjuYmbt4X2nzz8Rm1sMDkXBVmj4pTZ5FZrknSZ 4lmChkaqZUijlbKmyo6tv9VdUD+BAopxLj+7vWUg36h2wZ0vPsO1g9p+jj+ltFxCdcLN Ww/Q== X-Gm-Message-State: APt69E0OHsqH/wdnuZ7b1HuSgF+Grp5APlFVtODDlQtossAH+DhZvdl7 Fb9kbp5FEARoI70+MsWtulwBQAj3wcPiwzQePxFGllR9gmqxFAadyvOd+L4exxqh7N+pHRsOcbA 19qoGtKANLw6pZzaAHd3/tS6D5b1O/DqNYFOYrwP8NyU2aOn2r8kiM7SQ/3FvzisXsQo//OZcfv EoKO962ZRbcjSumLLdK9mIqGLERfgbodGpKomOaQ9h8xNnnvQfx0EuqYl5Wb5fCtzkNOXNPibKt ewAJB+ZE7dz4fSOIA8BOqh1Jg7EUDIuvS4tAPUXWWGTmtAdQH1WDFmP8MUtqWTLYf0/IP0A4djz nBSPLqEt5Dhp64lgrTzYa1pqX8md+rXAGEvli43F4SYdO5ZCjp4M9lLyDzF9hi2IHjS2o0iizqm O X-Received: by 2002:a17:902:b7c4:: with SMTP id v4-v6mr7755167plz.30.1530132117154; Wed, 27 Jun 2018 13:41:57 -0700 (PDT) X-Received: by 2002:a17:902:b7c4:: with SMTP id v4-v6mr7755138plz.30.1530132116316; Wed, 27 Jun 2018 13:41:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530132116; cv=none; d=google.com; s=arc-20160816; b=WRskh2YSLnDQAwJ6CWtn4izNEUVbMnX4opLNH5aSP5Zgu6neCwTeutNqUCl+zBjEP1 merxGr2pECRWdBA2Ep6W8XzSoZ7dxM7ILOyl6cRAvGyGHi4z9CfhNDQHNnXcFvr1VWWJ 0Uh7buQMvWRRijgFuL36VtASKVAj6CJveN2eR724eSpH4WUni2psZplzzc3GmQJ3DUR6 6HpGULKWpLX8h168Jbg7VPNxDDildw/wqjSH4ORyMt5sszL0Pk2mtluYCmkJk2htpFL3 kq/e6UDHUsnlkMwpNcwBUmzLIx0w5QBqzq1ZWkItHLBS5t+NViEcHn6jHLy4ZmRVlQH5 0j7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=OkwLo9YxvKe085egdShSLIguaqYgQrkn5A3f36HdP0M=; b=Fkbzpws566ynJLi9IPl1Bhff03p5FxlmKcVF6sFkN5G9/qsfsmyJlK6nI9piaRJvpT R1guoXJBdJOXmmdJKXPdOvnQIuMKFZ4U+abu8DPasitb7ossmya3Ha3MpzTgkhifqqPE z3XNHFcB/cB9JLv8Q6UAVm3aKEP+za3MFgqhtw6JERjx/Rr1DEn/sgj/EsriqguCovJ8 WLN3DK29e6Y4YQFFvnLJxxXxnwpkzDH3tLIWacdV882gi2HojYdTe216y3WKnmZuI4wM 3iGpnwYm7mzUVWcyKbnJRimU40efNdLo9Kwy5XLIiTy15oG5gFYS6azeXG/la+tvzaKZ x0Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=UDpKNBxJ; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 5-v6sor1633562plx.112.2018.06.27.13.41.56 for (Google Transport Security); Wed, 27 Jun 2018 13:41:56 -0700 (PDT) Received-SPF: pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=UDpKNBxJ; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=OkwLo9YxvKe085egdShSLIguaqYgQrkn5A3f36HdP0M=; b=UDpKNBxJo8Bby3yBuGfbXT6sqJKi4/x3Hh7X2P+oG7lfB0Y86PbyNqAHKHW2pPzdk/ jUZlUU8ElB2LAgGKfo8FhWbTHGA7ifUFTMrGgkfkEElXQ2gyW4vHa5vFhAtmHQkbGHmh 1ZotiNqNjIodhAEw5DFgeilzFPE+SA3T3nvbyQ2PcYq/E6PEUzxwMgrWDAmkMfM0GlRV 2Dqr54Cj9Y799aISWf+hESuIN+hNx11MhTHmjLKovqdllMB0mooYjEJjPu00oaxMYUIV kNDKhU250XQCFpOw/iWJR0LNoTS5nkXI3FxRyH0mVeHG/tVe0yir3lxh7bdimbe1me4R TDlA== X-Google-Smtp-Source: ADUXVKJlpROODQro2NOMMYbIQj8mLOSSajVomC0k+pZ8i/pKjXWkOtHmcLhJFSktvBFgoAqmfWruNA== X-Received: by 2002:a17:902:9b98:: with SMTP id y24-v6mr7615092plp.177.1530132115486; Wed, 27 Jun 2018 13:41:55 -0700 (PDT) Received: from shakeelb.mtv.corp.google.com ([2620:15c:2cb:201:3a5f:3a4f:fa44:6b63]) by smtp.gmail.com with ESMTPSA id t5-v6sm7977593pfh.32.2018.06.27.13.41.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 13:41:53 -0700 (PDT) From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Vladimir Davydov , Greg Thelen , Roman Gushchin , "David S . Miller" , Eric Dumazet , Kirill Tkhai , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt Subject: [RFC PATCH] net, mm: account sock objects to kmemcg Date: Wed, 27 Jun 2018 13:41:39 -0700 Message-Id: <20180627204139.225988-1-shakeelb@google.com> X-Mailer: git-send-email 2.18.0.rc2.346.g013aa6912e-goog 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: X-Virus-Scanned: ClamAV using ClamSMTP Currently the kernel accounts the memory for network traffic through mem_cgroup_[un]charge_skmem() interface. However the memory accounted only includes the truesize of sk_buff which does not include the size of sock objects. In our production environment, with opt-out kmem accounting, the sock kmem caches (TCP[v6], UDP[v6], RAW[v6], UNIX) are among the top most charged kmem caches and consume a significant amount of memory which can not be left as system overhead. So, this patch converts the kmem caches of more important sock objects to SLAB_ACCOUNT. Signed-off-by: Shakeel Butt --- net/ipv4/raw.c | 1 + net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/udp.c | 1 + net/ipv6/raw.c | 1 + net/ipv6/tcp_ipv6.c | 2 +- net/ipv6/udp.c | 1 + net/unix/af_unix.c | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index abb3c9490c55..2c4b04c6461a 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -988,6 +988,7 @@ struct proto raw_prot = { .hash = raw_hash_sk, .unhash = raw_unhash_sk, .obj_size = sizeof(struct raw_sock), + .slab_flags = SLAB_ACCOUNT, .useroffset = offsetof(struct raw_sock, filter), .usersize = sizeof_field(struct raw_sock, filter), .h.raw_hash = &raw_v4_hashinfo, diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index fed3f1c66167..9ae31979aefa 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2459,7 +2459,7 @@ struct proto tcp_prot = { .sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_tcp_rmem), .max_header = MAX_TCP_HEADER, .obj_size = sizeof(struct tcp_sock), - .slab_flags = SLAB_TYPESAFE_BY_RCU, + .slab_flags = SLAB_TYPESAFE_BY_RCU | SLAB_ACCOUNT, .twsk_prot = &tcp_timewait_sock_ops, .rsk_prot = &tcp_request_sock_ops, .h.hashinfo = &tcp_hashinfo, diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 9bb27df4dac5..26e07b8a83cc 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2657,6 +2657,7 @@ struct proto udp_prot = { .sysctl_wmem_offset = offsetof(struct net, ipv4.sysctl_udp_wmem_min), .sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_udp_rmem_min), .obj_size = sizeof(struct udp_sock), + .slab_flags = SLAB_ACCOUNT, .h.udp_table = &udp_table, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_udp_setsockopt, diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index ce6f0d15b5dd..044ed44e7c16 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -1272,6 +1272,7 @@ struct proto rawv6_prot = { .hash = raw_hash_sk, .unhash = raw_unhash_sk, .obj_size = sizeof(struct raw6_sock), + .slab_flags = SLAB_ACCOUNT, .useroffset = offsetof(struct raw6_sock, filter), .usersize = sizeof_field(struct raw6_sock, filter), .h.raw_hash = &raw_v6_hashinfo, diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index b620d9b72e59..7187609ca25f 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1973,7 +1973,7 @@ struct proto tcpv6_prot = { .sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_tcp_rmem), .max_header = MAX_TCP_HEADER, .obj_size = sizeof(struct tcp6_sock), - .slab_flags = SLAB_TYPESAFE_BY_RCU, + .slab_flags = SLAB_TYPESAFE_BY_RCU | SLAB_ACCOUNT, .twsk_prot = &tcp6_timewait_sock_ops, .rsk_prot = &tcp6_request_sock_ops, .h.hashinfo = &tcp_hashinfo, diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index e6645cae403e..47c9a3c74981 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1582,6 +1582,7 @@ struct proto udpv6_prot = { .sysctl_wmem_offset = offsetof(struct net, ipv4.sysctl_udp_wmem_min), .sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_udp_rmem_min), .obj_size = sizeof(struct udp6_sock), + .slab_flags = SLAB_ACCOUNT, .h.udp_table = &udp_table, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_udpv6_setsockopt, diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 95b02a71fd47..5e3e377a7269 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -742,6 +742,7 @@ static struct proto unix_proto = { .name = "UNIX", .owner = THIS_MODULE, .obj_size = sizeof(struct unix_sock), + .slab_flags = SLAB_ACCOUNT, }; static struct sock *unix_create1(struct net *net, struct socket *sock, int kern)