From nobody Mon Apr 6 11:54:37 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ABEFC433F5 for ; Tue, 11 Oct 2022 01:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230251AbiJKBdC (ORCPT ); Mon, 10 Oct 2022 21:33:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230235AbiJKBcy (ORCPT ); Mon, 10 Oct 2022 21:32:54 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 919AB78BF1 for ; Mon, 10 Oct 2022 18:32:53 -0700 (PDT) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MmdVs70xTzpTKb; Tue, 11 Oct 2022 09:29:41 +0800 (CST) Received: from huawei.com (10.67.175.88) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 11 Oct 2022 09:32:50 +0800 From: Li Zetao To: , , , , , , , , , , , CC: , , , , , , , Subject: [PATCH -next v4 1/2] x86/boot: Remove unused variables Date: Tue, 11 Oct 2022 01:29:03 +0000 Message-ID: <20221011012904.2330473-2-lizetao1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221011012904.2330473-1-lizetao1@huawei.com> References: <202210090815.526C76396@keescook> <20221011012904.2330473-1-lizetao1@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.175.88] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Gcc report warning as follows: arch/x86/boot/compressed/efi.c: In function =E2=80=98efi_get_system_table= =E2=80=99: arch/x86/boot/compressed/efi.c:62:23: warning: unused variable =E2=80=98et= =E2=80=99 [-Wunused-variable] arch/x86/boot/compressed/efi.c: In function =E2=80=98efi_get_conf_table=E2= =80=99: arch/x86/boot/compressed/efi.c:134:13: warning: unused variable =E2=80=98ret=E2=80=99 [-Wunused-variable] arch/x86/boot/compressed/acpi.c: In function =E2=80=98__efi_get_rsdp_addr= =E2=80=99: arch/x86/boot/compressed/acpi.c:27:13: warning: unused variable =E2=80=98ret=E2=80=99 [-Wunused-variable] arch/x86/boot/compressed/acpi.c: In function =E2=80=98efi_get_rsdp_addr=E2= =80=99: arch/x86/boot/compressed/acpi.c:55:22: warning: unused variable =E2=80=98nr_tables=E2=80=99 [-Wunused-variable] arch/x86/boot/compressed/sev.c: In function =E2=80=98enforce_vmpl0=E2=80=99: arch/x86/boot/compressed/sev.c:256:13: error: unused variable =E2=80=98err= =E2=80=99 [-Werror=3Dunused-variable] Fix these warnings by removing unused variables. Fixes: 58f3e6b71f42 ("x86/compressed/acpi: Move EFI system table lookup to = helper") Fixes: 61c14ceda840 ("x86/compressed/acpi: Move EFI config table lookup to = helper") Fixes: dee602dd5d14 ("x86/compressed/acpi: Move EFI vendor table lookup to = helper") Fixes: f9d230e893e8 ("x86/boot: Correct RSDP parsing with 32-bit EFI") Fixes: 81cc3df9a90e ("x86/sev: Check the VMPL level") Signed-off-by: Li Zetao Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers --- v1 -> v2: Remove unused variables "et" in efi_get_system_table(), "ret" in efi_get_conf_table(), "ret" in __efi_get_rsdp_addr() and "nr_tables" in efi_get_rsdp_addr() v2 -> v3: None v3 -> v4: Put this patch in front arch/x86/boot/compressed/acpi.c | 2 -- arch/x86/boot/compressed/efi.c | 2 -- arch/x86/boot/compressed/sev.c | 1 - 3 files changed, 5 deletions(-) diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acp= i.c index 9caf89063e77..21febd9f21ab 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -24,7 +24,6 @@ __efi_get_rsdp_addr(unsigned long cfg_tbl_pa, unsigned in= t cfg_tbl_len) { #ifdef CONFIG_EFI unsigned long rsdp_addr; - int ret; =20 /* * Search EFI system tables for RSDP. Preferred is ACPI_20_TABLE_GUID to @@ -52,7 +51,6 @@ static acpi_physical_address efi_get_rsdp_addr(void) unsigned long cfg_tbl_pa =3D 0; unsigned int cfg_tbl_len; unsigned long systab_pa; - unsigned int nr_tables; enum efi_type et; int ret; =20 diff --git a/arch/x86/boot/compressed/efi.c b/arch/x86/boot/compressed/efi.c index 6edd034b0b30..6ffd22710ed2 100644 --- a/arch/x86/boot/compressed/efi.c +++ b/arch/x86/boot/compressed/efi.c @@ -59,7 +59,6 @@ unsigned long efi_get_system_table(struct boot_params *bp) { unsigned long sys_tbl_pa; struct efi_info *ei; - enum efi_type et; =20 /* Get systab from boot params. */ ei =3D &bp->efi_info; @@ -131,7 +130,6 @@ int efi_get_conf_table(struct boot_params *bp, unsigned= long *cfg_tbl_pa, { unsigned long sys_tbl_pa; enum efi_type et; - int ret; =20 if (!cfg_tbl_pa || !cfg_tbl_len) return -EINVAL; diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index c93930d5ccbd..b9451761a69a 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -253,7 +253,6 @@ void do_boot_stage2_vc(struct pt_regs *regs, unsigned l= ong exit_code) static void enforce_vmpl0(void) { u64 attrs; - int err; =20 /* * RMPADJUST modifies RMP permissions of a lesser-privileged (numerically --=20 2.34.1 From nobody Mon Apr 6 11:54:37 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFC7AC433FE for ; Tue, 11 Oct 2022 01:33:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229871AbiJKBdH (ORCPT ); Mon, 10 Oct 2022 21:33:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229804AbiJKBc4 (ORCPT ); Mon, 10 Oct 2022 21:32:56 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1EB97A741 for ; Mon, 10 Oct 2022 18:32:54 -0700 (PDT) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MmdTR5PPMzVhnD; Tue, 11 Oct 2022 09:28:27 +0800 (CST) Received: from huawei.com (10.67.175.88) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 11 Oct 2022 09:32:51 +0800 From: Li Zetao To: , , , , , , , , , , , CC: , , , , , , , Subject: [PATCH -next v4 2/2] x86/boot/compressed: Add "-Wall" flag to Makefile Date: Tue, 11 Oct 2022 01:29:04 +0000 Message-ID: <20221011012904.2330473-3-lizetao1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221011012904.2330473-1-lizetao1@huawei.com> References: <202210090815.526C76396@keescook> <20221011012904.2330473-1-lizetao1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.175.88] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Compressed/Makefile does not have "-Wall" flag, this is the old problem of x86 not sharing makefiles. Fix by adding "-Wall" flag to Makefile. But when "-Wall" flag added to Makefile, a few extra warnings were found. 1. In file included from arch/x86/boot/compressed/misc.c:15: In file included from arch/x86/boot/compressed/misc.h:24: In file included from ./include/linux/elf.h:6: In file included from ./arch/x86/include/asm/elf.h:8: In file included from ./include/linux/thread_info.h:60: ./arch/x86/include/asm/thread_info.h:175:13: warning: calling "__builtin_frame_address" with a nonzero argument is unsafe [-Wframe-address] oldframe =3D __builtin_frame_address(1); ^~~~~~~~~~~~~~~~~~~~~~~~~~ ./arch/x86/include/asm/thread_info.h:177:11: warning: calling "__builtin_frame_address" with a nonzero argument is unsafe [-Wframe-address] frame =3D __builtin_frame_address(2); ^~~~~~~~~~~~~~~~~~~~~~~~~~ This warning is disabled in the main Makefile for this reason so we should just be able to disable it, adding "frame-address" flag to Makefile. 2. arch/x86/boot/compressed/kaslr.c:627:6: warning: unused variable "i" [-Wunused-variable] int i; ^ This happens when CONFIG_MEMORY_HOTREMOVE or CONFIG_ACPI are "n". Fix by adding "-std=3Dgnu11" flag to Makefile, and we should put the variable "i" within the for loop. 3. arch/x86/boot/compressed/acpi.c:23:1: warning: unused function "__efi_get_rsdp_addr" [-Wunused-function] This happens when CONFIG_EFI is disabled for the reason that function "__efi_get_rsdp_addr" is only called in efi_get_rsdp_addr when CONFIG_EFI enable. So function "__efi_get_rsdp_addr" should not be defined when CONFIG_EFI is disabled. Signed-off-by: Li Zetao Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers --- v1 -> v2: Patch is new v2 -> v3: Resolve extra warnings after "-Wall" flag added v3 -> v4: Put this patch at the end arch/x86/boot/compressed/Makefile | 3 ++- arch/x86/boot/compressed/acpi.c | 5 +++-- arch/x86/boot/compressed/kaslr.c | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/M= akefile index 3a261abb6d15..8918a8306dff 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -35,7 +35,7 @@ targets :=3D vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.b= in.bz2 vmlinux.bin.lzma \ # be valid. KBUILD_CFLAGS :=3D -m$(BITS) -O2 $(CLANG_FLAGS) KBUILD_CFLAGS +=3D -fno-strict-aliasing -fPIE -KBUILD_CFLAGS +=3D -Wundef +KBUILD_CFLAGS +=3D -Wundef -Wall -std=3Dgnu11 KBUILD_CFLAGS +=3D -DDISABLE_BRANCH_PROFILING cflags-$(CONFIG_X86_32) :=3D -march=3Di386 cflags-$(CONFIG_X86_64) :=3D -mcmodel=3Dsmall -mno-red-zone @@ -44,6 +44,7 @@ KBUILD_CFLAGS +=3D -mno-mmx -mno-sse KBUILD_CFLAGS +=3D -ffreestanding -fshort-wchar KBUILD_CFLAGS +=3D -fno-stack-protector KBUILD_CFLAGS +=3D $(call cc-disable-warning, address-of-packed-member) +KBUILD_CFLAGS +=3D $(call cc-disable-warning, frame-address) KBUILD_CFLAGS +=3D $(call cc-disable-warning, gnu) KBUILD_CFLAGS +=3D -Wno-pointer-sign KBUILD_CFLAGS +=3D $(call cc-option,-fmacro-prefix-map=3D$(srctree)/=3D) diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acp= i.c index 21febd9f21ab..c062a8230e9c 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -19,10 +19,10 @@ */ struct mem_vector immovable_mem[MAX_NUMNODES*2]; =20 +#ifdef CONFIG_EFI static acpi_physical_address __efi_get_rsdp_addr(unsigned long cfg_tbl_pa, unsigned int cfg_tbl_len) { -#ifdef CONFIG_EFI unsigned long rsdp_addr; =20 /* @@ -41,9 +41,10 @@ __efi_get_rsdp_addr(unsigned long cfg_tbl_pa, unsigned i= nt cfg_tbl_len) return (acpi_physical_address)rsdp_addr; =20 debug_putstr("Error getting RSDP address.\n"); -#endif + return 0; } +#endif =20 static acpi_physical_address efi_get_rsdp_addr(void) { diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/ka= slr.c index e476bcbd9b42..4abc9c42cf4d 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -625,7 +625,6 @@ static bool process_mem_region(struct mem_vector *regio= n, unsigned long minimum, unsigned long image_size) { - int i; /* * If no immovable memory found, or MEMORY_HOTREMOVE disabled, * use @region directly. @@ -645,7 +644,7 @@ static bool process_mem_region(struct mem_vector *regio= n, * If immovable memory found, filter the intersection between * immovable memory and @region. */ - for (i =3D 0; i < num_immovable_mem; i++) { + for (int i =3D 0; i < num_immovable_mem; i++) { u64 start, end, entry_end, region_end; struct mem_vector entry; =20 --=20 2.34.1