From nobody Thu Apr 25 16:56:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:a689:0:0:0:0:0 with SMTP id j9csp2214599jam; Tue, 21 Sep 2021 04:39:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDiIgrJwWsXCNhHiW56s8TVajKuBQf8ZE8PrAJL4dryCRqRRsm1ICQx4aj+2GqrwyKWNeR X-Received: by 2002:a17:902:d48e:b0:13a:60a5:f410 with SMTP id c14-20020a170902d48e00b0013a60a5f410mr27051888plg.64.1632224387051; Tue, 21 Sep 2021 04:39:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632224387; cv=none; d=google.com; s=arc-20160816; b=gLT19CN/3vNKsURs4rV3ac0+GUZZDMtCP3dh55UCRRESXpH4U5HsyAdKWvnnSGENaN i9OUwyoNDBm1iZLJDl3KoPAAz8W6fLF7vo5eHkA33yzfzpQu4jELCn3wv8HV7LEf4xnw GyItDyB2yeQTmmKwRqmS+wCLiVZhw8bUdS2eOr++GHibBgM24NuXZ0XT0DGWML9d19Tt dW/lsqAvzTvdaRPwFg+27lPzCys2aS9Z3GJ9HekUdmuw1CadNdZ4PIpMW/H3Zf9kRDdD MGdFt1dCznDIsULywZWkI5tuYQDKPiSFVtjQ0Gh7RTOBt/gWTMr+vW5yo3x3kQT5E8gm H/hA== 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=b5sNgDEk+W5RDFVwa8F10oYnbOYVACrpRXyliB6ESZI+sW76WlctDKNoGtWZtBk4o/ qnzOah4GctsqD3O8SvycfeCETOFIva3TZ57DTxW1oCj32qwta06Ssgkmv2CH47cOkC3U 21eeALj0kvOf3WeIWHRLobVa+0zTLK74foZGYSGG++W28I41EPL0kyNrBR/OiSTu4GrY +2KNjJQwG4EOEvGRWg5IepffACryGwD9RlsAiSWmb+BXuwWGwCylGLYknD1vQVZ82isT LKhf+WEfdLn5qUrSMAg/ut6dl4P2DHkuSl1uq7Y6+HbLBnchWXF0RbS9WqFqSv6WEJFD 49MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=J3vE7TPQ; spf=pass (google.com: domain of mptcp+bounces-1995-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-1995-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. [147.75.69.165]) by mx.google.com with ESMTPS id l6si15081489pls.421.2021.09.21.04.39.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Sep 2021 04:39:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1995-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=J3vE7TPQ; spf=pass (google.com: domain of mptcp+bounces-1995-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-1995-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 77E013E0F06 for ; Tue, 21 Sep 2021 11:39:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7DC103FC2; Tue, 21 Sep 2021 11:39:43 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.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 8EFD22FAE for ; Tue, 21 Sep 2021 11:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632224380; 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=J3vE7TPQ2xY/WmfI8ayxb5PYTcuMgpKsfgPkoM+pzL+r0Y1XsrwMj321LuswTacvu9OM+u h7a7M6LXBmu4eUwGc8WbNflfTzXOtNrXXweE4ItbMAxvF3UwfyICGVag8xQi4kZ/YZMuey w8SJMyyWgZlkXHzFjnRNx2H5Ou1idLw= 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-131-qDTcoXKYMOySP9EPAz-3Yw-1; Tue, 21 Sep 2021 07:39:39 -0400 X-MC-Unique: qDTcoXKYMOySP9EPAz-3Yw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2F20108468A for ; Tue, 21 Sep 2021 11:39:38 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.195.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A9B560C17 for ; Tue, 21 Sep 2021 11:39:38 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 1/3] Squash-to: "tcp: expose the tcp_mark_push() and skb_entail() helpers" Date: Tue, 21 Sep 2021 13:39:25 +0200 Message-Id: <9934d3a84518fac74119c18044baeb4241c13e98.1632217366.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.12 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 Thu Apr 25 16:56:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:a689:0:0:0:0:0 with SMTP id j9csp2214578jam; Tue, 21 Sep 2021 04:39:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEdKL+ZTwdgJZ/00NLH4OWn0tLpgKWmX4AVIvGmlSZ9K70hxkWEEXSWq/9cnMzKb3Lh0XN X-Received: by 2002:a63:b045:: with SMTP id z5mr5521078pgo.65.1632224385714; Tue, 21 Sep 2021 04:39:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632224385; cv=none; d=google.com; s=arc-20160816; b=HclQhP1kkHAlRVxi3D2RfhZ8+UiMJrqSQ0v2QeeSXSuL/jue0pg1WDBuHvlSix+fa2 SiIEoSz7MQgztCO1JJCK0R667JecdZ0hZNp94TD2r6NG6NYp8xBmc7JB3lgtVLwNxE+F fxH6SZ8/vTaHgWvavh4uUDz0RV8miwtBQ/DC8PAJ1qwG9Fnbvf+MM/mzH2uOjE2lJqaQ t8OBncqUbAYUkdNnUQY8YBL6cY1LNctzVwVil+jHQCXeKURqm8K6gf1ZrwSdYrZ26FWs IVo4MpMhJbwPFmHlbuAZaMuIaNLet/IFxoraG8avV2MHfFTVH3BbUPUkNMR6IaRXN1fT Sh/g== 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=DC5vHerLLRy1cQXDeEGX3t6dhFXahpBKRWVX5a6A60XFAIGzI04+xGDtRwWTYxzvRW fL90walTCMOnFL8RiwdR5LoKZ0YnnKQOA11DwVcNZSr10l8C3Vusd/PjnWGXfUjXTU9T Hw1CNmRlEooTgdy8tzSUnCErjZIBl+LJXoOc7FcjZH0Z8OXegWBWxCXD1rioy5pH0W/j 4D8g0WiozJ+SNHnRbLmHM6w4N/RCCu176pXcII+T1isYhN22KM01nW4Xs8XWADBI8Wzo x/2Tzgz9170O4hVnp6QVQ1z4RDy9tYhbN47YDJuP8yeeto6AfikS4vQZNG1aqNAhXV69 ni1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hub10yDh; spf=pass (google.com: domain of mptcp+bounces-1994-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-1994-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. [147.75.69.165]) by mx.google.com with ESMTPS id w18si24422176pff.198.2021.09.21.04.39.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Sep 2021 04:39:45 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1994-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hub10yDh; spf=pass (google.com: domain of mptcp+bounces-1994-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-1994-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 4859B3E0477 for ; Tue, 21 Sep 2021 11:39:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 630AE3FC0; Tue, 21 Sep 2021 11:39:43 +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 5FBA23FC2 for ; Tue, 21 Sep 2021 11:39:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632224381; 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=Hub10yDhUzNkQQDEEL2g52TlgNotwefxfJUAE1D7UHyykbXCbkb4cd00zQaJK0C8VbOQez jCSAkK4FU7d3mzXYuddp8Y7+oum/Wul1kz3cz0X2SENtZqRjRKypmdkhQWZaeiMM1gtR9U t9jvH+JdrUw6Gw26JVLjuCiF/EDXtpA= 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-182-HypfdXYhNc2UZXaHJpvhHQ-1; Tue, 21 Sep 2021 07:39:40 -0400 X-MC-Unique: HypfdXYhNc2UZXaHJpvhHQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B2B49BBEE0 for ; Tue, 21 Sep 2021 11:39:39 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.195.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2883660C17 for ; Tue, 21 Sep 2021 11:39:38 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 2/3] Squash-to: "mptcp: stop relying on tcp_tx_skb_cache" Date: Tue, 21 Sep 2021 13:39:26 +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.12 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 Thu Apr 25 16:56:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:a689:0:0:0:0:0 with SMTP id j9csp2214611jam; Tue, 21 Sep 2021 04:39:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMj/EJw3fg2SsQ8Rt/BONHtBm/fiDzxH5rd2a84xDrLQ+EAEDyd2y8SuMoh4vywbPbbdd6 X-Received: by 2002:a63:7e41:: with SMTP id o1mr14449619pgn.436.1632224388356; Tue, 21 Sep 2021 04:39:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632224388; cv=none; d=google.com; s=arc-20160816; b=KDEJfZnUEUW8uE2zQt0ITLUidBtEdRBcWw8epSzY0xyKhxt4lGTIMyqmwVcjHQvZms Js8CZUon0L9XxiJIXZX6ogBzvwhnlXAVKWSqrM9fsPzUVUkWy9H5CdS1zVa5fOiDM5Jk EzTzSw07GSCWpEQMKj8niRSqjiiYlIpfxw6joi4uoFZ5p5QPS1t2l39qhRzi6hHLErIt rB79WOD+YpndX2UdiBnmqgDDgv0bbZzDOzPWrka9gDbJe8xN0FlQFNhkUz9fuoECpvIe 4iVMfMTITMhAU/6nLbtHaIuahBepo3nxA7rnMrTrdwxxaYrhRmCy8Swg9kT5M++If2Pl 8KgQ== 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=cVopC3MwRdoidOVDTHAv0XPH/07fSiWFiO19TOP4P5A=; b=xd/EajBYR5wpeoL/xIx+Zul9eArqPZ5qQCcBu0hmGjVQ6pSt4DMhROZqxn+nF1hzhm lhC/7ZndXl2dRt5RDPNMQKUPV4OTebF8lC3fLV/H7A9qnnmad71pd/40FAz1fEkd43k8 +yIrGWncVVDfv/JW0L5gawPtRuv5d/X8X6HVggn6dMK1vjP2srb8UYBZ8JuSgvEdYp1j ISjam+IMfcE3afWZlGVol9/9l8pES/W4hGkMKUXGB/sBn0tJt5CiO1c4lOvI+wEgOVFd FS0W7c+yleu1dvhrk6Wc+OicQnJNAesJIPVUfN5ZZDysYdujPwJl6RCz5Fm+7Utn/wbK NFJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NFYMMakB; spf=pass (google.com: domain of mptcp+bounces-1996-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-1996-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. [147.75.69.165]) by mx.google.com with ESMTPS id d15si20578000pfj.27.2021.09.21.04.39.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Sep 2021 04:39:48 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1996-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NFYMMakB; spf=pass (google.com: domain of mptcp+bounces-1996-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-1996-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 B4AC73E0EFD for ; Tue, 21 Sep 2021 11:39:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A0B143FCE; Tue, 21 Sep 2021 11:39:44 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.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 814653FCD for ; Tue, 21 Sep 2021 11:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632224382; 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=cVopC3MwRdoidOVDTHAv0XPH/07fSiWFiO19TOP4P5A=; b=NFYMMakBQuPZgfHYEqlcENL7ThmbsQKZucq9nNVP5REN0IN5kpxfb9RYwchyFQZyzhp64q 52tjX9NfCQS8f/czVWnbqez1QHA+WB2hHnJpqqbUu1KAeIsEVFtOoU69i0TMNVOtDUKcEj uVDJC6jr4d2X6tw+MZMaZWTquPVRSlY= 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-333-zObhymfcM8yiJCOFOZfEsg-1; Tue, 21 Sep 2021 07:39:41 -0400 X-MC-Unique: zObhymfcM8yiJCOFOZfEsg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99B89BBEE3 for ; Tue, 21 Sep 2021 11:39:40 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.195.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1138E60C17 for ; Tue, 21 Sep 2021 11:39:39 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 3/3] tcp: make tcp_build_frag() static Date: Tue, 21 Sep 2021 13:39:27 +0200 Message-Id: <4be7c77b82fd1de877ee60377aeb6afe249797d8.1632217366.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.12 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 | 4 ++-- 2 files changed, 2 insertions(+), 4 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..29cb7bf9dc1c 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); --=20 2.26.3