From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 296BD3EDE4E; Tue, 12 May 2026 17:59:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608773; cv=none; b=uGsYdITZCQPc2erbCWS49VTNBZn1Ui8JbTJLnxzxTLiefvyiUGlE7BHXbqAfayhzE+NfiN7SCm53CNQYjbgG21jOha0qDfm9XsleavNsiLZY6/2EF3NxmZfwjFyXEtzIzEgO1E1P219APcQZNkPNufYSSf0FaTZizoybUhTaCI8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608773; c=relaxed/simple; bh=jTiwCOM9I+V23m2cK44Atj/TvkNx5KgvzI6GlrMr4dI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hf4TYC2BK5jF5ua8bCmYu+WteA8fPDoIrJIXEdQH6gV9CzraAWe41a9thE6yNnSyZ9AQQMwqGWIBXMd8vJNOGoQ8TjWQjKmpXPPNt/n7XM8+aDhtXHG+IItFZo28fGOhbCxAMcr38gNrYj2mGcKTVuimEGDQfLnFsad/Iau+Ax8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1EBt8C7K; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1EBt8C7K" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3B95C2BCB0; Tue, 12 May 2026 17:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778608773; bh=jTiwCOM9I+V23m2cK44Atj/TvkNx5KgvzI6GlrMr4dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1EBt8C7K89jKD/oz19OVO4e+NMgPYNrjqrH+qjUYXOpOHH/EkMJJOQ+TAX5udWV7R YT5AnJEZdWvtCz6uPFTtraOovqYgK6Dq7/Q4stZEXOC1hUKoxe9CRn/14QSgtXBkRB HJGjvKeLGSW5yMWZqNRBvfxiXaUEi87dEz1W5sxQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mat Martineau , "Matthieu Baerts (NGI0)" , Jakub Kicinski Subject: [PATCH 6.18 207/270] selftests: mptcp: pm: restrict unknown check to pm_nl_ctl Date: Tue, 12 May 2026 19:40:08 +0200 Message-ID: <20260512173942.806934630@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512173938.452574370@linuxfoundation.org> References: <20260512173938.452574370@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthieu Baerts (NGI0) commit 53705ddfa18408f8e1f064331b6387509fa19f7f upstream. When pm_netlink.sh is executed with '-i', 'ip mptcp' is used instead of 'pm_nl_ctl'. IPRoute2 doesn't support the 'unknown' flag, which has only been added to 'pm_nl_ctl' for this specific check: to ensure that the kernel ignores such unsupported flag. No reason to add this flag to 'ip mptcp'. Then, this check should be skipped when 'ip mptcp' is used. Fixes: 0cef6fcac24d ("selftests: mptcp: ip_mptcp option for more scripts") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-11-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/net/mptcp/pm_netlink.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -194,9 +194,13 @@ check "show_endpoints" \ flush_endpoint check "show_endpoints" "" "flush addrs" -add_endpoint 10.0.1.1 flags unknown -check "show_endpoints" "$(format_endpoints "1,10.0.1.1")" "ignore unknown flags" -flush_endpoint +# "unknown" flag is only supported by pm_nl_ctl +if ! mptcp_lib_is_ip_mptcp; then + add_endpoint 10.0.1.1 flags unknown + check "show_endpoints" "$(format_endpoints "1,10.0.1.1")" \ + "ignore unknown flags" + flush_endpoint +fi set_limits 9 1 2>/dev/null check "get_limits" "${default_limits}" "rcv addrs above hard limit"