| Message ID | 20230413231120.544685-6-peterx@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm/hugetlb: More fixes around uffd-wp vs fork() / RO pins | expand |
On 14.04.23 01:11, Peter Xu wrote: > The macro and facility can be reused in other tests too. Make it general. > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > tools/testing/selftests/mm/Makefile | 8 ++++---- > tools/testing/selftests/mm/check_config.sh | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile > index 5a3434419403..9ffce175d5e6 100644 > --- a/tools/testing/selftests/mm/Makefile > +++ b/tools/testing/selftests/mm/Makefile > @@ -161,8 +161,8 @@ warn_32bit_failure: > endif > endif > > -# cow_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. > -$(OUTPUT)/cow: LDLIBS += $(COW_EXTRA_LIBS) > +# IOURING_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. > +$(OUTPUT)/cow: LDLIBS += $(IOURING_EXTRA_LIBS) > > $(OUTPUT)/mlock-random-test $(OUTPUT)/memfd_secret: LDLIBS += -lcap > > @@ -175,11 +175,11 @@ local_config.mk local_config.h: check_config.sh > > EXTRA_CLEAN += local_config.mk local_config.h > > -ifeq ($(COW_EXTRA_LIBS),) > +ifeq ($(IOURING_EXTRA_LIBS),) > all: warn_missing_liburing > > warn_missing_liburing: > @echo ; \ > - echo "Warning: missing liburing support. Some COW tests will be skipped." ; \ > + echo "Warning: missing liburing support. Some tests will be skipped." ; \ > echo > endif > diff --git a/tools/testing/selftests/mm/check_config.sh b/tools/testing/selftests/mm/check_config.sh > index bcba3af0acea..3954f4746161 100644 > --- a/tools/testing/selftests/mm/check_config.sh > +++ b/tools/testing/selftests/mm/check_config.sh > @@ -21,11 +21,11 @@ $CC -c $tmpfile_c -o $tmpfile_o >/dev/null 2>&1 > > if [ -f $tmpfile_o ]; then > echo "#define LOCAL_CONFIG_HAVE_LIBURING 1" > $OUTPUT_H_FILE > - echo "COW_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE > + echo "IOURING_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE > else > echo "// No liburing support found" > $OUTPUT_H_FILE > echo "# No liburing support found, so:" > $OUTPUT_MKFILE > - echo "COW_EXTRA_LIBS = " >> $OUTPUT_MKFILE > + echo "IOURING_EXTRA_LIBS = " >> $OUTPUT_MKFILE > fi > > rm ${tmpname}.* Reviewed-by: David Hildenbrand <david@redhat.com>
On Fri, Apr 14, 2023 at 11:52:40AM +0200, David Hildenbrand wrote: > On 14.04.23 01:11, Peter Xu wrote: > > The macro and facility can be reused in other tests too. Make it general. > > > > Signed-off-by: Peter Xu <peterx@redhat.com> > > --- > > tools/testing/selftests/mm/Makefile | 8 ++++---- > > tools/testing/selftests/mm/check_config.sh | 4 ++-- > > 2 files changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile > > index 5a3434419403..9ffce175d5e6 100644 > > --- a/tools/testing/selftests/mm/Makefile > > +++ b/tools/testing/selftests/mm/Makefile > > @@ -161,8 +161,8 @@ warn_32bit_failure: > > endif > > endif > > -# cow_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. > > -$(OUTPUT)/cow: LDLIBS += $(COW_EXTRA_LIBS) > > +# IOURING_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. > > +$(OUTPUT)/cow: LDLIBS += $(IOURING_EXTRA_LIBS) > > $(OUTPUT)/mlock-random-test $(OUTPUT)/memfd_secret: LDLIBS += -lcap > > @@ -175,11 +175,11 @@ local_config.mk local_config.h: check_config.sh > > EXTRA_CLEAN += local_config.mk local_config.h > > -ifeq ($(COW_EXTRA_LIBS),) > > +ifeq ($(IOURING_EXTRA_LIBS),) > > all: warn_missing_liburing > > warn_missing_liburing: > > @echo ; \ > > - echo "Warning: missing liburing support. Some COW tests will be skipped." ; \ > > + echo "Warning: missing liburing support. Some tests will be skipped." ; \ > > echo > > endif > > diff --git a/tools/testing/selftests/mm/check_config.sh b/tools/testing/selftests/mm/check_config.sh > > index bcba3af0acea..3954f4746161 100644 > > --- a/tools/testing/selftests/mm/check_config.sh > > +++ b/tools/testing/selftests/mm/check_config.sh > > @@ -21,11 +21,11 @@ $CC -c $tmpfile_c -o $tmpfile_o >/dev/null 2>&1 > > if [ -f $tmpfile_o ]; then > > echo "#define LOCAL_CONFIG_HAVE_LIBURING 1" > $OUTPUT_H_FILE > > - echo "COW_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE > > + echo "IOURING_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE > > else > > echo "// No liburing support found" > $OUTPUT_H_FILE > > echo "# No liburing support found, so:" > $OUTPUT_MKFILE > > - echo "COW_EXTRA_LIBS = " >> $OUTPUT_MKFILE > > + echo "IOURING_EXTRA_LIBS = " >> $OUTPUT_MKFILE > > fi > > rm ${tmpname}.* > > Reviewed-by: David Hildenbrand <david@redhat.com> Oops, I planned to drop this patch but I forgot.. I was planning to use iouring but only later found that it cannot take RO pins so switched to gup_test per your cow test. Hence this patch is not needed anymore. But since it's already there and looks like still good to have.. let me keep it around with your R-b then. Thanks,
On 14.04.23 15:56, Peter Xu wrote: > On Fri, Apr 14, 2023 at 11:52:40AM +0200, David Hildenbrand wrote: >> On 14.04.23 01:11, Peter Xu wrote: >>> The macro and facility can be reused in other tests too. Make it general. >>> >>> Signed-off-by: Peter Xu <peterx@redhat.com> >>> --- >>> tools/testing/selftests/mm/Makefile | 8 ++++---- >>> tools/testing/selftests/mm/check_config.sh | 4 ++-- >>> 2 files changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile >>> index 5a3434419403..9ffce175d5e6 100644 >>> --- a/tools/testing/selftests/mm/Makefile >>> +++ b/tools/testing/selftests/mm/Makefile >>> @@ -161,8 +161,8 @@ warn_32bit_failure: >>> endif >>> endif >>> -# cow_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. >>> -$(OUTPUT)/cow: LDLIBS += $(COW_EXTRA_LIBS) >>> +# IOURING_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. >>> +$(OUTPUT)/cow: LDLIBS += $(IOURING_EXTRA_LIBS) >>> $(OUTPUT)/mlock-random-test $(OUTPUT)/memfd_secret: LDLIBS += -lcap >>> @@ -175,11 +175,11 @@ local_config.mk local_config.h: check_config.sh >>> EXTRA_CLEAN += local_config.mk local_config.h >>> -ifeq ($(COW_EXTRA_LIBS),) >>> +ifeq ($(IOURING_EXTRA_LIBS),) >>> all: warn_missing_liburing >>> warn_missing_liburing: >>> @echo ; \ >>> - echo "Warning: missing liburing support. Some COW tests will be skipped." ; \ >>> + echo "Warning: missing liburing support. Some tests will be skipped." ; \ >>> echo >>> endif >>> diff --git a/tools/testing/selftests/mm/check_config.sh b/tools/testing/selftests/mm/check_config.sh >>> index bcba3af0acea..3954f4746161 100644 >>> --- a/tools/testing/selftests/mm/check_config.sh >>> +++ b/tools/testing/selftests/mm/check_config.sh >>> @@ -21,11 +21,11 @@ $CC -c $tmpfile_c -o $tmpfile_o >/dev/null 2>&1 >>> if [ -f $tmpfile_o ]; then >>> echo "#define LOCAL_CONFIG_HAVE_LIBURING 1" > $OUTPUT_H_FILE >>> - echo "COW_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE >>> + echo "IOURING_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE >>> else >>> echo "// No liburing support found" > $OUTPUT_H_FILE >>> echo "# No liburing support found, so:" > $OUTPUT_MKFILE >>> - echo "COW_EXTRA_LIBS = " >> $OUTPUT_MKFILE >>> + echo "IOURING_EXTRA_LIBS = " >> $OUTPUT_MKFILE >>> fi >>> rm ${tmpname}.* >> >> Reviewed-by: David Hildenbrand <david@redhat.com> > > Oops, I planned to drop this patch but I forgot.. I was planning to use > iouring but only later found that it cannot take RO pins so switched to > gup_test per your cow test. Hence this patch is not needed anymore. > Yeah, it's unfortunate ... I briefly thought about adding R/O fixed buffer support, but it looked like more work than eventual benefit. > But since it's already there and looks like still good to have.. let me > keep it around with your R-b then. Yes, makes sense to me.
diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 5a3434419403..9ffce175d5e6 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -161,8 +161,8 @@ warn_32bit_failure: endif endif -# cow_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. -$(OUTPUT)/cow: LDLIBS += $(COW_EXTRA_LIBS) +# IOURING_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. +$(OUTPUT)/cow: LDLIBS += $(IOURING_EXTRA_LIBS) $(OUTPUT)/mlock-random-test $(OUTPUT)/memfd_secret: LDLIBS += -lcap @@ -175,11 +175,11 @@ local_config.mk local_config.h: check_config.sh EXTRA_CLEAN += local_config.mk local_config.h -ifeq ($(COW_EXTRA_LIBS),) +ifeq ($(IOURING_EXTRA_LIBS),) all: warn_missing_liburing warn_missing_liburing: @echo ; \ - echo "Warning: missing liburing support. Some COW tests will be skipped." ; \ + echo "Warning: missing liburing support. Some tests will be skipped." ; \ echo endif diff --git a/tools/testing/selftests/mm/check_config.sh b/tools/testing/selftests/mm/check_config.sh index bcba3af0acea..3954f4746161 100644 --- a/tools/testing/selftests/mm/check_config.sh +++ b/tools/testing/selftests/mm/check_config.sh @@ -21,11 +21,11 @@ $CC -c $tmpfile_c -o $tmpfile_o >/dev/null 2>&1 if [ -f $tmpfile_o ]; then echo "#define LOCAL_CONFIG_HAVE_LIBURING 1" > $OUTPUT_H_FILE - echo "COW_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE + echo "IOURING_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE else echo "// No liburing support found" > $OUTPUT_H_FILE echo "# No liburing support found, so:" > $OUTPUT_MKFILE - echo "COW_EXTRA_LIBS = " >> $OUTPUT_MKFILE + echo "IOURING_EXTRA_LIBS = " >> $OUTPUT_MKFILE fi rm ${tmpname}.*
The macro and facility can be reused in other tests too. Make it general. Signed-off-by: Peter Xu <peterx@redhat.com> --- tools/testing/selftests/mm/Makefile | 8 ++++---- tools/testing/selftests/mm/check_config.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)