From nobody Mon Feb 9 15:09:53 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a17:907:7811:b0:6d8:2910:9a8 with SMTP id la17csp4144854ejc; Mon, 28 Mar 2022 05:49:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKfX4Twvikz1DSd/xnqiB1jSt8nysJXXV+rAIcKByD2iqrdoD2e/hLXX6/iQwtKosZHdX5 X-Received: by 2002:a17:907:7204:b0:6db:ebf4:9988 with SMTP id dr4-20020a170907720400b006dbebf49988mr26644688ejc.709.1648471774661; Mon, 28 Mar 2022 05:49:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648471774; cv=none; d=google.com; s=arc-20160816; b=S2yYFb3ghJs2JveJKe7rgvx7Acf4zkXOH1TK/H/aIdh1wIhv0Tpgu0f1L/tWaliXe1 1ZxJaTyT6HVeS+xcwrITxZXKz9S/yqj8MsMvCFJHWQNLTy9/27+9V7EKIisbLga3uiQS 7aVDVRNd8Qe5n7srFCZAVrkzUk6pKzvuAVDCt9SZCYJyDno/RdNtabnTXbH+z8o+pRUc STa6duhsTlHCg/3z0HXNWs2aye1HCBLC8dasrVpgqJie4Bo6/NR4tsIZBrlnDRqpOjp1 5YW7iMC/B2MpecZM36d78HxaoXcDouxuuWc+nuKQtyPeb65d2TmWFsXZiAIKQQm/lNxn felQ== 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=r5NBWNLd5oRaXaqe+tpr8w1+8UvHELWVtmlQkSIHrMg=; b=vMhv0QpLWCBIDgVhxSUpRT5VBxCxje+X5rG1qi8LTPDfKAOdvuZqma3lrCCaqVJ+j/ CDnfFtXrpFe9o79D/eACZk7YHn/Kc5y+hiWI22jbT4dLrbt+aGW4EKCxFPhBfKOL5acW ekZV5yOj8lgsUQE0nCPGo3m+0W1ABv+UB/125Bc3h02V/fP+eneRScEkE/0JbaWdVr5J 3CuMhKJcunUhlyEK/fMg4FLkISQIW/j+AhGutth6r3QLl507h6bprwJaJ8vSN/2FNqdT RmxSIOcMa1UW2DMXDkVgouwOs4xrDuU4OGVPsVZTSLZA0+/Nd2Ob0VHBf44jX6y7Ma57 3OWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4478-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4478-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id f3-20020a1709063f4300b006dfa02fa314si13632793ejj.845.2022.03.28.05.49.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Mar 2022 05:49:34 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4478-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-4478-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4478-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 5F14C1C09CF for ; Mon, 28 Mar 2022 12:49:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E04D942BA; Mon, 28 Mar 2022 12:49:31 +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 5446E3D95 for ; Mon, 28 Mar 2022 12:49:30 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nYooK-000691-9z; Mon, 28 Mar 2022 14:49:28 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next v2 2/3] mptcp: remove locking in mptcp_diag_fill_info Date: Mon, 28 Mar 2022 14:49:12 +0200 Message-Id: <20220328124913.29768-3-fw@strlen.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220328124913.29768-1-fw@strlen.de> References: <20220328124913.29768-1-fw@strlen.de> 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" Problem is that listener iteration would call this from atomic context so this locking is not allowed. One way is to drop locks before calling the helper, but afaics the lock isn't really needed, all values are fetched via READ_ONCE(). Signed-off-by: Florian Westphal --- net/mptcp/sockopt.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index f949d22f52bd..826b0c1dae98 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -853,15 +853,11 @@ static int mptcp_getsockopt_first_sf_only(struct mptc= p_sock *msk, int level, int =20 void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) { - struct sock *sk =3D &msk->sk.icsk_inet.sk; u32 flags =3D 0; - bool slow; u8 val; =20 memset(info, 0, sizeof(*info)); =20 - slow =3D lock_sock_fast(sk); - info->mptcpi_subflows =3D READ_ONCE(msk->pm.subflows); info->mptcpi_add_addr_signal =3D READ_ONCE(msk->pm.add_addr_signaled); info->mptcpi_add_addr_accepted =3D READ_ONCE(msk->pm.add_addr_accepted); @@ -882,8 +878,6 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struc= t mptcp_info *info) info->mptcpi_snd_una =3D READ_ONCE(msk->snd_una); info->mptcpi_rcv_nxt =3D READ_ONCE(msk->ack_seq); info->mptcpi_csum_enabled =3D READ_ONCE(msk->csum_enabled); - - unlock_sock_fast(sk, slow); } EXPORT_SYMBOL_GPL(mptcp_diag_fill_info); =20 --=20 2.35.1