From nobody Sat May 18 19:12:44 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D2B3A171C2 for ; Sun, 7 Apr 2024 10:38:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712486328; cv=none; b=mmOBa/mJWYnt5hwi7No15z0pm2eJKbJ9vlVC8XlcYM8gVJ17HHKRMA8PMVjfVeu9j6rZ9QtL2+hZebd30RlQQATxaAv0HXtL6PRp81oW4B+4wQz/348NNxWni0IL3r8KrXpo37eTqGKmKwn8yD2AiyOu5qoot8gdA+aiWplW6jA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712486328; c=relaxed/simple; bh=eSSrLw+h2+ymvm3W8hgx4e3RZcevK1hk8++bbfGpR5k=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=N72zFVXD0fF0wg7sLNHjW6B7Tg0Jj3ptJUQVxjxhhHL4ySIrzNcHDrZ5FyWA7JLdRQgduKMlEgHll3HId3s6WF4NjE3NV5cCgnsRgu4+GfaQjgnKvAMPKrZm8eH4VazTJv077Fl/t46XgQcNWYqLEFduvrX71KeKn35b9r8RcNY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=g2nuE8LK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="g2nuE8LK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3CFBC433F1; Sun, 7 Apr 2024 10:38:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712486328; bh=eSSrLw+h2+ymvm3W8hgx4e3RZcevK1hk8++bbfGpR5k=; h=From:To:Cc:Subject:Date:From; b=g2nuE8LKIAy01CL4hjg/GgiSTBAkCp9VAtNJUUu8RrRv2JhC1SV4ClrvWPVAN4nSD 5ZQgTqfTIK0RyYfidA88P+64HzJqx8HQP1rwGOAgo6S1agOSgyh3WKZ1wkNetathER lOz2CvFh5QvSIDRSENl7SkKE5Kx6iQc4SfvHADuYn0edu+fjYQzkrxxNs++Sw5z0Li 6bh/CGwEafehMIvr0uGdofNDAzTbZxpN5cbe/XkvCN+p6SrAN92DL+iz+wCbudmdNv NWgpyGrvFhQHlKvdpTv/YEdR/L1eeKBaPLQqFX/wWuj6YOWBiaPtZoOhQZ00F1eykZ tznWPG7GdK97g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2] Squash to "mptcp: add last time fields in mptcp_info" Date: Sun, 7 Apr 2024 18:38:40 +0800 Message-Id: <7930751788d3bc8155898d4a22bdd6efca8cfde0.1712486293.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.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" From: Geliang Tang Please append the following lines into the commit log: ''' Since msk->last_ack_recv needs to be protected by mptcp_data_lock/unlock, and lock_sock_fast can sleep and be quite slow, move the entire mptcp_data_lock/unlock block after the lock/unlock_sock_fast block. Then mptcpi_last_data_sent and mptcpi_last_data_recv are set in lock/unlock_sock_fast block, while mptcpi_last_ack_recv is set in mptcp_data_lock/unlock block. ''' v2: - move the entire mptcp_data_lock()/mptcp_data_unlock() block after the lock_sock_fast()/unlock_sock_fast() block. - can't move it inside lock_sock_fast()/unlock_sock_fast() block, this causes a deadlock. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) --- net/mptcp/sockopt.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 2ec2fdf9f4af..40b262b2c24a 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -896,9 +896,9 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_= sock *msk, int level, int void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) { struct sock *sk =3D (struct sock *)msk; - u32 now =3D tcp_jiffies32; u32 flags =3D 0; bool slow; + u32 now; =20 memset(info, 0, sizeof(*info)); =20 @@ -927,12 +927,6 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, stru= ct mptcp_info *info) if (READ_ONCE(msk->can_ack)) flags |=3D MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED; info->mptcpi_flags =3D flags; - mptcp_data_lock(sk); - info->mptcpi_snd_una =3D msk->snd_una; - info->mptcpi_rcv_nxt =3D msk->ack_seq; - info->mptcpi_bytes_acked =3D msk->bytes_acked; - info->mptcpi_last_ack_recv =3D jiffies_to_msecs(now - msk->last_ack_recv); - mptcp_data_unlock(sk); =20 slow =3D lock_sock_fast(sk); info->mptcpi_csum_enabled =3D READ_ONCE(msk->csum_enabled); @@ -944,9 +938,17 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, stru= ct mptcp_info *info) info->mptcpi_bytes_retrans =3D msk->bytes_retrans; info->mptcpi_subflows_total =3D info->mptcpi_subflows + __mptcp_has_initial_subflow(msk); + now =3D tcp_jiffies32; info->mptcpi_last_data_sent =3D jiffies_to_msecs(now - msk->last_data_sen= t); info->mptcpi_last_data_recv =3D jiffies_to_msecs(now - msk->last_data_rec= v); unlock_sock_fast(sk, slow); + + mptcp_data_lock(sk); + info->mptcpi_snd_una =3D msk->snd_una; + info->mptcpi_rcv_nxt =3D msk->ack_seq; + info->mptcpi_bytes_acked =3D msk->bytes_acked; + info->mptcpi_last_ack_recv =3D jiffies_to_msecs(now - msk->last_ack_recv); + mptcp_data_unlock(sk); } EXPORT_SYMBOL_GPL(mptcp_diag_fill_info); =20 --=20 2.40.1