From patchwork Tue Feb 7 10:46:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 53828 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2777841wrn; Tue, 7 Feb 2023 02:53:21 -0800 (PST) X-Google-Smtp-Source: AK7set8WrsHea/vbg2ANuqMvabjcJgWQZAtg1V8/cXGCap/SpaNf47lblAEj4TTaujuytN+j2CeO X-Received: by 2002:a50:d553:0:b0:4aa:b5e7:9e77 with SMTP id f19-20020a50d553000000b004aab5e79e77mr3123286edj.11.1675767200968; Tue, 07 Feb 2023 02:53:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675767200; cv=none; d=google.com; s=arc-20160816; b=ZN3yZ+fC4yCFlZsh9FLfdJ2w4sNkzm7JbJ0E33mMYqUIl1Ga3B94sqM/RWFxVDSUv+ DFNyLjvxpMRslPME+I6X7XEO9ru+cocy83j4+O6ESk/SfGxW50HvR+6mmakd6z6ec0+m 4/9asVNPc/lXK3sk/4TQju7pqWV+Wgb2z8PJYAWY0Wo1Fp+258All+3XWjYjKkBKZvpw 4Xl0XSGSr+hp1KPGLk96fodH68vy3oRXT1EQ0yH24tFtM0xiSrdvbKY+YMUQCojcOJWz cQ/wZvqUWa8OqZXW7GiODGXT2zh65f6eznTfv5QV1IM3+DbIzOwkB+Y4xKXnnGDhX2Ib h6Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:dkim-signature :dkim-signature:date; bh=d4OfPHVZxvLVQJiLGkEzwDcFDOPDdLvwh5U9K8Vc7IA=; b=VZujvFnMjrjCuIr98jG4dbVW34AWeXoL7SF6WPQWuS4IrkJpVj91k9/TZU05cWpZcp SSzZce6ymqK53Pi3/e6SQkgOa+iVTVayWl8Um5FqMDdxJpFN59wL5sGlnqvPk1zglyzL RBeO3BCqFaPCh2op+2jHtB98p//duzAS/dnjQKWDpZ9wSVmSmsqEDveHeTH5AKy4NYGw wG/LAqBnqckTqWR7nEv4VveK5BC/umK1obLVtkISCLc95M0SU1TJ3Se77pYeGSRlBdni UWoxhpOQM2e2Fv2n/HtunTR9K+4S4uDJEeEQO0saFkyJlJO7/Ps/GvWMHJAQZmXY31ny +K+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="W/z9JUom"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=S1CWbPQk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id en25-20020a056402529900b0048c44c8cfcdsi12593982edb.167.2023.02.07.02.52.58; Tue, 07 Feb 2023 02:53:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="W/z9JUom"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=S1CWbPQk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231285AbjBGKqk (ORCPT + 99 others); Tue, 7 Feb 2023 05:46:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230121AbjBGKqi (ORCPT ); Tue, 7 Feb 2023 05:46:38 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8A334EE0 for ; Tue, 7 Feb 2023 02:46:36 -0800 (PST) Date: Tue, 7 Feb 2023 11:46:33 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1675766795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d4OfPHVZxvLVQJiLGkEzwDcFDOPDdLvwh5U9K8Vc7IA=; b=W/z9JUomEvP15zgVYP3y53fhmlDRhZDjuaPO5RFTivUu2xbGCL2FQalemJn/KCF6M3Qr3E jI5O4z/RU0N2ulLHBo+vQjP9LUyzgGSEXnVHSj9bF3ZIZoqT5Qq/o0QF6w3HR53Kfw0cYR 2IQ44/46QuKBefIR3HW3xqMPcRM6gDvCLlfqIjQ/mObFFqahOqm9a7YJdpGX6ElBXkJhXL UFxNIfgPGA69/xXKklRBN6J0T1x+0cPstvxVe2rDKmtesfmIVhLJ4jE2RZtPETpXu+XeCn eQp1Mb6k1Kid41cjHfgl8FMiyZezT13qNvUaqeC6KORLnOi2ZBcgzQpzTQhSMQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1675766795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d4OfPHVZxvLVQJiLGkEzwDcFDOPDdLvwh5U9K8Vc7IA=; b=S1CWbPQkKU7cyRM3kKxQ2x4gi+2UDGFv8hOGfC8VMpMVVZeEH5t7Z3gTZJ+pEv6FPV7Aqz xrU/HYqeK+4aQ8DQ== From: Sebastian Andrzej Siewior To: kernel test robot , Nathan Chancellor , Nick Desaulniers , Tom Rix Cc: llvm@lists.linux.dev, oe-kbuild-all@lists.linux.dev, linux-kernel@vger.kernel.org, x86@kernel.org, Thomas Gleixner , Andy Lutomirski , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH] x86/vdso: Fake 32bit VDSO build on 64bit compile for vgetcpu. Message-ID: References: <202302071338.m7nBGR5i-lkp@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <202302071338.m7nBGR5i-lkp@intel.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757169268567750519?= X-GMAIL-MSGID: =?utf-8?q?1757169268567750519?= The 64bit register constrains in __arch_hweight64() can not be fulfilled in a 32bit build. The function is only declared, not used within vclock_gettime.c and gcc does not care. LLVM complains and aborts. Move the "fake a 32 bit kernel configuration" bits from vclock_gettime.c into a common header file. Use this from vclock_gettime.c and vgetcpu.c. Fixes: 92d33063c081a ("x86/vdso: Provide getcpu for x86-32.") Reported-by: kernel test robot Signed-off-by: Sebastian Andrzej Siewior Tested-by: Nathan Chancellor --- arch/x86/entry/vdso/vdso32/fake_32bit_build.h | 25 +++++++++++++++++ arch/x86/entry/vdso/vdso32/vclock_gettime.c | 27 +------------------ arch/x86/entry/vdso/vdso32/vgetcpu.c | 1 + 3 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 arch/x86/entry/vdso/vdso32/fake_32bit_build.h diff --git a/arch/x86/entry/vdso/vdso32/fake_32bit_build.h b/arch/x86/entry/vdso/vdso32/fake_32bit_build.h new file mode 100644 index 0000000000000..db1b15f686e32 --- /dev/null +++ b/arch/x86/entry/vdso/vdso32/fake_32bit_build.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifdef CONFIG_X86_64 + +/* + * in case of a 32 bit VDSO for a 64 bit kernel fake a 32 bit kernel + * configuration + */ +#undef CONFIG_64BIT +#undef CONFIG_X86_64 +#undef CONFIG_COMPAT +#undef CONFIG_PGTABLE_LEVELS +#undef CONFIG_ILLEGAL_POINTER_VALUE +#undef CONFIG_SPARSEMEM_VMEMMAP +#undef CONFIG_NR_CPUS +#undef CONFIG_PARAVIRT_XXL + +#define CONFIG_X86_32 1 +#define CONFIG_PGTABLE_LEVELS 2 +#define CONFIG_PAGE_OFFSET 0 +#define CONFIG_ILLEGAL_POINTER_VALUE 0 +#define CONFIG_NR_CPUS 1 + +#define BUILD_VDSO32_64 + +#endif diff --git a/arch/x86/entry/vdso/vdso32/vclock_gettime.c b/arch/x86/entry/vdso/vdso32/vclock_gettime.c index 283ed9d004267..86981decfea83 100644 --- a/arch/x86/entry/vdso/vdso32/vclock_gettime.c +++ b/arch/x86/entry/vdso/vdso32/vclock_gettime.c @@ -1,29 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 #define BUILD_VDSO32 - -#ifdef CONFIG_X86_64 - -/* - * in case of a 32 bit VDSO for a 64 bit kernel fake a 32 bit kernel - * configuration - */ -#undef CONFIG_64BIT -#undef CONFIG_X86_64 -#undef CONFIG_COMPAT -#undef CONFIG_PGTABLE_LEVELS -#undef CONFIG_ILLEGAL_POINTER_VALUE -#undef CONFIG_SPARSEMEM_VMEMMAP -#undef CONFIG_NR_CPUS -#undef CONFIG_PARAVIRT_XXL - -#define CONFIG_X86_32 1 -#define CONFIG_PGTABLE_LEVELS 2 -#define CONFIG_PAGE_OFFSET 0 -#define CONFIG_ILLEGAL_POINTER_VALUE 0 -#define CONFIG_NR_CPUS 1 - -#define BUILD_VDSO32_64 - -#endif - +#include "fake_32bit_build.h" #include "../vclock_gettime.c" diff --git a/arch/x86/entry/vdso/vdso32/vgetcpu.c b/arch/x86/entry/vdso/vdso32/vgetcpu.c index b777f84ffae9b..3a9791f5e9989 100644 --- a/arch/x86/entry/vdso/vdso32/vgetcpu.c +++ b/arch/x86/entry/vdso/vdso32/vgetcpu.c @@ -1,2 +1,3 @@ // SPDX-License-Identifier: GPL-2.0 +#include "fake_32bit_build.h" #include "../vgetcpu.c"