From patchwork Fri Oct 11 23:03:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13833242 X-Patchwork-Delegate: kuba@kernel.org 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 6DB7F28EB for ; Fri, 11 Oct 2024 23:03:16 +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=1728687797; cv=none; b=u6wu3eSXgQFviBLaSciO34Lsw0N8MX8C395Z1B1zeshBu/A+riA14LM7W8lIVtdITMLJy4t89QtdadA5+NXc8jo8VeTfjDC0jg0I4RrGOES814HWAQgVl26+1uPz8a7wY/esjbBI/jSxcL9GJJH5IzbX0Wr19JjFh+rWY1NIQkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728687797; c=relaxed/simple; bh=wEoszMBmFN4UafOMeXdT4FosiXT1Cil8+SZNZE6DNlI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hv+WyRUnN7skoJGDB3M4soIjOhUphCrc6+GY85yAhrpo1FoMlpHJtyAfG11+fcZbuLLC1jnAgf8jgQTcjyUqnYPgZu+JFitdI2Rode+OOsaUZaekQj2U38zsQw/6Gu9DUf8moNO+5wyvX4gMNmz2a2RsZzrv/PqEIhUzTliIwr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hxDJs9Sa; 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="hxDJs9Sa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49147C4CEC3; Fri, 11 Oct 2024 23:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728687796; bh=wEoszMBmFN4UafOMeXdT4FosiXT1Cil8+SZNZE6DNlI=; h=From:To:Cc:Subject:Date:From; b=hxDJs9SaozIxhxl9e8glJdUDRguBBArAq0czVPd4xTUQpM4QBUf22uOSnn9qJ92yq 3vXQcTpyq3ZuxvBrUHjpwrROdsCzsucLtNsf16Ak2Tu5AKTjxTDfTL+dRcu5ejPH9z wjCetF9evyHqzWGOVHl11PQxpKs4FsWHMyE5OAw/mhLtT1DqvOTV9A7QNuti4AmiNK dmS+ziiliiOpaGkdmcufky+2wxBysLguqULSNuwILIz7mHEcNFcS43BZD/9G6JVi6v v4SR8smDctsV4zdlY5IKyQ1K0qWr1NH27240AMJPhgZT1scVQp7X0LzG4Woe8ZZicU fmHiR7T+NdizQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, donald.hunter@gmail.com, Jakub Kicinski , Stanislav Fomichev Subject: [PATCH net-next v2 1/2] selftests: net: rebuild YNL if dependencies changed Date: Fri, 11 Oct 2024 16:03:10 -0700 Message-ID: <20241011230311.2529760-1-kuba@kernel.org> X-Mailer: git-send-email 2.46.2 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Try to rebuild YNL if either user added a new family or the specs of the families have changed. Stanislav's ncdevmem cause a false positive build failure in NIPA because libynl.a isn't rebuilt after ethtool is added to YNL_GENS. Note that sha1sum is already used in other parts of the build system. Acked-by: Stanislav Fomichev Signed-off-by: Jakub Kicinski --- v2: - use .libynl-$hash.sig as the name to avoid having to add to gitignore v1: https://lore.kernel.org/20241010220826.2215358-1-kuba@kernel.org --- tools/testing/selftests/net/ynl.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/ynl.mk b/tools/testing/selftests/net/ynl.mk index 1ef24119def0..add5c0cdeac4 100644 --- a/tools/testing/selftests/net/ynl.mk +++ b/tools/testing/selftests/net/ynl.mk @@ -9,6 +9,8 @@ # YNL_GEN_FILES: TEST_GEN_FILES which need YNL YNL_OUTPUTS := $(patsubst %,$(OUTPUT)/%,$(YNL_GEN_FILES)) +YNL_SPECS := \ + $(patsubst %,$(top_srcdir)/Documentation/netlink/specs/%.yaml,$(YNL_GENS)) $(YNL_OUTPUTS): $(OUTPUT)/libynl.a $(YNL_OUTPUTS): CFLAGS += \ @@ -16,10 +18,19 @@ $(YNL_OUTPUTS): CFLAGS += \ -I$(top_srcdir)/tools/net/ynl/lib/ \ -I$(top_srcdir)/tools/net/ynl/generated/ -$(OUTPUT)/libynl.a: +# Make sure we rebuild libynl if user added a new family. We can't easily +# depend on the contents of a variable so create a fake file with a hash. +YNL_GENS_HASH := $(shell echo $(YNL_GENS) | sha1sum | cut -c1-8) +$(OUTPUT)/.libynl-$(YNL_GENS_HASH).sig: + $(Q)rm -f $(OUTPUT)/.libynl-*.sig + $(Q)touch $(OUTPUT)/.libynl-$(YNL_GENS_HASH).sig + +$(OUTPUT)/libynl.a: $(YNL_SPECS) $(OUTPUT)/.libynl-$(YNL_GENS_HASH).sig + $(Q)rm -f $(top_srcdir)/tools/net/ynl/libynl.a $(Q)$(MAKE) -C $(top_srcdir)/tools/net/ynl GENS="$(YNL_GENS)" libynl.a $(Q)cp $(top_srcdir)/tools/net/ynl/libynl.a $(OUTPUT)/libynl.a EXTRA_CLEAN += \ $(top_srcdir)/tools/net/ynl/lib/__pycache__ \ - $(top_srcdir)/tools/net/ynl/lib/*.[ado] + $(top_srcdir)/tools/net/ynl/lib/*.[ado] \ + $(OUTPUT)/.libynl-*.sig From patchwork Fri Oct 11 23:03:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13833243 X-Patchwork-Delegate: kuba@kernel.org 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 6DBD71D049D for ; Fri, 11 Oct 2024 23:03:17 +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=1728687797; cv=none; b=d7sH4qdsDBDFxweWOWjEZLVTg9/6K5ERUOwWynziT5hcQipKknyIDUyZ8OdVWq2GgJp4hB5vRT89SJkZMfxUCgSmhQ6pFR66bmtQsOjXhd9gaELwYTZlwr/MbDmPY+Kjpwxc9EKwswBrXmauSPML+j7RITT4WKsOGLaoXvZp9tk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728687797; c=relaxed/simple; bh=qwbp9dDov6OLftlst/qfGoIZ1uSZher+ccmeeGqmftk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=amkFspbMQ5lrep3mG3MQaiUA0y/FagISmQK1+9OnIPTyY/CiauqTwsKr00cW9OqfV/bC5/vO1svpc1871u+oTSGqtbrs6Hgb07DcoB+Ul/oB7ec5ItlM0/LU4393Ia+aguDWwgLkKP2pjapcV5oP4jF4LJm5FzTLdXxGM/D4lzU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gIfLyeer; 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="gIfLyeer" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAA46C4CECF; Fri, 11 Oct 2024 23:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728687797; bh=qwbp9dDov6OLftlst/qfGoIZ1uSZher+ccmeeGqmftk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gIfLyeerIt+RdBxIB0B8Z+yLjoEE7b6fIJmxn270UPLyvp6/HXWjxWIe7/PUUcKR+ GK+2MrArI9PoHPlCbtaEZB0hfX679w9PZ+aBCB2BT38KEB+0kwMDyT7JS0uQPcZfQr DD5IecI/edOBnnGHVDl6XlA07ULrgS/WUWgQ3vJlHwQTGl7BDg8rfzZS12EVD7YmUy F7Yp3xCcrKfpVnOjW7N8bMvg+pYguKW0EPW5xER0xB58HcsoDHpS3yX6GvnBYc26ao 21Xz1qNNzgO4CHD1eD9+6mtv1iSndJNMa6kL2wGfZIu3ttFOUTjvct1/DbpiNlYVKw rC6dkvdaQTx1A== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, donald.hunter@gmail.com, Jakub Kicinski Subject: [PATCH net-next v2 2/2] selftests: net: move EXTRA_CLEAN of libynl.a into ynl.mk Date: Fri, 11 Oct 2024 16:03:11 -0700 Message-ID: <20241011230311.2529760-2-kuba@kernel.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241011230311.2529760-1-kuba@kernel.org> References: <20241011230311.2529760-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit 1fd9e4f25782 ("selftests: make kselftest-clean remove libynl outputs") added EXTRA_CLEAN of YNL generated files to ynl.mk. We already had a EXTRA_CLEAN in the file including the snippet. Consolidate them. Signed-off-by: Jakub Kicinski Acked-by: Stanislav Fomichev --- v2: - new patch --- tools/testing/selftests/net/Makefile | 1 - tools/testing/selftests/net/ynl.mk | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 649f1fe0dc46..26a4883a65c9 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -98,7 +98,6 @@ TEST_PROGS += vlan_hw_filter.sh TEST_PROGS += bpf_offload.py # YNL files, must be before "include ..lib.mk" -EXTRA_CLEAN += $(OUTPUT)/libynl.a YNL_GEN_FILES := ncdevmem TEST_GEN_FILES += $(YNL_GEN_FILES) diff --git a/tools/testing/selftests/net/ynl.mk b/tools/testing/selftests/net/ynl.mk index add5c0cdeac4..d43afe243779 100644 --- a/tools/testing/selftests/net/ynl.mk +++ b/tools/testing/selftests/net/ynl.mk @@ -33,4 +33,5 @@ $(OUTPUT)/libynl.a: $(YNL_SPECS) $(OUTPUT)/.libynl-$(YNL_GENS_HASH).sig EXTRA_CLEAN += \ $(top_srcdir)/tools/net/ynl/lib/__pycache__ \ $(top_srcdir)/tools/net/ynl/lib/*.[ado] \ - $(OUTPUT)/.libynl-*.sig + $(OUTPUT)/.libynl-*.sig \ + $(OUTPUT)/libynl.a