From patchwork Mon Nov 28 15:42:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 2319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5763685wrr; Mon, 28 Nov 2022 07:48:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf5xn7r+rO9ZhK7Vn2Ks52Gla3oDV22+ouTSmIp6leNmWQLVSen+Q0vBKT9rDmphKhQSNJP+ X-Received: by 2002:a17:906:43d8:b0:7bd:7455:a196 with SMTP id j24-20020a17090643d800b007bd7455a196mr11581880ejn.71.1669650486726; Mon, 28 Nov 2022 07:48:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669650486; cv=none; d=google.com; s=arc-20160816; b=AJTzhanfO/gWT5QB1rbIcwhGRIuj1bgBo0A1M8ab80FkB9d0At8ctONe2O359sGT4x ZPWTjkm/hqB2bsvzFFRMGwk5mQWh/fSlkweJ/sPaYraqO8kGoif8ChKb3EpQ+6c5Bvar bOpgB+pxylla17qKU+JeURSmFofIDX1xXOzGKtt/gfrkwMXuHFTF+4HFZbfL2y3Ex4b7 q6rN8YXQdKGtuO00mNgwygsWtnN7nVXMW8LNX8cVN+r30NmL2LEl34VGBFSuBvxCMpqa /GNE+lGxA4L+Da838Djo8W/tiLt7tOtxTgzlXyyLL119ivCKtRjok9PIOR0YWzodN70e ekmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=WTPlnqI4X1EQdZ427Qdxpqetj4xUaQDyeIVc2yaysg4=; b=KK1knp0EIcTZOpkeB5A4/5qjXE8CbIpnJcAzPoG7v1DZWBNqbtCbKNAPbiMxDHJKa1 XdZm+5Fhm27UVuxdI1rHR/ZzLoVwZEFVnkOiGQwf2ypFcJmZiVa4sHiKvMoGkz06e1/0 GYFKu5apkKmy2tYce0Ttzg6WnCLCfTcniCpGAqqmCg9JN8pGKe5BY/XXNqv18Y+KB5sW PCAOyleCOMQ9/a4MiNI/JsUCHqjubdLVCz8Hh8IMwzToT/KekrB/M0oyG9w5H42D8DsS v0qSveE2tCYOTZwBh8alDEMMIG/dXMHqkFbFQKWvS5LY6EXLaCTsywyyIrRRtJEzGyfJ q5Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=RhTkZA17; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o23-20020a170906601700b007707ab4be28si7031155ejj.972.2022.11.28.07.47.42; Mon, 28 Nov 2022 07:48:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=RhTkZA17; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230035AbiK1Pnh (ORCPT + 99 others); Mon, 28 Nov 2022 10:43:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231775AbiK1Pnc (ORCPT ); Mon, 28 Nov 2022 10:43:32 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 774E31D67B for ; Mon, 28 Nov 2022 07:43:31 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id s5so15930804edc.12 for ; Mon, 28 Nov 2022 07:43:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WTPlnqI4X1EQdZ427Qdxpqetj4xUaQDyeIVc2yaysg4=; b=RhTkZA17FTqr2QzKPiZHWXGJczsNB/1GP8mICWLllgQsNhtmLwdjlrYxvYT03rqtEF yuWQZvdiS6kwbBW6aiVKLb9W9vABka+YXKeubtqM6W8fCMwj6D0jFeo+/9t74TBZKstw rZ+JRnkd4TOtF5N+kQdRikkVckYDqJerXD2duF6bA3WuQqw0mHnl1i54hm0kUYJCk2t1 pR4LJezSZ3SiDoMH/KytmQPzTFum88wHKeYr+oFo5aodP/V8PaoSMuGl0PkZGpP8all6 qoWjXmLoSByn/V/C2brHn7XK78debbp8MBkv7hXc3clqvQJrcujZBDNWw2k+wDa7qmEI 1ygg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WTPlnqI4X1EQdZ427Qdxpqetj4xUaQDyeIVc2yaysg4=; b=1xUuCEIbCK5hubmWhtKbcn+FC41iKe7eP6g7kmDXgNn4wqI0ywGzd8JJR2ZWlHcXhG 7dvN333Mepyj9qAczceUFVx/nspfl/fEhl3hzkzns+InRUB7yx4pimBbRYaGAnwvSGqb BoDmHCm+cCNLYEm3KiqSTaZ4naaCIz6O8KUa8q+lwAd/ZnKpZCK9OACbWN3kqEgTBcs1 8OOAp/ypYychG4T+GWaUn2YRm1Mlp5ITXeeXJnMGhWBAfFzshzr85yc9etzj6lMG4T4Y 7LNl6ictBB9WkvpOkuEF+Qb1cHxr9i9sNX2ppzmQzyc3te90DsDZO2mYkIOQMvtyB5mb r7eA== X-Gm-Message-State: ANoB5pnpvPXCk4yjIGEPjNFAuCnXr38udtb/xzHysM13MNgFZ7/lvN2M 1LTrtNtGkZU09y4eQqMhY2GKrA== X-Received: by 2002:aa7:da4d:0:b0:46b:4156:bf29 with SMTP id w13-20020aa7da4d000000b0046b4156bf29mr3948998eds.246.1669650209963; Mon, 28 Nov 2022 07:43:29 -0800 (PST) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id n6-20020aa7db46000000b0046aa2a36954sm4854179edt.97.2022.11.28.07.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 07:43:29 -0800 (PST) From: Matthieu Baerts To: Davide Caratti , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Mat Martineau , Matthieu Baerts , Mengen Sun , Menglong Dong , Paolo Abeni Cc: Jiang Biao , linux-kernel@vger.kernel.org, mptcp@lists.linux.dev, netdev@vger.kernel.org Subject: [PATCH net 0/2] mptcp: More fixes for 6.1 Date: Mon, 28 Nov 2022 16:42:36 +0100 Message-Id: <20221128154239.1999234-1-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=724; i=matthieu.baerts@tessares.net; h=from:subject; bh=TuOle9aMVAdwejSJaELmoVnupS13kiLmy7nhhiprnbc=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjhNbo5o3pdZU+fR+Elezm+jlhfnafeu6/PtaMwcmQ JZyu/rSJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY4TW6AAKCRD2t4JPQmmgcwrKEA CToHobqfqMJpJioemGJHF3KJQoJAFomQ3ObzW8b/37e6bh6sRywV/mktnVpQHxOc36B9BH7hr8NJgv +o3HM5J8YA1XZQPBi4t+e0AKA4D2SGc4o+CZ47Otty1PnzROsHFsNn/RewP2kn/NnzAkc3zhD6Q4Cz 5ynOcdZjs9McQ9R88dXjXEh32RPtSBy8HB73yNeEnMsUEB/xQZvasOOla+0PbbQ605DUCu0FEsSZ6I taMajUT4r4YwiVWiMFV64NyRNWoD7iMOOeHux8QETAE6Z+F+nEpYYK6KPjJXkC4CytmRoz0pg7VAMM gUlXUdvBRnCGckT/6EANsAcKdx5Z+GNMlH3uGij3H1o6fqp0pqlfzcwFXvuPLQ5Yk2s38OE6/VKQEt Fd1jZBuEsTayL3Ah0K9RHtSM7G/+bKVedohjhslbAiJW8YR93ppsl7VM733pVI31eOysHuWZEhONwp Ub4Gff1FpSPd7Y4uhwf/xYWAllPA4Acv67ai6rHOQZvryAeJAQCyfha5XtkTx7Pj0fWZRu8Ix/nVj0 TVhAAOVEohrcCAh0eKmy+Ei+wwHd5LctrhNbZI14QiR126O2NCDOicx34+TVVRSMPOhxcZFYPgufiU om9cUcxQ1qhqiC/f+iqgx6BhgKyN0wdIT7gwEZZuSKCgYMM1exSaRW9WtvUg== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750755428327897239?= X-GMAIL-MSGID: =?utf-8?q?1750755428327897239?= Patch 1 makes sure data received after a close will still be processed and acked as exepected. This is a regression for a commit introduced in v5.11. Patch 2 fixes a kernel deadlock found when working on validating TFO with a listener MPTCP socket. This is not directly linked to TFO but it is easier to reproduce the issue with it. This fixes a bug introduced by a commit from v6.0. Menglong Dong (1): mptcp: don't orphan ssk in mptcp_close() Paolo Abeni (1): mptcp: fix sleep in atomic at close time net/mptcp/protocol.c | 13 ++++++------- net/mptcp/subflow.c | 6 +++--- 2 files changed, 9 insertions(+), 10 deletions(-) base-commit: f2fc2280faabafc8df83ee007699d21f7a6301fe