From nobody Sat Apr 20 03:02:06 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:a689:0:0:0:0:0 with SMTP id j9csp1495252jam; Mon, 20 Sep 2021 10:24:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxgdIrGNDDpO3GQza0sQYyvQI4XH32vdIUqmIrWZjCnZiPzIKx0Oc0ApHdC9t8pT7/58qS X-Received: by 2002:a05:620a:2994:: with SMTP id r20mr24822144qkp.245.1632158687161; Mon, 20 Sep 2021 10:24:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632158687; cv=none; d=google.com; s=arc-20160816; b=duqVFw887Rf7Tc0aSsdAtbGmHA/3F35x30gM49zEJe0OcochiKBx8ONDQZysswL/Wg QZ66JpvS1EDUdjLWMhzl1PnYZdEA7DGgcl3IoqWA7r7gke2+P2OUJIcp0Ys9FuJpBmDL v7GC7Y0PLl7LV4NLXqyEv7almzr+XroMA8zcV/7gHbyHrlAzMIWK8eKv+EFsBMeX0+Su uHcf6Lgud+y1+WaQLnFVfrwerbqwZMFU/txhhmHZRnPx2T8+oG6JREcbPL+I8gbXK+87 UUmVSG7ATKv9IQsao+JINoEi1JwvincQvve/ItfkZXVR8CD1JPUPE2geoGZnkk7oNT6I XkIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=02oLvmsxDylXifmWi/t243YphWofM9PNvpTCGshx69c=; b=uCDiHfj3msROtHzq64gG+hfqXzFL49A6Yv3caAT+a/QClAcQD9ofXgIpEXjzm+AJw3 d+lv3AudYjoT8T8Zhw94rT5iTl/2ANtIQtboz6lM2Yr+SPZ35tDd85rYvfRW1+AyXbAR DBh9ZFh7sDONZBF1F4+sR5MvNtsZOxiMxLQI1QtTtEKSfWBZV/Op+z/iohxwDOdEEB6L fMFdeSbVBWNwHCIY4LyQjEOXRQY3KKjaYYK/lIk3oU74jOMCyMHe9Yfr3e/GZle/ZZ3N 29ty/vGcxGGgStdi6XwOxcWZlUYHiVo8fIXx+P0YzkDZxvhEfYZGfwEUdXGhuoqaxq35 TK+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FNyhUKtR; spf=pass (google.com: domain of mptcp+bounces-1981-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-1981-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id 18si9486583qtd.251.2021.09.20.10.24.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Sep 2021 10:24:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1981-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FNyhUKtR; spf=pass (google.com: domain of mptcp+bounces-1981-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-1981-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id BC2961C0741 for ; Mon, 20 Sep 2021 17:24:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 48EBB3FCA; Mon, 20 Sep 2021 17:24:45 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DAFE29CA for ; Mon, 20 Sep 2021 17:24:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632158683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=02oLvmsxDylXifmWi/t243YphWofM9PNvpTCGshx69c=; b=FNyhUKtRC2SOvgSHbiEpfZ2UTjuOy2NlQ3hwBzsW54wDVha76kihnvU0w3gCxn0a3heB/L j7AOsAXyaWUZS5DXRsRrRSa38bxsg9TvD+SloA1vLZ11MrmbmnfZM9uK/7uRtX6BPGxl2U OEuCqZ7YixqfetQQtxkDmyEKCgGrWdk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-152-itKTiJcTNdiiIp49749G_A-1; Mon, 20 Sep 2021 13:24:41 -0400 X-MC-Unique: itKTiJcTNdiiIp49749G_A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 124091084681 for ; Mon, 20 Sep 2021 17:24:41 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80A096060F for ; Mon, 20 Sep 2021 17:24:40 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 1/3] Squash-to: "tcp: expose the tcp_mark_push() and skb_entail() helpers" Date: Mon, 20 Sep 2021 19:24:27 +0200 Message-Id: <9934d3a84518fac74119c18044baeb4241c13e98.1632158356.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Also change the commit title and message to: """ tcp: expose the tcp_mark_push() and tcp_skb_entail() helpers the tcp_skb_entail() helper actually skb_entail(), renamed to provide proper scope. The two helper will be used by the next patch. RFC -> v1: - rename skb_entail to tcp_skb_entail (Eric) """ Signed-off-by: Paolo Abeni --- include/net/tcp.h | 2 +- net/ipv4/tcp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index dc52ea8adfc7..4a96f6e0f6f8 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -581,7 +581,7 @@ __u32 cookie_v6_init_sequence(const struct sk_buff *skb= , __u16 *mss); #endif /* tcp_output.c */ =20 -void skb_entail(struct sock *sk, struct sk_buff *skb); +void tcp_skb_entail(struct sock *sk, struct sk_buff *skb); void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb); void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss, int nonagle); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 7a3e632b0048..c592454625e1 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -658,7 +658,7 @@ static inline bool forced_push(const struct tcp_sock *t= p) return after(tp->write_seq, tp->pushed_seq + (tp->max_window >> 1)); } =20 -void skb_entail(struct sock *sk, struct sk_buff *skb) +void tcp_skb_entail(struct sock *sk, struct sk_buff *skb) { struct tcp_sock *tp =3D tcp_sk(sk); struct tcp_skb_cb *tcb =3D TCP_SKB_CB(skb); @@ -985,7 +985,7 @@ struct sk_buff *tcp_build_frag(struct sock *sk, int siz= e_goal, int flags, #ifdef CONFIG_TLS_DEVICE skb->decrypted =3D !!(flags & MSG_SENDPAGE_DECRYPTED); #endif - skb_entail(sk, skb); + tcp_skb_entail(sk, skb); copy =3D size_goal; } =20 @@ -1314,7 +1314,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) process_backlog++; skb->ip_summed =3D CHECKSUM_PARTIAL; =20 - skb_entail(sk, skb); + tcp_skb_entail(sk, skb); copy =3D size_goal; =20 /* All packets are restored as if they have --=20 2.26.3 From nobody Sat Apr 20 03:02:06 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:a689:0:0:0:0:0 with SMTP id j9csp1495258jam; Mon, 20 Sep 2021 10:24:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMNerEoGL9b17h8Gqnq7GDd97mFDamlWZ+mJp99squXwu1MWmgxvXb4pPmAYhQuEMO1tr+ X-Received: by 2002:a63:7b01:: with SMTP id w1mr24136185pgc.246.1632158688378; Mon, 20 Sep 2021 10:24:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632158688; cv=none; d=google.com; s=arc-20160816; b=lkmc13gtgQKxFYtKq7Svwbw93JhewJ2P2s51id0moC4wiHe7H5NSa+pL2SN2hJ9G/0 u/wWUnAjE+HqiM7OBnAlelET4sFjtx6yW/SqDPvZxMzUZpmgQtAYO7GMZCQuDYk0Ns2u N0A/BmEWx39aZ5+EBujs345+1dHBhvttrjnksHFai9Exa2A2fLOv/bIXKVVxJZB4q7nJ 8cuCq0Aier9/knYTnQ1D/oYT6AoLNcbW3lFQ+6l44vT118u0BBdkDhBR3eZHeE4nLrXO hx9Ybc+rL+rt/JAJSGJOhMGdR3gBcycx/EF+MKQuSVNqojyatzuZgINQG9zi2f8hJr08 0HdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=itGcEwyjOs6Bt2rWM6D9pm2ZYUhnjp9s3RQJk57xkOo=; b=HKxS8mqG0QSoXEJDm2nqvNsEGJTlCyC63CRnh0yXm55UnQDgD5sdXaIMJWCTfwisau vEE8vUJIrxC1c1Lmen0Kxrpu3t0gwHt0XkieZyXgIjJ51FMZVXSYDh9qHDXiJzndu4zY p7Mc/BZUK7ROC7NnLW4V9zooRlLs40BWGh7X5A+YxKd2Obqr2Ax0XdsTjPKujKHKJTq/ /GjlFFnKc651MlHnC/MFkCgn6NSoKhjsjpXNDEqPC4Fl0Dbw8msr+PNv/Qh3Euk9u8qt voH3pOw/p2ZlR5CltYKUpAPQb31yZoknGkSVUGTQPWMkgFXPqePZ6gC2E661uYxSi1Cd udcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QO6xdZXx; spf=pass (google.com: domain of mptcp+bounces-1982-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1982-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id g2si18112791pfm.186.2021.09.20.10.24.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Sep 2021 10:24:48 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1982-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QO6xdZXx; spf=pass (google.com: domain of mptcp+bounces-1982-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1982-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 8CC533E0F2D for ; Mon, 20 Sep 2021 17:24:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0D20B3FCC; Mon, 20 Sep 2021 17:24:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEFF42FB3 for ; Mon, 20 Sep 2021 17:24:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632158683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=itGcEwyjOs6Bt2rWM6D9pm2ZYUhnjp9s3RQJk57xkOo=; b=QO6xdZXxmoCKd8RMd+9uc8tupMcYk6siWmdRUT4/G8o7ROm85SFU9EObH60XuyeQdi7T8C u+pO64YTW/SSqABFpHlfDeck/QY664JFqjvLtHLaJqIaPbjHZZC3Gs2Ek/C63id7B66E8W QosvfRO5ORV2i2WPWa8zcxI0tQarc04= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-368-K4-7-mpyPz6BC9s98UT0eg-1; Mon, 20 Sep 2021 13:24:42 -0400 X-MC-Unique: K4-7-mpyPz6BC9s98UT0eg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EED91104FC0E for ; Mon, 20 Sep 2021 17:24:41 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 670076060F for ; Mon, 20 Sep 2021 17:24:41 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 2/3] Squash-to: "mptcp: stop relying on tcp_tx_skb_cache" Date: Mon, 20 Sep 2021 19:24:28 +0200 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" fix build after helper rename Signed-off-by: Paolo Abeni --- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 48e0e3a945e4..87ee409d68ab 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1240,7 +1240,7 @@ static struct sk_buff *__mptcp_alloc_tx_skb(struct so= ck *sk, struct sock *ssk, g return NULL; =20 if (likely(sk_wmem_schedule(ssk, skb->truesize))) { - skb_entail(ssk, skb); + tcp_skb_entail(ssk, skb); return skb; } kfree_skb(skb); --=20 2.26.3 From nobody Sat Apr 20 03:02:06 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:a689:0:0:0:0:0 with SMTP id j9csp1495285jam; Mon, 20 Sep 2021 10:24:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfVSYmX2Orq9gIEfDyz4XP7ouHBFxZD2rHrSFclTfQQx9o3cV/Xkqt+XX92P14qUQRwlZY X-Received: by 2002:ad4:4b0b:: with SMTP id r11mr26443210qvw.49.1632158690637; Mon, 20 Sep 2021 10:24:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632158690; cv=none; d=google.com; s=arc-20160816; b=LDvBeXVPZMY54jD7oM1z1knTQWlexPmYwE6ulm+TEXIXxRd1o+Ir0aChMiYgRG+1i0 ChDZzHLHJu6GpSYsioeoVAgRzCaVayJeeSCbOxZI564mwo3d91iN595VxFfqE0wTLLto U3Fu7WMH8c77jZskZAfNAtx67pwjo3LVYSCa1W8FrMlb6uSVjjXdYpRxN4vVfz5vYKBT tJf+bTrBpqwpJbGN07oCUMuh+jPhY/tv191PCoMJubgZkCwTE63Y5mFwmfyhg+jtRE3S 85CkTiBd6iwQwne/o/9eL9s6duFnEft3A0PRbtxOxk+UQYpFYhThHzAQlZT7PxP/Vs5N M9Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=jHJuP6TU+3CSIWM10S4+0yoR3zKV97SHbHfLlIweF6M=; b=iRqaiH/PpS074OudTfKiYocu1zPb9RvMZhPwYTh70XuPyBNoeVtaMop3xQLFv4eEge ojIbmxAjc0/iv7bvrH0Nnkpi4y2wquZFoA/xyhFMondxwMbvh30ObhGxOx7IHB2mgNe2 O/d8/NndfviseRa9bZK/u9B9qQX0A1znxOrxD9hKuIQcR11rWIbbX6s7Ztm9LG+g2Crv F70MrcE0ia/YXaAfWq+H6ZXLY0UjEDZkS/+0xiNEjsK6NIlTBjUl//JWJ3UCguMdH4X1 jD18RlrB44PUtKnGz3LuLI7Bkz45KRQxQM0v2diyTGlXE3AnhL/i0ZuTbjTlpyI4w7kE +XwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="PL1ByMO/"; spf=pass (google.com: domain of mptcp+bounces-1984-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1984-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id p6si1850461qvg.10.2021.09.20.10.24.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Sep 2021 10:24:50 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1984-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="PL1ByMO/"; spf=pass (google.com: domain of mptcp+bounces-1984-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1984-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 50D7C1C03AE for ; Mon, 20 Sep 2021 17:24:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EA4793FC0; Mon, 20 Sep 2021 17:24:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9E233FCB for ; Mon, 20 Sep 2021 17:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632158685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jHJuP6TU+3CSIWM10S4+0yoR3zKV97SHbHfLlIweF6M=; b=PL1ByMO/mJzBUiihFtsnVIbfHXilRrV/YG6xqUMUOtJ2mw96ZH1Z9z4dd6A3Ag+w5ITmrX XPniSqcSFIksxvheUj3cGYgAYzBShwPU23/6jiId13wRVtgHY/oJZ7QgcT2d+UwMapa7wy FWIHxz5F/kojMEHvJn78eG4UUrGa/R0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-304-YRTxEMcwP5qEL1qOWgCqYQ-1; Mon, 20 Sep 2021 13:24:43 -0400 X-MC-Unique: YRTxEMcwP5qEL1qOWgCqYQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D56751923767 for ; Mon, 20 Sep 2021 17:24:42 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D1FE1B400 for ; Mon, 20 Sep 2021 17:24:42 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 3/3] tcp: make tcp_build_frag() static Date: Mon, 20 Sep 2021 19:24:29 +0200 Message-Id: <1949660e9af338adc8913b7cdf8c632401d6d6e0.1632158356.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" After the previous patch the mentioned helper is used only inside its compilation unit: let's make it static. RFC -> v1: - preserve the tcp_build_frag() helper (Eric) Signed-off-by: Paolo Abeni --- Note: this should _replace_: """ Partially revert "tcp: factor out tcp_build_frag()" """ I did not opted for a squash to patch, as it would still require conflicts resolution after the previous squash-to patch. @matttbe: please let me know if you prefer otherwise. --- include/net/tcp.h | 2 -- net/ipv4/tcp.c | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 4a96f6e0f6f8..673c3b01e287 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -330,8 +330,6 @@ int tcp_sendpage(struct sock *sk, struct page *page, in= t offset, size_t size, int flags); int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset, size_t size, int flags); -struct sk_buff *tcp_build_frag(struct sock *sk, int size_goal, int flags, - struct page *page, int offset, size_t *size); ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset, size_t size, int flags); int tcp_send_mss(struct sock *sk, int *size_goal, int flags); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c592454625e1..4ae43222d71f 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -963,8 +963,8 @@ void tcp_remove_empty_skb(struct sock *sk, struct sk_bu= ff *skb) } } =20 -struct sk_buff *tcp_build_frag(struct sock *sk, int size_goal, int flags, - struct page *page, int offset, size_t *size) +static struct sk_buff *tcp_build_frag(struct sock *sk, int size_goal, int = flags, + struct page *page, int offset, size_t *size) { struct sk_buff *skb =3D tcp_write_queue_tail(sk); struct tcp_sock *tp =3D tcp_sk(sk); @@ -1064,7 +1064,6 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page= *page, int offset, size_t copy =3D size; =20 skb =3D tcp_build_frag(sk, size_goal, flags, page, offset, ©); - if (!skb) goto wait_for_space; =20 if (!copied) --=20 2.26.3