From nobody Wed May 15 15:18:38 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 60D7A1CD21 for ; Tue, 16 Jan 2024 18:16:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428987; cv=none; b=XdKAbXSRufAwhzLO/RnQdsEa0dUt7JqJYAAASuXD8zqyIoqW3pAOzweUVr3dFrk7K8enJ/1uYqo9Ku9izkgH6T2LrqISBMlfY63pOTfwXqc/DEdiCrn3j55HqRyzoxv070mlBoGjiZ8R9GMbWz7UDtjFH7clNLS1AgtOmJkBtqA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428987; c=relaxed/simple; bh=JAdd3wng0B/X6jRk4nsqgyqR5ZDLrf0oqjst/pHFdng=; h=DKIM-Signature:Received:X-MC-Unique:Received:Received:From:To: Subject:Date:Message-ID:In-Reply-To:References:MIME-Version: X-Scanned-By:X-Mimecast-Spam-Score:X-Mimecast-Originator: Content-Transfer-Encoding:Content-Type; b=Lh3LHzlSLnh8h5tfQJYxlyLq/ABYDbOjejc+ZEhL8XljPe9uuLIc+yybb9BZMFbVdNZWaMms5OCZjAcz3QWvGfAT2zgdcwTpWfIgEde/MKHy/Yc/B6yhaUS6Kg+tTgOnShTWYJO21KArPRZ0BKW9HYnqcT6A3DZejuH/RAixMjM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=XpjK7lEA; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XpjK7lEA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705428985; 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=JeSTqZcI6r9ZCof/h7CPLjlVy137iejm9AXS9B/fQY8=; b=XpjK7lEAaX7ytEQc5YS5G+9DTx09Zf4E6ZqL5HB911jXzjse3PHvBotubTIeymH8Bjngw/ U28vjbNCO0+KJQLiOk2aMWEwSMEjsmadEqZ3xfUTHdBfLVi7jPDFk1p5Xi6lS8R//NcPsc wBWfMapuAdy0X0skR8IcdKaE5u/Rmjk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-623-8vxCph3kN0qMbGd76xXNhQ-1; Tue, 16 Jan 2024 13:16:23 -0500 X-MC-Unique: 8vxCph3kN0qMbGd76xXNhQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5185E811E9E for ; Tue, 16 Jan 2024 18:16:23 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4D8D1121306 for ; Tue, 16 Jan 2024 18:16:22 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 1/5] mptcp: annotate access for msk keys Date: Tue, 16 Jan 2024 19:16:10 +0100 Message-ID: <1ab56741c6fb79307b91051080db1d2254f28b9c.1705427537.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 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Both the local and the remote key follow the same locking schema, put in place the proper ONCE accessors. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/options.c | 12 ++++++------ net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 6 ++++-- net/mptcp/subflow.c | 10 ++++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index e3e96a49f922..cebbd0bc32aa 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -689,8 +689,8 @@ static bool mptcp_established_options_add_addr(struct s= ock *sk, struct sk_buff * opts->suboptions |=3D OPTION_MPTCP_ADD_ADDR; if (!echo) { MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ADDADDRTX); - opts->ahmac =3D add_addr_generate_hmac(msk->local_key, - msk->remote_key, + opts->ahmac =3D add_addr_generate_hmac(READ_ONCE(msk->local_key), + READ_ONCE(msk->remote_key), &opts->addr); } else { MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ECHOADDTX); @@ -792,7 +792,7 @@ static bool mptcp_established_options_fastclose(struct = sock *sk, =20 *size =3D TCPOLEN_MPTCP_FASTCLOSE; opts->suboptions |=3D OPTION_MPTCP_FASTCLOSE; - opts->rcvr_key =3D msk->remote_key; + opts->rcvr_key =3D READ_ONCE(msk->remote_key); =20 pr_debug("FASTCLOSE key=3D%llu", opts->rcvr_key); MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX); @@ -1100,8 +1100,8 @@ static bool add_addr_hmac_valid(struct mptcp_sock *ms= k, if (mp_opt->echo) return true; =20 - hmac =3D add_addr_generate_hmac(msk->remote_key, - msk->local_key, + hmac =3D add_addr_generate_hmac(READ_ONCE(msk->remote_key), + READ_ONCE(msk->local_key), &mp_opt->addr); =20 pr_debug("msk=3D%p, ahmac=3D%llu, mp_opt->ahmac=3D%llu\n", @@ -1148,7 +1148,7 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) =20 if (unlikely(mp_opt.suboptions !=3D OPTION_MPTCP_DSS)) { if ((mp_opt.suboptions & OPTION_MPTCP_FASTCLOSE) && - msk->local_key =3D=3D mp_opt.rcvr_key) { + READ_ONCE(msk->local_key) =3D=3D mp_opt.rcvr_key) { WRITE_ONCE(msk->rcv_fastclose, true); mptcp_schedule_work((struct sock *)msk); MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSERX); diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 70108854ec9b..9ad672a10c11 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3203,7 +3203,7 @@ struct sock *mptcp_sk_clone_init(const struct sock *s= k, __mptcp_init_sock(nsk); =20 msk =3D mptcp_sk(nsk); - msk->local_key =3D subflow_req->local_key; + WRITE_ONCE(msk->local_key, subflow_req->local_key); msk->token =3D subflow_req->token; msk->in_accept_queue =3D 1; WRITE_ONCE(msk->fully_established, false); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d442d876f465..3af85643328e 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -260,8 +260,10 @@ struct mptcp_data_frag { struct mptcp_sock { /* inet_connection_sock must be the first member */ struct inet_connection_sock sk; - u64 local_key; - u64 remote_key; + u64 local_key; /* protected by the first subflow socket lock + * lockless access read + */ + u64 remote_key; /* same as above */ u64 write_seq; u64 bytes_sent; u64 snd_nxt; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index c34ecadee120..02dab0669cfc 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -75,7 +75,8 @@ static void subflow_req_create_thmac(struct mptcp_subflow= _request_sock *subflow_ =20 get_random_bytes(&subflow_req->local_nonce, sizeof(u32)); =20 - subflow_generate_hmac(msk->local_key, msk->remote_key, + subflow_generate_hmac(READ_ONCE(msk->local_key), + READ_ONCE(msk->remote_key), subflow_req->local_nonce, subflow_req->remote_nonce, hmac); =20 @@ -714,7 +715,8 @@ static bool subflow_hmac_valid(const struct request_soc= k *req, if (!msk) return false; =20 - subflow_generate_hmac(msk->remote_key, msk->local_key, + subflow_generate_hmac(READ_ONCE(msk->remote_key), + READ_ONCE(msk->local_key), subflow_req->remote_nonce, subflow_req->local_nonce, hmac); =20 @@ -1548,8 +1550,8 @@ int __mptcp_subflow_connect(struct sock *sk, const st= ruct mptcp_addr_info *loc, mptcp_pm_get_flags_and_ifindex_by_id(msk, local_id, &flags, &ifindex); subflow->remote_key_valid =3D 1; - subflow->remote_key =3D msk->remote_key; - subflow->local_key =3D msk->local_key; + subflow->remote_key =3D READ_ONCE(msk->remote_key); + subflow->local_key =3D READ_ONCE(msk->local_key); subflow->token =3D msk->token; mptcp_info2sockaddr(loc, &addr, ssk->sk_family); =20 --=20 2.43.0 From nobody Wed May 15 15:18:38 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 D1E371CD23 for ; Tue, 16 Jan 2024 18:16:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428988; cv=none; b=pHTpc8t6QOw2kL5xNp9acQ2/rdiO1tO6KThMAVcY8OhMtPbd7qKylW1VG9MmLTMRmYPaOqpotobYKEL9gFMGmGsChko+TRgPsKyp1ZriYMAND3CBD5JWnaEv+wCl7KprqUk7Op4svaK57VWQJKPbJ86rpJmwOP6Z1d8lRLpkC4A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428988; c=relaxed/simple; bh=sX5FbE8Pbm0Ynp7114CU3ikFv9zcrotQgGAx37goFpg=; h=DKIM-Signature:Received:X-MC-Unique:Received:Received:From:To: Subject:Date:Message-ID:In-Reply-To:References:MIME-Version: X-Scanned-By:X-Mimecast-Spam-Score:X-Mimecast-Originator: Content-Transfer-Encoding:Content-Type; b=uOdhb02K7W6ePf/Arg3QsV4mBWsbQnc0QUTW9LKQZMaKDW/nPpIXSTf5LDE4uWc3ch31cOvuKWrKIVFRdMRdYGkQQDfxJEWVgpM3p7PUTIFFYQtHp6X3t0lqP/10K+e35+jRKOa5whivzkSajHBGfqFT6pOWgVcNyNc9rZ6WXAg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=bLsOvrxJ; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bLsOvrxJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705428985; 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=FT09gDIvluUFxbY3kzwRCZoIX35ySbqgC6jLcmu8Qv8=; b=bLsOvrxJGEDuBiOzEI1NOuw1lvoQyiURKBrc5eiJeFtae4i754H4jt4VvcaWetlwoCL7ci Go0GqP2pFq/PPNb4ARID4DcWorCcPUaZoLzgCyyWCWvd16siM6V42YcDsplvDOcYAWFcAw /5VzaZAkVWHAXCP6pwagsuPmbIgYf2k= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-159-tzQnuWBbNSulgndgxCAovA-1; Tue, 16 Jan 2024 13:16:24 -0500 X-MC-Unique: tzQnuWBbNSulgndgxCAovA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 173773869142 for ; Tue, 16 Jan 2024 18:16:24 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AF101121306 for ; Tue, 16 Jan 2024 18:16:23 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 2/5] mptcp: annotate lockless access for the tx path Date: Tue, 16 Jan 2024 19:16:11 +0100 Message-ID: <92930a7b962611507f4bb87671d97f526ece5952.1705427537.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 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The mptcp-level TX path info (write_seq, bytes_sent, snd_nxt) are under the msk socket lock protection, and are accessed lockless in a few spots. Always mark the write operations with WRITE_ONCE, read operations outside the lock with READ_ONCE and drop the annotation for read under such lock. To simplify the annotations move mptcp_pending_data_fin_ack() from __mptcp_data_acked() to __mptcp_clean_una(), under the msk socket lock, where such call would belong. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/options.c | 2 +- net/mptcp/protocol.c | 14 ++++++-------- net/mptcp/protocol.h | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index cebbd0bc32aa..51b00d7e7c89 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1061,7 +1061,7 @@ static void ack_update_msk(struct mptcp_sock *msk, msk->wnd_end =3D new_wnd_end; =20 /* this assumes mptcp_incoming_options() is invoked after tcp_ack() */ - if (after64(msk->wnd_end, READ_ONCE(msk->snd_nxt))) + if (after64(msk->wnd_end, snd_nxt)) __mptcp_check_push(sk, ssk); =20 if (after64(new_snd_una, old_snd_una)) { diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9ad672a10c11..679d4576d2c1 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1033,13 +1033,14 @@ static void __mptcp_clean_una(struct sock *sk) msk->recovery =3D false; =20 out: - if (snd_una =3D=3D READ_ONCE(msk->snd_nxt) && - snd_una =3D=3D READ_ONCE(msk->write_seq)) { + if (snd_una =3D=3D msk->snd_nxt && snd_una =3D=3D msk->write_seq) { if (mptcp_rtx_timer_pending(sk) && !mptcp_data_fin_enabled(msk)) mptcp_stop_rtx_timer(sk); } else { mptcp_reset_rtx_timer(sk); } + if (mptcp_pending_data_fin_ack(sk)) + mptcp_schedule_work(sk); } =20 static void __mptcp_clean_una_wakeup(struct sock *sk) @@ -1499,7 +1500,7 @@ static void mptcp_update_post_push(struct mptcp_sock = *msk, */ if (likely(after64(snd_nxt_new, msk->snd_nxt))) { msk->bytes_sent +=3D snd_nxt_new - msk->snd_nxt; - msk->snd_nxt =3D snd_nxt_new; + WRITE_ONCE(msk->snd_nxt, snd_nxt_new); } } =20 @@ -3210,8 +3211,8 @@ struct sock *mptcp_sk_clone_init(const struct sock *s= k, if (mp_opt->suboptions & OPTION_MPTCP_CSUMREQD) WRITE_ONCE(msk->csum_enabled, true); =20 - msk->write_seq =3D subflow_req->idsn + 1; - msk->snd_nxt =3D msk->write_seq; + WRITE_ONCE(msk->write_seq, subflow_req->idsn + 1); + WRITE_ONCE(msk->snd_nxt, msk->write_seq); msk->snd_una =3D msk->write_seq; msk->wnd_end =3D msk->snd_nxt + req->rsk_rcv_wnd; msk->setsockopt_seq =3D mptcp_sk(sk)->setsockopt_seq; @@ -3316,9 +3317,6 @@ void __mptcp_data_acked(struct sock *sk) __mptcp_clean_una(sk); else __set_bit(MPTCP_CLEAN_UNA, &mptcp_sk(sk)->cb_flags); - - if (mptcp_pending_data_fin_ack(sk)) - mptcp_schedule_work(sk); } =20 void __mptcp_check_push(struct sock *sk, struct sock *ssk) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 3af85643328e..d05ec76dd7c2 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -402,7 +402,7 @@ static inline struct mptcp_data_frag *mptcp_rtx_head(st= ruct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); =20 - if (msk->snd_una =3D=3D READ_ONCE(msk->snd_nxt)) + if (msk->snd_una =3D=3D msk->snd_nxt) return NULL; =20 return list_first_entry_or_null(&msk->rtx_queue, struct mptcp_data_frag, = list); --=20 2.43.0 From nobody Wed May 15 15:18:38 2024 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 B11191CD1B for ; Tue, 16 Jan 2024 18:16:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428989; cv=none; b=HHktR06uqve/2R/bOxrq9pgGAKyhmHOixLpRx6QUA+YAjmg97/L8pjfDsam5pMKJhZYT4cYXaF+mICMVG7Fdv5naCh+8a1ErTgEmbo9kH4BYp7NtyXwa7McDJ/gg8Kb6ur9lw9KFEXlLEDEpFq3EUPXH5BZ8sqB6coIDOy7aKe4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428989; c=relaxed/simple; bh=y+7fepVWg86hWUrppBQKM+NamxBRB/xvWHMfEJv/MJQ=; h=DKIM-Signature:Received:X-MC-Unique:Received:Received:From:To: Subject:Date:Message-ID:In-Reply-To:References:MIME-Version: X-Scanned-By:X-Mimecast-Spam-Score:X-Mimecast-Originator: Content-Transfer-Encoding:Content-Type; b=EReaQLJurS1x4Zr6sqkoE3fYDuHlegCjmrpYX4uGNAq//2eVCUjV52wz4Zyugha+AOeRi+YAF9PJ9wT21v/dy+b7hC5qUK5Y1KainsPdjPVLKXipoBV5xioCj42wPZrcuhBI7PcpC+iPkFuZ4r/X6GLrh4xWJMklrnS9MzFXtFw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Js/CDT0V; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Js/CDT0V" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705428986; 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=bub5QgJl/76M9NKFacI0j+kLeA11yHpnDb3Puq8YKE8=; b=Js/CDT0V2coul/7YYDLUW21kVgALuc4BKg0yWMymIIkAkVh/GBb6IfEjr/qr+8mebEkgQd noVc3DbA7IhziJZmA9G0r8DNwqYbrKXTM/zhE/+2YHXYiBwKVkV1zpSBFj/unnFevBfM1K C6fyyAWXO1o9Ggzq1cmcL+qUiMnXQMA= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-418-l3zYHLiwORS6mGLIKcAGqw-1; Tue, 16 Jan 2024 13:16:25 -0500 X-MC-Unique: l3zYHLiwORS6mGLIKcAGqw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CD5173869141 for ; Tue, 16 Jan 2024 18:16:24 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C1431121306 for ; Tue, 16 Jan 2024 18:16:24 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 3/5] mptcp: annotate lockless access for RX path fields. Date: Tue, 16 Jan 2024 19:16:12 +0100 Message-ID: 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 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The following fields: ack_seq snd_una wnd_end rmem_fwd_alloc are protected by the data lock end accessed lockless in a few spots. Ensure ONCE annotation for write (under such lock) and for lockless read. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/options.c | 6 +++--- net/mptcp/protocol.c | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 51b00d7e7c89..23e317ffc901 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1031,7 +1031,7 @@ u64 __mptcp_expand_seq(u64 old_seq, u64 cur_seq) static void __mptcp_snd_una_update(struct mptcp_sock *msk, u64 new_snd_una) { msk->bytes_acked +=3D new_snd_una - msk->snd_una; - msk->snd_una =3D new_snd_una; + WRITE_ONCE(msk->snd_una, new_snd_una); } =20 static void ack_update_msk(struct mptcp_sock *msk, @@ -1058,7 +1058,7 @@ static void ack_update_msk(struct mptcp_sock *msk, new_wnd_end =3D new_snd_una + tcp_sk(ssk)->snd_wnd; =20 if (after64(new_wnd_end, msk->wnd_end)) - msk->wnd_end =3D new_wnd_end; + WRITE_ONCE(msk->wnd_end, new_wnd_end); =20 /* this assumes mptcp_incoming_options() is invoked after tcp_ack() */ if (after64(msk->wnd_end, snd_nxt)) @@ -1072,7 +1072,7 @@ static void ack_update_msk(struct mptcp_sock *msk, =20 trace_ack_update_msk(mp_opt->data_ack, old_snd_una, new_snd_una, - new_wnd_end, msk->wnd_end); + new_wnd_end, READ_ONCE(msk->wnd_end)); } =20 bool mptcp_update_rcv_data_fin(struct mptcp_sock *msk, u64 data_fin_seq, b= ool use_64bit) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 679d4576d2c1..35a5a2f54362 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -410,6 +410,7 @@ static void mptcp_close_wake_up(struct sock *sk) sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN); } =20 +/* called under the msk socket lock */ static bool mptcp_pending_data_fin_ack(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); @@ -441,16 +442,17 @@ static void mptcp_check_data_fin_ack(struct sock *sk) } } =20 +/* can be called with no lock acquired */ static bool mptcp_pending_data_fin(struct sock *sk, u64 *seq) { struct mptcp_sock *msk =3D mptcp_sk(sk); =20 if (READ_ONCE(msk->rcv_data_fin) && - ((1 << sk->sk_state) & + ((1 << inet_sk_state_load(sk)) & (TCPF_ESTABLISHED | TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2))) { u64 rcv_data_fin_seq =3D READ_ONCE(msk->rcv_data_fin_seq); =20 - if (msk->ack_seq =3D=3D rcv_data_fin_seq) { + if (READ_ONCE(msk->ack_seq) =3D=3D rcv_data_fin_seq) { if (seq) *seq =3D rcv_data_fin_seq; =20 @@ -748,7 +750,7 @@ static bool __mptcp_ofo_queue(struct mptcp_sock *msk) __skb_queue_tail(&sk->sk_receive_queue, skb); } msk->bytes_received +=3D end_seq - msk->ack_seq; - msk->ack_seq =3D end_seq; + WRITE_ONCE(msk->ack_seq, end_seq); moved =3D true; } return moved; @@ -985,6 +987,7 @@ static void dfrag_clear(struct sock *sk, struct mptcp_d= ata_frag *dfrag) put_page(dfrag->page); } =20 +/* called under both the msk socket lock and the data lock */ static void __mptcp_clean_una(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); @@ -2115,7 +2118,7 @@ static unsigned int mptcp_inq_hint(const struct sock = *sk) =20 skb =3D skb_peek(&msk->receive_queue); if (skb) { - u64 hint_val =3D msk->ack_seq - MPTCP_SKB_CB(skb)->map_seq; + u64 hint_val =3D READ_ONCE(msk->ack_seq) - MPTCP_SKB_CB(skb)->map_seq; =20 if (hint_val >=3D INT_MAX) return INT_MAX; @@ -2762,7 +2765,7 @@ static void __mptcp_init_sock(struct sock *sk) __skb_queue_head_init(&msk->receive_queue); msk->out_of_order_queue =3D RB_ROOT; msk->first_pending =3D NULL; - msk->rmem_fwd_alloc =3D 0; + WRITE_ONCE(msk->rmem_fwd_alloc, 0); WRITE_ONCE(msk->rmem_released, 0); msk->timer_ival =3D TCP_RTO_MIN; msk->scaling_ratio =3D TCP_DEFAULT_SCALING_RATIO; @@ -2978,7 +2981,7 @@ static void __mptcp_destroy_sock(struct sock *sk) =20 sk->sk_prot->destroy(sk); =20 - WARN_ON_ONCE(msk->rmem_fwd_alloc); + WARN_ON_ONCE(READ_ONCE(msk->rmem_fwd_alloc)); WARN_ON_ONCE(msk->rmem_released); sk_stream_kill_queues(sk); xfrm_sk_free_policy(sk); @@ -3213,8 +3216,8 @@ struct sock *mptcp_sk_clone_init(const struct sock *s= k, =20 WRITE_ONCE(msk->write_seq, subflow_req->idsn + 1); WRITE_ONCE(msk->snd_nxt, msk->write_seq); - msk->snd_una =3D msk->write_seq; - msk->wnd_end =3D msk->snd_nxt + req->rsk_rcv_wnd; + WRITE_ONCE(msk->snd_una, msk->write_seq); + WRITE_ONCE(msk->wnd_end, msk->snd_nxt + req->rsk_rcv_wnd); msk->setsockopt_seq =3D mptcp_sk(sk)->setsockopt_seq; mptcp_init_sched(msk, mptcp_sk(sk)->sched); =20 --=20 2.43.0 From nobody Wed May 15 15:18:38 2024 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 D38651CD23 for ; Tue, 16 Jan 2024 18:16:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428990; cv=none; b=WWoHZB/uwfpb7oFgpR/h5Mlo+Y1K9PdvEWUAKQALVwVzF7XOaU8aKd8m3HxZL4lZ4p7XgYxFG2grRLtpj3VO4hGYqJxRuCENlNTegmuZib5iXtiO12awzMhjG3sx+tKwIn9YMJF8K5l6vYdhH9WmG7iqRrJOTwy4mdLVi78ZjXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428990; c=relaxed/simple; bh=MTLFm9hy0u18Giy81s2uUgwMftTeGx8gRb8NLHOghcg=; h=DKIM-Signature:Received:X-MC-Unique:Received:Received:From:To: Subject:Date:Message-ID:In-Reply-To:References:MIME-Version: X-Scanned-By:X-Mimecast-Spam-Score:X-Mimecast-Originator: Content-Transfer-Encoding:Content-Type; b=hkTO4RHoUsf5fBmbdUGetPTt5nytauKbNgriC4ofD/0NDKBRH6UYQbdeRkVzHP2TjuRbB/hFpeex8lKR/GUb0uvZjLtePE8zkZTHVcf9wTvIPdP+X2fhMk/IJYUH0AKOA8KRnkr5FwuYXuE37yKTRf42uqB11nMlmBY9eQdfnmE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=bePRVRp6; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bePRVRp6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705428987; 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=aeH3i+LMQzJ6zLjyH4dQUtoqKhfiePEKF2Etnvrjzw0=; b=bePRVRp6tig95F+TkP/A5W6YDnRQW2KsPMcQ049zI+itACBR3wJ1nsMbunqJE7kVLbppP6 7f+J37HOEP2FCp9oDXIJJriKj9fayb7u4X20UjfRAo8wQAM+zK4W+xMffBj5J3oEzKA+Ch bPjVGpVj832Thh7oMcohbp15QYIf/u4= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-490-54X1yzK6MqOvF7g-5sbXbg-1; Tue, 16 Jan 2024 13:16:25 -0500 X-MC-Unique: 54X1yzK6MqOvF7g-5sbXbg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D8C23C0F19A for ; Tue, 16 Jan 2024 18:16:25 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D30E1121306 for ; Tue, 16 Jan 2024 18:16:24 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 4/5] mptcp: annotate lockless access for token Date: Tue, 16 Jan 2024 19:16:13 +0100 Message-ID: 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 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The token field is manipulated under the msk socket lock and accessed lockless in a few spots, add proper ONCE annotation Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/pm.c | 2 +- net/mptcp/pm_netlink.c | 10 +++++----- net/mptcp/protocol.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 4ae19113b8eb..53e0b08b1123 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -77,7 +77,7 @@ void mptcp_pm_new_connection(struct mptcp_sock *msk, cons= t struct sock *ssk, int { struct mptcp_pm_data *pm =3D &msk->pm; =20 - pr_debug("msk=3D%p, token=3D%u side=3D%d", msk, msk->token, server_side); + pr_debug("msk=3D%p, token=3D%u side=3D%d", msk, READ_ONCE(msk->token), se= rver_side); =20 WRITE_ONCE(pm->server_side, server_side); mptcp_event(MPTCP_EVENT_CREATED, msk, ssk, GFP_ATOMIC); diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 287a60381eae..d9ad45959219 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1997,7 +1997,7 @@ static int mptcp_event_put_token_and_ssk(struct sk_bu= ff *skb, const struct mptcp_subflow_context *sf; u8 sk_err; =20 - if (nla_put_u32(skb, MPTCP_ATTR_TOKEN, msk->token)) + if (nla_put_u32(skb, MPTCP_ATTR_TOKEN, READ_ONCE(msk->token))) return -EMSGSIZE; =20 if (mptcp_event_add_subflow(skb, ssk)) @@ -2055,7 +2055,7 @@ static int mptcp_event_created(struct sk_buff *skb, const struct mptcp_sock *msk, const struct sock *ssk) { - int err =3D nla_put_u32(skb, MPTCP_ATTR_TOKEN, msk->token); + int err =3D nla_put_u32(skb, MPTCP_ATTR_TOKEN, READ_ONCE(msk->token)); =20 if (err) return err; @@ -2083,7 +2083,7 @@ void mptcp_event_addr_removed(const struct mptcp_sock= *msk, uint8_t id) if (!nlh) goto nla_put_failure; =20 - if (nla_put_u32(skb, MPTCP_ATTR_TOKEN, msk->token)) + if (nla_put_u32(skb, MPTCP_ATTR_TOKEN, READ_ONCE(msk->token))) goto nla_put_failure; =20 if (nla_put_u8(skb, MPTCP_ATTR_REM_ID, id)) @@ -2118,7 +2118,7 @@ void mptcp_event_addr_announced(const struct sock *ss= k, if (!nlh) goto nla_put_failure; =20 - if (nla_put_u32(skb, MPTCP_ATTR_TOKEN, msk->token)) + if (nla_put_u32(skb, MPTCP_ATTR_TOKEN, READ_ONCE(msk->token))) goto nla_put_failure; =20 if (nla_put_u8(skb, MPTCP_ATTR_REM_ID, info->id)) @@ -2234,7 +2234,7 @@ void mptcp_event(enum mptcp_event_type type, const st= ruct mptcp_sock *msk, goto nla_put_failure; break; case MPTCP_EVENT_CLOSED: - if (nla_put_u32(skb, MPTCP_ATTR_TOKEN, msk->token) < 0) + if (nla_put_u32(skb, MPTCP_ATTR_TOKEN, READ_ONCE(msk->token)) < 0) goto nla_put_failure; break; case MPTCP_EVENT_ANNOUNCED: diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 35a5a2f54362..bc472f1294e1 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3208,7 +3208,7 @@ struct sock *mptcp_sk_clone_init(const struct sock *s= k, =20 msk =3D mptcp_sk(nsk); WRITE_ONCE(msk->local_key, subflow_req->local_key); - msk->token =3D subflow_req->token; + WRITE_ONCE(msk->token, subflow_req->token); msk->in_accept_queue =3D 1; WRITE_ONCE(msk->fully_established, false); if (mp_opt->suboptions & OPTION_MPTCP_CSUMREQD) --=20 2.43.0 From nobody Wed May 15 15:18:38 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 183F71CD28 for ; Tue, 16 Jan 2024 18:16:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428991; cv=none; b=odQOUwcJz3cwETzUDsa3tPJiJbjzbq9B+RducTe/5uzK9ArOPKl5VCsMKhRpM/HSkmtxLyTM5cHIq3UgkxGkBqd+oYHRK0rByTrk8fzf7zdYFUnZh1J7UVnu87Ww2I3PhtenCpMmFpMbZ81XpIzr0Vp4+zSx+tZqTIJaqoaPlmk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705428991; c=relaxed/simple; bh=2zzc5B7C9WvsTcfmq0/eBm9mkqKNXmlc922j9Jw9xVc=; h=DKIM-Signature:Received:X-MC-Unique:Received:Received:From:To: Subject:Date:Message-ID:In-Reply-To:References:MIME-Version: X-Scanned-By:X-Mimecast-Spam-Score:X-Mimecast-Originator: Content-Transfer-Encoding:Content-Type; b=LF9TGrpVQd09E80UiYARP0kDrDEbjBLcfMrXETwFoPiT3I5HAn1K58ablYHwLJ6LmVDKRCl/paXT96OD5CoPmG4YIipZa5e9g/ClA7nPXEoow3NkspKy0RB2ZsvWa7tWnJWUaV72oettidfpUG2b+jQkNZ4f4SohxikTgcq5bnI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FWgxjTG/; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FWgxjTG/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705428988; 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=g62sdjsj0410fQnTGPvmV4Nc6x9d5pW53LC0rzjTZRY=; b=FWgxjTG/Tu/5zhAr78SnE3qkLVu1munCabdCJTQeF4Ahs2VnV1qLPgXSSi6XXGnYyPxfyl YBBKAbR6DQQro7KAfbyw1J3wWLpMuUvrsEfX2OsSots06xGHSxKLIGkf/pZKkKjUspO1Dw 1OqEediKELtBs1awyHTtoZR5mW8z+JM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-3jPGCAZXPuSTZMdkbZQm3g-1; Tue, 16 Jan 2024 13:16:26 -0500 X-MC-Unique: 3jPGCAZXPuSTZMdkbZQm3g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4E280890F60 for ; Tue, 16 Jan 2024 18:16:26 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id D25E01121306 for ; Tue, 16 Jan 2024 18:16:25 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 5/5] mptcp: annotate lockless accesses around read-mostly fields Date: Tue, 16 Jan 2024 19:16:14 +0100 Message-ID: <4f4ba04c46b432b5f2a95bb75d85912bcb937cfb.1705427537.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 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The following MPTCP socket fieds: can_ack fully_established rcv_data_fin snd_data_fin_enable rcv_fastclose use_64bit_ack are accessed without any lock, add the appropriate annotation. The schema is safe as each field can change its value at most once in the whole mptcp socket life cycle. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 14 +++++++------- net/mptcp/sockopt.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index bc472f1294e1..744b4d6f15f4 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3156,16 +3156,16 @@ static int mptcp_disconnect(struct sock *sk, int fl= ags) WRITE_ONCE(msk->flags, 0); msk->cb_flags =3D 0; msk->recovery =3D false; - msk->can_ack =3D false; - msk->fully_established =3D false; - msk->rcv_data_fin =3D false; - msk->snd_data_fin_enable =3D false; - msk->rcv_fastclose =3D false; - msk->use_64bit_ack =3D false; - msk->bytes_consumed =3D 0; + WRITE_ONCE(msk->can_ack, false); + WRITE_ONCE(msk->fully_established, false); + WRITE_ONCE(msk->rcv_data_fin, false); + WRITE_ONCE(msk->snd_data_fin_enable, false); + WRITE_ONCE(msk->rcv_fastclose, false); + WRITE_ONCE(msk->use_64bit_ack, false); WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk))); mptcp_pm_data_reset(msk); mptcp_ca_reset(sk); + msk->bytes_consumed =3D 0; msk->bytes_acked =3D 0; msk->bytes_received =3D 0; msk->bytes_sent =3D 0; diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index c40f1428e602..da37e4541a5d 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -942,7 +942,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struc= t mptcp_info *info) mptcp_data_unlock(sk); =20 slow =3D lock_sock_fast(sk); - info->mptcpi_csum_enabled =3D msk->csum_enabled; + info->mptcpi_csum_enabled =3D READ_ONCE(msk->csum_enabled); info->mptcpi_token =3D msk->token; info->mptcpi_write_seq =3D msk->write_seq; info->mptcpi_retransmits =3D inet_csk(sk)->icsk_retransmits; --=20 2.43.0