From nobody Thu Sep 18 12:38:17 2025 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