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=-16.6 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_PASS,USER_AGENT_GIT,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 E5720C43381 for ; Tue, 26 Feb 2019 17:49:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB48E21850 for ; Tue, 26 Feb 2019 17:49:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ms8LYoJi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728878AbfBZRtf (ORCPT ); Tue, 26 Feb 2019 12:49:35 -0500 Received: from mail-yw1-f74.google.com ([209.85.161.74]:55067 "EHLO mail-yw1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727624AbfBZRte (ORCPT ); Tue, 26 Feb 2019 12:49:34 -0500 Received: by mail-yw1-f74.google.com with SMTP id y133so9418883ywa.21 for ; Tue, 26 Feb 2019 09:49:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=iha5xofDbdEZkM7H2VvryXaNGwvvzApma9u4VS1NNVk=; b=Ms8LYoJi67XMKiaYZfZIZe1dFoz2FULboYqJHp2vxPa1y/XNXQoan89rqLy4Ffr9wf japULEMaoArl/z2Nl7qO9pe6JooUEvMGJyqdmISLb43YgWwHBFzKn04vJY+My8OFJhN9 rhscd+lBlqn4C+sDMFkeI8JQEJp7btOHrpThE975HNzbN6kuvIlgpHCIKnNDF72zTbFs nyh22tPrrdl5A8YaD8YEjgQVu7esavo2CxKaKf+dCGhTMMZzs3P7983WtHsuVlHqwCW/ uIZ3D4PGBll3ZM5Sq8s8h6U9G3hgHE9BFA+qyDMDKih8VxAbv6e7TLhQYGz1qzy0D7Nl W93Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=iha5xofDbdEZkM7H2VvryXaNGwvvzApma9u4VS1NNVk=; b=JQHhq6yQ2T9D+XdDAlkwYREjf6LDfAHv8mDNIdwjShaE/fGikfhvlOrNLx63RCXvy+ 5mDTsP7T5xmCis+kiQdZt/qhlODuDbCdtm20klAUcbYNLXhBsnjMHk0L3QQusPGPX9s5 cdKwBc/JlZCb0YTz9h4ZHshLp17p1NbOuB2zt/T0mG7mHio32beyvltI1Xb9tNndS+XJ OPV4VsqNslkzXPLMID30jJSc2eRb5NWMCi6mPeLsTJJS8w04UfHd7NrZ6sDakNMNz+/n VHqO7abAmxx/5QqQY8WT4ZO3R7XMGLiOKxpVLyNhxMdsFPkOEvcHCjpno8WzbA9m2nF2 WDpw== X-Gm-Message-State: AHQUAuYlhtbU6JATzSKK4cYAdzJ+H/pQAtVAAzPg+aatWNqrf9aMEIcT iwXDUJBd1D+ivc6L/kZHpXEukf4JEdQvVw== X-Google-Smtp-Source: AHgI3IZ8B4caBK1lwNRMHo4gvJMIDifF9LxoFrmQmcSbgVjL92tadxMtIKg8nG70A2755gMirLnR0n6o1TRwpQ== X-Received: by 2002:a25:be47:: with SMTP id d7mr8863372ybm.15.1551203374107; Tue, 26 Feb 2019 09:49:34 -0800 (PST) Date: Tue, 26 Feb 2019 09:49:13 -0800 In-Reply-To: <20190226174913.18824-1-edumazet@google.com> Message-Id: <20190226174913.18824-6-edumazet@google.com> Mime-Version: 1.0 References: <20190226174913.18824-1-edumazet@google.com> X-Mailer: git-send-email 2.21.0.rc2.261.ga7da99ff1b-goog Subject: [PATCH net-next 5/5] tcp: remove tcp_queue argument from tso_fragment() From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tso_fragment() is only called for packets still in write queue. Remove the tcp_queue parameter to make this more obvious, even if the comment clearly states this. Signed-off-by: Eric Dumazet --- net/ipv4/tcp_output.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 91f5cc5a3f88953da1043d051af9c5971c6006de..4522579aaca2d24b7be61abac658a3c8cbd2b960 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1846,17 +1846,17 @@ static bool tcp_snd_wnd_test(const struct tcp_sock *tp, * know that all the data is in scatter-gather pages, and that the * packet has never been sent out before (and thus is not cloned). */ -static int tso_fragment(struct sock *sk, enum tcp_queue tcp_queue, - struct sk_buff *skb, unsigned int len, +static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, unsigned int mss_now, gfp_t gfp) { - struct sk_buff *buff; int nlen = skb->len - len; + struct sk_buff *buff; u8 flags; /* All of a TSO frame must be composed of paged data. */ if (skb->len != skb->data_len) - return tcp_fragment(sk, tcp_queue, skb, len, mss_now, gfp); + return tcp_fragment(sk, TCP_FRAG_IN_WRITE_QUEUE, + skb, len, mss_now, gfp); buff = sk_stream_alloc_skb(sk, 0, gfp, true); if (unlikely(!buff)) @@ -1892,7 +1892,7 @@ static int tso_fragment(struct sock *sk, enum tcp_queue tcp_queue, /* Link BUFF into the send queue. */ __skb_header_release(buff); - tcp_insert_write_queue_after(skb, buff, sk, tcp_queue); + tcp_insert_write_queue_after(skb, buff, sk, TCP_FRAG_IN_WRITE_QUEUE); return 0; } @@ -2391,8 +2391,7 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle, nonagle); if (skb->len > limit && - unlikely(tso_fragment(sk, TCP_FRAG_IN_WRITE_QUEUE, - skb, limit, mss_now, gfp))) + unlikely(tso_fragment(sk, skb, limit, mss_now, gfp))) break; if (tcp_small_queue_check(sk, skb, 0)) -- 2.21.0.rc2.261.ga7da99ff1b-goog