From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC31EC2BD09 for ; Mon, 1 Jul 2024 06:15:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23ABC6B008A; Mon, 1 Jul 2024 02:15:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EAB36B008C; Mon, 1 Jul 2024 02:15:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 063B86B0092; Mon, 1 Jul 2024 02:15:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D9EA36B008A for ; Mon, 1 Jul 2024 02:15:36 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 697EFA257B for ; Mon, 1 Jul 2024 06:15:36 +0000 (UTC) X-FDA: 82290172272.20.672181D Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by imf28.hostedemail.com (Postfix) with ESMTP id 28FF3C000D for ; Mon, 1 Jul 2024 06:15:33 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=RP6AD1v+; spf=pass (imf28.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com; dmarc=pass (policy=quarantine) header.from=collabora.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719814524; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Qb3pOIQuoQVipsgixxzvSYHAtL9xZmnSY92YqlwvDeI=; b=XPPDWLiuRVAVV+ikV562dkHGLoh1B00DVXA3VifgfY859ksVxg1x2iXXqIzjsK8kfaDgPm WLTfCYVIj9oM46DRj9md89xFWm679YsWtr3E7ICfQvhiyaOMkho+bUyTl9oNbTM1OOH4Du dmSdNj6dZQbLTeEENGLCEgdE8grF7HM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=RP6AD1v+; spf=pass (imf28.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com; dmarc=pass (policy=quarantine) header.from=collabora.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719814524; a=rsa-sha256; cv=none; b=WbkNuMj9FGnkSwS5rYDcL4REtR5BzU7LQjKk+sAE68mTNolxlkEfNNslLYOPSztes4kgvw cx+NqKt8f/hycruTv9iVuyAMZ7WA7Yu6KaWQJGogk2XQ3eYj3PEwVPotg3/eEA+MIEnEmu 3kk0eEkNiV/q4+zVy/P81KWXwWJeh9o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1719814532; bh=WmI09JaExLOgwIiAfkIPKvdePbKWzCZg6yL6VDCaUN4=; h=Date:Cc:Subject:To:References:From:In-Reply-To:From; b=RP6AD1v+j6bPzkD4Qfi/D0Q58GhtnnMPgGqhmQ9YGJX9Jc/5j84eJ7xUBdHZJRzFx aXPXn39mJWbIX+hF2Rx6HPtqgMK4vfUXHqti+IbFCO5Q8bGEOYciAZVbAvxI1kGzeR g0TD5c0QDnRR5cYZ0bk02V6Iz6eS/b5EgMh95woV6SkktOdHJgXgDkEDcqIbeyMewD TfpEAsVSV82X6VPFFcT0pA4AfIytfyCqe6TFWaYlNmT4kY7j1t72YZQc6kzGiHWxze VlPaDaj3j6O+JFwu31mdPgmr5u8MzDcUXIrceg69E0CyvjyMCcC0aTq021O4QEtL3Z exwCDx8GCLtyg== Received: from [100.113.15.66] (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id AA10E3782065; Mon, 1 Jul 2024 06:15:00 +0000 (UTC) Message-ID: <221495d5-1be2-4c71-ab2f-eb145257737a@collabora.com> Date: Mon, 1 Jul 2024 11:14:54 +0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: Muhammad Usama Anjum , linux-kernel@vger.kernel.org, seanjc@google.com, kernel-team@android.com, linux-mm@kvack.org, iommu@lists.linux.dev, kvm@vger.kernel.org, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sgx@vger.kernel.org, John Hubbard Subject: Re: [PATCH v7 1/1] selftests: Centralize -D_GNU_SOURCE= to CFLAGS in lib.mk To: Edward Liaw , linux-kselftest@vger.kernel.org, Eric Biederman , Kees Cook , Shuah Khan , Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart , Davidlohr Bueso , =?UTF-8?Q?Andr=C3=A9_Almeida?= , Jason Gunthorpe , Kevin Tian , Paolo Bonzini , Andrew Morton , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Fenghua Yu , Reinette Chatre , Paul Walmsley , Palmer Dabbelt , Albert Ou , Jarkko Sakkinen , Dave Hansen References: <20240625223454.1586259-1-edliaw@google.com> <20240625223454.1586259-2-edliaw@google.com> Content-Language: en-US From: Muhammad Usama Anjum In-Reply-To: <20240625223454.1586259-2-edliaw@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 28FF3C000D X-Stat-Signature: ffjk5cama47gt45smf71upc6kscrqxcd X-HE-Tag: 1719814533-481040 X-HE-Meta: U2FsdGVkX1/pMlVVQi9jbP89Hn90EcIdRCueyQCcMrtbgZ8IKNbIPqgz6wPHBlMZSYcDENUcTXw5Gi1UGTq1T5bq0E/+/XAg0jJaG+jZoXVnYiyX4bR/t4XCtB1NVWGACWTcKTNAZ/L8wVLbvRoD8U+S5yl1JPLu2KITce4aA7OZo6lGFyLyKodaRhFvZr47Pu5vYXGPGuuTBm1tpqZYuTxRu3mDJ0+WCZGZf2P/L+3gqd2fg/tN/IKAXk3Vey59eu/laAM81l685RjD1ZxMHRY/VT0Y8otJcOFYxghHqPoaUSheMWG4P5G29dqztAoEdJJ7637sUa/oiTkDm7k3K/FvSLDd24k0E+4xg+10qzc8BFDbxKKO5rq5BDcWmHD1UPMcvg9794852Z3PUeovJKOv2UhMNnjJ4PHOybQeeiz1D44ZU6fDnVxMfrAwCDmSy38xHk/gs2o62D5gDTZy3HczW76tqYMe7v2aKER+ywSUSBCYpVrSzKRrSeBpCHKhqEyRrqZdvmu1uGbs899eo3kb3BBq8dr0SIMUMxD3EZ2smGHFZiQ9psuv8/NIu5/ZTLiShiB0thaO8Iukfvk9zmGB/7iZ1Gt2RcNUauT6+EtU0Z/dpuk9zxzMhO8vrwXhMvLVXpTrIjBR/2/SFaM2rI2UW6wA3drOJ8Y10qLOv1lEs6fHh8ArBJxAT5Y0o8Ph8eccm1NufN+y4Co44MvIWSSLhO2sWRYESVGSRSxkblcpJVFSnbCnL2Hjbd8w+0V9BNWlt5XN8LOnFA5hnyqJRztZ+PTIBZS+dTo1H11oxJ39ORTghT6L8vRSUZbKKeoZG89pYb4WZ+mMa1S4QF5gy6IRrsKQZtDhLoMUXfY8PzFTMNINyzUHBTVh6UkBu1YaMmbksTTNXeyf7hAg6aOgeqnrs6mmtB8bU0wpZzHqfBeWmBo15cmGDZ505+0ReYXLkpYmUFACzFapW80zaqZ 7Wrgz26i N+MH6OgJaoDAevYtt+LkOIHGlwB5uIt+3C7mrR2K8dZLLOLnof+0wNm8LKMi4rqdU1jCqeKwZsDyd+/FFF6xHxO5ojAvIwYvbGzUKo0DhEGfoH7gK+n7W6/5BUzmO0BvrGHqKvr+gc6XmkeG6j5smB2slwNRJFk2pz+OtgkqRKbcToMCJHxBqtCGNdUTo4LuQGUpe5QyxpMnxyOuCjS/mIuug3yZSUXXTTAj4+N7BYfHih8nHBc158gs3OL5ECJ/x5q6ePqp9IOlHgrviMK7C75UdWJMHogHzEZlQm00xcCzrK86sGVvR+HT30JDwNnRR82DHlNeDtsjtTW/bWTJJLA3EZfvkKQ3xxE+zRMXA4CKwH1eoFpSZB8sWLbv50IatmCi+Tp2YlyOgRkUMv5vNrw9MNmWr+R3vG7zYRubLNbiuCdBJg3rWSBoeAvQ2pzrCJIBrbGiABU0Lvrj0E2u4kag1dDttQrCUc/ew7/Q7exBqYc450nOOo0DxR4uPxOTFdyD18Klv2HqDpJ8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 6/26/24 3:34 AM, Edward Liaw wrote: > Centralize the _GNU_SOURCE definition to CFLAGS in lib.mk. Remove > redundant defines from Makefiles that import lib.mk. Convert any usage > of "#define _GNU_SOURCE 1" to "#define _GNU_SOURCE". > > This uses the form "-D_GNU_SOURCE=", which is equivalent to > "#define _GNU_SOURCE". > > Otherwise using "-D_GNU_SOURCE" is equivalent to "-D_GNU_SOURCE=1" and > "#define _GNU_SOURCE 1", which is less commonly seen in source code and > would require many changes in selftests to avoid redefinition warnings. > > Suggested-by: John Hubbard > Signed-off-by: Edward Liaw Reviewed-by: Muhammad Usama Anjum > --- > tools/testing/selftests/exec/Makefile | 1 - > tools/testing/selftests/futex/functional/Makefile | 2 +- > tools/testing/selftests/intel_pstate/Makefile | 2 +- > tools/testing/selftests/iommu/Makefile | 2 -- > tools/testing/selftests/kvm/Makefile | 2 +- > tools/testing/selftests/lib.mk | 3 +++ > tools/testing/selftests/mm/thuge-gen.c | 2 +- > tools/testing/selftests/net/Makefile | 2 +- > tools/testing/selftests/net/tcp_ao/Makefile | 2 +- > tools/testing/selftests/proc/Makefile | 1 - > tools/testing/selftests/resctrl/Makefile | 2 +- > tools/testing/selftests/ring-buffer/Makefile | 1 - > tools/testing/selftests/riscv/mm/Makefile | 2 +- > tools/testing/selftests/sgx/Makefile | 2 +- > tools/testing/selftests/tmpfs/Makefile | 1 - > 15 files changed, 12 insertions(+), 15 deletions(-) > > diff --git a/tools/testing/selftests/exec/Makefile b/tools/testing/selftests/exec/Makefile > index ab67d58cfab7..ba012bc5aab9 100644 > --- a/tools/testing/selftests/exec/Makefile > +++ b/tools/testing/selftests/exec/Makefile > @@ -1,7 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > CFLAGS = -Wall > CFLAGS += -Wno-nonnull > -CFLAGS += -D_GNU_SOURCE > > ALIGNS := 0x1000 0x200000 0x1000000 > ALIGN_PIES := $(patsubst %,load_address.%,$(ALIGNS)) > diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile > index 994fa3468f17..f79f9bac7918 100644 > --- a/tools/testing/selftests/futex/functional/Makefile > +++ b/tools/testing/selftests/futex/functional/Makefile > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > INCLUDES := -I../include -I../../ $(KHDR_INCLUDES) > -CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE= -pthread $(INCLUDES) $(KHDR_INCLUDES) > +CFLAGS := $(CFLAGS) -g -O2 -Wall -pthread $(INCLUDES) $(KHDR_INCLUDES) > LDLIBS := -lpthread -lrt > > LOCAL_HDRS := \ > diff --git a/tools/testing/selftests/intel_pstate/Makefile b/tools/testing/selftests/intel_pstate/Makefile > index 05d66ef50c97..f45372cb00fe 100644 > --- a/tools/testing/selftests/intel_pstate/Makefile > +++ b/tools/testing/selftests/intel_pstate/Makefile > @@ -1,5 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0 > -CFLAGS := $(CFLAGS) -Wall -D_GNU_SOURCE > +CFLAGS := $(CFLAGS) -Wall > LDLIBS += -lm > > ARCH ?= $(shell uname -m 2>/dev/null || echo not) > diff --git a/tools/testing/selftests/iommu/Makefile b/tools/testing/selftests/iommu/Makefile > index 32c5fdfd0eef..fd6477911f24 100644 > --- a/tools/testing/selftests/iommu/Makefile > +++ b/tools/testing/selftests/iommu/Makefile > @@ -2,8 +2,6 @@ > CFLAGS += -Wall -O2 -Wno-unused-function > CFLAGS += $(KHDR_INCLUDES) > > -CFLAGS += -D_GNU_SOURCE > - > TEST_GEN_PROGS := > TEST_GEN_PROGS += iommufd > TEST_GEN_PROGS += iommufd_fail_nth > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile > index ac280dcba996..4ee37abf70ff 100644 > --- a/tools/testing/selftests/kvm/Makefile > +++ b/tools/testing/selftests/kvm/Makefile > @@ -231,7 +231,7 @@ LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include > endif > CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \ > -Wno-gnu-variable-sized-type-not-at-end -MD -MP -DCONFIG_64BIT \ > - -D_GNU_SOURCE -fno-builtin-memcmp -fno-builtin-memcpy \ > + -fno-builtin-memcmp -fno-builtin-memcpy \ > -fno-builtin-memset -fno-builtin-strnlen \ > -fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \ > -I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \ > diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk > index 7b299ed5ff45..d6edcfcb5be8 100644 > --- a/tools/testing/selftests/lib.mk > +++ b/tools/testing/selftests/lib.mk > @@ -196,6 +196,9 @@ endef > clean: $(if $(TEST_GEN_MODS_DIR),clean_mods_dir) > $(CLEAN) > > +# Build with _GNU_SOURCE by default > +CFLAGS += -D_GNU_SOURCE= > + > # Enables to extend CFLAGS and LDFLAGS from command line, e.g. > # make USERCFLAGS=-Werror USERLDFLAGS=-static > CFLAGS += $(USERCFLAGS) > diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c > index d50dc71cac32..e4370b79b62f 100644 > --- a/tools/testing/selftests/mm/thuge-gen.c > +++ b/tools/testing/selftests/mm/thuge-gen.c > @@ -13,7 +13,7 @@ > sudo ipcs | awk '$1 == "0x00000000" {print $2}' | xargs -n1 sudo ipcrm -m > (warning this will remove all if someone else uses them) */ > > -#define _GNU_SOURCE 1 > +#define _GNU_SOURCE > #include > #include > #include > diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile > index bc3925200637..8eaffd7a641c 100644 > --- a/tools/testing/selftests/net/Makefile > +++ b/tools/testing/selftests/net/Makefile > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0 > # Makefile for net selftests > > -CFLAGS = -Wall -Wl,--no-as-needed -O2 -g > +CFLAGS += -Wall -Wl,--no-as-needed -O2 -g > CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES) > # Additional include paths needed by kselftest.h > CFLAGS += -I../ > diff --git a/tools/testing/selftests/net/tcp_ao/Makefile b/tools/testing/selftests/net/tcp_ao/Makefile > index 522d991e310e..bd88b90b902b 100644 > --- a/tools/testing/selftests/net/tcp_ao/Makefile > +++ b/tools/testing/selftests/net/tcp_ao/Makefile > @@ -26,7 +26,7 @@ LIB := $(LIBDIR)/libaotst.a > LDLIBS += $(LIB) -pthread > LIBDEPS := lib/aolib.h Makefile > > -CFLAGS := -Wall -O2 -g -D_GNU_SOURCE -fno-strict-aliasing > +CFLAGS += -Wall -O2 -g -fno-strict-aliasing > CFLAGS += $(KHDR_INCLUDES) > CFLAGS += -iquote ./lib/ -I ../../../../include/ > > diff --git a/tools/testing/selftests/proc/Makefile b/tools/testing/selftests/proc/Makefile > index 6066f607f758..ee424a9f075f 100644 > --- a/tools/testing/selftests/proc/Makefile > +++ b/tools/testing/selftests/proc/Makefile > @@ -1,6 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0-only > CFLAGS += -Wall -O2 -Wno-unused-function > -CFLAGS += -D_GNU_SOURCE > LDFLAGS += -pthread > > TEST_GEN_PROGS := > diff --git a/tools/testing/selftests/resctrl/Makefile b/tools/testing/selftests/resctrl/Makefile > index 021863f86053..f408bd6bfc3d 100644 > --- a/tools/testing/selftests/resctrl/Makefile > +++ b/tools/testing/selftests/resctrl/Makefile > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > > -CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE > +CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2 > CFLAGS += $(KHDR_INCLUDES) > > TEST_GEN_PROGS := resctrl_tests > diff --git a/tools/testing/selftests/ring-buffer/Makefile b/tools/testing/selftests/ring-buffer/Makefile > index 627c5fa6d1ab..23605782639e 100644 > --- a/tools/testing/selftests/ring-buffer/Makefile > +++ b/tools/testing/selftests/ring-buffer/Makefile > @@ -1,7 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > CFLAGS += -Wl,-no-as-needed -Wall > CFLAGS += $(KHDR_INCLUDES) > -CFLAGS += -D_GNU_SOURCE > > TEST_GEN_PROGS = map_test > > diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile > index c333263f2b27..4664ed79e20b 100644 > --- a/tools/testing/selftests/riscv/mm/Makefile > +++ b/tools/testing/selftests/riscv/mm/Makefile > @@ -3,7 +3,7 @@ > # Originally tools/testing/arm64/abi/Makefile > > # Additional include paths needed by kselftest.h and local headers > -CFLAGS += -D_GNU_SOURCE -std=gnu99 -I. > +CFLAGS += -std=gnu99 -I. > > TEST_GEN_FILES := mmap_default mmap_bottomup > > diff --git a/tools/testing/selftests/sgx/Makefile b/tools/testing/selftests/sgx/Makefile > index 867f88ce2570..03b5e13b872b 100644 > --- a/tools/testing/selftests/sgx/Makefile > +++ b/tools/testing/selftests/sgx/Makefile > @@ -12,7 +12,7 @@ OBJCOPY := $(CROSS_COMPILE)objcopy > endif > > INCLUDES := -I$(top_srcdir)/tools/include > -HOST_CFLAGS := -Wall -Werror -g $(INCLUDES) -fPIC > +HOST_CFLAGS := -Wall -Werror -g $(INCLUDES) -fPIC $(CFLAGS) > HOST_LDFLAGS := -z noexecstack -lcrypto > ENCL_CFLAGS += -Wall -Werror -static-pie -nostdlib -ffreestanding -fPIE \ > -fno-stack-protector -mrdrnd $(INCLUDES) > diff --git a/tools/testing/selftests/tmpfs/Makefile b/tools/testing/selftests/tmpfs/Makefile > index aa11ccc92e5b..3be931e1193f 100644 > --- a/tools/testing/selftests/tmpfs/Makefile > +++ b/tools/testing/selftests/tmpfs/Makefile > @@ -1,6 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0-only > CFLAGS += -Wall -O2 > -CFLAGS += -D_GNU_SOURCE > > TEST_GEN_PROGS := > TEST_GEN_PROGS += bug-link-o-tmpfile -- BR, Muhammad Usama Anjum