From patchwork Thu May 6 06:39:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1474821 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.dev (client-ip=2604:1380:1000:8100::1; helo=sjc.edge.kernel.org; envelope-from=mptcp+bounces-550-incoming=patchwork.ozlabs.org@lists.linux.dev; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=MIRDmF6H; dkim-atps=neutral Received: from sjc.edge.kernel.org (sjc.edge.kernel.org [IPv6:2604:1380:1000:8100::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FbP8Q1DXrz9sT6 for ; Thu, 6 May 2021 16:40:06 +1000 (AEST) 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 sjc.edge.kernel.org (Postfix) with ESMTPS id 859A83E0F29 for ; Thu, 6 May 2021 06:40:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3695129CA; Thu, 6 May 2021 06:40:03 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E94BC72 for ; Thu, 6 May 2021 06:40:01 +0000 (UTC) Received: by mail-pj1-f47.google.com with SMTP id ge1so2807495pjb.2 for ; Wed, 05 May 2021 23:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vtOUOV4yeQ1B5Q9SExm0XgIDX2qz2MsnQsGRDOzJW/A=; b=MIRDmF6H7yyvhQXAv2M9DJ2+h13ZK7yvhCL3YcjT0c2FetVeiwXak3eRtmbMTIpaXw q0CxH3rXQExqv9qzLgT7iMp0avjgciD1DOyoFy11a4fphUEihA3gYwSonSErCsPHG2OS ng28uddkMZAiDvZMNwLWjj2qyETvtZIiuNv/iBQvDUbKfwUdAocu7EtMErQBH1dDWIic arJ+BoXlrNdoOyaeeXCfIJVpI9nJo8wAdHl0oBDQwVEJ2ADQEtSVv5cLwpzH6UeSNc7J obf9mA29sCtir5e1Lu78hHuM4Y60GbFcdkAoKdaHtaao5HeXbT5XQP6MXjuoEAQbAm73 pyRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vtOUOV4yeQ1B5Q9SExm0XgIDX2qz2MsnQsGRDOzJW/A=; b=iwaqVp9QFtjpbLMyIqMHCjWL5EdasFF4+RW+J9WwrkZ2CUoqHPC/VwyiO4e/qcM7LA Wi9oEc1ycGskiR3rOVQAojTd3xyRE38C5kAXZMKPrM3iAX3ouewyugxGcWYX1NjcOBjf YQiGAQUuKPhbdsVABJ49we9IrmYh16PTleA1xTuSjfQVGC9Io56HbUQZCdifRDIkHXoU fDQZPzDBCj/zvJdcgfTY108LESsbjGHH7vpMZRseblYa4LPMXGhbvxz+B29FprcLAZxq jl02HLbXL5+O9xKJZmz2NWgtOreFn72u9D2hbe3JhP3CNOquC7lizBzOVVZ2u5uqOWLD NIUw== X-Gm-Message-State: AOAM53340rKmCadIwNqB9fzhdOEOt12/dahBLzbaRIdaBzClvdzBXujN 0AWQn5naHOUXPUYeoq+prjj33f59h+k= X-Google-Smtp-Source: ABdhPJzz9jbF8s9IwrXchQgV1BPEmg1bQgiBxJZJ3/+wgYqEset3uSvuvKKg+NPh/IpkvDyNQeu3vQ== X-Received: by 2002:a17:902:a515:b029:eb:2723:3fde with SMTP id s21-20020a170902a515b02900eb27233fdemr2773197plq.56.1620283201422; Wed, 05 May 2021 23:40:01 -0700 (PDT) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id t133sm1130925pgb.0.2021.05.05.23.40.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 23:40:01 -0700 (PDT) From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [MPTCP][PATCH mptcp-next 1/3] mptcp: MP_FAIL suboption sending Date: Thu, 6 May 2021 14:39:51 +0800 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This patch added the MP_FAIL suboption sending support. Add a new flag named send_mp_fail in struct mptcp_subflow_context. If this flag is set, send out MP_FAIL suboption. Add a new member fail_seq in struct mptcp_out_options to save the data sequence number to put into the MP_FAIL suboption. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 1 + net/mptcp/options.c | 46 +++++++++++++++++++++++++++++++++++++++++++- net/mptcp/protocol.h | 4 ++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index cb580b06152f..f48d3b5a3fd4 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -72,6 +72,7 @@ struct mptcp_out_options { u32 nonce; u64 thmac; u32 token; + u64 fail_seq; u8 hmac[20]; struct mptcp_ext ext_copy; #endif diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 4179287bd647..485c5a77e71b 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -777,6 +777,28 @@ static noinline void mptcp_established_options_rst(struct sock *sk, struct sk_bu opts->reset_reason = subflow->reset_reason; } +static bool mptcp_established_options_mp_fail(struct sock *sk, + unsigned int *size, + unsigned int remaining, + struct mptcp_out_options *opts) +{ + struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); + + if (!subflow->send_mp_fail) + return false; + + if (remaining < TCPOLEN_MPTCP_FAIL) + return false; + + *size = TCPOLEN_MPTCP_FAIL; + opts->suboptions |= OPTION_MPTCP_FAIL; + opts->fail_seq = subflow->fail_seq; + + pr_debug("MP_FAIL fail_seq=%llu", opts->fail_seq); + + return true; +} + bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, unsigned int *size, unsigned int remaining, struct mptcp_out_options *opts) @@ -792,8 +814,16 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, if (unlikely(__mptcp_check_fallback(msk))) return false; + if (mptcp_established_options_mp_fail(sk, &opt_size, remaining, opts)) { + *size += opt_size; + remaining -= opt_size; + ret = true; + } + if (unlikely(skb && TCP_SKB_CB(skb)->tcp_flags & TCPHDR_RST)) { - mptcp_established_options_rst(sk, skb, size, remaining, opts); + mptcp_established_options_rst(sk, skb, &opt_size, remaining, opts); + *size += opt_size; + remaining -= opt_size; return true; } @@ -1338,6 +1368,20 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, opts->backup, TCPOPT_NOP); } + if (OPTION_MPTCP_FAIL & opts->suboptions) { + const struct sock *ssk = (const struct sock *)tp; + struct mptcp_subflow_context *subflow; + + subflow = mptcp_subflow_ctx(ssk); + subflow->send_mp_fail = 0; + + *ptr++ = mptcp_option(MPTCPOPT_MP_FAIL, + TCPOLEN_MPTCP_FAIL, + 0, 0); + put_unaligned_be64(opts->fail_seq, ptr); + ptr += 2; + } + if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { *ptr++ = mptcp_option(MPTCPOPT_MP_JOIN, TCPOLEN_MPTCP_MPJ_SYN, diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 41baa2ffc9a9..ff70b3e97dd0 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -26,6 +26,7 @@ #define OPTION_MPTCP_FASTCLOSE BIT(8) #define OPTION_MPTCP_PRIO BIT(9) #define OPTION_MPTCP_RST BIT(10) +#define OPTION_MPTCP_FAIL BIT(11) /* MPTCP option subtypes */ #define MPTCPOPT_MP_CAPABLE 0 @@ -67,6 +68,7 @@ #define TCPOLEN_MPTCP_PRIO_ALIGN 4 #define TCPOLEN_MPTCP_FASTCLOSE 12 #define TCPOLEN_MPTCP_RST 4 +#define TCPOLEN_MPTCP_FAIL 12 #define TCPOLEN_MPTCP_MPC_ACK_DATA_CSUM (TCPOLEN_MPTCP_DSS_CHECKSUM + TCPOLEN_MPTCP_MPC_ACK_DATA) @@ -419,6 +421,7 @@ struct mptcp_subflow_context { mpc_map : 1, backup : 1, send_mp_prio : 1, + send_mp_fail : 1, rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */ @@ -433,6 +436,7 @@ struct mptcp_subflow_context { u8 reset_seen:1; u8 reset_transient:1; u8 reset_reason:4; + u64 fail_seq; long delegated_status; struct list_head delegated_node; /* link into delegated_action, protected by local BH */ From patchwork Thu May 6 06:39:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1474822 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.dev (client-ip=2604:1380:1:3600::1; helo=ewr.edge.kernel.org; envelope-from=mptcp+bounces-551-incoming=patchwork.ozlabs.org@lists.linux.dev; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=R+3hZATY; dkim-atps=neutral Received: from ewr.edge.kernel.org (ewr.edge.kernel.org [IPv6:2604:1380:1:3600::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FbP8W3rjKz9sRf for ; Thu, 6 May 2021 16:40:11 +1000 (AEST) 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 25C751C0D4F for ; Thu, 6 May 2021 06:40:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B6DB329CA; Thu, 6 May 2021 06:40:06 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA1A272 for ; Thu, 6 May 2021 06:40:05 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id m124so4003755pgm.13 for ; Wed, 05 May 2021 23:40:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y7Ozr2aR83j5lpMgMUuDf1OzzgrVuZ5PbSPx9cpiStU=; b=R+3hZATYNEfFogx0FoAmFDYvF93euxAqRxmQPnPTJTX7+8vmfZX936pTUOgu2fByeG nDUZ/wG4rcZu9nJ8v0+XqcEkPxHEB2INRTOefzPyXqnQFOfwmRSETdAbT6HIMYQm81gh TstohE5Dn/c/nCcS/fphV5BMtQADyAeVcOn8IzQXu/C46pWtf3lS8TXJRMksx9Q9ivWb 1KJxblUlwlQ2aXkKgdO365mcU/OPspJCyp0v3pVuFmaKiv+YvgarEsqo6rITAwX/QsTN ghGrxbH6A/IK/nxhDJbTeO290SYj4XNRjaFrJy/xE5aDKJ6nLiGq+5FUyi+uA1iNlELl N2xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y7Ozr2aR83j5lpMgMUuDf1OzzgrVuZ5PbSPx9cpiStU=; b=T0rJT0pBPOqPFOpqcz8x+ZdEZ7dh8e7yvu5ZvN5FCE1qUo71B7utB6XvmW5X0BEudk vIhSYCK8gRp0L2ixI4yb36cLglWIRemtVCpaMfgGOvwJHKCi0ZxWafPOfAMJjmmMEaRD ZXflYNCK6Y1rIdHUvEafsM7bly/94StK3W+oMqz5UKirvNh+YgAX3pP0yYskhbCNy+vn UeGkEnBwhiTTF8Bg2DQhjAIuloxqIbEG7X2aeNoT0sNJlJdWDrcVU9eveKmzdjhc4p6t gk8eYFSe0Y8losAtsMHt3IMuemiGEm1RwzFoYKfb+Jm8TVIl+T7sJlbOlN30UJ+/nBT4 r5Qw== X-Gm-Message-State: AOAM5317bX2NFL7AgsFxM41LnqdxDQw6IDfxxJlph+2JXOOAEkBgQtoZ bp1GDocU2YM2BVRr4hRR2+3QaKUisuw= X-Google-Smtp-Source: ABdhPJxLFUTwIa4WKKITUuqfDKpqzS2hMZbCWAchWL6XHJh5dQqUbjJ3WGeGGItx1Y0T49EgBPTduQ== X-Received: by 2002:a63:ea06:: with SMTP id c6mr2782049pgi.401.1620283205220; Wed, 05 May 2021 23:40:05 -0700 (PDT) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id x62sm1143679pfb.71.2021.05.05.23.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 23:40:05 -0700 (PDT) From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [MPTCP][PATCH mptcp-next 2/3] mptcp: MP_FAIL suboption receiving Date: Thu, 6 May 2021 14:39:52 +0800 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This patch added handling for receiving MP_FAIL suboption. Add a new members mp_fail and fail_seq in struct mptcp_options_received. When MP_FAIL suboption is received, set mp_fail to 1 and save the sequence number to fail_seq. Then invoke mptcp_pm_mp_fail_received to deal with the MP_FAIL suboption. In it, send MP_FAIL + RST and fallback. Signed-off-by: Geliang Tang --- net/mptcp/options.c | 16 ++++++++++++++++ net/mptcp/pm.c | 17 +++++++++++++++++ net/mptcp/protocol.h | 3 +++ 3 files changed, 36 insertions(+) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 485c5a77e71b..9795e3ccf6cc 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -341,6 +341,16 @@ static void mptcp_parse_option(const struct sock *sk, mp_opt->reset_reason = *ptr; break; + case MPTCPOPT_MP_FAIL: + if (opsize != TCPOLEN_MPTCP_FAIL) + break; + + ptr += 2; + mp_opt->mp_fail = 1; + mp_opt->fail_seq = get_unaligned_be64(ptr); + pr_debug("MP_FAIL: data_seq=%llu", mp_opt->fail_seq); + break; + default: break; } @@ -367,6 +377,7 @@ void mptcp_get_options(const struct sock *sk, mp_opt->reset = 0; mp_opt->csum_reqd = 0; mp_opt->deny_join_id0 = 0; + mp_opt->mp_fail = 0; length = (th->doff * 4) - sizeof(struct tcphdr); ptr = (const unsigned char *)(th + 1); @@ -1127,6 +1138,11 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) mp_opt.mp_prio = 0; } + if (mp_opt.mp_fail) { + mptcp_pm_mp_fail_received(sk, mp_opt.fail_seq); + mp_opt.mp_fail = 0; + } + if (mp_opt.reset) { subflow->reset_seen = 1; subflow->reset_reason = mp_opt.reset_reason; diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 639271e09604..87152a2bcbc4 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -247,6 +247,23 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) mptcp_event(MPTCP_EVENT_SUB_PRIORITY, mptcp_sk(subflow->conn), sk, GFP_ATOMIC); } +void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq) +{ + struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); + struct mptcp_sock *msk = mptcp_sk(subflow->conn); + + pr_debug("map_seq=%llu fail_seq=%llu %llu", subflow->map_seq, subflow->fail_seq, fail_seq); + + if (subflow->fail_seq != fail_seq) { + subflow->send_mp_fail = 1; + subflow->fail_seq = fail_seq; + mptcp_subflow_reset(sk); + } + + pr_fallback(msk); + __mptcp_do_fallback(msk); +} + /* path manager helpers */ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index ff70b3e97dd0..fef6adef3c99 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -138,6 +138,7 @@ struct mptcp_options_received { add_addr : 1, rm_addr : 1, mp_prio : 1, + mp_fail : 1, echo : 1, csum_reqd : 1, backup : 1, @@ -159,6 +160,7 @@ struct mptcp_options_received { u64 ahmac; u8 reset_reason:4; u8 reset_transient:1; + u64 fail_seq; }; static inline __be32 mptcp_option(u8 subopt, u8 len, u8 nib, u8 field) @@ -697,6 +699,7 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup); int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct mptcp_addr_info *addr, u8 bkup); +void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq); void mptcp_pm_free_anno_list(struct mptcp_sock *msk); bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk); struct mptcp_pm_add_entry * From patchwork Thu May 6 06:39:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1474823 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.dev (client-ip=2604:1380:1:3600::1; helo=ewr.edge.kernel.org; envelope-from=mptcp+bounces-552-incoming=patchwork.ozlabs.org@lists.linux.dev; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=c6KOt9Bt; dkim-atps=neutral Received: from ewr.edge.kernel.org (ewr.edge.kernel.org [IPv6:2604:1380:1:3600::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FbP8Y3kk4z9sRf for ; Thu, 6 May 2021 16:40:13 +1000 (AEST) 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 A32231C0D66 for ; Thu, 6 May 2021 06:40:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5ED1E2F81; Thu, 6 May 2021 06:40:10 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9318172 for ; Thu, 6 May 2021 06:40:09 +0000 (UTC) Received: by mail-pg1-f178.google.com with SMTP id m12so4025199pgr.9 for ; Wed, 05 May 2021 23:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vVjigd1qX519ndNq/Ykljn9j8iBmrrAjlLeHceG/21g=; b=c6KOt9Btqb957+5tXUeF9ThLAB0jE7Pd39kNeU/v0m4GM7TxKFJKwZk62wWjKdOYgi WakU4C1oFZUcR5Dl8JwXO2SpDFk/tJs4x5FtHypT3NTZo6E/HzHefOlr2tOE34QaK832 vPrN+z0yL52lsZc8G6BdrPWGMrOl/g1oUjyi53VLA6o4SanREAewmKxEpcDZhgvudk26 Xm81sGKnD8FAs2SCbJAmL2UUNyz8bnKZxPWHcRkgqXmVGw6y++XyPNNVMcLQ7RtUnIuW JofT7UILh4vMIO740tYeRUBLA98RCbv7U9upmIhix7r4wSiKLngXXlX6BZju6s+tNjO6 QYzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vVjigd1qX519ndNq/Ykljn9j8iBmrrAjlLeHceG/21g=; b=VuPQxow0a0zS3zPUGzdlQ4rbIUyQAP6QhTyLZ8+0g9Lj/zZPlSZez5i+4DSK5CdaQd 8EY7rwPbYc2gQyNvE1INQ11UPXYh64yk0urv+Sxyvbjg1WNEjH+aqUIsXJB5L0uM0yVR KC/uyFYtHBDiqsTVG7LU3G2WBfZGRI1KNvgoPHkVGZvM/KgyuFH6GUYzueDuwA6BUZgG mlzWYOeSXnOoK3VuCO8Z4JRVmTkqP1FotbWUHYwdpjb2KqxZ63tynv/jPwAWxVPAjYk4 2LTKG3MDBhaBH70aDa4iBk5QVz9wi0TzmhSK9Numl4Dxxl/sUbGkNVic/GFvailc94cK mjJw== X-Gm-Message-State: AOAM533HCX2bdM7BZo1gjdn4xo28pYoFmbqSt96uLGGAidZmCnwGswBh z2Zy6avQr0zoy48BtaWUuKdoJeBWaXs= X-Google-Smtp-Source: ABdhPJx7MYAc7ZveHrmgRI/0KA79bVfrO//H5HJkpYNMv2RdSlzfKWLaDfvsvA1o/qGyhN3M5Z8aZw== X-Received: by 2002:a63:4512:: with SMTP id s18mr2767150pga.275.1620283209089; Wed, 05 May 2021 23:40:09 -0700 (PDT) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id a5sm1081580pja.37.2021.05.05.23.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 23:40:08 -0700 (PDT) From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [MPTCP][PATCH mptcp-next 3/3] mptcp: send out MP_FAIL when data checksum fail Date: Thu, 6 May 2021 14:39:53 +0800 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When a bad checksum is detected, send out the MP_FAIL suboption. Signed-off-by: Geliang Tang --- net/mptcp/subflow.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 659b8842ae3b..efd84ff61015 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -906,6 +906,8 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff * csum = csum_partial(&header, sizeof(header), subflow->map_data_csum); if (unlikely(csum_fold(csum))) { MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DSSCSUMERR); + subflow->send_mp_fail = 1; + subflow->fail_seq = subflow->map_seq; return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY; }