From patchwork Thu Apr 26 17:42:18 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: 905283 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="dqa2F+yq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40X4CR2Kckz9ry1 for ; Fri, 27 Apr 2018 03:42:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932255AbeDZRml (ORCPT ); Thu, 26 Apr 2018 13:42:41 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:33481 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756850AbeDZRmb (ORCPT ); Thu, 26 Apr 2018 13:42:31 -0400 Received: by mail-qt0-f194.google.com with SMTP id f16-v6so28798913qth.0 for ; Thu, 26 Apr 2018 10:42:31 -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=JIy6jWuNVmGDK0FMCsh6oGo2DOs0LSikBpfZxTWBXvQ=; b=dqa2F+yq26oxsQMBid+VUuTDd5x46OmJJudWbZMlTGWlM1tWCgebxqqVLzyHAfbv5z qqRKA6MN4/NKyy7dw2/WInsrrhPsJaVcHD8SZDEqhoNRz6EO0KRKi5dcYrT989UOeFfr gxo6sWjLNARS1d2VRDIp/CCSr8Y3EwcQuQKj8/uZMeomTuPFgU9Py5l4h++SwEnMxL+K UuFB3npUiVvMs1u02lCK9q7pzIwvzfjHkB+UVekWktsweqwWsMR9/yn4b8q+Ih9eaZz5 mYvx4Pjep9af7MQn0CEbGx6gOpI1jqb0bCLgvznmU1QsfCTLC/oI/sv9KBYuTDsJ3jq7 LwUQ== 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=JIy6jWuNVmGDK0FMCsh6oGo2DOs0LSikBpfZxTWBXvQ=; b=IuYeODAJzpfWUJgNYRQOoGtpxbLNx6ECDrLrXjHgvHeDuZR1BdsV3NPJZt0zxJerxW PCpayw1QGQlq44WCNjCCCYk0OTELm9X1j5xiUMaXCnioAV2bkDtLxYQ8Ut9ATP9ehIUX Cz/09o5Gj+EXpF5ZMShHq9NBlmJL23uOtyc9zAkaF42Te1W8Teq6tgt7XIvvw7N/eHdr q309ruzaES1Giq9bsB/FVrOJxUJUlSZF37bDuRSuhVfJoJUMt834kG7V/IStwBJDzYLB 8cBVONFzrnY+eEPjzBuuL+RMgd1qQMKN7oJ6xzaeLYKnpuxZHHb0PiZrdJ/Tqn2OPOBR 2Usw== X-Gm-Message-State: ALQs6tBX0E2gHWHWADi8JI0NHyDEeLj2K2OTMaKTxDiHUIVlLkP7nEvp su/DeqcoJvz6hkaDymHkQnnYCzr3 X-Google-Smtp-Source: AB8JxZqZSCAgqt0iOcaWY9oEfeW9YaiWdv/fwTBq271qoi22pK1hKm3kvHTgzkJ3esq9i664uW9dDw== X-Received: by 2002:ac8:39f:: with SMTP id t31-v6mr37362243qtg.259.1524764550179; Thu, 26 Apr 2018 10:42:30 -0700 (PDT) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id o14-v6sm12927515qta.23.2018.04.26.10.42.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Apr 2018 10:42:29 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: davem@davemloft.net, alexander.duyck@gmail.com, Willem de Bruijn Subject: [PATCH net-next v2 04/11] udp: better wmem accounting on gso Date: Thu, 26 Apr 2018 13:42:18 -0400 Message-Id: <20180426174225.246388-5-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog In-Reply-To: <20180426174225.246388-1-willemdebruijn.kernel@gmail.com> References: <20180426174225.246388-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 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 6b09220ca407..d806529b9b3d 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -191,6 +191,8 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, netdev_features_t features, unsigned int mss, __sum16 check) { + struct sock *sk = gso_skb->sk; + unsigned int sum_truesize = 0; struct sk_buff *segs, *seg; unsigned int hdrlen; struct udphdr *uh; @@ -201,9 +203,15 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, hdrlen = gso_skb->data - skb_mac_header(gso_skb); skb_pull(gso_skb, sizeof(*uh)); + /* 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) { uh = udp_hdr(seg); @@ -214,8 +222,14 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, if (!seg->next) csum_replace2(&uh->check, htons(mss), htons(seg->len - hdrlen - sizeof(*uh))); + + seg->destructor = sock_wfree; + seg->sk = sk; + sum_truesize += seg->truesize; } + refcount_add(sum_truesize - gso_skb->truesize, &sk->sk_wmem_alloc); + return segs; }