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 D32D9248879; Tue, 20 May 2025 14:09:53 +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=1747750193; cv=none; b=CnxGN/XxLgFlDJR2kcpBitOxIys4meozbsMrvWTuwLA1aN8hp35kONo31s+YBVwTOsB63q7KLf9fGL6tmfzuEene0CTblkWxnqxSmwmtaBbqvzUglvCs++vYY4Kb51qDMoorAfRlu6dvtbhWcJZ11/BugzrqIHRxsnHW4wQMQOc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747750193; c=relaxed/simple; bh=RDcYXyEPGUP4SLKOB1mt4ItBqC/nM70mum8VAoAidyw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TfxR2OdWec0bMUif+o5o56efg52ufU0yId+mDaGpziN/DQJ+wl8LemlegWJY7oNul3lj50t1r32ZpYBBdvfED3lCkWf0jKpzBvFzG4JdlyCLXiZj5quAe1347KqjADWOLyYd5ZBb/JtnL7LdKrN9ZeBoya6ZvqYo311Tn3e8zrU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cpV1wNao; 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="cpV1wNao" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E152EC4CEE9; Tue, 20 May 2025 14:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747750193; bh=RDcYXyEPGUP4SLKOB1mt4ItBqC/nM70mum8VAoAidyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cpV1wNaoCDaV7y/DFUeMyfJAgffGC8iGGil9qyzFzfWnss/SOLh0v6pjWC5JMvWC+ piE/7ddlwMOdTeacGVegnVR5DnOnEIA2ZBt9P8uLT7sOmPlpVD1f2/yfBHx8opbkfR QvYxzcDCWdQrT/pL8PwP68UotdMf7WcUp5fYSU4U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mina Almasry , Joe Damato , Stanislav Fomichev , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 041/143] selftests: ncdevmem: Make client_ip optional Date: Tue, 20 May 2025 15:49:56 +0200 Message-ID: <20250520125811.667116307@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250520125810.036375422@linuxfoundation.org> References: <20250520125810.036375422@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stanislav Fomichev [ Upstream commit 0ebd75f5f2392c2ada04c6e11447415911fe1506 ] Support 3-tuple filtering by making client_ip optional. When -c is not passed, don't specify src-ip/src-port in the filter. Reviewed-by: Mina Almasry Reviewed-by: Joe Damato Signed-off-by: Stanislav Fomichev Link: https://patch.msgid.link/20241107181211.3934153-5-sdf@fomichev.me Signed-off-by: Jakub Kicinski Stable-dep-of: 97c4e094a4b2 ("tests/ncdevmem: Fix double-free of queue array") Signed-off-by: Sasha Levin --- tools/testing/selftests/net/ncdevmem.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/ncdevmem.c b/tools/testing/selftests/net/ncdevmem.c index 4733d1a0aab5d..faa9dce121c72 100644 --- a/tools/testing/selftests/net/ncdevmem.c +++ b/tools/testing/selftests/net/ncdevmem.c @@ -62,7 +62,7 @@ */ static char *server_ip = "192.168.1.4"; -static char *client_ip = "192.168.1.2"; +static char *client_ip; static char *port = "5201"; static size_t do_validation; static int start_queue = 8; @@ -236,8 +236,14 @@ static int configure_channels(unsigned int rx, unsigned int tx) static int configure_flow_steering(void) { - return run_command("sudo ethtool -N %s flow-type tcp4 src-ip %s dst-ip %s src-port %s dst-port %s queue %d >&2", - ifname, client_ip, server_ip, port, port, start_queue); + return run_command("sudo ethtool -N %s flow-type tcp4 %s %s dst-ip %s %s %s dst-port %s queue %d >&2", + ifname, + client_ip ? "src-ip" : "", + client_ip ?: "", + server_ip, + client_ip ? "src-port" : "", + client_ip ? port : "", + port, start_queue); } static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd, -- 2.39.5