From patchwork Thu Jun 10 22:59:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 458295 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70D01C48BE0 for ; Thu, 10 Jun 2021 22:59:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 57C56613F1 for ; Thu, 10 Jun 2021 22:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231153AbhFJXBs (ORCPT ); Thu, 10 Jun 2021 19:01:48 -0400 Received: from mga09.intel.com ([134.134.136.24]:55161 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230484AbhFJXBr (ORCPT ); Thu, 10 Jun 2021 19:01:47 -0400 IronPort-SDR: /jiZEsooGhYBR02r0Sx7RJtoUASLKZWMBoIYtuig03RRSC0L1HGMXYcXeZ2ceK/2o8i++no3dn shOqp+Cz+FEg== X-IronPort-AV: E=McAfee;i="6200,9189,10011"; a="205383801" X-IronPort-AV: E=Sophos;i="5.83,264,1616482800"; d="scan'208";a="205383801" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2021 15:59:50 -0700 IronPort-SDR: HQY8/5wxQYDJ2ev1x8LFPECtKofreEBLMMzXjSR/KH6tX8+DoqggqRT5TaqmS/rpfeDu44Wqaf 9OOv6FF49xtw== X-IronPort-AV: E=Sophos;i="5.83,264,1616482800"; d="scan'208";a="441387018" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.70.185]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2021 15:59:49 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Mat Martineau , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev Subject: [PATCH net 0/5] mptcp: More v5.13 fixes Date: Thu, 10 Jun 2021 15:59:39 -0700 Message-Id: <20210610225944.351224-1-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Here's another batch of MPTCP fixes for v5.13. Patch 1 cleans up memory accounting between the MPTCP-level socket and the subflows to more reliably transfer forward allocated memory under pressure. Patch 2 wakes up socket readers more reliably. Patch 3 changes a WARN_ONCE to a pr_debug. Patch 4 changes the selftests to only use syncookies in test cases where they do not cause spurious failures. Patch 5 modifies socket error reporting to avoid a possible soft lockup. Paolo Abeni (5): mptcp: try harder to borrow memory from subflow under pressure mptcp: wake-up readers only for in sequence data mptcp: do not warn on bad input from the network selftests: mptcp: enable syncookie only in absence of reorders mptcp: fix soft lookup in subflow_error_report() net/mptcp/protocol.c | 52 +++++---- net/mptcp/protocol.h | 1 - net/mptcp/subflow.c | 108 +++++++++--------- .../selftests/net/mptcp/mptcp_connect.sh | 11 +- 4 files changed, 88 insertions(+), 84 deletions(-) base-commit: 22488e45501eca74653b502b194eb0eb25d2ad00