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=-14.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham 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 68686C3F2CD for ; Thu, 5 Mar 2020 04:38:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 24F122072D for ; Thu, 5 Mar 2020 04:38:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mPnvGwwI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24F122072D 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 B81766B0003; Wed, 4 Mar 2020 23:38:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B32AD6B0005; Wed, 4 Mar 2020 23:38:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A47D26B0007; Wed, 4 Mar 2020 23:38:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0237.hostedemail.com [216.40.44.237]) by kanga.kvack.org (Postfix) with ESMTP id 8DECA6B0003 for ; Wed, 4 Mar 2020 23:38:07 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2533B180AD802 for ; Thu, 5 Mar 2020 04:38:07 +0000 (UTC) X-FDA: 76560051414.03.book44_ca4128dd4743 X-HE-Tag: book44_ca4128dd4743 X-Filterd-Recvd-Size: 7435 Received: from mail-vs1-f65.google.com (mail-vs1-f65.google.com [209.85.217.65]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Thu, 5 Mar 2020 04:38:06 +0000 (UTC) Received: by mail-vs1-f65.google.com with SMTP id x194so1030825vsc.12 for ; Wed, 04 Mar 2020 20:38:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wT7fX3XNpFUklA+4ubZ3A31ow/x3fc9U86BQ8duNKxk=; b=mPnvGwwIyc8PT9pu6q66/Xy/ag6QPMQHDyXJlCIiDTmTeYgipFoyhF1mRpzK0vT54c j7mVmd5I9pjGiM0Kgj4rIDhSIJ1vCE35gVKV5R9sD0dqxRnUnN479aGCHq4R0Ys/6QyJ AjH5TUwEl45CjFaDUVfjZT20unJjwtiCN9dz0pvaeKRUn0xPvQnxO9qHz9fhctfmKFvL ZfwXszJ3SCcT1z4FjJe6cdD3M1AQQoMtZmRVjvEPMhLufWXFeZsodXlZecriYJomGOdO AyBlIXzJbV3MTnDG0/ULrakFCgJdCH61wd8ssnq08gHeSwTXFPy86ENlrDxluvER3aZk eAZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wT7fX3XNpFUklA+4ubZ3A31ow/x3fc9U86BQ8duNKxk=; b=c8mpI3rlysR71Ss4yW501vqalGHlm3QPbkagZRTdhpDrThoCFFN9O8MJcQca/EcLwM 4Ia8ghJdOrtm+niZPzY0GkT1xr4OBG5DcwGRFsu2n5kdX59bU1DRg4K7DaXYGZwOD4TK dM2PPi6sfRZTnTusmHj+jOdZmDUrVKbV8+dgB3ctBs4b/lJ8pq6JoKjHXSA3qlvtOCJJ B+nXAQK1vrUFsPhGcppfCtgaC9Tz8ZafHVOBpBurtNCgMLV3EyzYZdewPeZempsQyfQy eaApir6qa3fwNSzrFEdy4dUNeB4n278eyMAsju+wPRaUu+i2D43BvpYUAgyMqLTvhsPu qatA== X-Gm-Message-State: ANhLgQ1Bof/6FUz6h8A+I6gQgF7SelU/OlNjcYz5HTRdtJPpgnh6stG5 HuR5EW8OEZCuFrPeMtsLvhrYmIiygy1BVOKyIRbSRQ== X-Google-Smtp-Source: ADFU+vtpr6/USWdDlF9OiCn6kxzaHvl/3Ges+ziOkGWGK22NIqrfWwtyXIjIUamxEVSJsteoPkHUpPj7fNkprubJfjE= X-Received: by 2002:a67:ea84:: with SMTP id f4mr4016914vso.218.1583383085993; Wed, 04 Mar 2020 20:38:05 -0800 (PST) MIME-Version: 1.0 References: <20200304233856.257891-1-shakeelb@google.com> In-Reply-To: From: Eric Dumazet Date: Wed, 4 Mar 2020 20:37:53 -0800 Message-ID: Subject: Re: [PATCH v2] net: memcg: late association of sock to memcg To: Shakeel Butt Cc: Roman Gushchin , Johannes Weiner , Michal Hocko , Andrew Morton , "David S . Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , netdev , linux-mm , Cgroups , LKML Content-Type: text/plain; charset="UTF-8" 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: On Wed, Mar 4, 2020 at 6:19 PM Shakeel Butt wrote: > > On Wed, Mar 4, 2020 at 5:36 PM Eric Dumazet wrote: > > > > On Wed, Mar 4, 2020 at 3:39 PM Shakeel Butt wrote: > > > > > > 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 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 | 19 +++++++++++++++++++ > > > 1 file changed, 19 insertions(+) > > > > > > diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c > > > index a4db79b1b643..7bcd657cd45e 100644 > > > --- a/net/ipv4/inet_connection_sock.c > > > +++ b/net/ipv4/inet_connection_sock.c > > > @@ -482,6 +482,25 @@ 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 and set 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); > > > + > > > + release_sock(newsk); > > > + > > > + if (newsk->sk_memcg) > > > > Most sockets in accept queue should have amt == 0, so maybe avoid > > calling this thing only when amt == 0 ? > > > > Thanks, will do in the next version. BTW I have tested with adding > mdelay() here and running iperf3 and I did see non-zero amt. > > > Also I would release_sock(newsk) after this, otherwise incoming > > packets could mess with newsk->sk_forward_alloc > > > > I think that is fine. Once sk->sk_memcg is set then > mem_cgroup_charge_skmem() will be called for new incoming packets. > Here we just need to call mem_cgroup_charge_skmem() with amt before > sk->sk_memcg was set. Unfortunately, as soon as release_sock(newsk) is done, incoming packets can be fed to the socket, and completely change memory usage of the socket. For example, the whole queue might have been zapped, or collapsed, if we receive a RST packet, or if memory pressure asks us to prune the out of order queue. So you might charge something, then never uncharge it, since at close() time the socket will have zero bytes to uncharge. > > > if (amt && newsk->sk_memcg) > > mem_cgroup_charge_skmem(newsk->sk_memcg, amt); > > release_sock(newsk); > > > > Also, I wonder if mem_cgroup_charge_skmem() has been used at all > > these last four years > > on arches with PAGE_SIZE != 4096 > > > > ( SK_MEM_QUANTUM is not anymore PAGE_SIZE, but 4096) > > > > Oh so sk_mem_pages() does not really give the number of pages. Yeah > this needs a fix for non-4906 page size architectures. Though I can > understand why this has not been caught yet. Network memory accounting > is opt-in in cgroup v1 and most of the users still use v1. In cgroup > v2, it is enabled and there is no way to opt-out. Facebook is a > well-known v2 user and it seems like they don't have non-4096 page > size arch systems.