From patchwork Thu Mar 5 20:55:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 11422621 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6709014B7 for ; Thu, 5 Mar 2020 20:55:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3323E20848 for ; Thu, 5 Mar 2020 20:55:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DiLLZ921" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3323E20848 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5BE7F6B0005; Thu, 5 Mar 2020 15:55:36 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 56E826B0006; Thu, 5 Mar 2020 15:55:36 -0500 (EST) 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 483E86B0007; Thu, 5 Mar 2020 15:55:36 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0131.hostedemail.com [216.40.44.131]) by kanga.kvack.org (Postfix) with ESMTP id 2F36A6B0005 for ; Thu, 5 Mar 2020 15:55:36 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D639E180AD804 for ; Thu, 5 Mar 2020 20:55:35 +0000 (UTC) X-FDA: 76562514630.05.snow18_6b07be0ec2a56 X-Spam-Summary: 2,0,0,730a4ba2a0d5845d,d41d8cd98f00b204,3rwdhxggkcjie3w6007x2aa270.ya8749gj-886hwy6.ad2@flex--shakeelb.bounces.google.com,,RULES_HIT:41:152:273:355:379:541:800:960:966:973:988:989:1260:1277:1313:1314:1345:1437:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2559:2562:2693:3138:3139:3140:3141:3142:3152:3353:3865:3866:3867:3868:3870:3871:3872:4250:4321:4385:5007:6117:6119:6261:6653:6742:7875:7903:9969:10004:10400:11026:11232:11658:11914:12043:12291:12296:12297:12438:12555:12679:12895:12986:13161:13227:13229:13869:14096:14097:14181:14394:14659:14721:21080:21092:21433:21444:21450:21451:21627:21740:21939:21987:30054:30070,0,RBL:209.85.216.73:@flex--shakeelb.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: snow18_6b07be0ec2a56 X-Filterd-Recvd-Size: 4777 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Thu, 5 Mar 2020 20:55:35 +0000 (UTC) Received: by mail-pj1-f73.google.com with SMTP id k44so3428374pjb.8 for ; Thu, 05 Mar 2020 12:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=mljG1c45tyBHCNvH//AiEZZTlDTTk3P0kV7UDMwCvTs=; b=DiLLZ921cvStv9VpgT9chw1u+67yb+Jf1wZHKgKeRrtR6Vd+VVjzBFoE3075eabKkB vL9Q1THdoudDtlzUB2SlXnPecVbbuAg124mgQ8cq9H95q1YMiqQXbrNKd7dT2fAnUn3n dPRVeotMzxE6Byy9sl8GMe1jbOn5REl2Dx/4Jw3dbu3R5Z0VldYTbblzUPZ/nq/hvU5m UW41Z7wBfxhTTlXQkI1TtX3zZrz8D1ZvUtgjIr8/MH5OdVN/TMfeA6uQ38HLwN+syvBs NSC1Z9sBv8MySgOXqKr3+c5YO5Dh9yruYybkpx5dtHt7G3kaEndhLvrvjxgKLh+C3qkQ DSTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=mljG1c45tyBHCNvH//AiEZZTlDTTk3P0kV7UDMwCvTs=; b=k5uHUZjW8NSsB3x9l19rn5C9VoiXyIJ+hd+lK2XsQBAMo7h7n4d49PhSERFB33bLQc C8kRxnfdoKEsZObOfKcdhKD0uPslpnKUFslpqGJg3mp0zWFhZ0wV+3LoPC8cn71FkUhy bH4SP7J1sCE9aOjd6/49jWtndf2n4O0Oxt2C8gHm0FY3ZHpTxIgkTO9vwjTTLOKbuZ4R PChA29AfzQrwtn/EMY/G3KrX38INgF13MH7+y/u82Z/3YHYDs0QB5PbE/apyld4wfz1/ Q1MfR10yvG5CDZKcMoAf1e8Y03L+GQfTbfiPTYiGGL2M0+fbsJe47tqRPbYhJft3kPTO 6yTg== X-Gm-Message-State: ANhLgQ3ez01KJ51/sQsHvFb1vRobQAh2WSFSoSY0oTNYRE3DtuIePvhn zIxcL+9Jf+mp8c1hFrOJQTvb3KwZqjmCMQ== X-Google-Smtp-Source: ADFU+vtVGz7DVOErF5e2OURgUg2ecxIgD7Eb6KdrmeesDbmcr0yLA+SUXXXVg19kGdyFzvBxzDpSLTmT/w31sA== X-Received: by 2002:a63:74b:: with SMTP id 72mr19359pgh.320.1583441733885; Thu, 05 Mar 2020 12:55:33 -0800 (PST) Date: Thu, 5 Mar 2020 12:55:25 -0800 Message-Id: <20200305205525.245058-1-shakeelb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog Subject: [PATCH v3] net: memcg: late association of sock to memcg From: Shakeel Butt To: Eric Dumazet , Roman Gushchin Cc: Johannes Weiner , Michal Hocko , Andrew Morton , "David S . Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , netdev@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Shakeel Butt 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: If a TCP socket is allocated in IRQ context or cloned from unassociated (i.e. not associated to a memcg) in IRQ context then it will remain unassociated for its whole life. Almost half of the TCPs created on the system are created in IRQ context, so, memory used by such sockets will not be accounted by the memcg. This issue is more widespread in cgroup v1 where network memory accounting is opt-in but it can happen in cgroup v2 if the source socket for the cloning was created in root memcg. To fix the issue, just do the late association of the unassociated sockets at accept() time in the process context and then force charge the memory buffer already reserved by the socket. Signed-off-by: Shakeel Butt --- Changes since v2: - Additional check for charging. - Release the sock after charging. Changes since v1: - added sk->sk_rmem_alloc to initial charging. - added synchronization to get memory usage and set sk_memcg race-free. net/ipv4/inet_connection_sock.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index a4db79b1b643..5face55cf818 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -482,6 +482,26 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err, bool kern) } spin_unlock_bh(&queue->fastopenq.lock); } + + if (mem_cgroup_sockets_enabled && !newsk->sk_memcg) { + int amt; + + /* atomically get the memory usage, set and charge the + * sk->sk_memcg. + */ + lock_sock(newsk); + + /* The sk has not been accepted yet, no need to look at + * sk->sk_wmem_queued. + */ + amt = sk_mem_pages(newsk->sk_forward_alloc + + atomic_read(&sk->sk_rmem_alloc)); + mem_cgroup_sk_alloc(newsk); + if (newsk->sk_memcg && amt) + mem_cgroup_charge_skmem(newsk->sk_memcg, amt); + + release_sock(newsk); + } out: release_sock(sk); if (req)