From nobody Mon Apr 29 23:26:55 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp3085945jam; Thu, 10 Feb 2022 06:48:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsG9lVf5pfQY9zHqiPA2W9guE3CXBmTlIx8Ci/kTHB5dk4QNOHVoIg/h9/vpbFe49z6PPd X-Received: by 2002:a65:66d5:: with SMTP id c21mr2520847pgw.152.1644504537453; Thu, 10 Feb 2022 06:48:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644504537; cv=none; d=google.com; s=arc-20160816; b=IZASgwh3JPXun0+Zbfdg+AruvJPcDXX7FdaY4/LIWctFyF5JIZnSHGiB2ShAV7Rteg kz1XyxeXTmPa4O3GZFnrYj6bHMSj2wHfO6AIYha2FdGcMJ6e/w6Iu/JX6yw5RLrS5qZn 9Ts/QMFs5z1Bt1dURg8CUY4WHFGXsZlbXC0YIf8YnYKZzV58K1fpiu398VG0biiTED1w 5B8RUj0WoOYAw+FAf5l79OCFd5x8xTLjrZMFfzsI6KMkwoDLZ+vNu9YQzHLtIsZse9aQ MBt5iyjqnd9EfCs99HkzqJjt9uhyYZNXzmAItTmWe7wDhT8JvfYjTWL+Pcp1kAhWFvsV L/ig== 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:message-id:date:subject:cc:to :from; bh=lKCctHqVg9oXBa+gmUkBqZFKiFVZAbNLagOMMnkxSpY=; b=dO1svj3tk21YBoayQf8MSnOKKhXkkIEpQ4POoso3fg0Kwg1e/9XsibXCJo3BTRvKU8 yOoR3D6DIKKEmfhKDDKtHubW0DCPnJPjIp9+oAAnW+97dK3CALIIiiU3nES5u5OxUGnX NYdCUZpaeUuHuWdCmlTWO4DE8O13SXr3mKMlARDLxxWReToCTIv3tJYFcXnLdAyYMfQV WxF+xVkwlxhEK+kQ3rYb5Jaqbb9fLlSKnvWwOeSzpIcQ8ENsJuWtTqFZkZ2Xd9HybRM6 +/EGcx1sl9MCWzc2Fg2zACYg03VjGVu8l8T+oeBTtEy/QXsPMaqlvQbrgCxcWrouueG1 CjXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-3633-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3633-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id u10si2625217plh.227.2022.02.10.06.48.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Feb 2022 06:48:57 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3633-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; spf=pass (google.com: domain of mptcp+bounces-3633-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3633-wpasupplicant.patchew=gmail.com@lists.linux.dev" 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 6D1D33E104C for ; Thu, 10 Feb 2022 14:48:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 990512C9C; Thu, 10 Feb 2022 14:48:55 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [193.142.43.52]) (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 DD5742F20 for ; Thu, 10 Feb 2022 14:48:53 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nIAkY-000321-8h; Thu, 10 Feb 2022 15:48:46 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH v2 mptcp-next] mptcp: don't save tcp data_ready and write space callbacks Date: Thu, 10 Feb 2022 15:48:39 +0100 Message-Id: <20220210144839.26742-1-fw@strlen.de> X-Mailer: git-send-email 2.34.1 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" Assign the helpers directly rather than save/restore in the context structure. Signed-off-by: Florian Westphal Reviewed-by: Mat Martineau --- net/mptcp/protocol.h | 6 ++---- net/mptcp/subflow.c | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 0eebfc9f39bc..3937ea3f6759 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -479,9 +479,7 @@ struct mptcp_subflow_context { struct sock *tcp_sock; /* tcp sk backpointer */ struct sock *conn; /* parent mptcp_sock */ const struct inet_connection_sock_af_ops *icsk_af_ops; - void (*tcp_data_ready)(struct sock *sk); void (*tcp_state_change)(struct sock *sk); - void (*tcp_write_space)(struct sock *sk); void (*tcp_error_report)(struct sock *sk); =20 struct rcu_head rcu; @@ -626,9 +624,9 @@ bool mptcp_subflow_active(struct mptcp_subflow_context = *subflow); static inline void mptcp_subflow_tcp_fallback(struct sock *sk, struct mptcp_subflow_context *ctx) { - sk->sk_data_ready =3D ctx->tcp_data_ready; + sk->sk_data_ready =3D sock_def_readable; sk->sk_state_change =3D ctx->tcp_state_change; - sk->sk_write_space =3D ctx->tcp_write_space; + sk->sk_write_space =3D sk_stream_write_space; sk->sk_error_report =3D ctx->tcp_error_report; =20 inet_csk(sk)->icsk_af_ops =3D ctx->icsk_af_ops; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 485f00dcaf84..0e929aa71b18 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1661,10 +1661,12 @@ static int subflow_ulp_init(struct sock *sk) tp->is_mptcp =3D 1; ctx->icsk_af_ops =3D icsk->icsk_af_ops; icsk->icsk_af_ops =3D subflow_default_af_ops(sk); - ctx->tcp_data_ready =3D sk->sk_data_ready; ctx->tcp_state_change =3D sk->sk_state_change; - ctx->tcp_write_space =3D sk->sk_write_space; ctx->tcp_error_report =3D sk->sk_error_report; + + WARN_ON_ONCE(sk->sk_data_ready !=3D sock_def_readable); + WARN_ON_ONCE(sk->sk_write_space !=3D sk_stream_write_space); + sk->sk_data_ready =3D subflow_data_ready; sk->sk_write_space =3D subflow_write_space; sk->sk_state_change =3D subflow_state_change; @@ -1719,9 +1721,7 @@ static void subflow_ulp_clone(const struct request_so= ck *req, =20 new_ctx->conn_finished =3D 1; new_ctx->icsk_af_ops =3D old_ctx->icsk_af_ops; - new_ctx->tcp_data_ready =3D old_ctx->tcp_data_ready; new_ctx->tcp_state_change =3D old_ctx->tcp_state_change; - new_ctx->tcp_write_space =3D old_ctx->tcp_write_space; new_ctx->tcp_error_report =3D old_ctx->tcp_error_report; new_ctx->rel_write_seq =3D 1; new_ctx->tcp_sock =3D newsk; --=20 2.34.1