From: John Hubbard <jhubbard@nvidia.com>
To: "Edward Liaw" <edliaw@google.com>,
shuah@kernel.org, "Mark Brown" <broonie@kernel.org>,
"Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will@kernel.org>, "Nhat Pham" <nphamcs@gmail.com>,
"Johannes Weiner" <hannes@cmpxchg.org>,
"Christian Brauner" <brauner@kernel.org>,
"Eric Biederman" <ebiederm@xmission.com>,
"Kees Cook" <keescook@chromium.org>,
"OGAWA Hirofumi" <hirofumi@mail.parknet.co.jp>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Darren Hart" <dvhart@infradead.org>,
"Davidlohr Bueso" <dave@stgolabs.net>,
"André Almeida" <andrealmeid@igalia.com>,
"Jiri Kosina" <jikos@kernel.org>,
"Benjamin Tissoires" <bentiss@kernel.org>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Kevin Tian" <kevin.tian@intel.com>,
"Andy Lutomirski" <luto@amacapital.net>,
"Will Drewry" <wad@chromium.org>, "Marc Zyngier" <maz@kernel.org>,
"Oliver Upton" <oliver.upton@linux.dev>,
"James Morse" <james.morse@arm.com>,
"Suzuki K Poulose" <suzuki.poulose@arm.com>,
"Zenghui Yu" <yuzenghui@huawei.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Sean Christopherson" <seanjc@google.com>,
"Anup Patel" <anup@brainfault.org>,
"Atish Patra" <atishp@atishpatra.org>,
"Paul Walmsley" <paul.walmsley@sifive.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Janosch Frank" <frankja@linux.ibm.com>,
"Claudio Imbrenda" <imbrenda@linux.ibm.com>,
"David Hildenbrand" <david@redhat.com>,
"Mickaël Salaün" <mic@digikod.net>,
"Paul Moore" <paul@paul-moore.com>,
"James Morris" <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Seth Forshee" <sforshee@kernel.org>,
"Bongsu Jeon" <bongsu.jeon@samsung.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Steffen Klassert" <steffen.klassert@secunet.com>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"Andreas Färber" <afaerber@suse.de>,
"Manivannan Sadhasivam" <manivannan.sadhasivam@linaro.org>,
"Matthieu Baerts" <matttbe@kernel.org>,
"Mat Martineau" <martineau@kernel.org>,
"Geliang Tang" <geliang@kernel.org>,
"Willem de Bruijn" <willemdebruijn.kernel@gmail.com>,
"Fenghua Yu" <fenghua.yu@intel.com>,
"Reinette Chatre" <reinette.chatre@intel.com>,
"Mathieu Desnoyers" <mathieu.desnoyers@efficios.com>,
"Paul E. McKenney" <paulmck@kernel.org>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Jarkko Sakkinen" <jarkko@kernel.org>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"Muhammad Usama Anjum" <usama.anjum@collabora.com>
Cc: <linux-kernel@vger.kernel.org>, <linux-kselftest@vger.kernel.org>,
<kernel-team@android.com>, <linux-sound@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <linux-mm@kvack.org>,
<linux-input@vger.kernel.org>, <iommu@lists.linux.dev>,
<kvmarm@lists.linux.dev>, <kvm@vger.kernel.org>,
<kvm-riscv@lists.infradead.org>,
<linux-riscv@lists.infradead.org>,
<linux-security-module@vger.kernel.org>,
<linux-fsdevel@vger.kernel.org>, <netdev@vger.kernel.org>,
<linux-actions@lists.infradead.org>, <mptcp@lists.linux.dev>,
<linux-rtc@vger.kernel.org>, <linux-sgx@vger.kernel.org>,
<bpf@vger.kernel.org>, kernel test robot <oliver.sang@intel.com>
Subject: Re: [PATCH v2 1/5] selftests: Compile kselftest headers with -D_GNU_SOURCE
Date: Wed, 8 May 2024 14:23:13 -0700 [thread overview]
Message-ID: <ac8c217e-4109-4ca7-a7dd-fc4fc8b0a4de@nvidia.com> (raw)
In-Reply-To: <20240507214254.2787305-2-edliaw@google.com>
On 5/7/24 2:38 PM, Edward Liaw wrote:
> Add the -D_GNU_SOURCE flag to KHDR_INCLUDES so that it is defined in a
> central location.
>
> 809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
> asprintf into kselftest_harness.h, which is a GNU extension and needs
> _GNU_SOURCE to either be defined prior to including headers or with the
> -D_GNU_SOURCE flag passed to the compiler.
>
> Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
> Reported-by: kernel test robot <oliver.sang@intel.com>
> Closes: https://lore.kernel.org/oe-lkp/202404301040.3bea5782-oliver.sang@intel.com
> Signed-off-by: Edward Liaw <edliaw@google.com>
> ---
> tools/testing/selftests/Makefile | 4 ++--
> tools/testing/selftests/kselftest_harness.h | 2 +-
> tools/testing/selftests/lib.mk | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
> index e1504833654d..ed012a7f0786 100644
> --- a/tools/testing/selftests/Makefile
> +++ b/tools/testing/selftests/Makefile
> @@ -161,11 +161,11 @@ ifneq ($(KBUILD_OUTPUT),)
> # $(realpath ...) resolves symlinks
> abs_objtree := $(realpath $(abs_objtree))
> BUILD := $(abs_objtree)/kselftest
> - KHDR_INCLUDES := -isystem ${abs_objtree}/usr/include
> + KHDR_INCLUDES := -D_GNU_SOURCE -isystem ${abs_objtree}/usr/include
> else
> BUILD := $(CURDIR)
> abs_srctree := $(shell cd $(top_srcdir) && pwd)
> - KHDR_INCLUDES := -isystem ${abs_srctree}/usr/include
> + KHDR_INCLUDES := -D_GNU_SOURCE -isystem ${abs_srctree}/usr/include
> DEFAULT_INSTALL_HDR_PATH := 1
> endif
Just a small copy-paste duplication request: can we maybe do it this
way, instead, to remove the duplication? It's small *so far*, but
still. :)
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index e1504833654d..13a5b11db59a 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -152,6 +152,8 @@ ifeq ("$(origin O)", "command line")
KBUILD_OUTPUT := $(O)
endif
+KHDR_INCLUDES := -D_GNU_SOURCE
+
ifneq ($(KBUILD_OUTPUT),)
# Make's built-in functions such as $(abspath ...), $(realpath ...) cannot
# expand a shell special character '~'. We use a somewhat tedious way here.
@@ -161,11 +163,11 @@ ifneq ($(KBUILD_OUTPUT),)
# $(realpath ...) resolves symlinks
abs_objtree := $(realpath $(abs_objtree))
BUILD := $(abs_objtree)/kselftest
- KHDR_INCLUDES := -isystem ${abs_objtree}/usr/include
+ KHDR_INCLUDES += -isystem ${abs_objtree}/usr/include
else
BUILD := $(CURDIR)
abs_srctree := $(shell cd $(top_srcdir) && pwd)
- KHDR_INCLUDES := -isystem ${abs_srctree}/usr/include
+ KHDR_INCLUDES += -isystem ${abs_srctree}/usr/include
DEFAULT_INSTALL_HDR_PATH := 1
endif
>
> diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
> index d98702b6955d..b2a1b6343896 100644
> --- a/tools/testing/selftests/kselftest_harness.h
> +++ b/tools/testing/selftests/kselftest_harness.h
> @@ -51,7 +51,7 @@
> #define __KSELFTEST_HARNESS_H
>
> #ifndef _GNU_SOURCE
> -#define _GNU_SOURCE
> +static_assert(0, "kselftest harness requires _GNU_SOURCE to be defined");
> #endif
> #include <asm/types.h>
> #include <ctype.h>
> diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
> index da2cade3bab0..2503dc732b4d 100644
> --- a/tools/testing/selftests/lib.mk
> +++ b/tools/testing/selftests/lib.mk
> @@ -45,7 +45,7 @@ selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST))))
> top_srcdir = $(selfdir)/../../..
>
> ifeq ($(KHDR_INCLUDES),)
> -KHDR_INCLUDES := -isystem $(top_srcdir)/usr/include
> +KHDR_INCLUDES := -D_GNU_SOURCE -isystem $(top_srcdir)/usr/include
> endif
>
> # The following are built by lib.mk common compile rules.
The rest looks good. And whether you accept my recommendation above,
or not, either way this patch looks good, so please feel free to add:
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
thanks,
--
John Hubbard
NVIDIA
next prev parent reply other threads:[~2024-05-08 21:23 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 21:38 [PATCH v2 0/5] Define _GNU_SOURCE for sources using Edward Liaw
2024-05-07 21:38 ` [PATCH v2 1/5] selftests: Compile kselftest headers with -D_GNU_SOURCE Edward Liaw
2024-05-08 7:48 ` Muhammad Usama Anjum
2024-05-08 12:05 ` Mark Brown
2024-05-08 21:23 ` John Hubbard [this message]
2024-05-07 21:38 ` [PATCH v2 2/5] selftests/sgx: Include KHDR_INCLUDES in Makefile Edward Liaw
2024-05-08 7:49 ` Muhammad Usama Anjum
2024-05-08 15:33 ` Dave Hansen
2024-05-08 16:44 ` Jarkko Sakkinen
2024-05-08 21:25 ` John Hubbard
2024-05-07 21:38 ` [PATCH v2 3/5] selftests: " Edward Liaw
2024-05-07 22:36 ` Jarkko Sakkinen
2024-05-08 7:49 ` Muhammad Usama Anjum
2024-05-08 21:41 ` John Hubbard
2024-05-09 0:29 ` Edward Liaw
2024-05-09 1:03 ` John Hubbard
2024-05-09 5:14 ` Mark Brown
2024-05-07 21:38 ` [PATCH v2 4/5] selftests: Drop define _GNU_SOURCE Edward Liaw
2024-05-08 7:50 ` Muhammad Usama Anjum
2024-05-08 13:54 ` Sean Christopherson
2024-05-08 20:27 ` Edward Liaw
2024-05-08 21:39 ` John Hubbard
2024-05-07 21:38 ` [PATCH v2 5/5] selftests: Drop duplicate -D_GNU_SOURCE Edward Liaw
2024-05-08 7:58 ` Muhammad Usama Anjum
2024-05-08 21:49 ` John Hubbard
2024-05-07 23:28 ` [PATCH v2 0/5] Define _GNU_SOURCE for sources using Kees Cook
2024-05-08 13:47 ` Sean Christopherson
2024-05-08 18:03 ` Edward Liaw
2024-05-08 23:10 ` Shuah Khan
2024-05-09 6:13 ` Edward Liaw
2024-05-09 14:37 ` Shuah Khan
2024-05-09 17:45 ` Edward Liaw
2024-05-09 18:20 ` Muhammad Usama Anjum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ac8c217e-4109-4ca7-a7dd-fc4fc8b0a4de@nvidia.com \
--to=jhubbard@nvidia.com \
--cc=afaerber@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alexandre.belloni@bootlin.com \
--cc=andrealmeid@igalia.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=atishp@atishpatra.org \
--cc=bentiss@kernel.org \
--cc=bongsu.jeon@samsung.com \
--cc=boqun.feng@gmail.com \
--cc=borntraeger@linux.ibm.com \
--cc=bpf@vger.kernel.org \
--cc=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=dave@stgolabs.net \
--cc=davem@davemloft.net \
--cc=david@redhat.com \
--cc=dvhart@infradead.org \
--cc=ebiederm@xmission.com \
--cc=edliaw@google.com \
--cc=edumazet@google.com \
--cc=fenghua.yu@intel.com \
--cc=frankja@linux.ibm.com \
--cc=geliang@kernel.org \
--cc=hannes@cmpxchg.org \
--cc=herbert@gondor.apana.org.au \
--cc=hirofumi@mail.parknet.co.jp \
--cc=imbrenda@linux.ibm.com \
--cc=iommu@lists.linux.dev \
--cc=james.morse@arm.com \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=jikos@kernel.org \
--cc=jmorris@namei.org \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=kevin.tian@intel.com \
--cc=kuba@kernel.org \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-actions@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=manivannan.sadhasivam@linaro.org \
--cc=martineau@kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=matttbe@kernel.org \
--cc=maz@kernel.org \
--cc=mic@digikod.net \
--cc=mingo@redhat.com \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=nphamcs@gmail.com \
--cc=oliver.sang@intel.com \
--cc=oliver.upton@linux.dev \
--cc=pabeni@redhat.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=paul@paul-moore.com \
--cc=paulmck@kernel.org \
--cc=pbonzini@redhat.com \
--cc=perex@perex.cz \
--cc=peterz@infradead.org \
--cc=reinette.chatre@intel.com \
--cc=seanjc@google.com \
--cc=serge@hallyn.com \
--cc=sforshee@kernel.org \
--cc=shuah@kernel.org \
--cc=steffen.klassert@secunet.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.com \
--cc=usama.anjum@collabora.com \
--cc=wad@chromium.org \
--cc=will@kernel.org \
--cc=willemdebruijn.kernel@gmail.com \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).