From patchwork Tue Nov 21 23:56:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168040 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp990846vqb; Tue, 21 Nov 2023 15:57:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IENZ7x/ghIdZhoE3Fhh2B/U2kqNKWLFJRc9U48G9t9bUjK6DnIKtfKjnrZbOobvaVM08tX6 X-Received: by 2002:a9d:6d05:0:b0:6af:95f9:7adc with SMTP id o5-20020a9d6d05000000b006af95f97adcmr997076otp.14.1700611042143; Tue, 21 Nov 2023 15:57:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700611042; cv=none; d=google.com; s=arc-20160816; b=M1PCuisLI9YOzQftk5R18aXNH8gL2EljyvIUpC78dD9quY7pP568orel8dXdBh9UMo huJPhGaWNwmRW5tM9OEql1gqB6pReQJhPNTnmJvAiHTDCs7uLD3lq3Tymy3C5uvYTIkD LyGPnZJXqoQLgfcf/neHWcfPPQlJIVGp8fst7HCehbZ/Keze3/s+mliENfqV6k86IjXY zgqPthFqLsak+LKY9BY45BZ51BuJoGhXdugapmkJygCuXO7LNueArrqAIfaUbmfUJNWA GHbIPIPLPk8qZwK8YsP3TpbdYjXaal6KQq/TaeKI8sk/WRD8XeYpELb90T0auTbaN+fY VWIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FhcatHLNfDBa2OVUyKpsyVWzhojt7NxRuFdWXLbHkjA=; fh=/47gT1gwZAnqEEt4O4OE4vb0HHfsM+7WswUPP+TBAbs=; b=Aljj3K8P17XJvv8acDFH9vJC5V+YscQ1/1fGKOlMAY0QJruz2dy+PL7Q+fWc/Qxx70 VolGvBQIM1y4AgSITc/ejLRCSvBSj0C+I1KFuTd9h8li1XzAEFAU7xb6um+4yAsad2Eq XwHzGuOCJGSI7UBg3jjgLVwKA5MyYU86rmJc8yj8ZNrYVjgDfzGyAGtjtD2biFQUKJIo uk+bO98+8N9a6tNkTA+B90ZRr+A7VaFYJBjFDB1awclx2cxovbkaCef8nyL41YleENGV bvJN3TlRR3qsyIPqg+vLs+ynpA1FbJf1yPIUd70bBq+noMcGydRXzTq6Z/j9lDcqyn4P 1YxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AECmMPUz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id g22-20020a63f416000000b0058990e98429si11344024pgi.146.2023.11.21.15.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 15:57:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AECmMPUz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 8C1D78027F2D; Tue, 21 Nov 2023 15:57:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234940AbjKUX5S (ORCPT + 99 others); Tue, 21 Nov 2023 18:57:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234703AbjKUX5O (ORCPT ); Tue, 21 Nov 2023 18:57:14 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA9B21A2 for ; Tue, 21 Nov 2023 15:57:10 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 044C8C433CB; Tue, 21 Nov 2023 23:57:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700611030; bh=YIz9IynczYR7U90yH62Boq0adsyZcqNtIbOqQHRnXxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AECmMPUzvp8OXYGuSbkcsiIb34EBjISMOkmWB2e0PFYP0yRrPV111M7GOBfowZNN9 up76BEiuiYJqSAR34fIl/dpeV+M26AGqlNgIZ7weQvatRSoSNPHb3QmAgVL+NwA7V5 kbxf7LyKTuUlSZ2k1FnPL1qQlEpdpaICq0hfnIxKsk1srhCMPrZuW3Gs4wTfFhGaBk 1XdJ2mBbU8cpu56+aOe41iJTYfvsUDQQ7WyE/tpkmg0hE0B7635Pib6QFRcFp2APo6 9JLgWVBezkbY/5MKejlBvALX+U4PPadgpAjAyNoIGOLgl8yYOcCE0I2RDhYOzISAHP cBXqqqbqpFBjg== From: Masahiro Yamada To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: Masahiro Yamada , Andy Lutomirski , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] x86: vdso: consolidate targets and clean-files Date: Wed, 22 Nov 2023 08:56:58 +0900 Message-Id: <20231121235701.239606-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231121235701.239606-1-masahiroy@kernel.org> References: <20231121235701.239606-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 21 Nov 2023 15:57:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783219924017268689 X-GMAIL-MSGID: 1783219924017268689 'targets' and 'clean-files' do not need to list the same files because the files listed in 'targets' are cleaned up. Refactor the code. Signed-off-by: Masahiro Yamada --- arch/x86/entry/vdso/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index b1b8dd1608f7..2038d9c8e527 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -55,11 +55,8 @@ targets += vdso32/vdso32.lds $(vobjs32-y) # Build the vDSO image C files and link them in. vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o) -vdso_img_cfiles := $(vdso_img-y:%=vdso-image-%.c) -vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg) obj-y += $(vdso_img_objs) -targets += $(vdso_img_cfiles) -targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so) +targets += $(foreach x, 64 x32 32, vdso-image-$(x).c vdso$(x).so vdso$(x).so.dbg) CPPFLAGS_vdso.lds += -P -C @@ -190,5 +187,3 @@ GCOV_PROFILE := n quiet_cmd_vdso_and_check = VDSO $@ cmd_vdso_and_check = $(cmd_vdso); $(cmd_vdso_check) - -clean-files := vdso32.so vdso32.so.dbg vdso64* vdso-image-*.c vdsox32.so* From patchwork Tue Nov 21 23:56:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168043 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp991031vqb; Tue, 21 Nov 2023 15:57:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpdvYBx0IwNaDezT7KGOGnFaZLtFjqRKBzIWpcG5/QYgG17frpCYbXbOdziEXRxSf/T/hv X-Received: by 2002:a05:6a20:e30b:b0:187:b5b8:f438 with SMTP id nb11-20020a056a20e30b00b00187b5b8f438mr630644pzb.18.1700611075453; Tue, 21 Nov 2023 15:57:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700611075; cv=none; d=google.com; s=arc-20160816; b=0gaGkJV0gWPye5BcJrAYi1dQlNYT14TpvTcK/oFDbv8XwjlilPJIs6hWQ7qahcFRO3 DxoMtKQVQfgMpskRIN/aCxM4/1CTPUoC+0Ku+LvRoax44GwRxJnGh3OoplclApw+DXVQ /0UxnGjzthAcSinwt9zNqClosvgq7uXCLytDNxivLJgYQ4lnD/sw9kj9QyedeMY+QF0F yBw5NMAnCYNBLxZxgWu/d1r/q/PZRa1EDJzMVsmSgf3HJYOC92/bn6zKYCzc4rgGi9ei RqROZ3f9sVvrZav1xbbkB1Oq2c2ofFlYJwXjlV4y419S8fKpqwFJNoi2xbUwEphz1RXc DhPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Bm7p9xKyuAxVXNKaI2SGd9apYGaVMvqyzS1RgsgyAn0=; fh=/47gT1gwZAnqEEt4O4OE4vb0HHfsM+7WswUPP+TBAbs=; b=c7YmekGyxbr6ln16/H+wLjBuZNrPkrNAcSsqva93LJXR79phXdP4iTDv1SxgxcE3x8 F6JdIQ0gEqw0zLVZET/eBY/MI/UunZmPOyT9rY/LV0rXNmDu7hMSm7RvUtmuFgB+5Mw+ mnGLeRgBNacS8aZ/GdDPnXXXYXvWSkDibs8dcDlYOj5oU+/FpVNwloUYLQb2pDmWeHPy iXHUJQCeXfCB6Euj5wKxe39zx3VyzpbC2mHbUJlFtPWiyoMddxLdYglNSu9dPnjzL+je 7+nOY51EUYz5uVsl1QZhf09TDb1NjVLaimMa7FdgLHF82jYLV5C0twlqoSY7KxECCcv9 sU6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=P5Oqx2ad; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id lj11-20020a17090b344b00b002839a6e8812si212808pjb.36.2023.11.21.15.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 15:57:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=P5Oqx2ad; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id DB9828021236; Tue, 21 Nov 2023 15:57:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234950AbjKUX5V (ORCPT + 99 others); Tue, 21 Nov 2023 18:57:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234933AbjKUX5Q (ORCPT ); Tue, 21 Nov 2023 18:57:16 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD40CE7 for ; Tue, 21 Nov 2023 15:57:12 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA1C7C433C9; Tue, 21 Nov 2023 23:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700611032; bh=PgDod9JVK1SlTO6PB/we26pgwxZ6Hugtd6ddfhtvips=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P5Oqx2adFYIoQ9k4t/Fy/+5td7AJw0Ktf33vV/fGcP8SzAfragsJVRdICPCn1rAiq DY+8pX8mR5/DxUtJobAPYiON00qCGoJvj2BP+5n2et1TWEtFdgFs7egce9cUf+jEoM QuJAxXvWLW5r0KMCYoemcPkKHSz6roL/PrJIA8KHkR+/mWH94Fs+p2YMq8QI05E6ou s/mPI0QIWI4BLxziJ6Est+vJPCMnCuC9lG/Og/BKs8zJ3RLi+amuJSo3nbUqiRZ5bi rhC+VekE2qEghO/hzfZWrvY282W1JlDo00ewShT6Eo4W3aeFl1AH+6vr3odn1i+x/i lKcGM2Gr47bOg== From: Masahiro Yamada To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: Masahiro Yamada , Andy Lutomirski , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] x86: vdso: simplify obj-y addition Date: Wed, 22 Nov 2023 08:56:59 +0900 Message-Id: <20231121235701.239606-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231121235701.239606-1-masahiroy@kernel.org> References: <20231121235701.239606-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 21 Nov 2023 15:57:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783219959185212018 X-GMAIL-MSGID: 1783219959185212018 Add objects to obj-y in a more straightforward way. CONFIG_X86_32 and CONFIG_IA32_EMULATION are not enabled simultaneously, but even if they are, Kbuild graciously deduplicates obj-y entries. Signed-off-by: Masahiro Yamada --- arch/x86/entry/vdso/Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 2038d9c8e527..cbfb5aab5e9c 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -18,11 +18,6 @@ OBJECT_FILES_NON_STANDARD := y # Prevents link failures: __sanitizer_cov_trace_pc() is not linked in. KCOV_INSTRUMENT := n -VDSO64-$(CONFIG_X86_64) := y -VDSOX32-$(CONFIG_X86_X32_ABI) := y -VDSO32-$(CONFIG_X86_32) := y -VDSO32-$(CONFIG_IA32_EMULATION) := y - # files to link into the vdso vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vobjs32-y := vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o @@ -38,11 +33,11 @@ OBJECT_FILES_NON_STANDARD_vma.o := n OBJECT_FILES_NON_STANDARD_extable.o := n # vDSO images to build -vdso_img-$(VDSO64-y) += 64 -vdso_img-$(VDSOX32-y) += x32 -vdso_img-$(VDSO32-y) += 32 +obj-$(CONFIG_X86_64) += vdso-image-64.o +obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o +obj-$(CONFIG_X86_32) += vdso-image-32.o vdso32-setup.o +obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o -obj-$(VDSO32-y) += vdso32-setup.o OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) @@ -53,9 +48,6 @@ $(obj)/vdso.o: $(obj)/vdso.so targets += vdso.lds $(vobjs-y) targets += vdso32/vdso32.lds $(vobjs32-y) -# Build the vDSO image C files and link them in. -vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o) -obj-y += $(vdso_img_objs) targets += $(foreach x, 64 x32 32, vdso-image-$(x).c vdso$(x).so vdso$(x).so.dbg) CPPFLAGS_vdso.lds += -P -C From patchwork Tue Nov 21 23:57:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp990913vqb; Tue, 21 Nov 2023 15:57:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IF06uZTejw+qe2iCVbE/PhslZbTtsX+6rze/9KeBC0Fut35lAOB/Gb7fksYhu8hhgG3KRSg X-Received: by 2002:a17:902:e9c4:b0:1cc:64bc:ecf3 with SMTP id 4-20020a170902e9c400b001cc64bcecf3mr741560plk.34.1700611054111; Tue, 21 Nov 2023 15:57:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700611054; cv=none; d=google.com; s=arc-20160816; b=aF2j41ZXb9f3NX8Hyj8FglYxxKElGuBs64FaEueca+T92JYjwkqOK6rqKUShobLy2z /xHNyA8Io1D7DcUc6qFFN4MY91e7yRa9/ipNfGMGsnxw5cIGjZ2jg3sTIIt7uWlkWn94 xb4NRrVw3x5nscSK3nEPWsxkhZTNSolt0zx8UaldywPsxeLRprgP2B9fcbCASrOcB+R1 UemGLMoIDUNaZjvht4JGpWBuMUnPlpuqZ0FYc08rB2OH5+MOBMQK6/RaXb96nkrPDiXT V20bfvQuxcAoDc0+eBG8Ee9OuZbaHnjxXtAsF5cDlNcyHQUaicMAxu5UqXL+wtIGsHni iURg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=T5grv3r0QiRMcA860a/cMtEhx0Br3Tg1jMihI3gQqyo=; fh=/47gT1gwZAnqEEt4O4OE4vb0HHfsM+7WswUPP+TBAbs=; b=dOdeSrHkjFjCBMT1/4s4ggqmrMRtFL0WZ3u8pel71XJHp5Mrh/yZXfs5VEJT0+fSM+ DKhvGHPCqvyWNZB6ai5xxQNT5w62MxkWnKLpOoFbnpIt/9qQRJ02tqnin9CMPWKln3PT +3FhMcYKUaECW2si5R5N6VR7aoUioNuZsckC84066R2KsRYKeauNqsyqzMIipSrueydJ +0jrIBpVesQ9m7qeDvxOyZH9W40/XcoyEOt2GAjz4LMjYZwUqtUQ67zoWqt31d+GEBBv NxfeFNBAOGxsNLHqwnS+DI9qSX+SE970qPMlKWeDDgLfNl//OFMcW2IwB2g5HmYs3OTF myIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=c01rYmA+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id o1-20020a170902d4c100b001ca7a4c8360si11807969plg.31.2023.11.21.15.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 15:57:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=c01rYmA+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 2AE5380EAD57; Tue, 21 Nov 2023 15:57:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234954AbjKUX5Y (ORCPT + 99 others); Tue, 21 Nov 2023 18:57:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234939AbjKUX5R (ORCPT ); Tue, 21 Nov 2023 18:57:17 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F2D71A2 for ; Tue, 21 Nov 2023 15:57:14 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA97DC433C7; Tue, 21 Nov 2023 23:57:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700611034; bh=Fkwx/7dQoGPA1O843IBgRSOzjaXZ20gyiZMK5qWVDQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c01rYmA+0CI4XR/8U9hC++WrFzlDXyIYnsbGSyyfW036RN4nYUTUeme3vmska38aM wIWQ8k6/WfO+bitXUsyNMcN6vIGTHhpH/YOgqwx6LlQmo5RhvngfYtwMdv2Kd46Inb NCutzrvuFJoGA9kEGcWNj3T8PtFBh+LYPanD1qpaeKfuM31HKDDP5NFf0jpyyMbgAy +kYx4U9W1mge/911DdSElhawseIECJNwwTuW4/8U9yjkiF3IfJ1T3nsRj5oW2IKBWE B5ijq2DeQWWR3wrIgO3uHAYBaXZGhX5aZWMlgd38aM6TTlECz+onG4YbqCPJHaIIMN 6Brw+jm64NG4A== From: Masahiro Yamada To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: Masahiro Yamada , Andy Lutomirski , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] x86: vdso: use $(addprefix ) instead of $(foreach ) Date: Wed, 22 Nov 2023 08:57:00 +0900 Message-Id: <20231121235701.239606-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231121235701.239606-1-masahiroy@kernel.org> References: <20231121235701.239606-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 21 Nov 2023 15:57:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783219937120780611 X-GMAIL-MSGID: 1783219937120780611 $(addprefix ) is slightly shorter and more intuitive. Signed-off-by: Masahiro Yamada --- arch/x86/entry/vdso/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index cbfb5aab5e9c..439b52772e69 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -40,8 +40,8 @@ obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n -vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) -vobjs32 := $(foreach F,$(vobjs32-y),$(obj)/$F) +vobjs := $(addprefix $(obj)/, $(vobjs-y)) +vobjs32 := $(addprefix $(obj)/, $(vobjs32-y)) $(obj)/vdso.o: $(obj)/vdso.so @@ -112,7 +112,7 @@ VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \ vobjx32s-y := $(vobjs-y:.o=-x32.o) # same thing, but in the output directory -vobjx32s := $(foreach F,$(vobjx32s-y),$(obj)/$F) +vobjx32s := $(addprefix $(obj)/, $(vobjx32s-y)) # Convert 64bit object file to x32 for x32 vDSO. quiet_cmd_x32 = X32 $@ From patchwork Tue Nov 21 23:57:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp990968vqb; Tue, 21 Nov 2023 15:57:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IFrEuaSHfGRCFKsq0uGEp31edw2HjLTSu4DmqDqr7rkv0M0ZKnIyU/gzgPkuI9Os+un8BWq X-Received: by 2002:a05:6a20:3d0f:b0:152:4615:cb9d with SMTP id y15-20020a056a203d0f00b001524615cb9dmr6576300pzi.12.1700611064172; Tue, 21 Nov 2023 15:57:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700611064; cv=none; d=google.com; s=arc-20160816; b=Badvig+6HlCMUwbAI3h6ViDjBXOl77fp7VobhyLKNHfPvbfJThdObJMEeXVgA9J+w0 z42PdN73aqE2To9tBnqZPeY0Mb06ccXs3YkbQA6a5SLXXYkb/uv1O0ljEdh8avka4vwX t1IRBxd8hE6W5rcZOpa8wQ+HPAnWN2rC3hdfVQeAKlOMo9Yc0aajnhHDKhWC0XnUEy4q G2z/T24ZZ4Wf/VIcGWwI5m0aIGf6QQvNvTglymEpmGHPgU3BJWvrW9z9W3kwJSniriU5 UOrhDc/A2na6zalG2R7Pzy4UqnycWP+hQFSCzDFS9x5eVdMn1ocyqZPha1AIzuJuO7SC s9oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=35iE2s8GktRLhhsR+gt6IJqqAbkFA4YH6z5wI7k+c3w=; fh=/47gT1gwZAnqEEt4O4OE4vb0HHfsM+7WswUPP+TBAbs=; b=DjDNe7ts1XptL2n/F1KUDxM2vS1iCtDqrqY4qVfK2i83lkrOUgvh0+OEuRhfuY5W+A 6lwRCcgAb27mDMbliZXkpVSToc1+tJ5wjLqlWc3csyIrLZ449Ohp+/68wuTDg4E6+juu kPhsT51A2dxdoEU1TIE5/8SHMqvfPLGMmlan+p+rFVaQw9QcCsEjc+owHvRqXBhDnuFM ihkdhHVI4bqKOO596nRhB0OUa6nACUbXMVCVloOrnIeVAYXabxK1ErQ+RFyKoV6U+sJH lk6TzpUvMIxvltvU/tuJhvAFbYTYXl+7VowUCh6HN50nZxn88KuCBL6paPAjXjVkvCJW vSGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XUNEFwrZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id bv8-20020a632e08000000b00577f4d85fdbsi11221727pgb.548.2023.11.21.15.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 15:57:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XUNEFwrZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 847D181552F2; Tue, 21 Nov 2023 15:57:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234980AbjKUX53 (ORCPT + 99 others); Tue, 21 Nov 2023 18:57:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234947AbjKUX5U (ORCPT ); Tue, 21 Nov 2023 18:57:20 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0099C1A1 for ; Tue, 21 Nov 2023 15:57:16 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF890C433CC; Tue, 21 Nov 2023 23:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700611036; bh=Kbe8XGZbLDUllBFU/Mfn+D2rr3svacMDADLa8sIZMi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XUNEFwrZo225RtXVaOe/hy+9Kvk/BDvCi0m0LK/GZN9DL8vPOWrhlAUEqW4o69p0e Rr6JSs06aPB9kL8BU3tnPfugX+oMtpUSGg6UZ2QaUUxgIhCEYfmUs2Xb8QKdknTF27 55Opvav/2/yfgE+9o35iaZGTGWOTzz4sKpKyCf3fqhWslI5tfiOfoSLExDrxPmyKJW 9+TwJ8ReL+/R77yKVO3CtZm9xUeE8dUXzEoCNJcC3XH/tBROytVwoUxHXeB+KdIt6k EXRmQtkK8vshbpVr6ISpOGV2wx6J5bXklopRc0DTPdzcCYHYlHMAXs/syv8/YBYCbB UvpzJntMow/ng== From: Masahiro Yamada To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: Masahiro Yamada , Andy Lutomirski , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] x86: vdso: use CONFIG_COMPAT_32 to specify vdso32 Date: Wed, 22 Nov 2023 08:57:01 +0900 Message-Id: <20231121235701.239606-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231121235701.239606-1-masahiroy@kernel.org> References: <20231121235701.239606-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 21 Nov 2023 15:57:40 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783219946992812302 X-GMAIL-MSGID: 1783219946992812302 In arch/x86/Kconfig, COMPAT_32 is defined as (IA32_EMULATION || X86_32). Use it to eliminate redundancy in Makefile. Signed-off-by: Masahiro Yamada --- arch/x86/Makefile | 3 +-- arch/x86/entry/vdso/Makefile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 1a068de12a56..0899e71ddcc6 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -296,8 +296,7 @@ install: vdso-install-$(CONFIG_X86_64) += arch/x86/entry/vdso/vdso64.so.dbg vdso-install-$(CONFIG_X86_X32_ABI) += arch/x86/entry/vdso/vdsox32.so.dbg -vdso-install-$(CONFIG_X86_32) += arch/x86/entry/vdso/vdso32.so.dbg -vdso-install-$(CONFIG_IA32_EMULATION) += arch/x86/entry/vdso/vdso32.so.dbg +vdso-install-$(CONFIG_COMPAT_32) += arch/x86/entry/vdso/vdso32.so.dbg archprepare: checkbin checkbin: diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 439b52772e69..7a97b17f28b7 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -35,8 +35,7 @@ OBJECT_FILES_NON_STANDARD_extable.o := n # vDSO images to build obj-$(CONFIG_X86_64) += vdso-image-64.o obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o -obj-$(CONFIG_X86_32) += vdso-image-32.o vdso32-setup.o -obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o +obj-$(CONFIG_COMPAT_32) += vdso-image-32.o vdso32-setup.o OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n