From mboxrd@z Thu Jan 1 00:00:00 1970 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 5C09B74438 for ; Mon, 8 Apr 2024 11:47:34 +0000 (UTC) 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=1712576857; cv=none; b=BhA7KJgsT77XikkjcgmzeWgNqFpL9PkjjsXHaBDSuZrWVO+GAW5XDY/82nysPeR8mx6u3ZJ10XhIVj7X4GAYEcAfgRCozD19oz357j2AXDcpHPv1Hvcxi07eooZVMues3Lxsqr+G7tB4kX0rjvJ10ZMkoLf2EKRgNRf1JtMeAo4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712576857; c=relaxed/simple; bh=6loouzCPXAhtFaeI3w4dkAcAgjiCNdqi22ANQxAQZto=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: MIME-Version:Content-Type; b=W/Vcpt4jGAjNJ57OPChARQXwGbpBWvS/1n6fE/wjDePst0745RKQEt2slmmYBXjKVgZHVHUWJNoDt8bZNpftGXSG1nUz69ZLhKqUM6oEXOG0wkUN41rrrzK/c5tzTJac3vRJk5YT6fubpsnzvbq3FeZsDZH5CMuH1RGAktdOghI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ZW1BfEO5; arc=none smtp.client-ip=170.10.129.124 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; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZW1BfEO5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712576854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=5AN7OJSAOkUxd5uyxyQDkly7enfRiMdkFL6yExt5AvY=; b=ZW1BfEO5IHCjt8xeLmj+E81gfk1sJmmPoVRZpOkvpd40hVCEbHr+T+XYrsrBRICrfG4dXN +cjdzOeOr8AKqMuTS2LEjn5+3eA0uiYej2Gp6Gr13TiKtiJtDtbXnU7DniXogtQCR0WtFx gm8kCAwtjznS+h2TgwOBshjbRiopzFo= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-29--Hmc4x-cOh6_twXQ7Y_rCA-1; Mon, 08 Apr 2024 07:47:32 -0400 X-MC-Unique: -Hmc4x-cOh6_twXQ7Y_rCA-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-78a5e62931cso59220085a.0 for ; Mon, 08 Apr 2024 04:47:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712576852; x=1713181652; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:cc:to:from:subject:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tAyZusgXC+hi0oZxmqmMT7xPpLcaN6WvuFyr8mteK+Y=; b=GW6mTxS9ZBSwwPc8weVDlG5G6x6qp+rc7G1xehrMOuoHKXaT2pmQPM024cA+qfwY3r GXBWhmKNYFgSAvDiXIhqe+yVwZ/tdfIbqcsNV38WEbtFL1qMmKyNDfDUKjCKNhRTYrSh dIFDrXU/jx4MzJyg7f3qaGk1CNRYEfg++NBOIfsDS12mt9P5EKirHWMj4sqEC/h0sm01 2JcQyiVUgFlURucDpYtNLx6k/fF5+TJRLkXVkvq7FE0ktQUoBxVcw8DOJUMFjf0AScJ1 K3UXcqWI7epWdV4D8Nfiz+/VfPOHUozIIOW+MxiwE6bIFHziWhyLQ0/5t0TJSl/++dUe Kvag== X-Gm-Message-State: AOJu0YxUJv5gSnAU/BE4LLvXaMTp6/2f240mvDZZsK7oVzjGfvnmYttI OJtxF4LKJp4NIJBbCyEBIqOivoQWv8YBPtJtnTL/GKwsiTNDEoLhtY8WmJHs+KWXu+FY85KrqKh wmrRk3jL0+NN7HSJQQkS2Qe0IXNDwXLaBPrpp0PIvdC/GE4a25mf6 X-Received: by 2002:a05:620a:1793:b0:78d:67a6:4f34 with SMTP id ay19-20020a05620a179300b0078d67a64f34mr1824146qkb.2.1712576852503; Mon, 08 Apr 2024 04:47:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNkGVrA+Hr/hJmtk/0L2G4hIFkN7pbCA1+3V1qW/+LmTvTY7tEHRpQv57nY8bma7By4p9NOg== X-Received: by 2002:a05:620a:1793:b0:78d:67a6:4f34 with SMTP id ay19-20020a05620a179300b0078d67a64f34mr1824125qkb.2.1712576852155; Mon, 08 Apr 2024 04:47:32 -0700 (PDT) Received: from gerbillo.redhat.com (146-241-253-22.dyn.eolo.it. [146.241.253.22]) by smtp.gmail.com with ESMTPSA id b3-20020a05620a088300b0078d342e3710sm3134161qka.110.2024.04.08.04.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 04:47:31 -0700 (PDT) Message-ID: <25b2e5fd1d63fc21c6f52fe6adebdbd63f9907fb.camel@redhat.com> Subject: Re: [PATCH net-next v2] mptcp: add reset reason options in some places From: Paolo Abeni To: Jason Xing , davem@davemloft.net, edumazet@google.com, kuba@kernel.org, matttbe@kernel.org, martineau@kernel.org, geliang@kernel.org Cc: mptcp@lists.linux.dev, netdev@vger.kernel.org, Jason Xing Date: Mon, 08 Apr 2024 13:47:28 +0200 In-Reply-To: <20240406014848.71739-1-kerneljasonxing@gmail.com> References: <20240406014848.71739-1-kerneljasonxing@gmail.com> Autocrypt: addr=pabeni@redhat.com; prefer-encrypt=mutual; keydata=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 User-Agent: Evolution 3.50.4 (3.50.4-1.fc39) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, 2024-04-06 at 09:48 +0800, Jason Xing wrote: > From: Jason Xing >=20 > The reason codes are handled in two ways nowadays (quoting Mat Martineau)= : > 1. Sending in the MPTCP option on RST packets when there is no subflow > context available (these use subflow_add_reset_reason() and directly call > a TCP-level send_reset function) > 2. The "normal" way via subflow->reset_reason. This will propagate to bot= h > the outgoing reset packet and to a local path manager process via netlink > in mptcp_event_sub_closed() >=20 > RFC 8684 defines the skb reset reason behaviour which is not required > even though in some places: >=20 > A host sends a TCP RST in order to close a subflow or reject > an attempt to open a subflow (MP_JOIN). In order to let the > receiving host know why a subflow is being closed or rejected, > the TCP RST packet MAY include the MP_TCPRST option (Figure 15). > The host MAY use this information to decide, for example, whether > it tries to re-establish the subflow immediately, later, or never. >=20 > Since the commit dc87efdb1a5cd ("mptcp: add mptcp reset option support") > introduced this feature about three years ago, we can fully use it. > There remains some places where we could insert reason into skb as > we can see in this patch. >=20 > Many thanks to Mat and Paolo for help:) >=20 > Signed-off-by: Jason Xing > --- > v2 > Link: https://lore.kernel.org/all/5046e1867c65f39e07822beb0a19a22743b1064= b.camel@redhat.com/ > 1. complete all the possible reset reasons in the subflow_check_req() (Pa= olo) > --- > net/mptcp/subflow.c | 20 +++++++++++++++----- > 1 file changed, 15 insertions(+), 5 deletions(-) >=20 > diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c > index 1626dd20c68f..b7ce2ca1782c 100644 > --- a/net/mptcp/subflow.c > +++ b/net/mptcp/subflow.c > @@ -150,8 +150,10 @@ static int subflow_check_req(struct request_sock *re= q, > =09/* no MPTCP if MD5SIG is enabled on this socket or we may run out of > =09 * TCP option space. > =09 */ > -=09if (rcu_access_pointer(tcp_sk(sk_listener)->md5sig_info)) > +=09if (rcu_access_pointer(tcp_sk(sk_listener)->md5sig_info)) { > +=09=09subflow_add_reset_reason(skb, MPTCP_RST_EMPTCP); > =09=09return -EINVAL; > +=09} > #endif > =20 > =09mptcp_get_options(skb, &mp_opt); > @@ -219,6 +221,7 @@ static int subflow_check_req(struct request_sock *req= , > =09=09=09=09 ntohs(inet_sk((struct sock *)subflow_req->msk)->inet_sport)= ); > =09=09=09if (!mptcp_pm_sport_in_anno_list(subflow_req->msk, sk_listener)= ) { > =09=09=09=09SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MISMATCHPORTSYNRX); > +=09=09=09=09subflow_add_reset_reason(skb, MPTCP_RST_EPROHIBIT); > =09=09=09=09return -EPERM; > =09=09=09} > =09=09=09SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINPORTSYNRX); > @@ -227,10 +230,12 @@ static int subflow_check_req(struct request_sock *r= eq, > =09=09subflow_req_create_thmac(subflow_req); > =20 > =09=09if (unlikely(req->syncookie)) { > -=09=09=09if (mptcp_can_accept_new_subflow(subflow_req->msk)) > -=09=09=09=09subflow_init_req_cookie_join_save(subflow_req, skb); > -=09=09=09else > +=09=09=09if (!mptcp_can_accept_new_subflow(subflow_req->msk)) { > +=09=09=09=09subflow_add_reset_reason(skb, MPTCP_RST_EPROHIBIT); > =09=09=09=09return -EPERM; > +=09=09=09} > + > +=09=09=09subflow_init_req_cookie_join_save(subflow_req, skb); > =09=09} > =20 > =09=09pr_debug("token=3D%u, remote_nonce=3D%u msk=3D%p", subflow_req->to= ken, > @@ -873,13 +878,18 @@ static struct sock *subflow_syn_recv_sock(const str= uct sock *sk, > =09=09=09=09=09 ntohs(inet_sk((struct sock *)owner)->inet_sport)); > =09=09=09=09if (!mptcp_pm_sport_in_anno_list(owner, sk)) { > =09=09=09=09=09SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MISMATCHPORTACKRX); > +=09=09=09=09=09subflow_add_reset_reason(skb, MPTCP_RST_EPROHIBIT); > =09=09=09=09=09goto dispose_child; > =09=09=09=09} > =09=09=09=09SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINPORTACKRX); > =09=09=09} > =20 > -=09=09=09if (!mptcp_finish_join(child)) > +=09=09=09if (!mptcp_finish_join(child)) { > +=09=09=09=09struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(= child); > + > +=09=09=09=09subflow_add_reset_reason(skb, subflow->reset_reason); > =09=09=09=09goto dispose_child; > +=09=09=09} > =20 > =09=09=09SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINACKRX); > =09=09=09tcp_rsk(req)->drop_req =3D true; LGTM, Acked-by: Paolo Abeni