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 AE6D133509E; Wed, 18 Mar 2026 03:38:35 +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=1773805115; cv=none; b=cyr/JLO/T1D6EK5fBtE5LSVsxlGWyC3vN+OzpEEjXXlZ3NK/eJMzGvGIFiWhMfCocqMCbIOcE0RzzcAF3xUueQOabcXzkcjL6GN90JIky5HYPT8xUu6wcv0VCqeXs7+F1QzVNdbXuVQUlUwKXtkvobPW949riAq3Jjbysq3BUMQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773805115; c=relaxed/simple; bh=0sqywE3OZJ1/hZ7YhT0MaHvx4kTn/UJnrWinCgnLjSg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GBuePRsI5xnG+vcWlocqfvE9mBb+l++Y3NqSNCJXjVb8P7XaPFnNYrOZ5RKfWY5O4A18Ip51jVB285AvO3UuzMBtDo+u8iZhQ3ukVgvwDjhk5HL+Ky8VLco159gW6xZcPYAcHS4rhjApXF69GrhcO1eQEombf/k2zBbeuDUOiNY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W9M4ifJg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="W9M4ifJg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE473C2BC87; Wed, 18 Mar 2026 03:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773805115; bh=0sqywE3OZJ1/hZ7YhT0MaHvx4kTn/UJnrWinCgnLjSg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W9M4ifJgzMRKL8S0JZYKdk5szXDK8BCfEiTjWEvZpIzsP5Q4csOM+whjvI37fEDKb vPuhqeQVtlpDN8AG/Flyr8QqgdrtxrDuNKITE/CglJWuFM3HIMDwqNTP/bIpZM2aB3 0KSvLzIN5SdLv6uc5DcB0AD2XCouGUHSIRE2QucKbgQDB8iNYfsIF6Zc1VtKO6zln2 u2ohku+WSwMcRnqefV+fxIhS8+cAyE/+IxvfGnhNLy70CWsh4u/oWBmULnPiti9uDX 8uFDYuv5uTSSi7tj2VX36EJp8w4IQlPD/6DKmsT+fmkxClR1lLKHGv/aq5SSi2SJh5 +hcOnLAjiiyjA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, linux-kselftest@vger.kernel.org, shuah@kernel.org, willemb@google.com, petrm@nvidia.com, dw@davidwei.uk, mst@redhat.com, Jakub Kicinski Subject: [PATCH net-next v4 1/6] selftests: net: move gro to lib for HW vs SW reuse Date: Tue, 17 Mar 2026 20:38:14 -0700 Message-ID: <20260318033819.1469350-2-kuba@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260318033819.1469350-1-kuba@kernel.org> References: <20260318033819.1469350-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The gro.c packet sender is used for SW testing but bulk of incoming new tests will be HW-specific. So it's better to put them under drivers/net/hw/, to avoid tip-toeing around netdevsim. Move gro.c to lib so we can reuse it. Reviewed-by: Petr Machata Reviewed-by: Willem de Bruijn Signed-off-by: Jakub Kicinski --- tools/testing/selftests/drivers/net/Makefile | 1 - tools/testing/selftests/net/lib/Makefile | 1 + tools/testing/selftests/{drivers/net => net/lib}/gro.c | 2 +- tools/testing/selftests/drivers/net/.gitignore | 1 - tools/testing/selftests/drivers/net/gro.py | 2 +- tools/testing/selftests/net/lib/.gitignore | 1 + 6 files changed, 4 insertions(+), 4 deletions(-) rename tools/testing/selftests/{drivers/net => net/lib}/gro.c (99%) diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile index 8154d6d429d3..7c7fa75b80c2 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -6,7 +6,6 @@ TEST_INCLUDES := $(wildcard lib/py/*.py) \ ../../net/lib.sh \ TEST_GEN_FILES := \ - gro \ napi_id_helper \ # end of TEST_GEN_FILES diff --git a/tools/testing/selftests/net/lib/Makefile b/tools/testing/selftests/net/lib/Makefile index 5339f56329e1..ff83603397d0 100644 --- a/tools/testing/selftests/net/lib/Makefile +++ b/tools/testing/selftests/net/lib/Makefile @@ -14,6 +14,7 @@ TEST_FILES := \ TEST_GEN_FILES := \ $(patsubst %.c,%.o,$(wildcard *.bpf.c)) \ csum \ + gro \ xdp_helper \ # end of TEST_GEN_FILES diff --git a/tools/testing/selftests/drivers/net/gro.c b/tools/testing/selftests/net/lib/gro.c similarity index 99% rename from tools/testing/selftests/drivers/net/gro.c rename to tools/testing/selftests/net/lib/gro.c index 3c0745b68bfa..02e29509fbea 100644 --- a/tools/testing/selftests/drivers/net/gro.c +++ b/tools/testing/selftests/net/lib/gro.c @@ -77,7 +77,7 @@ #include #include "kselftest.h" -#include "../../net/lib/ksft.h" +#include "ksft.h" #define DPORT 8000 #define SPORT 1500 diff --git a/tools/testing/selftests/drivers/net/.gitignore b/tools/testing/selftests/drivers/net/.gitignore index 3633c7a3ed65..585ecb4d5dc4 100644 --- a/tools/testing/selftests/drivers/net/.gitignore +++ b/tools/testing/selftests/drivers/net/.gitignore @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -gro napi_id_helper psp_responder diff --git a/tools/testing/selftests/drivers/net/gro.py b/tools/testing/selftests/drivers/net/gro.py index cbc1b19dbc91..2da53686354f 100755 --- a/tools/testing/selftests/drivers/net/gro.py +++ b/tools/testing/selftests/drivers/net/gro.py @@ -117,7 +117,7 @@ from lib.py import ksft_variants """ Setup hardware loopback mode for GRO testing. """ if not hasattr(cfg, "bin_remote"): - cfg.bin_local = cfg.test_dir / "gro" + cfg.bin_local = cfg.net_lib_dir / "gro" cfg.bin_remote = cfg.remote.deploy(cfg.bin_local) if not hasattr(cfg, "feat"): diff --git a/tools/testing/selftests/net/lib/.gitignore b/tools/testing/selftests/net/lib/.gitignore index bbc97d6bf556..6cd2b762af5d 100644 --- a/tools/testing/selftests/net/lib/.gitignore +++ b/tools/testing/selftests/net/lib/.gitignore @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only csum +gro xdp_helper -- 2.53.0