From nobody Mon Feb 9 07:22:51 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp1110697jap; Fri, 3 Dec 2021 14:36:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJznNzwvrvu+4xdF65qrszrH4toyHiF7ZMqSErIWUxTEfljNJ6rNFDDSRgkHWITq47CjP5pP X-Received: by 2002:a37:712:: with SMTP id 18mr20316653qkh.366.1638570960950; Fri, 03 Dec 2021 14:36:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638570960; cv=none; d=google.com; s=arc-20160816; b=WCau+gmsK6zqjN8wqDGbiSw2GEg3HoIi5SdzfjiYZ5XzYGfyh2TULgA6t5r18LRMjN 2oMulWz+UR6neepW/Rlxh8mfZpCHrt+KRTQ7GK22NpP4fARFOK5roAtk2/3lZtkozOM1 q5Q28b/d/qJXfLr6cvMwd4wgG7uDvgnzzZs+HbCMe0XIPDnMvPQH1pc/NEh6dazotVGw k1KmzfiK7ofkzul/wgSSKhssYLa/MNAb6x4ST69bYsNJfe/vWf58piilESqu28zujlZc TKBBS41XXWCR5b+vg8IRILuryNgh2tuzVCVvEHVU5wV9raYLV6nriCkAjjuBnWsoKaNv 3qPQ== 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:cc:to:from; bh=85IM9K1uBIsWfXOcagqlMbIQs4ERoSq02G/mdOfeZQI=; b=viyQsCIhqj7YhVq1WhbjiY1VaWEZtS4dITXejnXJCksxa4Pf0hz/DQ6hDAC9VedE3k YIKXAVt+4fo7By6epKsaFjjypFxZoqMOg7Lxi2FRu1Hzc5SoDnaOJLHb4oiVADI597kD 7lewuWj72UeGvh2FsI1YdKbZLGPaymR4jpEtq2tYpuewPwNHTh0TBCk1p7xZTn1MtBqe uTLiR7KoW0QRuOuoMRNAB00jfkZemCS17riJx/gocOsPAa7bxn/+gyMN8J47o8k3V+GS MYrXLoVz0nYTDSJlb5/JeLTb8a7a3LasVb/8s1LFj+GwgeKQoMde5G49cZBlkr7WmtnZ O4rQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2632-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2632-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id z15si4701352qta.68.2021.12.03.14.36.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Dec 2021 14:36:00 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2632-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; spf=pass (google.com: domain of mptcp+bounces-2632-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2632-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.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 806CF1C0ECA for ; Fri, 3 Dec 2021 22:36:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5287E2CAB; Fri, 3 Dec 2021 22:35:53 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 1C0142CB0 for ; Fri, 3 Dec 2021 22:35:52 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10187"; a="235802948" X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="235802948" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 14:35:47 -0800 X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="460185313" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.18.88]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 14:35:47 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Maxim Galaganov , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Paolo Abeni , Mat Martineau Subject: [PATCH net-next 08/10] tcp: expose __tcp_sock_set_cork and __tcp_sock_set_nodelay Date: Fri, 3 Dec 2021 14:35:39 -0800 Message-Id: <20211203223541.69364-9-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211203223541.69364-1-mathew.j.martineau@linux.intel.com> References: <20211203223541.69364-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maxim Galaganov Expose __tcp_sock_set_cork() and __tcp_sock_set_nodelay() for use in MPTCP setsockopt code -- namely for syncing MPTCP socket options with subflows inside sync_socket_options() while already holding the subflow socket lock. Acked-by: Paolo Abeni Acked-by: Matthieu Baerts Signed-off-by: Maxim Galaganov Signed-off-by: Mat Martineau --- include/linux/tcp.h | 2 ++ net/ipv4/tcp.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 48d8a363319e..78b91bb92f0d 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -512,11 +512,13 @@ static inline u16 tcp_mss_clamp(const struct tcp_sock= *tp, u16 mss) int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from, int pcount, int shiftlen); =20 +void __tcp_sock_set_cork(struct sock *sk, bool on); void tcp_sock_set_cork(struct sock *sk, bool on); int tcp_sock_set_keepcnt(struct sock *sk, int val); int tcp_sock_set_keepidle_locked(struct sock *sk, int val); int tcp_sock_set_keepidle(struct sock *sk, int val); int tcp_sock_set_keepintvl(struct sock *sk, int val); +void __tcp_sock_set_nodelay(struct sock *sk, bool on); void tcp_sock_set_nodelay(struct sock *sk); void tcp_sock_set_quickack(struct sock *sk, int val); int tcp_sock_set_syncnt(struct sock *sk, int val); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 6ab82e1a1d41..20054618c87e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3207,7 +3207,7 @@ static void tcp_enable_tx_delay(void) * TCP_CORK can be set together with TCP_NODELAY and it is stronger than * TCP_NODELAY. */ -static void __tcp_sock_set_cork(struct sock *sk, bool on) +void __tcp_sock_set_cork(struct sock *sk, bool on) { struct tcp_sock *tp =3D tcp_sk(sk); =20 @@ -3235,7 +3235,7 @@ EXPORT_SYMBOL(tcp_sock_set_cork); * However, when TCP_NODELAY is set we make an explicit push, which overri= des * even TCP_CORK for currently queued segments. */ -static void __tcp_sock_set_nodelay(struct sock *sk, bool on) +void __tcp_sock_set_nodelay(struct sock *sk, bool on) { if (on) { tcp_sk(sk)->nonagle |=3D TCP_NAGLE_OFF|TCP_NAGLE_PUSH; --=20 2.34.1