mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
7146de5ff5
The phys_addr_t size is predicated on whether CONFIG_PHYS_ADDR_T_64BIT is
set or not.
In the VMA tests, virt_to_phys() from tools/include/linux casts a volatile
void * pointer to phys_addr_t, if CONFIG_PHYS_ADDR_T_64BIT is not set,
this will be 32-bit and trigger a warning.
Obviously this might also lead to truncation, which we would rather avoid.
Fix this by adjusting the generation of generated/bit-length.h to generate
a CONFIG_PHYS_ADDR_T{bits}BIT define.
This does result in the generation of the useless CONFIG_PHYS_ADDR_T_32BIT
define for 32-bit systems, but this should have no effect, and makes
implementation of this easier.
This resolves the issue and the warning.
[lorenzo.stoakes@oracle.com: VMA tests not properly importing bit-length.h]
Link: https://lkml.kernel.org/r/a6183df9-3108-4d59-8128-4fc6c14e22a5@lucifer.local
Link: https://lkml.kernel.org/r/20241017165638.95602-1-lorenzo.stoakes@oracle.com
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Tested-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Jann Horn <jannh@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
75 lines
2.1 KiB
Makefile
75 lines
2.1 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
CFLAGS += -I../shared -I. -I../../include -I../../../lib -g -Og -Wall \
|
|
-D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined
|
|
LDFLAGS += -fsanitize=address -fsanitize=undefined
|
|
LDLIBS += -lpthread -lurcu
|
|
LIBS := slab.o find_bit.o bitmap.o hweight.o vsprintf.o
|
|
SHARED_OFILES = xarray-shared.o radix-tree.o idr.o linux.o $(LIBS)
|
|
|
|
SHARED_DEPS = Makefile ../shared/shared.mk ../shared/*.h generated/map-shift.h \
|
|
generated/bit-length.h generated/autoconf.h \
|
|
../../include/linux/*.h \
|
|
../../include/asm/*.h \
|
|
../../../include/linux/xarray.h \
|
|
../../../include/linux/maple_tree.h \
|
|
../../../include/linux/radix-tree.h \
|
|
../../../lib/radix-tree.h \
|
|
../../../include/linux/idr.h \
|
|
../../../lib/maple_tree.c \
|
|
../../../lib/test_maple_tree.c
|
|
|
|
ifndef SHIFT
|
|
SHIFT=3
|
|
endif
|
|
|
|
ifeq ($(BUILD), 32)
|
|
CFLAGS += -m32
|
|
LDFLAGS += -m32
|
|
LONG_BIT := 32
|
|
endif
|
|
|
|
ifndef LONG_BIT
|
|
LONG_BIT := $(shell getconf LONG_BIT)
|
|
endif
|
|
|
|
%.o: ../shared/%.c
|
|
$(CC) -c $(CFLAGS) $< -o $@
|
|
|
|
vpath %.c ../../lib
|
|
|
|
$(SHARED_OFILES): $(SHARED_DEPS)
|
|
|
|
radix-tree.c: ../../../lib/radix-tree.c
|
|
sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@
|
|
|
|
idr.c: ../../../lib/idr.c
|
|
sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@
|
|
|
|
xarray-shared.o: ../shared/xarray-shared.c ../../../lib/xarray.c \
|
|
../../../lib/test_xarray.c
|
|
|
|
maple-shared.o: ../shared/maple-shared.c ../../../lib/maple_tree.c \
|
|
../../../lib/test_maple_tree.c
|
|
|
|
generated/autoconf.h:
|
|
@mkdir -p generated
|
|
cp ../shared/autoconf.h generated/autoconf.h
|
|
|
|
generated/map-shift.h:
|
|
@mkdir -p generated
|
|
@if ! grep -qws $(SHIFT) generated/map-shift.h; then \
|
|
echo "Generating $@"; \
|
|
echo "#define XA_CHUNK_SHIFT $(SHIFT)" > \
|
|
generated/map-shift.h; \
|
|
fi
|
|
|
|
generated/bit-length.h: FORCE
|
|
@mkdir -p generated
|
|
@if ! grep -qws CONFIG_$(LONG_BIT)BIT generated/bit-length.h; then \
|
|
echo "Generating $@"; \
|
|
echo "#define CONFIG_$(LONG_BIT)BIT 1" > $@; \
|
|
echo "#define CONFIG_PHYS_ADDR_T_$(LONG_BIT)BIT 1" >> $@; \
|
|
fi
|
|
|
|
FORCE: ;
|