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: 13057722 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AB71C43217 for ; Mon, 28 Nov 2022 15:43:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231909AbiK1Png (ORCPT ); Mon, 28 Nov 2022 10:43:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231786AbiK1Pnc (ORCPT ); Mon, 28 Nov 2022 10:43:32 -0500 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5B221D67C for ; Mon, 28 Nov 2022 07:43:31 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id s12so15965823edd.5 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=G8a2yMweblb7lyBw+8wYHCRus9Ygn0j1Lpcn/jOTFjSXtCcGynlPuR0sbhQC7J81Br Xa0wPXyHZZeeh91cq8n2IfbwiLFvdkokzErAORWYO8gh3qDFZiAcvctWnPMHS/zoLwow WYG2h2JPXERCedi2j7kuyc/RUpXB/xt769LCUaaNm0iiaeXD3MAksLhtoXFw8ikqNPTF kBYFzgLnuRg9dztBmhyG0TGPslQ8/t+pKXjAARk2E9uh1wwIX6Vtzw/hn3Cx+U5Lsz2P y1VGO61gXfyXo8rrzKCdMKze7fQO+4ATBW6xizbwK4VMS6FP9xm4akrswbhiF/QYkSPN wYGg== X-Gm-Message-State: ANoB5pk8euzqejM+YSbVo3RkqQXIvheLqJVJyjpd9KcpUhj/jwit7v24 aNGueXrBqogmPGi4YDJXOWaOJi2D0OnCuhuultc= X-Google-Smtp-Source: AA0mqf45iY6v5EnIgMFTeG3IxSMd6Qb9QNRFIz+rygd/FfAWFDxn0Z0xnwe1ifgK7VTI/+PiJ1NLvA== 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 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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