Commit b10fdeea authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: check sha1sum just once for each atomic header 



It is unneeded to check the sha1sum every time.

Create the timestamp files to manage it.

Add '.' to clean-dirs because 'make clean' must visit ./Kbuild to
clean up the timestamp files.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent a3c4d4ab

Kbuild

+24 −9
Original line number Diff line number Diff line
@@ -43,17 +43,32 @@ PHONY += missing-syscalls 
missing-syscalls: scripts/checksyscalls.sh $(offsets-file)

	$(call cmd,syscalls)



# Check atomic headers are up-to-date



quiet_cmd_atomics = CALL    $<

      cmd_atomics = $(CONFIG_SHELL) $<



PHONY += old-atomics

old-atomics: scripts/atomic/check-atomics.sh

	$(call cmd,atomics)

# Check the manual modification of atomic headers



quiet_cmd_check_sha1 = CHKSHA1 $<

      cmd_check_sha1 = \

	if ! command -v sha1sum >/dev/null; then \

		echo "warning: cannot check the header due to sha1sum missing"; \

		exit 0; \

	fi; \

	if [ "$$(sed -n '$$s:// ::p' $<)" != \

	     "$$(sed '$$d' $< | sha1sum | sed 's/ .*//')" ]; then \

		echo "error: $< has been modified." >&2; \

		exit 1; \

	fi; \

	touch $@



atomic-checks += $(addprefix $(obj)/.checked-, \

	  atomic-arch-fallback.h \

	  atomic-instrumented.h \

	  atomic-long.h)



targets += $(atomic-checks)

$(atomic-checks): $(obj)/.checked-%: include/linux/atomic/%  FORCE

	$(call if_changed,check_sha1)



# A phony target that depends on all the preparation targets



PHONY += prepare

prepare: $(offsets-file) missing-syscalls old-atomics

prepare: $(offsets-file) missing-syscalls $(atomic-checks)

	@:

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ vmlinux-dirs := $(patsubst %/,%,$(filter %/, \ 
		     $(libs-y) $(libs-m)))



build-dirs	:= $(vmlinux-dirs)

clean-dirs	:= $(sort $(vmlinux-dirs) Documentation \

clean-dirs	:= $(sort $(vmlinux-dirs) Documentation . \

		     $(patsubst %/,%,$(filter %/, $(core-) \

			$(drivers-) $(libs-))))

scripts/atomic/check-atomics.sh

deleted100755 → 0
+0 −33
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0

#

# Check if atomic headers are up-to-date



ATOMICDIR=$(dirname $0)

ATOMICTBL=${ATOMICDIR}/atomics.tbl

LINUXDIR=${ATOMICDIR}/../..



echo '' | sha1sum - > /dev/null 2>&1

if [ $? -ne 0 ]; then

	printf "sha1sum not available, skipping atomic header checks.\n"

	exit 0

fi



cat <<EOF |

linux/atomic/atomic-instrumented.h

linux/atomic/atomic-long.h

linux/atomic/atomic-arch-fallback.h

EOF

while read header; do

	OLDSUM="$(tail -n 1 ${LINUXDIR}/include/${header})"

	OLDSUM="${OLDSUM#// }"



	NEWSUM="$(sed '$d' ${LINUXDIR}/include/${header} | sha1sum)"

	NEWSUM="${NEWSUM%% *}"



	if [ "${OLDSUM}" != "${NEWSUM}" ]; then

		printf "warning: generated include/${header} has been modified.\n"

	fi

done



exit 0