From nobody Fri May 3 02:14:19 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp1563633ede; Mon, 14 Mar 2022 23:58:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9rNlq+vEUiGz2i7QUmKURxXFeVSYsEpz7J03+MTYvP1DzdNVnA+uC2R1cV4fF4fsQgXOs X-Received: by 2002:a63:8348:0:b0:380:bcc4:861f with SMTP id h69-20020a638348000000b00380bcc4861fmr22940726pge.151.1647327523606; Mon, 14 Mar 2022 23:58:43 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id i190-20020a6387c7000000b003813ba1db56si4238573pge.230.2022.03.14.23.58.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Mar 2022 23:58:43 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4228-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="FDNzY/Jm"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4228-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4228-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.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 sjc.edge.kernel.org (Postfix) with ESMTPS id 068F53E0E6A for ; Tue, 15 Mar 2022 06:58:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 280181B80; Tue, 15 Mar 2022 06:58:42 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 7D1D51B75 for ; Tue, 15 Mar 2022 06:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1647327518; 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; bh=9I2xkfE+OauegVyMOVSItd1hw2TumPX4MunGXE9uzrA=; b=FDNzY/Jm8kRKBZFcKE22JRE/GXloA79FS7WKgeTbSKU6vACpApejzLAlbCQSbMKcF5fqbO zv0gv1i5d9CwL7wEU9wuXj9x7ILkxi0qdEdQvWXpTCVrBcVN8h4LLeUaE4ARp8JBlZUTuu kZPviNynl1ncQ96rnO66NsjqXOnFAUc= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2106.outbound.protection.outlook.com [104.47.18.106]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-GvIL9ZiRNdOrmqyQk99hfw-1; Tue, 15 Mar 2022 07:58:37 +0100 X-MC-Unique: GvIL9ZiRNdOrmqyQk99hfw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HUeZo4/Aqf4Nt/B1puVdMjyOZ20l9HbnVY0Y6tf8wTWVgVAHaxQSzIhhG2NOjShMbCuyZ2nK+HRZ/mHezdTrXN093ffjs2ePdzgI8BcJxxi0/+Ugkitu7QqIId6eiDvZWG0B9UnDYUfLlenZDY0wrQOx/+5NNm5jCNmLQQlZbSjH1JDOAuXf8P1A3ecvWFht9rXb1uxCXRnujBGx26fwAdTPLxAXD23+AOzbtHquorSn7JMmmKCPKLC661xeI7QlQfprBvimrC0SEvGSyOaVcSOwQf0X6ZmI15kcQWhDVkciBuCj2gmx9RJSWS0i8f51h0FGZF5Y1ZkX6lkBhmRmMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=43+QFT2ekMs6H/tsBTApdMzPWZi3It8WuVBr/ZnQF0I=; b=TRenbw4fHzbcr2rAEBI6krDkbjJ8NCQBv+JGQcMRuQY1M35eA/mkPWvUO2G47HmhUMtr00aJ4u+jTKFkGVLSeyNZENLqJan5q9rZcw7MTfMbR2t2ROcCcG6G4wg9zcfJBizHKDEl+h+J4G96rfi5XPpKcSB7+gX2RTNmcpUiR4+m0EcHDEqj+hVhPeP5IblKl+lC93X9VATCfKExI2wyWTDYnhWXEa+2DmQEJpKoiYRgaqvqr6XSe9rxaEYO0hwg/8iIWQwYG6iTkeZCOETiv4K4ls0db89KWf1t/NnEPJ9/+EM6XNnCd6pTdTFUUTNImDQ2u0ArNFnMhTRW2UuZrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM5PR04MB3138.eurprd04.prod.outlook.com (2603:10a6:206:7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.28; Tue, 15 Mar 2022 06:58:37 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 06:58:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 1/6] mptcp: use mptcp_stop_timer Date: Tue, 15 Mar 2022 14:58:21 +0800 Message-ID: <9ea45b375250d4405f8b0547dd427ca1f387529a.1647327162.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0044.apcprd03.prod.outlook.com (2603:1096:202:17::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c08cd975-b842-4019-eba5-08da06513a83 X-MS-TrafficTypeDiagnostic: AM5PR04MB3138:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fA4XKxiBwfO3LQnPkP9cJDIN1rfvxCH9WYvaXQbjuU0sW+eDsXBcxtyRhPH/dgB3jOdOUmbZ/02rRUkhi0s9QM6L1/a2LNacxTBNrpywOsM21bezI1n+K1KXhjvLPf+9+fAZbkXWu/eJYcEH/f/WwnmlzMYaPRPgPlvTQ2kjBxAd8VBZWerxquETFQKQ4baX3vVts2bxOjZaUuvCWYnFLRd1FUHCt4UlUgx1YP3dc6ynlpIahrA4sffylP77ZpRKMbXD6gABdnA+ziOsIZcheFZvxQUja7BGeHgwzVDaqgAvGPXibwGY3kCmOwLuWb/buSCr5VkVQ6y2rB3DI6+7VVGrTFD/uTHsQJhIRtdYl+aEgG7MLdjiJ1NMt0MZ+DCXdCnrwiRCzJ7hl08ox9jflwAwyq04mL2j6cD8Gkx8joZhKc4KW/4SL1ffmcpBLpW7u+Ppcj9HeWDENpYUyBdRvveZUslPDXl5Y4FehzFFq4z/WGDzTkzr/eqNmyNreCaq+LakjKWpTFOh1aDPXqw5nwcUdY3Ky+7hdnYRSCT+LBeL92J5ub4HzrWyTgNI0JFOG+IpwPam7tve1j4hguyefLLGXU8iSFjvvH1Cc7cpoIDSMrmzhup02dJpHANlfFs5h3DzDqKSvQ8I8obzNaChKg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4326008)(8676002)(66946007)(66556008)(6506007)(6512007)(6666004)(38100700002)(36756003)(6486002)(5660300002)(508600001)(66476007)(107886003)(83380400001)(6916009)(8936002)(2906002)(86362001)(44832011)(2616005)(316002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qqLiUbVhSOstiJEbe73N403NQK7/0Nod2j8z5P4ye1N2JlmCD+COCnTERmCo?= =?us-ascii?Q?nHxuptdSky6ZOW0Dg9ThCF+zoYtKsEfUrYGqJ4UFXKyZ68crza8vswVJqscg?= =?us-ascii?Q?BrPsspmFZqr9UC/ZJ28UW564qbM3qIMHwz399KlBABMkqBriSCbTiYvRyM/z?= =?us-ascii?Q?CwVIYdScRTZEK8xvNhhHgSYriOEx9z10nx4b1j0Jl0qvd6cgAdPKWtNEZrTe?= =?us-ascii?Q?LY4WKZm5uBKuuRFa+ZA7uhe5loIXSpwQOwOYqgmJK9dUv+xDOxtGqqoj6jR5?= =?us-ascii?Q?J7Nni+pkYAOVhdVmGZinRrheDCPD0tf4XwRYPGH0vVxnsOKI95AhxbooE1UI?= =?us-ascii?Q?6lElzqCJXeDJ4whnKccCMMP8Csi9jop6ZnvD4ncY8lbxhstBPCwR0iRW3k1U?= =?us-ascii?Q?0tyXPhJb0tcvoAJWbLER0+CxgWNnTcG/0Iof8qe0JDpxdA9pej5cCM3DQsKr?= =?us-ascii?Q?rhikHNp2lQ+6enxU2keMsjhsjJCXJeW1OqbBj48fu55BDA0ubtZhkmIsU9WW?= =?us-ascii?Q?gHFGzTZf/cVzv71/LAuiNwg+Y5L1Vg4+e/QbNKxZS1QAgZ6roebN12yzZ1mI?= =?us-ascii?Q?hWzFONHf+TTEQl+kVnaSMf2OAqx2Ook0loPyk/lX3bak9i1EoHWyn09pCn17?= =?us-ascii?Q?xbDP9KcHPHfyHioKRM9z8wHrRTAo7kBuge7LCzufJGqejZKXpL0qLN0vnAck?= =?us-ascii?Q?anJ8TCNT1wp7ZCRZAlcjOq0Vt0FEJpmbB4QiXRsj5Ha8cbCUd4bdaKcJC6/2?= =?us-ascii?Q?jgF/INndTA8nxpjRX2pY6jRwvNT0rZ/0EG+dJ/BqgdEcytJQsT78CLlaqTWD?= =?us-ascii?Q?xfcMkdc7fj30rNZ9SpO2WnCoWyM/BhWkVLQJyNK4gj5tdrmnEi2VGK8UtLF4?= =?us-ascii?Q?u/jFwADw+XiEtmv6V6Dhzjl4Xno2QeHq/KMH4fHdkmAEPED1g9EdCGMqp4pV?= =?us-ascii?Q?5fGQyuXWTvn0L9MsUNSankdssbv1AkIeaNMhPVrxmYK2njIyyOx8QvQDFrYE?= =?us-ascii?Q?zSjgHjIN9lsSM7sWXz6P2R5UrfWTvKLaAsWedTDEvcOhzUsqL7ykwXbIUZ1A?= =?us-ascii?Q?U/1+7a9VO25Lq+6VqirONoTbc4wM5AtaceZzUOA/hfFQljZFM1k9qRot0wvR?= =?us-ascii?Q?3AcsejdvjPJwk5t0kuOzsUuOvgeCzW3GaZq91z9cgd5bLXZMRttsPL0LPf7n?= =?us-ascii?Q?untoKy8k4yDWYT8Da0Q8007wpSiCouL1Gywy8aQPYC2ghzr3xTDFh4t2QXJF?= =?us-ascii?Q?dJ0Pw5Nko7PgoVKt1x/OStJy3equ08H0WpWgTIhXWBJnMh0umkNZFk77qaF5?= =?us-ascii?Q?U5Hv9upw1vCaQsxyBvncddmiMA+uj9Rai93f4+2QpButCItuSJUkN5xKQv1J?= =?us-ascii?Q?Tmn3PBdPStk9AeoYxsV54e18cDHzTXzvk2xUUfwglULGsideAHgwN/Xk2uLh?= =?us-ascii?Q?qzUgU/fvFNdYbVHAz6NF9ltVjqM+/p8hVR08UdOSfrkfYGw8YrpLluGoiEOr?= =?us-ascii?Q?Qhec0/Vk3jKHqDHS1WxsMqpXXJDSzHBr1hsW+TI8cTGuMaUfbk/ZRSJyAg?= =?us-ascii?Q?=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c08cd975-b842-4019-eba5-08da06513a83 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 06:58:37.1125 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OpHx4nUagUsJQLn3Qpa+WZgYc+nW2IBgYysvAtFp9X2eKIIhgwsYJXsP6R/+W5vEZtG7zE/R1wDI2PeTAQz1yQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3138 Content-Type: text/plain; charset="utf-8" Use the helper mptcp_stop_timer() instead of using sk_stop_timer() to stop icsk_retransmit_timer directly. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3cb975227d12..90c2febe72cb 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2756,7 +2756,7 @@ static void __mptcp_destroy_sock(struct sock *sk) /* join list will be eventually flushed (with rst) at sock lock release t= ime*/ list_splice_init(&msk->conn_list, &conn_list); =20 - sk_stop_timer(sk, &msk->sk.icsk_retransmit_timer); + mptcp_stop_timer(sk); sk_stop_timer(sk, &sk->sk_timer); msk->pm.status =3D 0; =20 @@ -2864,7 +2864,7 @@ static int mptcp_disconnect(struct sock *sk, int flag= s) __mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_FASTCLOSE); } =20 - sk_stop_timer(sk, &msk->sk.icsk_retransmit_timer); + mptcp_stop_timer(sk); sk_stop_timer(sk, &sk->sk_timer); =20 if (mptcp_sk(sk)->token) --=20 2.34.1 From nobody Fri May 3 02:14:19 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp1563662ede; Mon, 14 Mar 2022 23:58:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZJ+3RXktadzlW34SvoHG6nEd0AQpgL6Y2t+kU0Z7mHmhY3E7J68SsKS44vx2q28wC02mF X-Received: by 2002:a05:6214:c49:b0:43c:dca9:b55e with SMTP id r9-20020a0562140c4900b0043cdca9b55emr14058869qvj.102.1647327531315; Mon, 14 Mar 2022 23:58:51 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id t25-20020ac86a19000000b002e06a302c2dsi7216620qtr.380.2022.03.14.23.58.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Mar 2022 23:58:51 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4229-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=QsoKUMQs; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4229-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4229-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.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 ewr.edge.kernel.org (Postfix) with ESMTPS id 151371C09CF for ; Tue, 15 Mar 2022 06:58:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9FC8F1B80; Tue, 15 Mar 2022 06:58:49 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 A01EF1B75 for ; Tue, 15 Mar 2022 06:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1647327525; 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; bh=nrMGp2MJPMAwyUwQeHigliZRsSWJrcDrR+i3zqyAV4E=; b=QsoKUMQs0ZnM4LLDiUW+w41OkFrbTRzhPjSktQRIZNWJDdx4PO6mMG4+xhhR/HHP4P/K0T Fbbm/Yp4fe5r4VB+jnLAbgGNcOWykf+iPNgmr9HJ57EJYltP9ls6sP2qEKRJ5SPdBN6Xpc FPbfLiBcR7A+FoW0AoNK3xE5bAR2ET0= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2113.outbound.protection.outlook.com [104.47.18.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-Gqo-jntlPNW8ebwt-41D4Q-1; Tue, 15 Mar 2022 07:58:45 +0100 X-MC-Unique: Gqo-jntlPNW8ebwt-41D4Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ny8tXmXmyghgfKsz3bqB9qJuv/w7q8qFzqXZbkbl473celmjzA8X98zTk4gXJiaJiglqnmOjwimDf4+RPyFBxKhIA+ctYcS7PuAgRBZdUFIvnEFBCgXKHHu2dZrtlQUWdl6PrOINDnSmePS5Cx99p09Gff19adtcGzfM42KEi4PFS/OPKgxa8c+14IEyIptVLD+CbxM342jj/gfBYMR2/uzESWE+85ca6RLzIVG1yBct1mbKKB8Yx+d3A3sFINLl5IR1lN6i44D6sWMnr/wWvUmeLBYD9INL0szSypuQ9Fv8Q/wsN36ky/hu0VDmjNYu8W0tC7KYS6SFWd7G+xcmDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5pUrkahfiqiNJHYTQPPktlfv2h/p8AJ0jgPh7most2A=; b=juvkrTfkfVUd64nnkGbUAro5HLLzZ13I6r09JsRk8GzE3B1YeGzuyYlbIiMslVnv6cB56f5AFOhMajyd4YPTpYoMKqRA2+/vlcTTSobX6B9Be10m7zYdzyMkTWgKrEszRTP/l4RmXiq5VnoVzLGe378P4S40Tk3EcE220mvrdD54KgtXoYFfJa2O1SUI3S6B8zeoZRt+sewOt5QXA5njxRB4mhOgrbgahjqUbM0U7f4eBkyzLJUvlbO9oZ/YGYOYoKc9xvW/NsdST6I+f4bkFv9AGzhXoLa1N3FW6gU7oBRPpps/HD2oaOUZIU6DI9aY3/tSz+WGptYqA5d1wkDJtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM5PR04MB3138.eurprd04.prod.outlook.com (2603:10a6:206:7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.28; Tue, 15 Mar 2022 06:58:44 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 06:58:44 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 2/6] mptcp: add data lock for sk timers Date: Tue, 15 Mar 2022 14:58:22 +0800 Message-ID: <78821d7062ea739af85dd920b5d47342775e796a.1647327162.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0104.apcprd03.prod.outlook.com (2603:1096:203:b0::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab482013-a535-4ffd-525c-08da06513e93 X-MS-TrafficTypeDiagnostic: AM5PR04MB3138:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rx0ucFUbmJm30YIpPkwCY4JLfQjoO0BnCHaOfGKuegWs58lT0dwSUSaIcRN3Sx2kY9BZTf25JitG+fPhYinh0uu+/Nsgiqzwf+fsjUe3QtaIjknN3FZAv2T15ipvKFhfusJPc1/wSDOdE8nvxNcO0j/zzjoifGyI00rv1SGMNhqrU5Y4YMVcM7bxWlJKLgFzWv5H9Gb3f0ic7jafDrw6L2UnNNTU0tiUQ4aNZVFwWr5JFfr8ZIzqJ9A4V2y20pm05SBfsW+1oSbr/ScbE9dDJlElqHra4X2RxqcuJwRE8Wo68Zv577oJPssEiY9KRcI6W8mjilLtX2PVSURym6DcZ8wm6UvaT9j+UEkN1Fmy/UrE9KBJZyD8CIqtXxa52wPWNAwD+fy+XndxXXrciGNCf2vnvHcNjLqlZ8mZttHoFX7PkvP1+K5LsK4CTQRYwaKRBssDlOsSBXncd4GrPpC6MXK0JQr+vW0CZAxm2LKknIUEeTjXXoZuBai2fdRuPFyKQ/ZNwp4F/oEDieLPW3bJZSBf9gHAsb5ndnT9Ys5102etLX083GBvBojFPzzH1CAwjOirRQKsVr9IYv9ME1MOPEYmGW7DSY2aR54i2qExB/atbUj9ktfuyjOK/ZKTmu7Jsfg5cuorlPfWSaj8ayBAMQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4326008)(8676002)(66946007)(66556008)(6506007)(6512007)(6666004)(38100700002)(36756003)(6486002)(5660300002)(508600001)(66476007)(107886003)(83380400001)(6916009)(8936002)(2906002)(86362001)(44832011)(2616005)(316002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mZ8klZMNlZ/o6ah4FDtgCzExN2ug29WaK3vrqhc0vgnPzCcNagZR7xBDrkxH?= =?us-ascii?Q?U5D6G0zp5DwASGW8MfHiCVOLtJhaB4qICkr5xOqwvSk8WVbqXOGOEpyXoQGS?= =?us-ascii?Q?dAk3J3okTFxOK4N7m8bx+bUeua7gpSXkVFm34P1xOTx07O5AXWrBwXaZgN8/?= =?us-ascii?Q?B6Hz+VZ6M1v2TFIEWqbgsHyZGszoHAXRdb0IEiAel8G4CMlSqsL5ZVzUnMyE?= =?us-ascii?Q?jOkTIyKH5eh2p3WzS899w4yk38KM7j/t/93JNKDS3saZgmN0pFIe4qMyVjGQ?= =?us-ascii?Q?61i97BfhfFMDWn89VoQLO0p21mHdjGwJFf1VwbMegud7fytiTwboEEx5q69v?= =?us-ascii?Q?PGksZyhliCBqHq0uId/eENGZ/MaVfYYeuWDqxj2O5nNgLvkwzNUh4crhDdrd?= =?us-ascii?Q?b1/LfKzwdEQ+kX2CCiNptJ4e8J1ijxJPPTCxI/tqzToWrErjvN8hWFp+if6A?= =?us-ascii?Q?i/lNfQUAfvF/esLjv56F6vmUC6cy6V0PoGVcoRCj8W00Xrv5bQwWCPQC1Ovi?= =?us-ascii?Q?q+Tm19mz6ub7KQYvclRPEN0lwqLRLrbgFp64k8yj5hsTorZJNwXGexdBwmJE?= =?us-ascii?Q?z4G+mlZHKN/bpV71NUfBmtvx0UNP/LmPPw3SKbkaAVkVyrM9cFEJywMnRVv7?= =?us-ascii?Q?uL+UAi7aFPoImVxdob6+aLOjqp5u8mc+zLXgKMq6SDTyf7G/J+69ETnFjRgN?= =?us-ascii?Q?SAds/yhhmwrsGYOPThTY7MnqiNqczc2hvxjoXEUqPRQt//1lvu4PJryXJfGk?= =?us-ascii?Q?SQqzLvZJZ4oWePqrW6HKxQy62g2/exLbX2KfB2OKVhjIV9oFt2wj2Wd/brjF?= =?us-ascii?Q?RL0pjL682J82t62yAYivNmt/UnpJrbx8xM7nh0EX8hvmjgnL/TLWUy8mC9Wl?= =?us-ascii?Q?U1dQo6C5RaIZoHica48A6RnrgyGhXYfzCcVOBxg4e9DpJ5IzMASVxyTcfYui?= =?us-ascii?Q?Zva077/3ZFHMufqJz53z9aYR5h1nvdT+5tvZeDWgrXGV3JNmHjpSgepuFt5S?= =?us-ascii?Q?W1CPmvhHyBeuvopdQn1yiW6ebGmnADXv5AxtlFxYxZQry8sYYwP9X2abDJdg?= =?us-ascii?Q?8+11WgZDujxTnY38T1kV5PJpfaID0aoC32L7EF1VygqB/mr6DEXp8wioYpI1?= =?us-ascii?Q?uUKjf/Dp7TFiORRYXX5VEBJt1ZfSfpw63duPlDbMsRf8uhNYMjOKHEAOg07L?= =?us-ascii?Q?54TwUHxZJHSi9pb20OyRw/6rrQvHoU6njtEL9roc3aijJ+EEEI0gSdAucXg1?= =?us-ascii?Q?D9D3Sr6bLZNOySDY6/L06r4LwVvk4K/S43cYLwLac3r/IQIfmBus9gdYFzL+?= =?us-ascii?Q?ALYyiZ5zKPAIq1ss5LYTeXh1b88X3ZbqygPJaNCD8exyGUMauPkCfQqGqs+Z?= =?us-ascii?Q?eR1V+WhBaOuciT6mRO2kRpESpzDtkt5CSvKd8QQmprdGCtEvHgCJ9HCwrZMG?= =?us-ascii?Q?sND3vxcg24/3ZH9JtAPa2dTJRFGO085bG+H3XbztlvmycgEH3u9XmOHBDY6i?= =?us-ascii?Q?AV072HSAkBYepEcSDijxdIZ6zsZuRWMEYI9oN+G6Tb682+IgROFpGjAVnQ?= =?us-ascii?Q?=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab482013-a535-4ffd-525c-08da06513e93 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 06:58:44.1431 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /xnMEpUzlhwv54EprBdr9NEwhfNE/Whm41JBTdVAOdK5z6gV6kVQWmcQyPzrzZOgR/XDLFGkeNHOLfPK/ov13g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3138 Content-Type: text/plain; charset="utf-8" mptcp_data_lock() needs to be held when manipulating the msk retransmit_timer or the sk sk_timer. This patch adds the data lock for the both timers. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 90c2febe72cb..483f4d4e8e87 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1604,8 +1604,10 @@ void __mptcp_push_pending(struct sock *sk, unsigned = int flags) =20 out: /* ensure the rtx timer is running */ + mptcp_data_lock(sk); if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); + mptcp_data_unlock(sk); if (copied) __mptcp_check_send_data_fin(sk); } @@ -2490,8 +2492,10 @@ static void __mptcp_retrans(struct sock *sk) reset_timer: mptcp_check_and_set_pending(sk); =20 + mptcp_data_lock(sk); if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); + mptcp_data_unlock(sk); } =20 static void mptcp_worker(struct work_struct *work) @@ -2654,8 +2658,10 @@ void mptcp_subflow_shutdown(struct sock *sk, struct = sock *ssk, int how) } else { pr_debug("Sending DATA_FIN on subflow %p", ssk); tcp_send_ack(ssk); + mptcp_data_lock(sk); if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); + mptcp_data_unlock(sk); } break; } @@ -2756,8 +2762,10 @@ static void __mptcp_destroy_sock(struct sock *sk) /* join list will be eventually flushed (with rst) at sock lock release t= ime*/ list_splice_init(&msk->conn_list, &conn_list); =20 + mptcp_data_lock(sk); mptcp_stop_timer(sk); sk_stop_timer(sk, &sk->sk_timer); + mptcp_data_unlock(sk); msk->pm.status =3D 0; =20 /* clears msk->subflow, allowing the following loop to close @@ -2819,7 +2827,9 @@ static void mptcp_close(struct sock *sk, long timeout) __mptcp_destroy_sock(sk); do_cancel_work =3D true; } else { + mptcp_data_lock(sk); sk_reset_timer(sk, &sk->sk_timer, jiffies + TCP_TIMEWAIT_LEN); + mptcp_data_unlock(sk); } release_sock(sk); if (do_cancel_work) @@ -2864,8 +2874,10 @@ static int mptcp_disconnect(struct sock *sk, int fla= gs) __mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_FASTCLOSE); } =20 + mptcp_data_lock(sk); mptcp_stop_timer(sk); sk_stop_timer(sk, &sk->sk_timer); + mptcp_data_unlock(sk); =20 if (mptcp_sk(sk)->token) mptcp_event(MPTCP_EVENT_CLOSED, mptcp_sk(sk), NULL, GFP_KERNEL); --=20 2.34.1 From nobody Fri May 3 02:14:19 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp1563682ede; Mon, 14 Mar 2022 23:58:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyd9EUjCgez2goM6BB9TbgGmDN8PdNrUW1RwXQy/1nnLX3PlR5hCFPjGK20PHLWysOBPuCs X-Received: by 2002:ac8:5c45:0:b0:2e1:dada:62ea with SMTP id j5-20020ac85c45000000b002e1dada62eamr4069691qtj.397.1647327538143; Mon, 14 Mar 2022 23:58:58 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id br9-20020a05620a460900b0067d186ce5e5si7844270qkb.753.2022.03.14.23.58.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Mar 2022 23:58:58 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4230-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=NogwEMx9; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4230-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4230-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.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 ewr.edge.kernel.org (Postfix) with ESMTPS id CDAAB1C0964 for ; Tue, 15 Mar 2022 06:58:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 98D541B80; Tue, 15 Mar 2022 06:58:56 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 7EE211B75 for ; Tue, 15 Mar 2022 06:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1647327532; 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; bh=UfAC9capa+dG+XD2hsj1t26KCF27EscWhUfjnUAQ0G0=; b=NogwEMx9zVDntPuHEbuWgAiqhjVLxztnpPXKglzX7Fh6IlK9T7Afq6oVM0nO2Dt7mUqGJI 42BH1AtVuCW/2/8nbtYBdfYFdwZfYO/UiQj3Q48htnVsQHDlWDdxr/M+9YZYwcWtAg+n8J ICBeHGSl7WUzgLYDpLod909jpd9fL9Q= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2109.outbound.protection.outlook.com [104.47.18.109]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-8nC72fw5MkikG9ZyGLURhg-1; Tue, 15 Mar 2022 07:58:51 +0100 X-MC-Unique: 8nC72fw5MkikG9ZyGLURhg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ElPAfs9T8Tch8LQZetvoxCOfi/Rk4jBBb8USYeE6YMeCGCgo1T0bWSTv/2WgzBWjRIzOAGNSvT51le4+7I+tlSdEpWRYowR72/DfnQB35Ap/GiYw1IF52DfMvge8xOkJLDg6JhYvFkDmv03dCIY1rD2CVKOXLaj9KavECsKCKd57zn+N4T6/GipxNjjcVnGbbYVxQGcAE0euW7BDaCZ3pq+qGLerSV8OyywTR1pVtizSfmL9JX9JZy3SThyrFjX7yM3w1sIHhKou183zdORTThFY5MVpzoot/8YC781mmQky6Ce5Ul0eg8r8PWsPwnFJTP0jGWFVCsc8Q6/t1PQAjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tg4NsWCDGlx9EShkaxfNB/t/1lgKY+sl/WyEBTWM3y4=; b=c2Z6qr8rwB79CdUIa7aNFOftys9si6SRhDVv4PkHVWOqmlLX9QqgIf1h4Ruk5z7DTyy60TxqAKcx3040NZjKU6Za3+LTb6Px/ip0sll5Mm8at6c0taP/he03ID8z6/0M+MS6TpgvnD8Y0MCYhbnxY+b63M1FJcPHUnQj5iIqJVL1asSOlWT+VTl9cEbKU0KW+UOMtMPN0bVm+BzjjwPp/CuAdODrGuKqIHFYorWMf+b6+LIAlCS/U/tlQgxh74OlrOgONiHlrL1pbKG56kggOt0hxXKwtZZNxJLaM8PHc+Q9lqa0gqswmEyvcb9g8GC3vllfaT4GhbNbrnrG7VltzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM5PR04MB3138.eurprd04.prod.outlook.com (2603:10a6:206:7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.28; Tue, 15 Mar 2022 06:58:51 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 06:58:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 3/6] mptcp: add MP_FAIL response support Date: Tue, 15 Mar 2022 14:58:23 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0180.apcprd02.prod.outlook.com (2603:1096:201:21::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4674c079-19ea-49f8-04d6-08da065142d0 X-MS-TrafficTypeDiagnostic: AM5PR04MB3138:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SI4JC0qrhHohPrUmm3NvG0EM7FBzrggRCsOioz/aWue2kmqazJn5r+Gw/aQUIRGv/bzyasV2uE5Da3yw8Kaa7FI+WYx4qmnpHo6JXgEYopV+QYg3vU0YmnEsM2DR51uM7oDyIg1ggEAV4DYBarOyDxPi7OVaUccBg0788sKO1GpxLoAWDaahXNbw9t0m+T4mr2nnFmX5zWl6KVi2YgxAwL4KGo8bFSmc5JE8fOSeLvznRJ02Q1ZTN2w21gmAyBPIS4cFnqvWDWYNaDlJncj8ACgJL4ROTpIQMnRVIs8jp2WVCtnBvHihDyEPeqk6OzErDm4rqNfZXukiH+uRTH3xfmOCH8AqnPTvNSmtn/SmcqiFz6EoeUwUGoj+vF9Sj+W5CE4vjkOzg0H8l3M7Kv+tz1r0v/jlzjyUPmP22dDeMHNakh79mL4+/xe6LRe3Y0LhB6o+5qflSTyLVrHEC8gjw96t7rFp1xI+/c2F80ndCRh9px62LzVIB5GMUfohR2QsYnUK6PAUFFneB98gnMXHn2W1lrUOwoyUvwkelDJKOU6XD1L8sRaosc82gQ/v4MZHgWBlzKqn18F8np/U5mD3qV1DGWsA0FODfV506SAer3t8A3YXlcBTHdUJxcy8KNlV08NB32kRznzJqgOnjVjMIA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4326008)(8676002)(66946007)(66556008)(6506007)(6512007)(6666004)(38100700002)(36756003)(6486002)(5660300002)(508600001)(66476007)(107886003)(83380400001)(6916009)(8936002)(2906002)(86362001)(44832011)(2616005)(316002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?c2w1uQgoobCsBr53h663sU5sHkm6dzx3cpFJtmnK9Ma1e2uzqjwF7btkVAu8?= =?us-ascii?Q?o4i+V4at/b1kwYuNjqeGZKTbR7ByoDK0ADWuMcqAyACrBoUeiF86yFfLMLf7?= =?us-ascii?Q?FYHaOPyV7il7lUiQyKwsS7y/UHJvz6fNf+auajgcDSX11S5MPW+hgbCJt7mZ?= =?us-ascii?Q?/b8XJOkTWOCS0f0vv1YnupQ02CEECo0DrCJxgXmfOC8llMWxDFFUQ4luv9kn?= =?us-ascii?Q?NW64r4NeXw9T0Es4c3y+U1GsirmMR/C1vbogyjicLbHE5sql/83wlLp8jCua?= =?us-ascii?Q?CekRPbARY2GpBmJ0xNWXXUoqqYxpHi54jYdvSmZa5kiK7K2eVvaOI8dJjdQZ?= =?us-ascii?Q?YHJrxwrqIVcYGHjQYt51SQyrTnk4UVLXxON+y8oSJzpWf2C0Z1/uAGDB17eQ?= =?us-ascii?Q?/WoqL3Rrf2azKpkbwtKKoRWSHEj0Nvj3zeKpzU9Yqq9gnl5zQS07g2U0gCkY?= =?us-ascii?Q?jMjShv7Nqsd+5GXRBG6xb9faMkHXLNFtE2+gruGn+Fv1T+QJi9glSEmlLXhp?= =?us-ascii?Q?DL1ko/M63187pE4Y2f0/j8ydXbJBMY8NRcWF3tLw2lOv1zdnDdTwK49simcV?= =?us-ascii?Q?5Kdjnnw17Nyx9aNN+PLWWZWJxqonxZ3o4T8nUmRKbHlAsjP3MGHQl/x1HKxc?= =?us-ascii?Q?9pxHM/7dG+1iR6hJRo1067bAZfVuNXXN2e/xRAB5UTpjD4xOZ7CLcHBJRXDl?= =?us-ascii?Q?5/RF9BGzw9lgEF6BvZMDj/Q427IriBnj+eA1Y2ak/Up8voypsw7cJa58W8bd?= =?us-ascii?Q?XQrwifH8sRkM/+ODc1ycP9yYxvz+BfXCGU5C1L2LtQU+QIzAFhNfspirT6zS?= =?us-ascii?Q?xpGt+Jzwzriog6Gst2DUsxoyskvQ2vNvHls0EHL9Kdd7hpruR7IKmNjReVYp?= =?us-ascii?Q?zUqH3M+zGMMAWf3Hz0BcEmB9kYNTvIQa+Sq12pxrOKTtJ31SB7bPDMKl7f5o?= =?us-ascii?Q?Q7Kkv6X6L7QqmQhBp/QVi6+aHOyH+7bI/RYeOVXrS1R2E/6/muBYYEKWAzG7?= =?us-ascii?Q?0eHOI4iDakokgEvpkQETWTs096o+83W8cOYmRFB8vLHfzOt+QwRMHK/SlDJ7?= =?us-ascii?Q?ApTEIiKs/9gmGuNrViwXVHv5j4Mq7lP8WAlNdO1yi2VSxCp49yPPwjbKqkhH?= =?us-ascii?Q?8aqH+DPRD4qv0U3jzjCSqlYOC8Zuwk8aBUZvvV3JJsb+y9n4ShExyXCbdbgF?= =?us-ascii?Q?sBetzOcOP8JeFdeQHGiNdNRGtljt5Vn/KRRSr8wYPpRY9Bx1j15I3UdgTsfR?= =?us-ascii?Q?eHfRBj1umuRkVI1zAFTggSWOjHBWeCXbKHrs5vD4c8okd9R4VXHSf3cj69eZ?= =?us-ascii?Q?2+RFXUdg/tvbQ8G4wYHUaDQX1MiBImbywbE9EShGz3120TwljYoFiHGhSGPW?= =?us-ascii?Q?6gOBoLq9FbtfHS0sTDUtxyLMzJ/e9FiH6KTuo3SqM3+gKwuV3KS984OvhFFg?= =?us-ascii?Q?fZJDYW9CFiBq214CXTDbr2x7Tp4ElO3dTDbcUaklzYuipQsJ9/0tWaoiAQqZ?= =?us-ascii?Q?3bc1cvGetbAdPtVUwV9XREY6AxbWL3rS5A8wcdZ9tiDngEtkhQR1TtXWJw?= =?us-ascii?Q?=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4674c079-19ea-49f8-04d6-08da065142d0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 06:58:51.0486 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +mPnJSD7UIAe7vIZ8TSOuKeFrpMkkAZ3UdQ2gPgRH6Aav4qnUvKa4ArFIRSdvBSh6DMMwMkZZbRXP5oh6V63tw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3138 Content-Type: text/plain; charset="utf-8" This patch added a new struct member mp_fail_response_expect in struct mptcp_subflow_context to support MP_FAIL response. In the single subflow with checksum error and contiguous data special case, a MP_FAIL sent in response to another MP_FAIL. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/pm.c | 10 +++++++++- net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index d0d31d5c198a..f5f4561f332a 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -279,8 +279,16 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fa= il_seq) =20 pr_debug("fail_seq=3D%llu", fail_seq); =20 - if (!mptcp_has_another_subflow(sk) && READ_ONCE(msk->allow_infinite_fallb= ack)) + if (mptcp_has_another_subflow(sk) || !READ_ONCE(msk->allow_infinite_fallb= ack)) + return; + + if (!READ_ONCE(subflow->mp_fail_response_expect)) { + pr_debug("send MP_FAIL response and infinite map"); + + subflow->send_mp_fail =3D 1; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX); subflow->send_infinite_map =3D 1; + } } =20 /* path manager helpers */ diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c8bada4537e2..83f0205f0d95 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -456,6 +456,7 @@ struct mptcp_subflow_context { stale : 1, /* unable to snd/rcv data, do not use for xmit */ local_id_valid : 1; /* local_id is correctly initialized */ enum mptcp_data_avail data_avail; + bool mp_fail_response_expect; u32 remote_nonce; u64 thmac; u32 local_nonce; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 30ffb00661bb..ca2352ad20d4 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1217,6 +1217,8 @@ static bool subflow_check_data_avail(struct sock *ssk) tcp_send_active_reset(ssk, GFP_ATOMIC); while ((skb =3D skb_peek(&ssk->sk_receive_queue))) sk_eat_skb(ssk, skb); + } else { + WRITE_ONCE(subflow->mp_fail_response_expect, true); } WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); return true; --=20 2.34.1 From nobody Fri May 3 02:14:19 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp1563699ede; Mon, 14 Mar 2022 23:59:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxUNS8N5Qfxm+KvlfFG3P22SVk1ge11PmSFcnj6VtFaf1rieK9X9VcWChFbvxh2fQefrCm X-Received: by 2002:aa7:8432:0:b0:4f6:6dcd:4f19 with SMTP id q18-20020aa78432000000b004f66dcd4f19mr27526953pfn.53.1647327546420; Mon, 14 Mar 2022 23:59:06 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id f2-20020a17090a638200b001bef37a5fdesi1092864pjj.117.2022.03.14.23.59.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Mar 2022 23:59:06 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4231-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=BsN8tOPn; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4231-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4231-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.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 sjc.edge.kernel.org (Postfix) with ESMTPS id DDB803E0E79 for ; Tue, 15 Mar 2022 06:59:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C86AC1B80; Tue, 15 Mar 2022 06:59:04 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 B59BB1B75 for ; Tue, 15 Mar 2022 06:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1647327540; 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; bh=CqFmZ02hP0661+OMsftMUJMSjklFZgV/vC+bLuwXF+k=; b=BsN8tOPnjLew9FWZyFpKyzSF5OccF3giD9qlIuE2XwwKfBN4tE7dR7WLMqK3g3c/vY96aQ ThkZdUNbPxjh4rD+8pXUgaCTXJ6VheLdKXUvw01oU2B05dzUeGwez3N6y8AnORqcXDNrnH 1NByEEIdaDAHFb5qDMVjeNaYLG6iv3k= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2104.outbound.protection.outlook.com [104.47.18.104]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-dkDslDIENaehv-suAHYD_Q-1; Tue, 15 Mar 2022 07:59:00 +0100 X-MC-Unique: dkDslDIENaehv-suAHYD_Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hmJU91lMFcgSDkvlMRMh0PQuHAtp+PtGwFDLyqC4CAhJF5ahdSXA+8oO+jDt25eQD5PdjlnEMZz2hUF4Xfqa3mb/KoIuiftV6S1r6qeoYQ+MDMLes25Bcjyocg8YweqBbYHc2qSb3GyfsGzaKlxw3A0NCFIrzDZooI4kunvz67IrjimOhSJ4EmCrEmrzi8utTJztJNa3S60RWndSlaVVvVgWNVFCzu7L2veG5nLffYbrBgMHC4FaOa+d/97iPsEcH4u22ecGzqQhChif8vEYIQz5x38lI7ScKXD5iUTmJa7QZUpQm5s2PBg61se7iT11Hedz8NXl8ysoaKs6IR6biw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6H2wHPGQmhN+kkbeEzhwivGrRtEMd5qfjVz+yPcBS1E=; b=HcF8LnJg0XD7KP2n0lH4B2N/8qLXKlBmwn88VAv1zc6xDijYsLftQKOrSL8M3Ki+g6Fo99Xj49OV9bnbaRiYhLbaALwPxBUPmKVWuvWy6RP3D1MI1lFN6XtmIkA02yWp7vEOLv4YO0JhB15t8wfC9PsEe4IxrNRZ4eUvvyzPLmscorYn7gQDQT0PbrH3UW+CnQgyQ1QqsjIiPLCtzL9IvGExPXBz08Y+re3G5HXOTEXoIV9/8hDQclrQno7s8ldepE4u/fwc9ZASV3AJlOIduZHaubq4oWxInZtguFRSCf1hcnMHuujqLGAgtr1+lvvi8dMWxieg0SohtN5jhYWV5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM5PR04MB3138.eurprd04.prod.outlook.com (2603:10a6:206:7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.28; Tue, 15 Mar 2022 06:58:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 06:58:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 4/6] mptcp: reset subflow when MP_FAIL doesn't respond Date: Tue, 15 Mar 2022 14:58:24 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0234.apcprd06.prod.outlook.com (2603:1096:4:ac::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0878f7ba-0c41-4eb7-c308-08da0651477c X-MS-TrafficTypeDiagnostic: AM5PR04MB3138:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NNmEjj4WzWZp/N8SJidkZshg/Uvz2B7H0PumWrdD2AxlRZRh345P1dptIsf/3LuG1LFOGC6Dv7t8b+jg/u1Jt2/dbvUGFWnvJrVc7q2adfiItBJD4ry8HieX7h/I1/JxQSKnj579P1eE/096Z7A0TlPNADa7GTjwNr0Pf2Q9ctfVnxnF9rRtmz2lu56+n8nRH+NsYncF1qKpq2vnd2EbbmtJj5OtbAroosxQUUSRDDIMENUsysrXXx3LoD3fxyZSTdSvZJ3RqmFyz+tuILCvmR0Cd9N0LhU+mgsgDnq87DWVvBuHuQ4wpR91Rqw+RoF/3G3LszSkcy+wBeM16gEY6+ywCnJNznMUCcVen8Vxkb8Rkwpum64dR2mq/MreG+Pg2F452bN2/EQ9Gu0yAOFtqID0zFSs0DkOAznkaIFMkBHIan4+AD3r0x/+JlazD5RCuM2+IT8EFKj7amPzbaIGMXPXImVKImxzk/hmodHW3rHwvUaIIdLuA3nW4sQ6wbTXtaaZ/Wf4rB2pny9SB2pKLrEMWaCB1LeJpZaykuvtjkFfz+vBgkjufqi0cQA/GCJ+96Yv0bsir0u/FL6KSMFRUqkcovqN8xLQzJDwc1dPKDukEQ9I03VjY3VrzN8t0MMXupHD+U4bhOgDhVDspmATPQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4326008)(8676002)(66946007)(66556008)(6506007)(6512007)(6666004)(38100700002)(36756003)(6486002)(5660300002)(508600001)(66476007)(107886003)(83380400001)(6916009)(8936002)(2906002)(86362001)(44832011)(2616005)(316002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?X8zEQ980zTg2NrwhxB65ktqxG00RTiu1M4JOmTrcSJl84ld5c2r8BAgRGPvI?= =?us-ascii?Q?+Ms/+IaParQfyNEqdPsPFVuaGgCyZiXXKAUOtBYp65VF4oQMQ6mtsff9eMvm?= =?us-ascii?Q?BDD1d+6Y5bVAM4k0rBeXPD6VRp1U1aSoa8u38ZkLcTej9A9YnTwN/CsxvQap?= =?us-ascii?Q?bkqo35Jl2CfTouRjcuqyZuPMQ+ZW2GLq2qDmcDbrFJbB0t1pZudHnI5JF8hn?= =?us-ascii?Q?PZUGsU8h/drIl/pEtJ29TiJiq2GCURe3oH4sfnm2StERplCcnlG2RWWYyc1V?= =?us-ascii?Q?EY8OqdoTLTDiyjqQABTLOarlQfMU7QGjSfBvv5K9zQasyTXCCoCiRhxZGRjQ?= =?us-ascii?Q?uOxCLyccCO3DKoyZKki0G6s7RzIPo4CExnxj0kg7H79UsHydEfgfZq3j0t5d?= =?us-ascii?Q?MApDS/PlGgny2X8NZvDo6n1hFMqhvQI+8o2s2oOn8h5nNuCtw2WFr8utaGvM?= =?us-ascii?Q?UAq7/zia/2iBE46Us8mxCPt7Pmoq7yeqlUXpyOQcTt7QfKWzAeAIZJ0vwu3M?= =?us-ascii?Q?xireB1Kh50A/80mlecLJGj+TFU86j2MdHTaOaql8lW+kZenG5CF5gOqvVYYy?= =?us-ascii?Q?ZWHFHaZieQdktuTfhZXOLtNPpJLSCQD1tV6GUZKORnwFPnIurC7DDMNUgCQ2?= =?us-ascii?Q?V8/00foRYAkre0YC1Qa2log3M0TODw8xSDDj6HG3BAT17yHPBcr1dNwsG4yc?= =?us-ascii?Q?Pm3qGj7fr6cc/hCWRaMd6EqJXDbezx8x5F+0bLjWdyYCfOAOAMt1Rs3UK6x+?= =?us-ascii?Q?DvtfysdNsQZnPI0okTH4uPh+t0MIjWeeJzYFpXTT7Z9IdGfwPyzS0YOi18vW?= =?us-ascii?Q?tZhJDi0b2hJRxXQyjkdPuIulYACAnul7gDaWwzFWWlgscpB8BDdRdkAYKiyK?= =?us-ascii?Q?4M0JzUf2r7I02r529wXm5OTNYL3Go0RsPWIadcgAXkEK+Z7osYmnEd3ZKwa/?= =?us-ascii?Q?Q0HGGOhV5eFol3catmyY2lC3TnCdeAdHWrLxAk4kLnGzci1dv3rHxKHlAHWa?= =?us-ascii?Q?bW+Zeklcy7D6aqRYiihGDqN6MhFmwoUopXx+siK5n8wRe+FZxJRlvMZ5FX8G?= =?us-ascii?Q?Ep1PHUZ+OaC7aaueDAqxDlekY8gRoC9c2CVgy9iBbSEyJtaIuW4/0HfpBebe?= =?us-ascii?Q?0/wf1OA2/ftSknCgDP/lhsRyuScZJjFbBRTYv7DCT12lz5Bhi3ZtZU8ejEZj?= =?us-ascii?Q?MHVlYONp+B3EuAprHgQMc9xaNpmTP2xQyVbN9bcbd7G9eCBQ3Ev+9cOdgQ1f?= =?us-ascii?Q?KIVRTRIgLsbP6Pi4iSgo7W2VU7OED3FKi5EyMhkZk1OWoPjAYBEIrnYbZYXP?= =?us-ascii?Q?crwT1Dfc5VVPW0cMKgJr3svX+PGVMN4hWT+BjnI2iqs0Ej8av7VLtbqfCLOu?= =?us-ascii?Q?97KUhAuMTsjYzJm/i0dd+RNh+cLkUpBjDgMylFL5HSNGwXb+g0+PM4OC0znk?= =?us-ascii?Q?YmeakLAWDJQsAJ7Ub9OuAa37jpM5b2GA7rGT3FmpOtJiWbvcSIOkuOcGu8A+?= =?us-ascii?Q?wkLbSf2s2LjG2vbUzr7YCncsakrIYtPQwMmPSUyDvcwvIEd19aiCie4QxQ?= =?us-ascii?Q?=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0878f7ba-0c41-4eb7-c308-08da0651477c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 06:58:59.0791 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: exEJgaxWSKXQT/V5z0+HQDV8qHnkS29/RF9gVGxxLsRQyUwj1xtMeyLzncDFtMV3qFspFxvyAI5B79nVNTmmNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3138 Content-Type: text/plain; charset="utf-8" This patch added a new msk->flags bit MPTCP_FAIL_NO_RESPONSE, then reused sk_timer to trigger a check if we have not received a response from the peer after sending MP_FAIL. If the peer doesn't respond properly, reset the subflow. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/pm.c | 8 ++++++++ net/mptcp/protocol.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 11 ++++++++++ 4 files changed, 68 insertions(+) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index f5f4561f332a..cbd6f90ffbac 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -276,6 +276,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fai= l_seq) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); + struct sock *s =3D (struct sock *)msk; =20 pr_debug("fail_seq=3D%llu", fail_seq); =20 @@ -288,6 +289,13 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fa= il_seq) subflow->send_mp_fail =3D 1; MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX); subflow->send_infinite_map =3D 1; + } else if (s && inet_sk_state_load(s) !=3D TCP_CLOSE) { + pr_debug("MP_FAIL response received"); + + mptcp_data_lock(s); + if (inet_sk_state_load(s) !=3D TCP_CLOSE) + sk_stop_timer(s, &s->sk_timer); + mptcp_data_unlock(s); } } =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 483f4d4e8e87..0e10bce5f7f1 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2168,10 +2168,38 @@ static void mptcp_retransmit_timer(struct timer_lis= t *t) sock_put(sk); } =20 +static struct mptcp_subflow_context * +mp_fail_response_expect_subflow(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow, *ret =3D NULL; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->mp_fail_response_expect)) { + ret =3D subflow; + break; + } + } + + return ret; +} + +static void mptcp_check_mp_fail_response(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct sock *sk =3D (struct sock *)msk; + + bh_lock_sock(sk); + subflow =3D mp_fail_response_expect_subflow(msk); + if (subflow) + __set_bit(MPTCP_FAIL_NO_RESPONSE, &msk->flags); + bh_unlock_sock(sk); +} + static void mptcp_timeout_timer(struct timer_list *t) { struct sock *sk =3D from_timer(sk, t, sk_timer); =20 + mptcp_check_mp_fail_response(mptcp_sk(sk)); mptcp_schedule_work(sk); sock_put(sk); } @@ -2498,6 +2526,23 @@ static void __mptcp_retrans(struct sock *sk) mptcp_data_unlock(sk); } =20 +static void mptcp_mp_fail_no_response(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct sock *ssk; + bool slow; + + subflow =3D mp_fail_response_expect_subflow(msk); + if (subflow) { + pr_debug("MP_FAIL doesn't respond, reset the subflow"); + + ssk =3D mptcp_subflow_tcp_sock(subflow); + slow =3D lock_sock_fast(ssk); + mptcp_subflow_reset(ssk); + unlock_sock_fast(ssk, slow); + } +} + static void mptcp_worker(struct work_struct *work) { struct mptcp_sock *msk =3D container_of(work, struct mptcp_sock, work); @@ -2538,6 +2583,9 @@ static void mptcp_worker(struct work_struct *work) if (test_and_clear_bit(MPTCP_WORK_RTX, &msk->flags)) __mptcp_retrans(sk); =20 + if (test_and_clear_bit(MPTCP_FAIL_NO_RESPONSE, &msk->flags)) + mptcp_mp_fail_no_response(msk); + unlock: release_sock(sk); sock_put(sk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 83f0205f0d95..bf58d3c886f5 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -116,6 +116,7 @@ #define MPTCP_WORK_EOF 3 #define MPTCP_FALLBACK_DONE 4 #define MPTCP_WORK_CLOSE_SUBFLOW 5 +#define MPTCP_FAIL_NO_RESPONSE 6 =20 /* MPTCP socket release cb flags */ #define MPTCP_PUSH_PENDING 1 diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index ca2352ad20d4..75c824b67ca9 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -968,6 +968,7 @@ static enum mapping_status get_mapping_status(struct so= ck *ssk, { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); bool csum_reqd =3D READ_ONCE(msk->csum_enabled); + struct sock *sk =3D (struct sock *)msk; struct mptcp_ext *mpext; struct sk_buff *skb; u16 data_len; @@ -1009,6 +1010,12 @@ static enum mapping_status get_mapping_status(struct= sock *ssk, pr_debug("infinite mapping received"); MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPRX); subflow->map_data_len =3D 0; + if (sk && inet_sk_state_load(sk) !=3D TCP_CLOSE) { + mptcp_data_lock(sk); + if (inet_sk_state_load(sk) !=3D TCP_CLOSE) + sk_stop_timer(sk, &sk->sk_timer); + mptcp_data_unlock(sk); + } return MAPPING_INVALID; } =20 @@ -1219,6 +1226,10 @@ static bool subflow_check_data_avail(struct sock *ss= k) sk_eat_skb(ssk, skb); } else { WRITE_ONCE(subflow->mp_fail_response_expect, true); + /* The data lock is acquired in __mptcp_move_skbs() */ + sk_reset_timer((struct sock *)msk, + &((struct sock *)msk)->sk_timer, + jiffies + TCP_RTO_MAX); } WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); return true; --=20 2.34.1 From nobody Fri May 3 02:14:19 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp1563721ede; Mon, 14 Mar 2022 23:59:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/S//5bac62GZZVPY9FbVqGYPMXncrU6mx5aZMjLhQOMRg1U9lhCE33N69z62WfW1+4phP X-Received: by 2002:ac8:5bd0:0:b0:2e1:b639:9d5d with SMTP id b16-20020ac85bd0000000b002e1b6399d5dmr18638558qtb.640.1647327551706; Mon, 14 Mar 2022 23:59:11 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id j5-20020a37c245000000b0067d3747ac81si7267588qkm.734.2022.03.14.23.59.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Mar 2022 23:59:11 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4232-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=UYV52W7j; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4232-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4232-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.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 ewr.edge.kernel.org (Postfix) with ESMTPS id 5A2D81C0B18 for ; Tue, 15 Mar 2022 06:59:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 492001B80; Tue, 15 Mar 2022 06:59:10 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 A3A891B75 for ; Tue, 15 Mar 2022 06:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1647327547; 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; bh=f76RwFKA5b8Bwp0PUQTNxsNuvx+bwEcYBtw6HMHVNYg=; b=UYV52W7jz/bBf0d0u+e7AySTEiuzUbXBW6iEMPkEXIWsxlBypxit7jaS71XjIGnhJGyXjQ o/O6W2oOzWNYNjLksRrnkcp7LhQvyf9a1bkvihSeFk7/Mi0khddz5QMRE+ROltrkgp8Po6 CI+v+xXRVEa8rSoCZyrjgF8VRQN871c= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2109.outbound.protection.outlook.com [104.47.18.109]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-7-Zxocy9aAPoqhlEizFmOIsQ-1; Tue, 15 Mar 2022 07:59:05 +0100 X-MC-Unique: Zxocy9aAPoqhlEizFmOIsQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PlWJdL6Vp3YZy1s2a/g+iVNTBzpA6lI84vTqADZkAclKNhAmsZnZLI/YjfCZEch11+3asYMuJoHq3iGdHNflSrB8VlGLifdmkbH/IlLPEGG7ix8KU+N92xsFdOphgHEDUrHP7tQ/YGAxhzTqNj2LNh7zwuIsWTdLcjABvxLvgy7Hk/h+qsDQYatayra+jfb+HT1blAr1XemuHrHMTaDuCG0AqcKqTjnqKD3Ow8iat4DrqDOcQIh2P72pcju2HZMCPZZw4NVdDsHRhw4J20sYv98bZhxZ4SzFJmv7Yn8K0p5mGXleV7hb+TENHo/PAl90ZEXKYmiElwUOoBQseYJCag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uU1mCqPs4Vw4kAL2cPM5Yvxj80ihZXnk3ObKZFUzFZI=; b=g0j0XJaZNLbCv2/3I5Mnn13my4f8PzpRJLqRfbcjit85zpjHILFYRYuvgwA4b++nmjOAxgaQeheYULEZVh9xxGK7dDVcbISoNmNFdYrKSAgxm2TWpdsmTfQV5bZL2dJvKoUZgMuYHlKHcl2Expo8xwrtqAo8u9gdjNh8XuLVNdv2slN66xShaqNEKgVsd3X1UwTdk/neOhwYO6iJms+NWLw5CaQ8HSKVrTd2pj7Yesxkg7x+UlraugaZrNNVqzpg5m8tLsN/2dhe3QZn7Mmkk4snwFCCdzSF86470SuYoFX5z+jICH1G4q3jYL98XVYfeOMZOf9byhXZ8HNn6hIMLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM5PR04MB3138.eurprd04.prod.outlook.com (2603:10a6:206:7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.28; Tue, 15 Mar 2022 06:59:05 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 06:59:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 5/6] selftests: mptcp: check MP_FAIL response mibs Date: Tue, 15 Mar 2022 14:58:25 +0800 Message-ID: <240eb41a0d8773685a552ba5950ae8198ee11e5f.1647327162.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0014.APCP153.PROD.OUTLOOK.COM (2603:1096::24) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d94962a4-ba49-467d-6e98-08da06514b0b X-MS-TrafficTypeDiagnostic: AM5PR04MB3138:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZPu7z2KR/djxd4fnklBOxTa4QM2wR6SfMl8guUo7LX4I7unEGFjpcdVsNbGcZ4cn/YJtl0Joh8yyhrWs2LAgPJ41LwNnauC4nYe1WPy9WUUDChisEbs8kGgym0eMHD6DGDI0RSr/2hwmpzRxfOX4hxDyp/XJcGMJolgJka6nq7BaP4Titd2x9Y7RaHd11rV3ixbO5RcJxJcs9BU+DuiEkM78sOCEtSU6c3yjkWy7SFb+fecXq3l79Fp17RXk/k/a1ngj6pKjLm490Uq0EGXKV/BaD2DNpx4mYJfu5Y/vBWixCiCDISd6SMQdd+UiIEjdui00XFechyQa7xyyGNRGGql83GmagValVTgRLzOIZBseBjq1F4MHV0Xef1fA69QNVJLUrAsOxGOk9nOoT9Q7t+5pMx5sbf42Y8KUKm2CcHGs92hXPAxjTulYteT7Ol1X6HfCrS4l3PsIaDr30O4j4LEZOZPU2eDxBhTt2h4pfzd9/Qkbu0zQp046/C/Ngi2J4L+nYd06W9VHLgriEil9hJtIu+HYAg8p3XWN7z1dC3Za4XXke4O0zo9Roym46NvNFFLRAO3RPa6sCOaKUmnM38NvIcUbDYXjRipSIihl8fssHaltX3snnAlEEPnA0AFMhdqkixWZnB1MYrKLS6292g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4326008)(8676002)(66946007)(66556008)(6506007)(6512007)(6666004)(38100700002)(36756003)(6486002)(5660300002)(508600001)(66476007)(107886003)(83380400001)(6916009)(8936002)(2906002)(86362001)(44832011)(2616005)(316002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vYgvRbgk93UAA7bT4xLczWa6/yN78t8kJGy1/KwmtXP27NMUAjxUr32iiBgk?= =?us-ascii?Q?nLyUxsz7Nrkpo1lyUItrOsauiPWk8fsTtexXkEhm8n0wb2CLkbUh7Omb+I+G?= =?us-ascii?Q?QMikidtijM7vi3eaN6edG/Wfnhe7O52dpqQSZwHR7OCk4XNb+ehKCDO+Gfho?= =?us-ascii?Q?ZhCQ4AJlrh0qz39iyreUDzJg64qncrLzwGx3ElsgM2T9SpiFNz7vqaSQ+aX2?= =?us-ascii?Q?3Nf0ilzoz2cssOKTR/uzPUlTPQPYiVgRv3cofIKuDJZFKFHdfLxPEahuMIo4?= =?us-ascii?Q?EnXmx+nuolnc8hOCnVidPEDDc0yroRbYndbPkeaOlQ/dstBOMb9qMvXlWVKD?= =?us-ascii?Q?XJTTteEwFq9lCnZrC9g6MIKPHvVUXdaUrZqjPT9GNbuxABnN5hhQyBexvPku?= =?us-ascii?Q?l7NJe1lmTpFS9EFA+cLYbK1N5g46XH/Bni3YsZHsr92/ogPJTGyBKHGevr3B?= =?us-ascii?Q?3Iw8FISuWbtV/UwygvU6Qemj/kC6SNB818fnP3KEFbnCIuj918jXSXTOiwwN?= =?us-ascii?Q?77+6V/bFHscr6Rqs8fo/hKNGtjof68+Bvzo2XFrsWAs2sVjiwu52/ZzyW12Q?= =?us-ascii?Q?sm65vpD1mC3Mkh4ZFX0WV0XKFfR0PVXjrBc3lRZt5cuUPROetJ6sy62EKN4k?= =?us-ascii?Q?FpBq2j8rEKxCYO55+lbw2bZORZZi6z8+K4Zx0cNN/EP4KtOo1+WWHT3z9iK6?= =?us-ascii?Q?LEPi67LmYkZvQNvdIEQSNrdAnFbt9fL4eA530T8Vho2NcGHK7wKSSDUEXACK?= =?us-ascii?Q?EE0jB88/+DX0uoOIuataCt3FT6QcJG+VHlI+768lFb+rItyLkuv4pC4bsJqr?= =?us-ascii?Q?bOZFVdNOcMNqfk7v0Tf/xjL/PXFIELG240fZKnQLU6U+zj52uO9v5ZZX83G3?= =?us-ascii?Q?5zd4u2hIWl8yi/CaMEuu6CNMY5h3UMrDcqMLkxxD5KQ6Hbfr5GouCJdoucDA?= =?us-ascii?Q?6UVTBcgtUTAz3HbsMI0zIqZyI2MP0SpJ5mbKLnrMvqUMjL7MeyV+rWpFpCgR?= =?us-ascii?Q?dnIp0e6m18jhknGF3f38mXJH9K46DIwOjI9sXK4NYWW1eAOYGKOR0wmuNoWb?= =?us-ascii?Q?xmkP7YnJmN6WLLYyGGepmo8eVBcayH9fk/Of9GKuImyLhZWLTnzajL3sXzgt?= =?us-ascii?Q?3Na4+XFZyBvqb9AezJIWrhmkSlp+D6Eud92v2ydM02Wawme6vJYN3CDIXbCu?= =?us-ascii?Q?aEmCsWERT/7X60nqHrfurbMSccLf+FCZPgZIQ9YWe7T4Q8kNE3J8Njk9Wk/c?= =?us-ascii?Q?WOCA8ZAMcBzs2r1jG2yvWs3YFNyD8duIP1J+wApzJTiwFS7TY/dndbx5NuNU?= =?us-ascii?Q?IxKDljfcpCGibT3uX5eJXeogAq8jp1CHqkS0iI2xE4R0yLiXHjLAaJ1pRVUN?= =?us-ascii?Q?FW9Gq4kiV1ft3VG+TIL8WskDiszrO69+8ufDYgUb6VnGV7eol8ic2+P/QaPm?= =?us-ascii?Q?+mT1DaosijQLfcNbLksEabi7KBMZmY5Qcn//Vji1pslpOwSTUCC4pSaO3eDc?= =?us-ascii?Q?IKLwE5ThPruJGX0g2f4E02UW+akAz1ZbKtG84D+Q5/DaFj/Ra6LDrCpoqQ?= =?us-ascii?Q?=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d94962a4-ba49-467d-6e98-08da06514b0b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 06:59:05.0472 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mmyFz4/qCn7iNoL69MEFqoa/DCseVTm27W+ntaSKn8ZIm9i84i0xhskicHQHrPy1Bp9KK/aYif4s7KUYY+dLpA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3138 Content-Type: text/plain; charset="utf-8" This patch extended chk_fail_nr to check the MP_FAIL response mibs. Added a new argument invert for chk_fail_nr to allow it can check the MP_FAIL TX and RX mibs from the opposite direction. When the infinite map was received before the MP_FAIL response, the response will be lost. A '-' can be added into fail_tx or fail_rx to represent that MP_FAIL response TX or RX can be lost when doing the checks. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 959e46122a84..2b77576d773c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1055,13 +1055,38 @@ chk_fail_nr() { local fail_tx=3D$1 local fail_rx=3D$2 + local ns_invert=3D${3:-""} local count local dump_stats + local ns_tx=3D$ns1 + local ns_rx=3D$ns2 + local extra_msg=3D"" + local allow_tx_lost=3D0 + local allow_rx_lost=3D0 + + if [[ $ns_invert =3D "invert" ]]; then + ns_tx=3D$ns2 + ns_rx=3D$ns1 + extra_msg=3D" invert" + fi + + if [[ "${fail_tx}" =3D "-"* ]]; then + allow_tx_lost=3D1 + fail_tx=3D${fail_tx:1} + fi + if [[ "${fail_rx}" =3D "-"* ]]; then + allow_rx_lost=3D1 + fail_rx=3D${fail_rx:1} + fi =20 printf "%-${nr_blank}s %s" " " "ftx" - count=3D$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailTx | awk '{pr= int $2}') + count=3D$(ip netns exec $ns_tx nstat -as | grep MPTcpExtMPFailTx | awk '{= print $2}') [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$fail_tx" ]; then + extra_msg=3D"$extra_msg,tx=3D$count" + fi + if { [ "$count" !=3D "$fail_tx" ] && [ $allow_tx_lost -eq 0 ]; } || + { [ "$count" -gt "$fail_tx" ] && [ $allow_tx_lost -eq 1 ]; }; then echo "[fail] got $count MP_FAIL[s] TX expected $fail_tx" fail_test dump_stats=3D1 @@ -1070,17 +1095,23 @@ chk_fail_nr() fi =20 echo -n " - failrx" - count=3D$(ip netns exec $ns2 nstat -as | grep MPTcpExtMPFailRx | awk '{pr= int $2}') + count=3D$(ip netns exec $ns_rx nstat -as | grep MPTcpExtMPFailRx | awk '{= print $2}') [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$fail_rx" ]; then + extra_msg=3D"$extra_msg,rx=3D$count" + fi + if { [ "$count" !=3D "$fail_rx" ] && [ $allow_rx_lost -eq 0 ]; } || + { [ "$count" -gt "$fail_rx" ] && [ $allow_rx_lost -eq 1 ]; }; then echo "[fail] got $count MP_FAIL[s] RX expected $fail_rx" fail_test dump_stats=3D1 else - echo "[ ok ]" + echo -n "[ ok ]" fi =20 [ "${dump_stats}" =3D 1 ] && dump_stats + + echo "$extra_msg" } =20 chk_fclose_nr() @@ -2672,6 +2703,7 @@ fail_tests() if reset_with_fail "Infinite map" 1; then run_tests $ns1 $ns2 10.0.1.1 128 chk_join_nr 0 0 0 +1 +0 1 0 1 "$(pedit_action_pkts)" + chk_fail_nr 1 -1 invert fi } =20 --=20 2.34.1 From nobody Fri May 3 02:14:19 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp1563742ede; Mon, 14 Mar 2022 23:59:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVet5nebzi2Ssvlo/j4cL4GFZQepaDfhYd7aKGlJSEXKW/G9ybNtcefuvj0FwSd35T55x2 X-Received: by 2002:a05:620a:b93:b0:67d:3914:a368 with SMTP id k19-20020a05620a0b9300b0067d3914a368mr17033724qkh.191.1647327558598; Mon, 14 Mar 2022 23:59:18 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id e27-20020ac8011b000000b002e0636b9f52si7654374qtg.96.2022.03.14.23.59.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Mar 2022 23:59:18 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4233-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=HV3JYOoa; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4233-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4233-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.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 ewr.edge.kernel.org (Postfix) with ESMTPS id 37FAE1C0B19 for ; Tue, 15 Mar 2022 06:59:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CE5B81B80; Tue, 15 Mar 2022 06:59:16 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 4B9A51B75 for ; Tue, 15 Mar 2022 06:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1647327553; 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; bh=rnn9IZtqT4kIKhVOcqxMgAMgBMJFPZzZPkyzjN4QOtM=; b=HV3JYOoaxC5ZgmaIYeXECPeSI5yAlMbsTKm1hZTQcST6aEuiYtgOKOboLqkXHa8O4LZPmT 6uBq+9MF42VQ3KrENqJGcDc9hKu1WZY2LPK4dJc11gOMVsLnbCOjTJo7eQE8YPYDc+xlRj sMklfkQF4yZA/TwKScEu6UK7iZX+3mc= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2108.outbound.protection.outlook.com [104.47.18.108]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-27-92YUEuDzOli0nT7uhMTyGg-1; Tue, 15 Mar 2022 07:59:12 +0100 X-MC-Unique: 92YUEuDzOli0nT7uhMTyGg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H6QF/I/tHv05Qn57iagk60AxcyNTTKRh3Mu4rGoVd6wV+jsRPw0bvF4/gkQpIltaBK4Ix4v4IPyivI+kEouMTrl4/+xhOPiFNf6Q9+sTATnBaSL5lFrzolB+WRfZSH6Z6SVNKqJqvyLTcRHK7z/S3lGyYJCjH9+/BPNlrw6I8wXH4WKLKf37lhzhK2LCI0B4tYc5h2VhyMRX/NKTvJaMB8LBYAg4tduyZzhpI5CSFpCOzj+V9Uj9OR7u/iusVM57Fqr6tzGeOlH8kQpnrC0UBEzoNXGDDD9g2I9btGDT4yhBqY6IXpO3jD13GBUbO7Uebq/c9gEhHIrhtsvGbVZ0Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2JqS73Y7HFpZcVVKEOxTx68bXAb6XxNNvOwtcqTbRLg=; b=B9Xrgsw7ogV7sgivO8pPd++7rltVo7WjoaTQ9OJa4lFN/elYenvQJXMIkJPW8Hito88bL97B+fZzgQmLMDndcA8IQ6QhQiQMR+wg7j2q9+aMTETUX09TRkiFloRr9dq9IodzL1Kxpd1t7qeZ2ngRwF+qzVjSMY73ZSP04MYxjrDzVEQT9z3/TD5kQIsZ84ZYgifT7j1bmmqzjcz72ojph7AWwApaCVerHe+z3c0FZjy0NZQSC/qui9U0LR3Xr2QxGGkTz0PXGtMU99Oqbk4di3cLc7oHtGRRh15iSfL4fq6onoKU6eXrUoeH0DggwdG4aj6YkvSSuyXkeQYk+H5BOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM5PR04MB3138.eurprd04.prod.outlook.com (2603:10a6:206:7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.28; Tue, 15 Mar 2022 06:59:12 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 06:59:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 6/6] selftests: mptcp: print extra msg in chk_csum_nr Date: Tue, 15 Mar 2022 14:58:26 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0236.apcprd06.prod.outlook.com (2603:1096:4:ac::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 10d06f45-ebd6-4725-e827-08da06514f2d X-MS-TrafficTypeDiagnostic: AM5PR04MB3138:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w5EB0zTaLFzhhjnFbazkqfqRcz4mO224uQ1igxSihlOFb/FyN0gS8hbSBcepiKSS0TSxjJ7OZDbAoC5utPpFAL9BM9dXEKM7h4+iaog1NfBhCN1skQl1tTK3tANx3Vdcc1xBQQSsTBJkioB3uu9rRNxHZJsR7dZE2pvCqTzg3ivUh02aiQVrWFpsrK//jmq6WCLm6gGgF+EQYaREPBm+/vpOrLe9QWvzny3VpWtwXqfBYxgNfvLGJUF5snK6MFMmbkm7cXKowLA1McpRiTMtWE5deC9Tu6iPg808YEPbpzPUlwKU6ID7TPUDpgbF745yWMZOIrEY54WnrJfZUdlS/HlJxMvMUhJws9x/GfYuIx5dc+a7E8MzxFE5iWSh2YQ82wyqiT48UCcUb09JfScCRPJX4DdvrAlHliBjXe6MmYdyFaXD1P4lEZGMvrkDdGZGet9409fc43IjSGw5YDEeuCn9iXb5B1sCDImcGPm57a6CuEv2Dj6C2zoVPSJDQt4G9YolW6hpPAF666jP/oR22p4neeOTqtOp3Oheo1KyKGyBruS2aW1JfXlEMN1yXdDWbxoKI55YsHFjmRMKOlRLO3gvtHKV9UR91UxnQu65XZ8PNvBDsjfoz0e/n0pK2mvOBamCEG0hpZWtlOPzbUCPvA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4326008)(8676002)(66946007)(66556008)(6506007)(6512007)(6666004)(38100700002)(36756003)(6486002)(5660300002)(508600001)(66476007)(107886003)(83380400001)(6916009)(8936002)(2906002)(86362001)(44832011)(2616005)(316002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AYSNRZvXtbG7Ew0ioPfo86v9/8pFpGGhvJq5PPnQnl1axftgoC9mRGBB8Ltc?= =?us-ascii?Q?nnLxvL/BclrmWc1oYfG74MBk6jhDMiD90vleuKedCX5yw5z82Jomw8Ti07je?= =?us-ascii?Q?cPy7XBPv0BKrTVuQZ1bARSn0zIY/b+kK7xOuPEIkAhLeR2G9MyKUp1TVdJiP?= =?us-ascii?Q?luxVy06QldsGM0KDi3kjw0AJNmO6rmpUbomxGwNRABgY6ur3WNRX0WD/pV3y?= =?us-ascii?Q?3hBynyyYXccix5EoNl+D3WiZPoIGUsy9hiSjls55ErkhYKIw3CP0ykSRARzt?= =?us-ascii?Q?7rvhOXW91THRKxWhElQotcMVGuxcrsnj848OTkhDXFrqw0MKy8YX/12MsoNt?= =?us-ascii?Q?4sthIUU0RRS3sSr168iFoyif43LDvh8jyIWcVbdldC6SgiO/Ukjnz9cxPQ+y?= =?us-ascii?Q?t2fH9VkNML3SJBwbRZIs4HqIGY53qnQgA8eFt8PoOeBC7HkpLH6OKm6BlKhf?= =?us-ascii?Q?mDrgO4b3aL8lq0hzIBlcyo/V5EJPhphqO+wiLu3OnIL2K8gYzG+gHekZhczU?= =?us-ascii?Q?hcCAw0SsoR+RMm+VqXdF3n0Rb1AOKVwNjgXl3yuK7q1cnCUkwWDuLrfW214m?= =?us-ascii?Q?nJVNNe8Y7p59rv2POAWFVtK0lx2Erq2v4LjljnvO/2ji7Yu4bGV5iP/wP/+I?= =?us-ascii?Q?UXTrPPXq38tA8fdEOA+TXqJ4jI0fCEfZ0bZVXcnTK2ZBhSTTFEMzQVihoE4P?= =?us-ascii?Q?QugPkVhifFX1c11EUyvDvQh+trkhBo6y99hFg7wfn9pBckfuG3tSBDlddmrx?= =?us-ascii?Q?5Ak2k4aMg9UTt77+JJJEi0tgP+ynTMwSC2r8Jkg67qHB/qArCt3JgioqAczR?= =?us-ascii?Q?dYZpAB3YJwgHGPGJIdkZvSQQxoWA61ilHDQbrBSxC7dsD+zUlRO+c3M/3+zU?= =?us-ascii?Q?6XX/A40nf/pGkiQfm3jpDEsq1tl8vcFb5ESEOSqYk7FASbtLei2cgI+g1h+Y?= =?us-ascii?Q?+5K4no6XY9yonrTBzjjc3ZyyNawb1I2ki8Woh54ZT94UdWSGy3H1JMbXl8qB?= =?us-ascii?Q?gDg01awxV5y3XLnV2W/4Q0x4A6maYUFORohW+POgCHxeIL/86oXbhv3/Riqg?= =?us-ascii?Q?S0QEbJkHCBDDS5l0JL13PVVAsnetZfy8ycC74LFJgVesM2fgxv6poauuykpj?= =?us-ascii?Q?B2+ZF+E64/HHOcaHTlhmYhP82p5VkckExeHrvN80zbA6mhiQKQzJvbGtIYms?= =?us-ascii?Q?mnlb/n+Y1FkZA9rTrmSUTB6O2AB2MxknypbuhXEL4/K94lOyvo2yp+uZfGbQ?= =?us-ascii?Q?oJlZlItkl3qXBQtXRyrjEMu3dq0g5XcYVZjldDVbTSueJtvUZ1Z80VoOzNoj?= =?us-ascii?Q?6jpv8idVQSLOqbpvLLHnsI0Ys59cO+uhRadF1HIyLEhsTuDINHqV1icii+tn?= =?us-ascii?Q?GybzXoeAOWQTqWinJcDbyutY78CWv49F05laVCnLawT+Vleq46P+no25wHDj?= =?us-ascii?Q?oxU7VzniU4X166pJft6qG8S8xuLXE2noPl97tSaVmyVnMdggb0NkxIsLwbrm?= =?us-ascii?Q?VBjgUoAPaa52JbRa3Cg1FYbUEcvWJzKO7O50czp9mx5WtA1Pm8nFTGMe1Q?= =?us-ascii?Q?=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10d06f45-ebd6-4725-e827-08da06514f2d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 06:59:11.9841 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ar9fI+yEPD68buSQI+h6To6wAw2+QSEqlhrNqV7prnCDsbTik0w8cBF/eijZBUVtSZFkQ3dlpUDq6+LooIpPwQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3138 Content-Type: text/plain; charset="utf-8" When the multiple checksum errors occur in chk_csum_nr(), print the numbers of the errors as an extra message. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 2b77576d773c..375b087edc7b 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1014,6 +1014,7 @@ chk_csum_nr() local csum_ns2=3D${2:-0} local count local dump_stats + local extra_msg=3D"" local allow_multi_errors_ns1=3D0 local allow_multi_errors_ns2=3D0 =20 @@ -1029,6 +1030,9 @@ chk_csum_nr() printf "%-${nr_blank}s %s" " " "sum" count=3D$(ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '= {print $2}') [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$csum_ns1" ]; then + extra_msg=3D"$extra_msg ns1=3D$count" + fi if { [ "$count" !=3D $csum_ns1 ] && [ $allow_multi_errors_ns1 -eq 0 ]; } = || { [ "$count" -lt $csum_ns1 ] && [ $allow_multi_errors_ns1 -eq 1 ]; }; = then echo "[fail] got $count data checksum error[s] expected $csum_ns1" @@ -1040,15 +1044,20 @@ chk_csum_nr() echo -n " - csum " count=3D$(ip netns exec $ns2 nstat -as | grep MPTcpExtDataCsumErr | awk '= {print $2}') [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$csum_ns2" ]; then + extra_msg=3D"$extra_msg ns2=3D$count" + fi if { [ "$count" !=3D $csum_ns2 ] && [ $allow_multi_errors_ns2 -eq 0 ]; } = || { [ "$count" -lt $csum_ns2 ] && [ $allow_multi_errors_ns2 -eq 1 ]; }; = then echo "[fail] got $count data checksum error[s] expected $csum_ns2" fail_test dump_stats=3D1 else - echo "[ ok ]" + echo -n "[ ok ]" fi [ "${dump_stats}" =3D 1 ] && dump_stats + + echo "$extra_msg" } =20 chk_fail_nr() --=20 2.34.1