From patchwork Wed Apr 25 18:55:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willem de Bruijn X-Patchwork-Id: 904696 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="emkaN7dI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40WTvq0sVvz9ryk for ; Thu, 26 Apr 2018 04:57:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932164AbeDYS46 (ORCPT ); Wed, 25 Apr 2018 14:56:58 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:41727 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751084AbeDYS4J (ORCPT ); Wed, 25 Apr 2018 14:56:09 -0400 Received: by mail-qt0-f193.google.com with SMTP id d3-v6so28229425qth.8 for ; Wed, 25 Apr 2018 11:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TilsqTXGH1bvmSAID5nTB4nbKi3G7ZEIYsiRGa5/8ZA=; b=emkaN7dIJuZw/QsQQnWMSfDzDCzpHx8s6dGagKKKRkbBZqk/9mvTTk5RVSGiQkkiM2 C7+31IMTupqWNJ1WCwPmbd8sZxr+QHdwjcaIq0UqVoWeVJVHzTWrlXmHzMYZeMF2Mr0X hHPXniTD6IYkHYE8kDSxGgjHC26nJS9bJSQ6puLJUsJj/tZ/Pdibwi+vNnw4qLrx3myJ S5nYVcxgP9ZbXEB4qX4vysqWR7a/7TN8L4h3R/zvySqnWo3zb/WAQ3kL6cD6M3gizSlZ S4gg9VQBCa0veMp4SPVEwgesQ4t3oAgui9c63lR44yZUfmjzPBl9wywRAQxMrHNCaekB KnJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TilsqTXGH1bvmSAID5nTB4nbKi3G7ZEIYsiRGa5/8ZA=; b=ISgQPnbBGeIKEdkqzv6ttRivPy1ARz3piA7MGBflK3gNYW6tU9CF/89FEbHKjynIcU ldaYxAcImDFlHPXLii9R/lL24tAMb6Mb3c4Uvekq1ymOaJBUn9K0ceRn+c5fK/NCc/B8 bcPq0K6UOe5MO8m+wpq893/zuZb4g5LFfbjRMvKUZktllxKPw+PDg+QI2X0ucrTY6iiu rTjEHpTMntx9ZYb7XQqMB7GBfZoW8sMWzW01SEioUAdZn/wq3Gk9pa+OdXFmV62gxMD2 fZMB8z0fyl4O7olwru3piAhjWUsKzzzInWkbrJSiXHfWI4OGKGK+XBfmTfwEfLLaz5mC DopQ== X-Gm-Message-State: ALQs6tC1J84aEh107O7sha+Wx3rpOK65GBNQyKQeooYYZ7TAmV9NyUsC KUSVctUAvlbYAkEP1DQCHppKKaPF X-Google-Smtp-Source: AIpwx4/3iJYDEgtE+JPHNrd2LnoTjlQG3acVyID3R9e2kCEbB60j1MQBpKDECavcsOehHHYhYFABYw== X-Received: by 2002:ac8:2403:: with SMTP id c3-v6mr34240584qtc.329.1524682568532; Wed, 25 Apr 2018 11:56:08 -0700 (PDT) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id t47-v6sm13952894qtc.1.2018.04.25.11.56.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 11:56:07 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: davem@davemloft.net, alexander.duyck@gmail.com, dmichail@google.com, Willem de Bruijn Subject: [PATCH net-next 03/10] udp: better wmem accounting on gso Date: Wed, 25 Apr 2018 14:55:54 -0400 Message-Id: <20180425185601.55511-4-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: <20180425185601.55511-1-willemdebruijn.kernel@gmail.com> References: <20180425185601.55511-1-willemdebruijn.kernel@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn skb_segment by default transfers allocated wmem from the gso skb to the tail of the segment list. This underreports real truesize of the list, especially if the tail might be dropped. Similar to tcp_gso_segment, update wmem_alloc with the aggregate list truesize and make each segment responsible for its own share by setting skb->destructor. Clear gso_skb->destructor prior to calling skb_segment to skip the default assignment to tail. Signed-off-by: Willem de Bruijn --- net/ipv4/udp_offload.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index a3244768e45f..acfef71459f8 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -192,7 +192,9 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, unsigned int mss, __sum16 check) { struct udphdr *uh = udp_hdr(gso_skb); - struct sk_buff *segs; + struct sock *sk = gso_skb->sk; + struct sk_buff *segs, *seg; + unsigned int sum_truesize = 0; unsigned int hdrlen; if (gso_skb->len <= sizeof(*uh) + mss) @@ -203,9 +205,23 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, skb_pull(gso_skb, sizeof(*uh)); hdrlen = gso_skb->data - skb_mac_header(gso_skb); + /* clear destructor to avoid skb_segment assigning it to tail */ + WARN_ON_ONCE(gso_skb->destructor != sock_wfree); + gso_skb->destructor = NULL; + segs = skb_segment(gso_skb, features); - if (unlikely(IS_ERR_OR_NULL(segs))) + if (unlikely(IS_ERR_OR_NULL(segs))) { + gso_skb->destructor = sock_wfree; return segs; + } + + for (seg = segs; seg; seg = seg->next) { + seg->destructor = sock_wfree; + seg->sk = sk; + sum_truesize += seg->truesize; + } + + refcount_add(sum_truesize - gso_skb->truesize, &sk->sk_wmem_alloc); /* If last packet is not full, fix up its header */ if (segs->prev->len != hdrlen + mss) {