From patchwork Wed Oct 27 20:19:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12588029 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3A3EC433F5 for ; Wed, 27 Oct 2021 20:19:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7740610A4 for ; Wed, 27 Oct 2021 20:19:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238627AbhJ0UV4 (ORCPT ); Wed, 27 Oct 2021 16:21:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231551AbhJ0UVy (ORCPT ); Wed, 27 Oct 2021 16:21:54 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88AE8C061570 for ; Wed, 27 Oct 2021 13:19:28 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id in13so586007pjb.1 for ; Wed, 27 Oct 2021 13:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kfwB6qoOHuGBEL7W0pzkeDjfh9Ste+Vt+lwQy8VDrgA=; b=HsB/tJZlTwAcxjGTCTJ9/PVNQg0jfQZdBkOA26e7Men3BQhsObftBI1rym+YxOnzo0 K+I8c8nisX/l79BtBgOX4rYSfgOGE5FOvSLAWwJOW1C9f30kVqJ6+ByKApYza0oJRFmI MJ/ppZ3hNxj/gxJb1mpCTY5QsS6yhiBsBuASjqkWnC5jJCwc3cDaHpBHf7W9dfhqyUsq tCa0OiWnuPNg7FwG1im/enFPftqteOUMpjZvZBzTo89xOyIxAahArTvDHzdT/7HJYKlX TPgjO6c6gwq2QHIoxr0M1ZNVfswRoLtQQBHCK/We2e811OqpVBEC5ead8PYW2YWRW+3F YGtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kfwB6qoOHuGBEL7W0pzkeDjfh9Ste+Vt+lwQy8VDrgA=; b=YFwyaLIlAiqi4HSBhNQZ/C7pieLpZPn4lXrS7XZY6N/aK9u7tKrJSm3wWxyLgzVkap Tyrp2s9QwMIytRJ1bMmRY1y9UmhZHy9Yn0yfI1I9XTgWtNNJx6x/vZ2OY9m5ebczmuPq Q8JY+Xvr9CoCjrj45Z2OHb0HTQ1hmDFObmBeOk+GffXFG0aFzC3ZmWAHnT12Gcu+qnnD m8w3+o0hYIyzF375HESywoc+aS1WHvRIzp28L9WJwI7HxR/gCRrkR9yFZQCU6WEMW8pm xVwZ6Wby+pMZnFpZf2yvyfRRNzw1Lrn39+nUddRIGX7eZrmkrqM6yWTn2i7w4+ZQB39l laSg== X-Gm-Message-State: AOAM530Sg+nNrtwiXiQyBrZ0eh38Oo/+kbtmD1bHPr4HIoTUv/nD7Bym 6UA8phwHuh9hWfrY+i1JAHo= X-Google-Smtp-Source: ABdhPJxodx+jwDEHYUWjuZ6oBXDsnh2Ou5u+uFsMxMi0xNISGXsth8iF45K47WMTzDz4OaIv1L952A== X-Received: by 2002:a17:90b:4c4a:: with SMTP id np10mr8206536pjb.233.1635365968182; Wed, 27 Oct 2021 13:19:28 -0700 (PDT) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:19fb:5287:bbfe:fc2a]) by smtp.gmail.com with ESMTPSA id fr12sm5338295pjb.36.2021.10.27.13.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 13:19:27 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 1/7] tcp: remove dead code from tcp_sendmsg_locked() Date: Wed, 27 Oct 2021 13:19:17 -0700 Message-Id: <20211027201923.4162520-2-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211027201923.4162520-1-eric.dumazet@gmail.com> References: <20211027201923.4162520-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet TCP sendmsg() no longer puts payload in skb head, we can remove dead code. Signed-off-by: Eric Dumazet --- net/ipv4/tcp.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index d0b848ff5c0f1f7c34cea1b178b700c264893724..4053ace0cd76fbf076e422017fa31a472f00d7ba 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1309,14 +1309,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) if (copy > msg_data_left(msg)) copy = msg_data_left(msg); - /* Where to copy to? */ - if (skb_availroom(skb) > 0 && !zc) { - /* We have some space in skb head. Superb! */ - copy = min_t(int, copy, skb_availroom(skb)); - err = skb_add_data_nocache(sk, skb, &msg->msg_iter, copy); - if (err) - goto do_fault; - } else if (!zc) { + if (!zc) { bool merge = true; int i = skb_shinfo(skb)->nr_frags; struct page_frag *pfrag = sk_page_frag(sk); @@ -1416,7 +1409,6 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) do_error: skb = tcp_write_queue_tail(sk); -do_fault: tcp_remove_empty_skb(sk, skb); if (copied + copied_syn) From patchwork Wed Oct 27 20:19:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12588031 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3769C433EF for ; Wed, 27 Oct 2021 20:19:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 975136103C for ; Wed, 27 Oct 2021 20:19:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239154AbhJ0UV4 (ORCPT ); Wed, 27 Oct 2021 16:21:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235727AbhJ0UVz (ORCPT ); Wed, 27 Oct 2021 16:21:55 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19882C061745 for ; Wed, 27 Oct 2021 13:19:30 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id y1-20020a17090a134100b001a27a7e9c8dso5684938pjf.3 for ; Wed, 27 Oct 2021 13:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oCVbn4+crfbJm61FKS7BRgKh14C9+eQiyLx9V/bT1mI=; b=Tdy0RelOXR2+1mLKFXHZ3cEX4gfiQHdpIgyPsVmefqqtsZwY9I73qJOFm4h3m1BNqH ph1MD0z6m5yPhWEIthAssVyRveNDnyJT4fa5KpAkUuC7XCtrzbvvwwdoc6kllXccCe3q ECxf7vscfEEjwV224C+kkcexncDVPT1z4fr9JytbdzxI0eqFigCUDJsHCyiLU2suhg+p eJYTVAJNR9yGp/w86KQrAUUfpfRaBrhCy3/WJrt2uKaAuEUk4lmyHjMRCaB4P2RoLJGO TGfB0RPd8ZfAsSsToG1cbq4YahiLw1VqezXsWj6l/NlQ7kzdZ1OItxEJ/ZBVTcwYLU/3 Vxmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oCVbn4+crfbJm61FKS7BRgKh14C9+eQiyLx9V/bT1mI=; b=eA4bX1aRY8zTHT/QujDVdQbNiNtRB/Fb+ny5TNnFN3SJNaMjjOyfJvk1dCSpWWC6F7 yoEQG6EfEj8NI1EMCdlEexUw6C4fCdo4L3ViOFNvswG6QwRROUC8BTKKpSFzlSsdMn6+ lblszAhXv2TyT2XNg7itfPmHAm6/OdYngUYzYQZn5xQUrgKcGSN8eLMZcFPt9o7NVUC0 nhifUWTx+R8kxd/9xqWg/kwbnPb6nDt21jFYXeWQclmWvepZR/0fjW5gi/WKEJQXzQQP KdlgtKRZE8opHifGLUPgQe2EjOYVh/lklKd+zX2w8CwP+yGo5oy+DmR3FFRtyWv4foRa 5Orw== X-Gm-Message-State: AOAM53126YN9+tWzi9HdzqaxnnCqC6pBhgXIgoYVMMvK3YUGUwXHM2Bz YmPuOwMt8ah1Z0IX/EtCDvw= X-Google-Smtp-Source: ABdhPJwKgR7SZPuAq6KEr689j00+BW1b1RF9a0pxa7ob8zticgE2SjO+MVXeFeT9Afn2J+4atd9DHw== X-Received: by 2002:a17:90b:3793:: with SMTP id mz19mr8214096pjb.6.1635365969673; Wed, 27 Oct 2021 13:19:29 -0700 (PDT) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:19fb:5287:bbfe:fc2a]) by smtp.gmail.com with ESMTPSA id fr12sm5338295pjb.36.2021.10.27.13.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 13:19:29 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 2/7] tcp: cleanup tcp_remove_empty_skb() use Date: Wed, 27 Oct 2021 13:19:18 -0700 Message-Id: <20211027201923.4162520-3-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211027201923.4162520-1-eric.dumazet@gmail.com> References: <20211027201923.4162520-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet All tcp_remove_empty_skb() callers now use tcp_write_queue_tail() for the skb argument, we can therefore factorize code. Signed-off-by: Eric Dumazet --- include/net/tcp.h | 2 +- net/ipv4/tcp.c | 9 +++++---- net/mptcp/protocol.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 701587af685296a6b2372fee7b3e94f998c3bbe8..8e8c5922a7b0c0a268a4c5a53d223489a10ca0bd 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -311,7 +311,7 @@ void tcp_shutdown(struct sock *sk, int how); int tcp_v4_early_demux(struct sk_buff *skb); int tcp_v4_rcv(struct sk_buff *skb); -void tcp_remove_empty_skb(struct sock *sk, struct sk_buff *skb); +void tcp_remove_empty_skb(struct sock *sk); int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw); int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size); int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 4053ace0cd76fbf076e422017fa31a472f00d7ba..68b946cfd433720a034c2023a13c086428646c51 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -933,8 +933,10 @@ int tcp_send_mss(struct sock *sk, int *size_goal, int flags) * importantly be able to generate EPOLLOUT for Edge Trigger epoll() * users. */ -void tcp_remove_empty_skb(struct sock *sk, struct sk_buff *skb) +void tcp_remove_empty_skb(struct sock *sk) { + struct sk_buff *skb = tcp_write_queue_tail(sk); + if (skb && TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb)->end_seq) { tcp_unlink_write_queue(skb, sk); if (tcp_write_queue_empty(sk)) @@ -1087,7 +1089,7 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset, return copied; do_error: - tcp_remove_empty_skb(sk, tcp_write_queue_tail(sk)); + tcp_remove_empty_skb(sk); if (copied) goto out; out_err: @@ -1408,8 +1410,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) return copied + copied_syn; do_error: - skb = tcp_write_queue_tail(sk); - tcp_remove_empty_skb(sk, skb); + tcp_remove_empty_skb(sk); if (copied + copied_syn) goto out; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index cd6b11c9b54d18e03bd3572e1f96c78d3dc37a2d..ccd62a2727c36a749455d122c106b4c5f76ef2ba 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1335,7 +1335,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, u64 snd_una = READ_ONCE(msk->snd_una); if (snd_una != msk->snd_nxt) { - tcp_remove_empty_skb(ssk, tcp_write_queue_tail(ssk)); + tcp_remove_empty_skb(ssk); return 0; } @@ -1351,7 +1351,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, copy = min_t(size_t, copy, info->limit - info->sent); if (!sk_wmem_schedule(ssk, copy)) { - tcp_remove_empty_skb(ssk, tcp_write_queue_tail(ssk)); + tcp_remove_empty_skb(ssk); return -ENOMEM; } From patchwork Wed Oct 27 20:19:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12588033 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D050C4332F for ; Wed, 27 Oct 2021 20:19:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 210EE610C8 for ; Wed, 27 Oct 2021 20:19:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239187AbhJ0UV6 (ORCPT ); Wed, 27 Oct 2021 16:21:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239127AbhJ0UV4 (ORCPT ); Wed, 27 Oct 2021 16:21:56 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 418B2C061745 for ; Wed, 27 Oct 2021 13:19:31 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id na16-20020a17090b4c1000b0019f5bb661f9so2985144pjb.0 for ; Wed, 27 Oct 2021 13:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YYFZN15iq+8xSqsk2/NEMj9yDVNiprtcJf2OiTV6b9w=; b=D/49T+T+2+JB5/uPIq0L0ng/FULXyK2w1LiTM1dPZFj0/YHqejiq0HD/KFTLG8IGXe puWz6xuUXyUJw0TLExqtpzRloKvWOQaKi6u7zlHxUyo//K0Xst1uo8k/H2lRCabCS1u+ 6lXE9aNQ52vMjQJfW1yBX9fyijyRmEa89RzdSAivVgn+gwHGiZpg7sJGrUl0682tRXCd Ija4NMWmEAzYGO62PE3TAIHCTc4poVUNgYtGTrOBLr6ytM0M9mA92jfM36+AAjdf7al7 Bvaz97bZFOhOVqTJXL+yO53wpGL0Gf1M9APVoSoegpPqtQW3qUvO+VfoK1dKq8pu6PQs rJ6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YYFZN15iq+8xSqsk2/NEMj9yDVNiprtcJf2OiTV6b9w=; b=b4TGESTHxI122TYInVBUBXntuzY2t3MvVosXRPJm8ykU7LGkqyMiDE8hsKMuKzF9cJ AikzkJxtrXnbn0AR2PQh0KH/+4X4t1xjQoGKN4Vn0YnvCpAGVW88ma9nD2Hp5dhB9N26 jxutJqp6fQTn0DGx2wm/xl8tbFK2TZYPVcjFveUVE0xkLJO0DEOYDo259QNnNTf2y2AG K/5VIDGmeIymC7OcuX2klBQ5zXCZTNKmQEK+iz4xu2cqxzZxi+OUP3BFsNVYcK3nZ8yc PVCN+/6JJvenN97WBpvXx2C+UH9RG93hTm04woq2kSfkTSwgZaUYIy7/3K7eDEVPU+YR LgHg== X-Gm-Message-State: AOAM5333ZwreCN1wzhrRiN73yiA6cgIuLnFhh416dOdnMA+zA6ibmVV/ Ts9D1DTCPZSCD+JXQ5LS5ZMwuY0Q3go= X-Google-Smtp-Source: ABdhPJzWwi3Dcu0xYPxDqlJbLc1BaiPasb5N9j4/bXcEWUjkbl0MvIb5FaQyWkdxkERRL5jTyPXqJQ== X-Received: by 2002:a17:902:e84a:b0:141:5fda:4fca with SMTP id t10-20020a170902e84a00b001415fda4fcamr9219308plg.74.1635365970886; Wed, 27 Oct 2021 13:19:30 -0700 (PDT) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:19fb:5287:bbfe:fc2a]) by smtp.gmail.com with ESMTPSA id fr12sm5338295pjb.36.2021.10.27.13.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 13:19:30 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 3/7] tcp: remove dead code from tcp_collapse_retrans() Date: Wed, 27 Oct 2021 13:19:19 -0700 Message-Id: <20211027201923.4162520-4-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211027201923.4162520-1-eric.dumazet@gmail.com> References: <20211027201923.4162520-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet TCP sendmsg() no longer puts payload in skb->head, remove some dead code from tcp_collapse_retrans(). Signed-off-by: Eric Dumazet --- net/ipv4/tcp_output.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index c0c55a8be8f79857e176714f240fddcb0580fa6b..e1dcc93d5b6daf34e41817658c4f2029d429e82b 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3045,13 +3045,9 @@ static bool tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb) BUG_ON(tcp_skb_pcount(skb) != 1 || tcp_skb_pcount(next_skb) != 1); - if (next_skb_size) { - if (next_skb_size <= skb_availroom(skb)) - skb_copy_bits(next_skb, 0, skb_put(skb, next_skb_size), - next_skb_size); - else if (!tcp_skb_shift(skb, next_skb, 1, next_skb_size)) - return false; - } + if (next_skb_size && !tcp_skb_shift(skb, next_skb, 1, next_skb_size)) + return false; + tcp_highest_sack_replace(sk, next_skb, skb); /* Update sequence range on original skb. */ From patchwork Wed Oct 27 20:19:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12588035 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73DBDC433EF for ; Wed, 27 Oct 2021 20:19:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5CBF4610CA for ; Wed, 27 Oct 2021 20:19:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239236AbhJ0UWA (ORCPT ); Wed, 27 Oct 2021 16:22:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239211AbhJ0UV7 (ORCPT ); Wed, 27 Oct 2021 16:21:59 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D61ECC061570 for ; Wed, 27 Oct 2021 13:19:33 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id k26so3810939pfi.5 for ; Wed, 27 Oct 2021 13:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p0edbO6SvxnfM0P4Jo1XWqLjXYzwPV2oty/MQVXgg1o=; b=BEAOTxiOj+0GocXmWoUDXi0oQeb2/FJR26XciRdKguvrWcrY94xclg/iXyrDt57OUE sRJegCujtzHKi9krLO7pYdcRl5nmXVs1STlR1wUo0vEMXD3Fb3Ursa1ZbjLfZPA+dLN+ NbHz0iCaH/a8cFRmSgcP+WsZBX3PEnO5X7TMpM3EBm6LZ9H5rW5N9FNwQeWdB+F1kDje CGM3VmL3vC6WLwotzIzDh5jABSSfEtk/2Bx5KKh4bNM+L2/gG+mO6uPyerKOlVb3F7qS faY0G8u4oA+re8Qz4YOh3zmDAfHAOQWynGCM1YLZ1tOVO0b3fgsY1S1JgVbMwYQZLtrx 5Ymw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p0edbO6SvxnfM0P4Jo1XWqLjXYzwPV2oty/MQVXgg1o=; b=ZapNQHnhUo9hN04y5drdvoWFADwtmjwZdhtQ+RGTuDCP+vjQIXKCKwdjQtfZHPvhYC 2YvTiZzFaj7HzcsEfFPdMgtu4KXrgHf3mHSeA6/iTZxLOgerMh+ns01JlrawjOaDKjKN DzwK2pTawlS1KMYY8pI3bNcQmQqgleCowQCgvRL3IWPCG+t8a05f8FuCQlf1OJvIBjxu iQWdzP2S8B75HDtfRHn5squmXZ5KHDRjymO2xRCr93rsOsXujd0b4vZmsio8hzxMVnDg YnpvK1UcH+CGLH6nbUQMFho1dzwtdGB/glOFb8i5RLpsbPBhjOh1zktRoJh2HRwkSkIT 2P+A== X-Gm-Message-State: AOAM530QCsq4W4mX8WsdZ7g4OLF7gT/nEW4DNzuh0ihYi0b5OObglMP8 aaCjZ48kU/oP1oErfwlehMYx8OAOSjg= X-Google-Smtp-Source: ABdhPJyA9SWVFEi/oDm5RYOjbb64dVPaCsi0irwRAHG4yVU3bwAgmRxFEWgRRLPkdlRa+6w5/8r4cg== X-Received: by 2002:a05:6a00:1413:b0:47d:2415:a021 with SMTP id l19-20020a056a00141300b0047d2415a021mr38181pfu.43.1635365973481; Wed, 27 Oct 2021 13:19:33 -0700 (PDT) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:19fb:5287:bbfe:fc2a]) by smtp.gmail.com with ESMTPSA id fr12sm5338295pjb.36.2021.10.27.13.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 13:19:33 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 4/7] tcp: no longer set skb->reserved_tailroom Date: Wed, 27 Oct 2021 13:19:20 -0700 Message-Id: <20211027201923.4162520-5-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211027201923.4162520-1-eric.dumazet@gmail.com> References: <20211027201923.4162520-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet TCP/MPTCP sendmsg() no longer puts payload in skb->head, we can remove not needed code. Signed-off-by: Eric Dumazet --- net/ipv4/tcp.c | 5 ----- net/mptcp/protocol.c | 1 - 2 files changed, 6 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 68b946cfd433720a034c2023a13c086428646c51..66ed0d79f41472f013edffe19802441e995175c9 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -876,11 +876,6 @@ struct sk_buff *tcp_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp, } if (likely(mem_scheduled)) { skb_reserve(skb, MAX_TCP_HEADER); - /* - * Make sure that we have exactly size bytes - * available to the caller, no more, no less. - */ - skb->reserved_tailroom = skb->end - skb->tail - size; INIT_LIST_HEAD(&skb->tcp_tsorted_anchor); return skb; } diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index ccd62a2727c36a749455d122c106b4c5f76ef2ba..22c7d10db15f8321e988602b8c97a46ffd872298 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1218,7 +1218,6 @@ static struct sk_buff *__mptcp_do_alloc_tx_skb(struct sock *sk, gfp_t gfp) if (likely(skb)) { if (likely(__mptcp_add_ext(skb, gfp))) { skb_reserve(skb, MAX_TCP_HEADER); - skb->reserved_tailroom = skb->end - skb->tail; INIT_LIST_HEAD(&skb->tcp_tsorted_anchor); return skb; } From patchwork Wed Oct 27 20:19:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12588037 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B0DAC433F5 for ; Wed, 27 Oct 2021 20:19:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A8F2610A0 for ; Wed, 27 Oct 2021 20:19:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239313AbhJ0UWC (ORCPT ); Wed, 27 Oct 2021 16:22:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239127AbhJ0UWA (ORCPT ); Wed, 27 Oct 2021 16:22:00 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AD2BC061570 for ; Wed, 27 Oct 2021 13:19:35 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id c4so4052391pgv.11 for ; Wed, 27 Oct 2021 13:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wxx8AczavcqaTVRCre8Jg2I2NRl2TMakN1ZpvN9azgY=; b=IWcJH52lOkDtlnRy4DxEggj6V796OvmrIe3/zyycJKupJiouvrDeI3qix01PgkRPm0 UfbdEMLCSaWs4jx4Au+rAIVNhZTC3qAXwFDklTFNXq8eVfQs3XxpU/6Vbc2txH0haddP sUWMGAv3WT6vWJyB+vlpRZ6SMuhY9a6J1A5n8+0MedZ7TvaJp+41zGzLRKHYWtkRfTvC e3mSGpNG6jtykkwb4ru0nDvUdb2fQYxfDJEA9e0fJdvdLj05NEIef2JEKhzghutnBcDQ EMJB2JRbkaCbSUpSV5lJU6xJe7L/nmYtl3Vm5/ItomH/5HSW8mbRCP2xtUzB0lWVTASC goYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wxx8AczavcqaTVRCre8Jg2I2NRl2TMakN1ZpvN9azgY=; b=MMAw/W/DO7XuGV+pz1X3m3ipjZcrgqGcHjLFoYA//UxAb6jA1mMe1YTw4NPq65Z3oZ M6KNdQnAObKtTRVNTMtKRkxgipP+1yqXyMTxeUUnVRDQBRfhM7YQRj0Ts66WK3RhjSM7 Q4zdQTVy72TymVzC0UNf3laaQ4jPVowtrd0CsjSS1yusbh+ANZZd2Xdbuvc1KgiPg/ti P5p+1Ay7m4qkIcFvjdKWVVTC5hsHJnLXrndUH1PYTIJLMIiLLGyCy0htskd6EKaLQwzr Tr0YzDfDMrMkxPSfj4Kr8f91O86P2FuYXjTGApZPYAAe+HeAU8jPLKS4HgEuiGy76F2s HE4g== X-Gm-Message-State: AOAM531YZm/bEiJrwLEbvmEnn1Tu1AqKV4aLufvnN9LlAQYEHmuwz9Js qGQ9T2GmXO6IuFGaxlP9FMQ= X-Google-Smtp-Source: ABdhPJzH9R2CJLJVtdLgdDJ9J4f+0IiaCFf4JQd5uncXCPI4rRzf16q6Zng19dzYLv05TeDSbehNWg== X-Received: by 2002:a62:5804:0:b0:44b:b75b:ec8f with SMTP id m4-20020a625804000000b0044bb75bec8fmr34550504pfb.63.1635365974879; Wed, 27 Oct 2021 13:19:34 -0700 (PDT) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:19fb:5287:bbfe:fc2a]) by smtp.gmail.com with ESMTPSA id fr12sm5338295pjb.36.2021.10.27.13.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 13:19:34 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 5/7] tcp: factorize ip_summed setting Date: Wed, 27 Oct 2021 13:19:21 -0700 Message-Id: <20211027201923.4162520-6-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211027201923.4162520-1-eric.dumazet@gmail.com> References: <20211027201923.4162520-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet Setting skb->ip_summed to CHECKSUM_PARTIAL can be centralized in tcp_stream_alloc_skb() and __mptcp_do_alloc_tx_skb() instead of being done multiple times. Signed-off-by: Eric Dumazet --- net/ipv4/tcp.c | 3 +-- net/ipv4/tcp_output.c | 6 ------ net/mptcp/protocol.c | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 66ed0d79f41472f013edffe19802441e995175c9..c58d448b45a098b23fdc09530c2565326e77c29f 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -876,6 +876,7 @@ struct sk_buff *tcp_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp, } if (likely(mem_scheduled)) { skb_reserve(skb, MAX_TCP_HEADER); + skb->ip_summed = CHECKSUM_PARTIAL; INIT_LIST_HEAD(&skb->tcp_tsorted_anchor); return skb; } @@ -993,7 +994,6 @@ static struct sk_buff *tcp_build_frag(struct sock *sk, int size_goal, int flags, skb->truesize += copy; sk_wmem_queued_add(sk, copy); sk_mem_charge(sk, copy); - skb->ip_summed = CHECKSUM_PARTIAL; WRITE_ONCE(tp->write_seq, tp->write_seq + copy); TCP_SKB_CB(skb)->end_seq += copy; tcp_skb_pcount_set(skb, 0); @@ -1289,7 +1289,6 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) goto wait_for_space; process_backlog++; - skb->ip_summed = CHECKSUM_PARTIAL; tcp_skb_entail(sk, skb); copy = size_goal; diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index e1dcc93d5b6daf34e41817658c4f2029d429e82b..7ecf35d0f847c0c6aa34d3cb05e3f28a623216bd 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1590,8 +1590,6 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, skb_split(skb, buff, len); - buff->ip_summed = CHECKSUM_PARTIAL; - buff->tstamp = skb->tstamp; tcp_fragment_tstamp(skb, buff); @@ -1676,7 +1674,6 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len) delta_truesize = __pskb_trim_head(skb, len); TCP_SKB_CB(skb)->seq += len; - skb->ip_summed = CHECKSUM_PARTIAL; if (delta_truesize) { skb->truesize -= delta_truesize; @@ -2147,7 +2144,6 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, tcp_skb_fragment_eor(skb, buff); - buff->ip_summed = CHECKSUM_PARTIAL; skb_split(skb, buff, len); tcp_fragment_tstamp(skb, buff); @@ -2403,7 +2399,6 @@ static int tcp_mtu_probe(struct sock *sk) TCP_SKB_CB(nskb)->tcp_flags = TCPHDR_ACK; TCP_SKB_CB(nskb)->sacked = 0; nskb->csum = 0; - nskb->ip_summed = CHECKSUM_PARTIAL; tcp_insert_write_queue_before(nskb, skb, sk); tcp_highest_sack_replace(sk, skb, nskb); @@ -3753,7 +3748,6 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn) syn_data = tcp_stream_alloc_skb(sk, space, sk->sk_allocation, false); if (!syn_data) goto fallback; - syn_data->ip_summed = CHECKSUM_PARTIAL; memcpy(syn_data->cb, syn->cb, sizeof(syn->cb)); if (space) { int copied = copy_from_iter(skb_put(syn_data, space), space, diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 22c7d10db15f8321e988602b8c97a46ffd872298..b84a89b2897114f6efb95fd75d5959fd4f5fd083 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1218,6 +1218,7 @@ static struct sk_buff *__mptcp_do_alloc_tx_skb(struct sock *sk, gfp_t gfp) if (likely(skb)) { if (likely(__mptcp_add_ext(skb, gfp))) { skb_reserve(skb, MAX_TCP_HEADER); + skb->ip_summed = CHECKSUM_PARTIAL; INIT_LIST_HEAD(&skb->tcp_tsorted_anchor); return skb; } @@ -1366,7 +1367,6 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, skb->truesize += copy; sk_wmem_queued_add(ssk, copy); sk_mem_charge(ssk, copy); - skb->ip_summed = CHECKSUM_PARTIAL; WRITE_ONCE(tcp_sk(ssk)->write_seq, tcp_sk(ssk)->write_seq + copy); TCP_SKB_CB(skb)->end_seq += copy; tcp_skb_pcount_set(skb, 0); From patchwork Wed Oct 27 20:19:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12588039 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C0B1C433EF for ; Wed, 27 Oct 2021 20:19:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B2BC6103C for ; Wed, 27 Oct 2021 20:19:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239211AbhJ0UWE (ORCPT ); Wed, 27 Oct 2021 16:22:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239306AbhJ0UWC (ORCPT ); Wed, 27 Oct 2021 16:22:02 -0400 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01FEEC061570 for ; Wed, 27 Oct 2021 13:19:37 -0700 (PDT) Received: by mail-pg1-x533.google.com with SMTP id c4so4052436pgv.11 for ; Wed, 27 Oct 2021 13:19:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R0iLonij+R27Z6+6JWptuMSg+2MKMt0QXgYcyv0uR2s=; b=SbzoDjr3bVei9w8gCEXAsubX1wYeOXrPoD7VTIHxdYnnbHCUlo3Cku8yMEStMZ5nch txHBsAmW2g8M41/H91I1vh2nM9ZJ4Io0yApHBwgGg8IVTKwT8Dc+3d0aJwLNRzs8zLpi IcAKbiHvWjXHrlc61C/GP5ZlHRBgTyp/LdrXg2m3QgglHi/5g4yboZmfF75DXCKi5pjA CaF3cNIkQJ5Z4ZK/FgPW8YcZrPypbOmzsCfOoK2CdjvaSmyBHDuW8NK/br1m8fbbX7BT xWUmZqIfHI6i7mP5PObmy7omOvZMJWQroxwitreaQDooWkb8BMy2+aUsJxnwvCxfhWc6 vM1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R0iLonij+R27Z6+6JWptuMSg+2MKMt0QXgYcyv0uR2s=; b=u9jfYiFIQm6u1N0Fs5PvMtpZ/rQKpBH2RBMZprDtNZAqqJ+E/ME6c0WhbXJi1S6et/ 0BKI7hSUHkwtckZ2/X7oSkD/LDgfRf50R/jCGZOcZdHL51my1eUG5ce2/jNcrJx+8ioy 7OLud78ghiaNeKy//GEG/0LPpOnnPrK94PYWrSpwgooVc9XfLK3ugUEcQkU5s9AqrN9L THU78HxpYuYjGxFE1pk9oBavDY5qemKetEDeUzDvA7D6GeBdx+P6VH0n0qNt4sLDJV76 5iGTp8avjkmoe3brV44Enfct7fHxInrPBfmDbzu1OI5Fr/6ctz9qS34IbKlCLSRYZyn8 tSkw== X-Gm-Message-State: AOAM533GGXNpXqBoDejx9akf2xMYGJWJh3+4E9LrJyEXm5VyQZGLP+Gn ghjGgsYNVv9WQd6agwTChpM= X-Google-Smtp-Source: ABdhPJzeW9uNTyXp7QWGN3vSnnM/nr/upucKYl5Bq9BpwH+G3nfFXiv9zsmt5tsESeixfvbhcl44lg== X-Received: by 2002:a05:6a00:21c1:b0:47c:11e0:84e9 with SMTP id t1-20020a056a0021c100b0047c11e084e9mr12617510pfj.23.1635365976487; Wed, 27 Oct 2021 13:19:36 -0700 (PDT) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:19fb:5287:bbfe:fc2a]) by smtp.gmail.com with ESMTPSA id fr12sm5338295pjb.36.2021.10.27.13.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 13:19:36 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 6/7] tcp: do not clear skb->csum if already zero Date: Wed, 27 Oct 2021 13:19:22 -0700 Message-Id: <20211027201923.4162520-7-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211027201923.4162520-1-eric.dumazet@gmail.com> References: <20211027201923.4162520-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet Freshly allocated skbs have their csum field cleared already. Signed-off-by: Eric Dumazet --- net/ipv4/tcp.c | 1 - net/ipv4/tcp_output.c | 1 - net/ipv6/tcp_ipv6.c | 1 - 3 files changed, 3 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c58d448b45a098b23fdc09530c2565326e77c29f..88475b64034432d4bb3c6989a69a3041ae6e7711 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -658,7 +658,6 @@ void tcp_skb_entail(struct sock *sk, struct sk_buff *skb) struct tcp_sock *tp = tcp_sk(sk); struct tcp_skb_cb *tcb = TCP_SKB_CB(skb); - skb->csum = 0; tcb->seq = tcb->end_seq = tp->write_seq; tcb->tcp_flags = TCPHDR_ACK; tcb->sacked = 0; diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 7ecf35d0f847c0c6aa34d3cb05e3f28a623216bd..5664355b0d09abc701ba7b422340ed9699bc71f0 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2398,7 +2398,6 @@ static int tcp_mtu_probe(struct sock *sk) TCP_SKB_CB(nskb)->end_seq = TCP_SKB_CB(skb)->seq + probe_size; TCP_SKB_CB(nskb)->tcp_flags = TCPHDR_ACK; TCP_SKB_CB(nskb)->sacked = 0; - nskb->csum = 0; tcp_insert_write_queue_before(nskb, skb, sk); tcp_highest_sack_replace(sk, skb, nskb); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index c678e778c1fb8f8cb7300c23cb876ef0d8e750c8..2cc9b0e53ad1c8e2d35fc9c6dbd1e90fee40b632 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -969,7 +969,6 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 fl6.flowlabel = label; buff->ip_summed = CHECKSUM_PARTIAL; - buff->csum = 0; __tcp_v6_send_check(buff, &fl6.saddr, &fl6.daddr); From patchwork Wed Oct 27 20:19:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12588041 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99F32C433F5 for ; Wed, 27 Oct 2021 20:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 81A07610A4 for ; Wed, 27 Oct 2021 20:19:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240671AbhJ0UWH (ORCPT ); Wed, 27 Oct 2021 16:22:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239322AbhJ0UWG (ORCPT ); Wed, 27 Oct 2021 16:22:06 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46422C061745 for ; Wed, 27 Oct 2021 13:19:40 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id r5so2847395pls.1 for ; Wed, 27 Oct 2021 13:19:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hQp9I3UY+cb3smQP00qjbPxl0RAUnYl8lVgQGUFwZ1M=; b=aIu2M+zRw9gf0/hfaRSKrh1FepyqD6pgS3CGGbpDHpmTYehc04u6Jv7sxxfWQB9yJ9 V3S6HKtFLZDVqolilV0SQKlg4NK8tbsbVsAuCSHbKkwYk3UjBoNoZUmZt97qu3a2hCvK QyRQXWl9Zw8lL+z5M6KPyeM28oOEzGlwE9Tqpfs0BcJJgd0yenoM9aei6R1nqnn/pHTV h3AVJOF1qOE3+prnUTRJG557c4LZpjXn9L1YZJibK1mAGQx+BfWfu69M/qH6y4WGCrhz s63yjE2iGgBl6fCFfBJDP7lRvBqS46PK4PR3aAWo0fQZAK5HiXFLXUXA4ciNgzj0Tklo dYkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hQp9I3UY+cb3smQP00qjbPxl0RAUnYl8lVgQGUFwZ1M=; b=ldYHyFpE4c0FiyYTOctYefiZjehppQP6piksmkqh4WC9I1reM+r5yL1TU/V9/kMkZW hpYzoW/5IwcM+XDdw/POyOVz7niKBy7uxAuDaqoh68ARkQKRpBEChO+xWWK+4e8xMgua asjGGhyQBCM1e2nsH+pN8kBaO3soaXbNv3rJU+vDSNISoEd8kUKKoUfsfwytl7cmQwxy c2rufQkKqkyrxzZG7Uzlol4znwuEyCHgO8REQdYY8bsFBynOd3lxbDxqR2a5Lv0GPsK+ WzzUK83KxhciqFReExKXQSw1gBbIPfwog4GB7Bdl4jS8mHyHApZDi8CR3j6u1gnJlDSu 3G8Q== X-Gm-Message-State: AOAM531Uyj8hMFXEAfY9WJe6VSp95vicH47f+iXcIlyD/mtcFWeTcyao dUxU+ulvoy/4GTUeo9+sxW0= X-Google-Smtp-Source: ABdhPJwPGPEmFFIAqwwIf4cutJfBXKKtJFUBDKHBSq4l2GleF2qQJ9tJyvgEjADIOGVEYHe7T5QRsQ== X-Received: by 2002:a17:90a:4d44:: with SMTP id l4mr8063066pjh.64.1635365979865; Wed, 27 Oct 2021 13:19:39 -0700 (PDT) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:19fb:5287:bbfe:fc2a]) by smtp.gmail.com with ESMTPSA id fr12sm5338295pjb.36.2021.10.27.13.19.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 13:19:39 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 7/7] tcp: do not clear TCP_SKB_CB(skb)->sacked if already zero Date: Wed, 27 Oct 2021 13:19:23 -0700 Message-Id: <20211027201923.4162520-8-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211027201923.4162520-1-eric.dumazet@gmail.com> References: <20211027201923.4162520-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet Freshly allocated skbs have zero in skb->cb[] already. Signed-off-by: Eric Dumazet --- net/ipv4/tcp.c | 1 - net/ipv4/tcp_output.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 88475b64034432d4bb3c6989a69a3041ae6e7711..7a7b9aa8f19a76861b2aa21395e085c1dde6deb0 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -660,7 +660,6 @@ void tcp_skb_entail(struct sock *sk, struct sk_buff *skb) tcb->seq = tcb->end_seq = tp->write_seq; tcb->tcp_flags = TCPHDR_ACK; - tcb->sacked = 0; __skb_header_release(skb); tcp_add_write_queue_tail(sk, skb); sk_wmem_queued_add(sk, skb->truesize); diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 5664355b0d09abc701ba7b422340ed9699bc71f0..6867e5db3e352d35b94b212db8b72f88672e3d1d 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -394,7 +394,6 @@ static void tcp_init_nondata_skb(struct sk_buff *skb, u32 seq, u8 flags) skb->ip_summed = CHECKSUM_PARTIAL; TCP_SKB_CB(skb)->tcp_flags = flags; - TCP_SKB_CB(skb)->sacked = 0; tcp_skb_pcount_set(skb, 1); @@ -2139,9 +2138,6 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, TCP_SKB_CB(skb)->tcp_flags = flags & ~(TCPHDR_FIN | TCPHDR_PSH); TCP_SKB_CB(buff)->tcp_flags = flags; - /* This packet was never sent out yet, so no SACK bits. */ - TCP_SKB_CB(buff)->sacked = 0; - tcp_skb_fragment_eor(skb, buff); skb_split(skb, buff, len); @@ -2397,7 +2393,6 @@ static int tcp_mtu_probe(struct sock *sk) TCP_SKB_CB(nskb)->seq = TCP_SKB_CB(skb)->seq; TCP_SKB_CB(nskb)->end_seq = TCP_SKB_CB(skb)->seq + probe_size; TCP_SKB_CB(nskb)->tcp_flags = TCPHDR_ACK; - TCP_SKB_CB(nskb)->sacked = 0; tcp_insert_write_queue_before(nskb, skb, sk); tcp_highest_sack_replace(sk, skb, nskb);