From nobody Thu Sep 18 08:18:36 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp209392uab; Wed, 15 Jun 2022 13:28:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uYSs/ZtAqmhh/bc/LrB8sKZFMZ+Yoi7AgUYgHMY7qdSNUEQ7fB6zrT/hJ69PPnIW5Q0Gn5 X-Received: by 2002:a17:90b:33c5:b0:1e3:e57a:8998 with SMTP id lk5-20020a17090b33c500b001e3e57a8998mr1281878pjb.54.1655324908269; Wed, 15 Jun 2022 13:28:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655324908; cv=none; d=google.com; s=arc-20160816; b=JdSbcLiTeRvcMTMho9RWJEJuXu9kBpGg+XJ9U6fMFfQVQ1QcMafxlDZHfTS7MEAvuM yh5EG6OS9zxf7OIA6j1wqVttS+Ww/YHzfdQG8JUZjL2O8RuIWRyHdTJ3IBhTV7NOF9Mu M07Du4kn9ODmMhR3A/VENvH2fi2Qe1m6Fc07dSqfqLeNf+WpnbyOQy4BjrNZUVy6c4f8 A3GQfiZ8C4NiJGmQ3DE1Eid8hc/yxWcuYLmtPoZkkenybsS+Mov9BKGfD8jphTheJge+ 62zS0w5kZcE7Lv2OxZyqfweCzFliF6Oh/iODHx+/kry08x3qwDbkNUTNS/Ak2ruK7+J6 XO4Q== 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:to:from:dkim-signature; bh=QyEw0Hxej3KhuemgaxQYg9IJahwM7VHtKclJqGNymzw=; b=ZYOpa6wS6wRbMuRZZ9zV8IjEs1MqjbfhSyLvUf/BDH2rie9wKO93sjeWmAIT4XG84n slml/HvkmZifP/VamZIRyMmcUdsVswi8E0rpsthJSidTj2iumXpuHMFCLIffp6pHOE0q hyyoTDmLVeMVw4uPSY6ZVwNyVtu4lm3PEiczOnnqxya+mkkR8zBZ0icD5LB8tJEWRL6d FUAwYCjatfEFPJde4aDJmLwVagq/krT5mJRFC0CGeOhW6oHvq8eu0nChNO3RQXrAh2VH jlAccjhalfvCRJnmhC1M9ZGe2OJ3+gYW3tptMQoRwB6rT9bZ1fqqfPP6u6KlzV8e64tt jwAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WdIfNpFa; spf=pass (google.com: domain of mptcp+bounces-5660-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5660-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id h14-20020a170902f54e00b0016784cc2e16si131670plf.393.2022.06.15.13.28.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2022 13:28:28 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5660-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WdIfNpFa; spf=pass (google.com: domain of mptcp+bounces-5660-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5660-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 62F19280A83 for ; Wed, 15 Jun 2022 20:28:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 696B23D9A; Wed, 15 Jun 2022 20:28:26 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 1F6B97A for ; Wed, 15 Jun 2022 20:28:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655324904; 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=QyEw0Hxej3KhuemgaxQYg9IJahwM7VHtKclJqGNymzw=; b=WdIfNpFaGu8y85j5K7i2xxKkQFWKLHlYRTNWfmFk3r/5HNlEa800OayVO28l0BOVB9Scf9 7ZsfB1BW/pm7m441TfZNjfoe+XLmUzbMz9IZ3nA9NRWtXdtT8usxFgB21wt/Cn27NfoTf/ NRaXCPL35U3lJH8/3/0U7wDey3kf5oM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-183-n6HjqHW8PEKvQPzI8tUMLA-1; Wed, 15 Jun 2022 16:28:23 -0400 X-MC-Unique: n6HjqHW8PEKvQPzI8tUMLA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C36303C0D850 for ; Wed, 15 Jun 2022 20:28:22 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53C8340C1289 for ; Wed, 15 Jun 2022 20:28:22 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-net v2 2/6] mptcp: introduce MAPPING_BAD_CSUM Date: Wed, 15 Jun 2022 22:28:09 +0200 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 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com 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" This allow moving a couple of conditional out of the fast path, making the code more easy to follow and will simplify the next patch. Signed-off-by: Paolo Abeni --- net/mptcp/subflow.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 57d2d8d933d0..98b12a9c4eb5 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -843,7 +843,8 @@ enum mapping_status { MAPPING_INVALID, MAPPING_EMPTY, MAPPING_DATA_FIN, - MAPPING_DUMMY + MAPPING_DUMMY, + MAPPING_BAD_CSUM }; =20 static void dbg_bad_map(struct mptcp_subflow_context *subflow, u32 ssn) @@ -958,9 +959,7 @@ static enum mapping_status validate_data_csum(struct so= ck *ssk, struct sk_buff * subflow->map_data_csum); if (unlikely(csum)) { MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR); - if (subflow->mp_join || subflow->valid_csum_seen) - subflow->send_mp_fail =3D 1; - return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY; + return MAPPING_BAD_CSUM; } =20 subflow->valid_csum_seen =3D 1; @@ -1178,10 +1177,8 @@ static bool subflow_check_data_avail(struct sock *ss= k) =20 status =3D get_mapping_status(ssk, msk); trace_subflow_check_data_avail(status, skb_peek(&ssk->sk_receive_queue)); - if (unlikely(status =3D=3D MAPPING_INVALID)) - goto fallback; - - if (unlikely(status =3D=3D MAPPING_DUMMY)) + if (unlikely(status =3D=3D MAPPING_INVALID || status =3D=3D MAPPING_DUMM= Y || + status =3D=3D MAPPING_BAD_CSUM)) goto fallback; =20 if (status !=3D MAPPING_OK) @@ -1223,7 +1220,10 @@ static bool subflow_check_data_avail(struct sock *ss= k) fallback: if (!__mptcp_check_fallback(msk)) { /* RFC 8684 section 3.7. */ - if (subflow->send_mp_fail) { + if (status =3D=3D MAPPING_BAD_CSUM && + ((subflow->mp_join || subflow->valid_csum_seen))) { + subflow->send_mp_fail =3D 1; + if (!READ_ONCE(msk->allow_infinite_fallback)) { ssk->sk_err =3D EBADMSG; tcp_set_state(ssk, TCP_CLOSE); --=20 2.35.3