From patchwork Tue May 23 16:54:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 98093 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2300690vqo; Tue, 23 May 2023 10:20:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71sjssJwlWP+stdDtL0iyMPn/e/pM00e2+WllTGKqMu3WYccE/NTgnX2nfMn4vAFEvzWQm X-Received: by 2002:a05:6a00:99c:b0:63d:5de3:b3f2 with SMTP id u28-20020a056a00099c00b0063d5de3b3f2mr21002742pfg.18.1684862403476; Tue, 23 May 2023 10:20:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684862403; cv=none; d=google.com; s=arc-20160816; b=OeqdddFq0FTAt+G62bBDRJrSI1NWlsUWx0c8TCiDWvgO4fjLBZ1ALVnjyaXV8sDnGz ErHPbH+EEGnXZNRDJ+NBz75YMZfVsSIU0pZkR1a4+MIBym0OJ0NVT24GHbAojr+P1kb3 cXUKUSD3mgDy2gnXdm7AjWNjY/m5yVWw4iXy1tHpw4xpGr3SuaJVv63nsM9FDvNFaQli g5AoQA+Vs3ZGeuo85Vtqp793M8OgLjAb/tWswlTLBhH8selA5w/mx+ZIyc/S25HMTqYT PnOzNdGpzjnFPa0SQ7TVoaiDHQOOx9HLYps9H7+JIb/EZ12ANYHCn0/emH5sCrnrukHx VF3A== 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=Xlf1GWYBVoM8WDz6if06yTnpMqv64J7+plOKWlXbDnI=; b=p65XqnpakTiM+m55JptFjYHDLthfeza6IYYwUCp3aNJuHzj6AhvVTvkZUl2NVFuGCJ yvMJWpy9IIJi2Tl3Ue9TSPoCvjJBa3ITDnhUdJ0OqSfkj4E6d1XKLd+052tv2BuRdaIc hC2BMLz6ll7rJcXeKx/qxTd/tKp8eWuN6hZOnW4kBdqTaHnndLe/FPIJa7XbdNG1oNvI klDGVljZVPhYkfZlcNfyQyRn8fOlEH4RPBnE33vK6zdFJ5swBk9DXla9jj/rns1uflex aIkj9aUkXV8RTehl9d+jw2304HThaFs7bh1zaJQ+KCN3/I8Su030fDK/ntufZ0vIBl7N Aw+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XenmqGcN; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z11-20020aa7958b000000b0064d2cca82b1si6913398pfj.48.2023.05.23.10.19.49; Tue, 23 May 2023 10:20:03 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=XenmqGcN; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237973AbjEWRGY (ORCPT + 99 others); Tue, 23 May 2023 13:06:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237952AbjEWRGR (ORCPT ); Tue, 23 May 2023 13:06:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05EB68F; Tue, 23 May 2023 10:06:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 91ACB634D9; Tue, 23 May 2023 17:06:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AD21C433EF; Tue, 23 May 2023 17:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684861576; bh=SFEBsgS/NuRbYn+gTRqLbgprOTjrzQzmKyN1/QnzNYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XenmqGcNT+t9qREdaU2ysYcIrUHpRMEc/ixHRS0pmUd7QY0KabDK/R6NircioTAuJ C7x3Ylv1KgugarEwJ9GU+bPjhCS1Q8UUOZTWKb/IRnmSFQ0vx3TnAKOGE5gGFxeUH/ vuWaDnQabyFUby68WbawVbE8Y5nty4ufPSLiMoFvszoD5j5aMGQ9/8nhVE3TyfkvFS lT6/qHnfvJ04hCUxy2jjo+k1GMEMfplP3blZT10wvxktFFVxpu3/1obmI737YIeLx1 fTecEVciQvmOw8zTVMuK7C1wUprgRIeJWue9u3DsoEPzJwqaNovFNNa/mz45MRTXna ujbRbtZMYMyWQ== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Arnd Bergmann Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH v2 1/4] riscv: move options to keep entries sorted Date: Wed, 24 May 2023 00:54:59 +0800 Message-Id: <20230523165502.2592-2-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230523165502.2592-1-jszhang@kernel.org> References: <20230523165502.2592-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,UPPERCASE_50_75 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?1766706279516746256?= X-GMAIL-MSGID: =?utf-8?q?1766706279516746256?= Recently, some commits break the entries order. Properly move their locations to keep entries sorted. Signed-off-by: Jisheng Zhang Reviewed-by: Conor Dooley Acked-by: Guo Ren --- arch/riscv/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 348c0fa1fc8c..8f55aa4aae34 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -101,6 +101,11 @@ config RISCV select HAVE_CONTEXT_TRACKING_USER select HAVE_DEBUG_KMEMLEAK select HAVE_DMA_CONTIGUOUS if MMU + select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && (CLANG_SUPPORTS_DYNAMIC_FTRACE || GCC_SUPPORTS_DYNAMIC_FTRACE) + select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE + select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL + select HAVE_FUNCTION_GRAPH_TRACER + select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION select HAVE_EBPF_JIT if MMU select HAVE_FUNCTION_ARG_ACCESS_API select HAVE_FUNCTION_ERROR_INJECTION @@ -110,7 +115,6 @@ config RISCV select HAVE_KPROBES if !XIP_KERNEL select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL select HAVE_KRETPROBES if !XIP_KERNEL - select HAVE_RETHOOK if !XIP_KERNEL select HAVE_MOVE_PMD select HAVE_MOVE_PUD select HAVE_PCI @@ -119,6 +123,7 @@ config RISCV select HAVE_PERF_USER_STACK_DUMP select HAVE_POSIX_CPU_TIMERS_TASK_WORK select HAVE_REGS_AND_STACK_ACCESS_API + select HAVE_RETHOOK if !XIP_KERNEL select HAVE_RSEQ select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS @@ -142,11 +147,6 @@ config RISCV select TRACE_IRQFLAGS_SUPPORT select UACCESS_MEMCPY if !MMU select ZONE_DMA32 if 64BIT - select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && (CLANG_SUPPORTS_DYNAMIC_FTRACE || GCC_SUPPORTS_DYNAMIC_FTRACE) - select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE - select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL - select HAVE_FUNCTION_GRAPH_TRACER - select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION config CLANG_SUPPORTS_DYNAMIC_FTRACE def_bool CC_IS_CLANG From patchwork Tue May 23 16:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 98100 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2306999vqo; Tue, 23 May 2023 10:31:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6oygUgjNLkxNeNk8sLKxM+vGYCLgHPl66gPU0CSs/StvS16PvR7u3tMPbYRUE3++RMCZRp X-Received: by 2002:a05:6a20:c995:b0:100:47a5:d754 with SMTP id gy21-20020a056a20c99500b0010047a5d754mr12560673pzb.23.1684863079335; Tue, 23 May 2023 10:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684863079; cv=none; d=google.com; s=arc-20160816; b=AgcnH8pN8kWFGT2w1wybEgjG4W7qDOAXMfAVwAbIBh4O7wboNrxJn1uTODmoQLhXNK QMe5dIsS4dlpyzswlgkYsNPz+Z44hEkThFl8qpIqQJc2fYkTbJuXZnaRZu9/c7+VYVW9 w0+7vRBelnSK1A2Gt2zXyyOFx8mzFxPqyFMm8X5fkU9DbUGLImnEN27VMx/OFA0XK7K4 vJvYiu7oVJ98+XbdR229HHb/J5b/CMz1iIMem0nBagsYAq6KjmFj2QJ9BofbnIdpnvYW Vie7johSHzn+9KnWVFjO/zvS3bKVdq6WkA/5/HCFIRHMMMRsv7YPH0opXvCd9bli2Tsb EBZw== 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=Pt//nkBDODDyO6hNUBwO68Pr5i1g34Mx5QA7Xq2zl3M=; b=u7+cAewDzB7hx2/C/prjupihTLpYXZzbb5cUuPdEFWnpRVoH9ohQyv2eUkItWGf/er c8cZ5vurLrYKeeMTe0iYYVqtVDCDShBHyy9UD1hX86sFujdKMteQOo3BJw8VXjIy9AZS FZIREC5UY1nYmrlUp5HwTuu26QPjKE6yWzqmmwR2IGPEhIJW9JK81mLpilO48RBY28FT LuST0nHIcvSs5z7rjJiFJmDcKuMyNPzoykw5BP8J9q2oweqYaJhpcys+2dAWaL5njNOF gHX64Jj+QQ4kqNxHZyazYjF+6zYP+e1clax1YENIOLzjpH0OjqUlNJmESLdj5TUKL7Mi hwKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VroAEK5O; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t64-20020a625f43000000b0064d241519bdsi5294506pfb.55.2023.05.23.10.31.05; Tue, 23 May 2023 10:31:19 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=VroAEK5O; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237984AbjEWRG3 (ORCPT + 99 others); Tue, 23 May 2023 13:06:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237959AbjEWRGV (ORCPT ); Tue, 23 May 2023 13:06:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 635BABF; Tue, 23 May 2023 10:06:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DEA8C6222F; Tue, 23 May 2023 17:06:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7886FC4339B; Tue, 23 May 2023 17:06:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684861578; bh=S1v3epwjKPZhhmwrrwdqziIQP7+cuuUHEgza9tY/ky4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VroAEK5OljQLhXtHf6feHA8/FP9OXYl6sjuMlhJsY8l8KPby6JgzKKo6wcnYW31kk 7699dMhJ4mj/3Sez4d4jeyXrd9ERwFEGrqRI4zLewef48JVaieRPxC68pFZq3gnrG0 QwLsevTvH5HQg2BMVx3o/K6NDABDbh/+eAmtHw4GRUCBfZkUonc6oKYSTltVEvG2ei wGp8bjpvxifPQIq+Vr3n/eYYBZuKYC77OR2xuYa91Vrd6O0cZDX3KKmKqEfPF3jLBK OXdEs3T9UefBk5W3LeStb3eKkp+/XzUWYJ/awKpJCTvSoEsiEa17E2YSrtqZ4j32yM 2VuLUKy8tPE7Q== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Arnd Bergmann Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Conor Dooley Subject: [PATCH v2 2/4] riscv: vmlinux-xip.lds.S: remove .alternative section Date: Wed, 24 May 2023 00:55:00 +0800 Message-Id: <20230523165502.2592-3-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230523165502.2592-1-jszhang@kernel.org> References: <20230523165502.2592-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766706988022406322?= X-GMAIL-MSGID: =?utf-8?q?1766706988022406322?= ALTERNATIVE mechanism can't work on XIP, and this is also reflected by below Kconfig dependency: RISCV_ALTERNATIVE ... depends on !XIP_KERNEL ... So there's no .alternative section at all for XIP case, remove it. Signed-off-by: Jisheng Zhang Reviewed-by: Conor Dooley Reviewed-by: Guo Ren --- arch/riscv/kernel/vmlinux-xip.lds.S | 6 ------ 1 files changed, 6 deletions(-) diff --git a/arch/riscv/kernel/vmlinux-xip.lds.S b/arch/riscv/kernel/vmlinux-xip.lds.S index eab9edc3b631..50767647fbc6 100644 --- a/arch/riscv/kernel/vmlinux-xip.lds.S +++ b/arch/riscv/kernel/vmlinux-xip.lds.S @@ -98,12 +98,6 @@ SECTIONS __soc_builtin_dtb_table_end = .; } - . = ALIGN(8); - .alternative : { - __alt_start = .; - *(.alternative) - __alt_end = .; - } __init_end = .; . = ALIGN(16); From patchwork Tue May 23 16:55:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 98092 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2299123vqo; Tue, 23 May 2023 10:17:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6TMILuXNuDUAC4kibijckJdgaNXTNovKDXIE3gG2yospnzOwSQh/eGIQQRsJ10SfWXYDiK X-Received: by 2002:a05:6a20:4321:b0:10c:b441:5bd0 with SMTP id h33-20020a056a20432100b0010cb4415bd0mr1731167pzk.18.1684862234611; Tue, 23 May 2023 10:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684862234; cv=none; d=google.com; s=arc-20160816; b=so8bWdqqYWwtSYW8LOxTdZbg9V7yQil/5Si+vPhrBPL+QWGP6Ve7voEj0oQIywm09u O7eddparTy4aTmNxMfbPpSxX3n17z9EU09guxhxJhqeZq682GPVyjb/j+cdAY9eKjZKV vUUNNSpXkmEPiFJBk9jfokmxoHbLdL4ikayCzx3TJEv8LY8u5csTGtlxjmg6uI/o95kH SV0+E2ZqXki5oq1cAsAHOEUybZrMmC9St3+DXkt8aF0zSAxU5IyQ+LHwp8utAXhtWz8Q /qvuLEmVqzG0sfLdfNqFKYffAFxp+X2+HJ6DvFy6muZYA5Otihcut+LglPvT2uHZw/tc Mo9Q== 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=8zlfSqhbFZ+8hH2tT062o2dqs0nfzVqN75x7D7cn6RA=; b=GzwFECov4sJBRjoozwo4+OMT2b3Ix+4oLsWYEX1flcvv6G5dOHPdWmqpZMLpNCk49E VhNh9o+adymBGwUwE7FyBstLIXZ3gMml2SGuW/Wv7GRlvLpJfIWdn2u0J/cY49X+h2Kz V8nJhA7HdRblJCVRJu6pjx/WlmZVVL336Bpr+CEErwm+YYMMH4XkqeoVpiDS1ng9VWTJ vR2KgTvrOJ4IKEGb7kJxW1YOKffISPH7m/Vl3iOELrGmWJ/TXEaLTC+MZw5TM0oCbB3X O8YBEUpvr4cLz3aR5eGyPS0Hh9qaLtxww2+2dFIU3ZWuyFMdOpMABH7s3JCxO38GVYnr cuHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ekUkv+8U; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ie2-20020a17090b400200b0024666c4e8d8si1056734pjb.187.2023.05.23.10.16.58; Tue, 23 May 2023 10:17:14 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=ekUkv+8U; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237991AbjEWRGc (ORCPT + 99 others); Tue, 23 May 2023 13:06:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235559AbjEWRGW (ORCPT ); Tue, 23 May 2023 13:06:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DE17DD; Tue, 23 May 2023 10:06:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0C77C634C3; Tue, 23 May 2023 17:06:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2DAFC4339C; Tue, 23 May 2023 17:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684861580; bh=XDpfU4QGkxHCk0PcVXqfWjLiQT8efnUkxx2g6qxryQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ekUkv+8Udgo0rQGikUzgVt1U+8VG4DYIqET6gmM4S7k9goJGn3cE6EIVMWx3nHzXX yBXZL/2rbnb2TMN2LJSbanLZck5wX+V8ygTKDIsZ+gxcaADr23j0vJlC2BY2vnfTDZ TZU8C+c9+M24vwOjravcJ8o3dk+YCUMk+Sqf7N+Bud9SE7IPtJrIoGHtUIbgtb3dwS 1BIos3/riAF8xW30yQ+SBN3Twvf4DDzykyhu6HoyL3/zpF90sp/6cCdeXI5ZG0/8DQ 1NI+5pZPAcfFAOsHiy2qs0k0ZFXtXkbymsvFmGP9I6UTbPYChQmMEc/Ep1tRlqv4MD xC48ZkFtW+JUg== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Arnd Bergmann Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH v2 3/4] vmlinux.lds.h: use correct .init.data.* section name Date: Wed, 24 May 2023 00:55:01 +0800 Message-Id: <20230523165502.2592-4-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230523165502.2592-1-jszhang@kernel.org> References: <20230523165502.2592-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766706102146492323?= X-GMAIL-MSGID: =?utf-8?q?1766706102146492323?= If building with -fdata-sections on riscv, LD_ORPHAN_WARN will warn similar as below: riscv64-linux-gnu-ld: warning: orphan section `.init.data.efi_loglevel' from `./drivers/firmware/efi/libstub/printk.stub.o' being placed in section `.init.data.efi_loglevel' I believe this is caused by a a typo: init.data.* should be .init.data.* Signed-off-by: Jisheng Zhang --- include/asm-generic/vmlinux.lds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index d1f57e4868ed..371026ca7221 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -688,7 +688,7 @@ /* init and exit section handling */ #define INIT_DATA \ KEEP(*(SORT(___kentry+*))) \ - *(.init.data init.data.*) \ + *(.init.data .init.data.*) \ MEM_DISCARD(init.data*) \ KERNEL_CTORS() \ MCOUNT_REC() \ From patchwork Tue May 23 16:55:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 98099 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2306816vqo; Tue, 23 May 2023 10:31:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4xvmBMQUHfs+W+Gwowvzgfw/iCWB5ulxn0QPHLAzrePsApUOxAvsnoIZzNITCuaJ/WaDCL X-Received: by 2002:a17:90a:380b:b0:255:5bde:e6c2 with SMTP id w11-20020a17090a380b00b002555bdee6c2mr6964203pjb.12.1684863065290; Tue, 23 May 2023 10:31:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684863065; cv=none; d=google.com; s=arc-20160816; b=Lad4a0rCdiym/dzsbrdHwmfXVOK/exiRl9obIoKzf824uLWTTpP24qLpeRbVnWBn/1 xa5VHkFsMcmWdazTm6PqrtAwlf+rBMQubUIR7DvGqN/b5/tjNpJ4htn9l7F24FXZD2zh wVtY6cb8xFE2ffzqejw4VpBOH5vksXz3bERiMavGqflEPr2/ep/uQtNn+HDHUbiZPVUl NZCfSpWd+dzAXHT3eBlauajZrpYNk94KPLkfFX+n3IZ15GDFhI/JA+ELSXvqkO8oZNfz SYgfCDEKc0jmGtZDyy0zw8v6lUycnVWSA11e7A8PT8HCwUCG7b7MU3GB1UBFOe2KCejz hR7Q== 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=OIKqnKf/UKDzTo9XG1fbJj1jkOedkgIuImiLZv6O5yM=; b=d2gmTV7A2l1OiIVUORTAe8r5AtuTHzqmqNm/aDHpCYfckMJOssa0NMiNIksVSL0pEm fH+Kyd9PrnecNvw+tnZT/74/K3Ynbkw6YMdc4nzU7EUsbgUiGF5G0FmlQDk702WQWfVC SB5DAlfPH+WWWADjHBdwCbkupJIBs3G7jLS1quXCh8x9czDAs3sptLYtZvn+YQf2waGb AnuMT5zJB4n89Ofyv+HRgnU/FGB3IwdO/w3WslPK9Ud9Ng4ypqCxVrq07ubZHC0QUGr7 5LjzPOgMvyOq+M83LxRARwzEUV3jExfoDysfeVKYWkUXCiVqHtHrVnmlLuAq4yXDQyEl chxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="tzqNIne/"; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 1-20020a630201000000b005347efdfed3si6693935pgc.806.2023.05.23.10.30.49; Tue, 23 May 2023 10:31:05 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b="tzqNIne/"; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238022AbjEWRGl (ORCPT + 99 others); Tue, 23 May 2023 13:06:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237980AbjEWRGZ (ORCPT ); Tue, 23 May 2023 13:06:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EFCCDA; Tue, 23 May 2023 10:06:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C0B91634C3; Tue, 23 May 2023 17:06:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4BE7C4339B; Tue, 23 May 2023 17:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684861583; bh=J4geLF9/wB/nci7eyTPzHGp1IQrIjTH306iCGvwIsQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tzqNIne/apjydPkehRRhk/0O0hkReo4pjcZtGnV4WX7abAD5K4e3kuBRAVahk8os8 NaRieZa7LqgDjJyjU1AXbv8j08bEFYKRnT2K5WaUoYsQG7u6dbZmYRa4w1lrVkLGKk AfNwCokEOjU34OHzwDt15ZOWzmY2EYcrAgK1lSiNg/G/2OrctV9LzlJcKjD0Xx2O5K 5QLRx+rWuzOuVStoft7q68LYRA02Ic6uHJtnWRJcDd5b682rKLWJKDIChj3ot3PNGU Oph96bKhybNTihKFHNrXw/h8maDWRzFbCZ2O4FrUuNE1nqNc9I2eedAOXS8Uji5dXA KoeOlvBux09Rg== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Arnd Bergmann Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Zhangjin Wu , Guo Ren , Bin Meng Subject: [PATCH v2 4/4] riscv: enable HAVE_LD_DEAD_CODE_DATA_ELIMINATION Date: Wed, 24 May 2023 00:55:02 +0800 Message-Id: <20230523165502.2592-5-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230523165502.2592-1-jszhang@kernel.org> References: <20230523165502.2592-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1766705885586457268?= X-GMAIL-MSGID: =?utf-8?q?1766706973553663061?= From: Zhangjin Wu Select CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION for RISC-V, allowing the user to enable dead code elimination. In order for this to work, ensure that we keep the alternative table by annotating them with KEEP. This boots well on qemu with both rv32_defconfig & rv64 defconfig, but it only shrinks their builds by ~1%, a smaller config is thereforce customized to test this feature: | rv32 | rv64 --------|------------------------|--------------------- No DCE | 4460684 | 4893488 DCE | 3986716 | 4376400 Shrink | 473968 (~10.6%) | 517088 (~10.5%) The config used above only reserves necessary options to boot on qemu with serial console, more like the size-critical embedded scenes: - rv64 config: https://pastebin.com/crz82T0s - rv32 config: rv64 config + 32-bit.config Here is Jisheng's original commit-msg: When trying to run linux with various opensource riscv core on resource limited FPGA platforms, for example, those FPGAs with less than 16MB SDRAM, I want to save mem as much as possible. One of the major technologies is kernel size optimizations, I found that riscv does not currently support HAVE_LD_DEAD_CODE_DATA_ELIMINATION, which passes -fdata-sections, -ffunction-sections to CFLAGS and passes the --gc-sections flag to the linker. This not only benefits my case on FPGA but also benefits defconfigs. Here are some notable improvements from enabling this with defconfigs: nommu_k210_defconfig: text data bss dec hex 1112009 410288 59837 1582134 182436 before 962838 376656 51285 1390779 1538bb after rv32_defconfig: text data bss dec hex 8804455 2816544 290577 11911576 b5c198 before 8692295 2779872 288977 11761144 b375f8 after defconfig: text data bss dec hex 9438267 3391332 485333 13314932 cb2b74 before 9285914 3350052 483349 13119315 c82f53 after Signed-off-by: Zhangjin Wu Co-developed-by: Jisheng Zhang Signed-off-by: Jisheng Zhang Reviewed-by: Guo Ren Tested-by: Bin Meng Reviewed-by: Kefeng Wang --- arch/riscv/Kconfig | 1 + arch/riscv/kernel/vmlinux.lds.S | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 8f55aa4aae34..62e84fee2cfd 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -115,6 +115,7 @@ config RISCV select HAVE_KPROBES if !XIP_KERNEL select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL select HAVE_KRETPROBES if !XIP_KERNEL + select HAVE_LD_DEAD_CODE_DATA_ELIMINATION select HAVE_MOVE_PMD select HAVE_MOVE_PUD select HAVE_PCI diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S index e5f9f4677bbf..492dd4b8f3d6 100644 --- a/arch/riscv/kernel/vmlinux.lds.S +++ b/arch/riscv/kernel/vmlinux.lds.S @@ -85,11 +85,11 @@ SECTIONS INIT_DATA_SECTION(16) .init.pi : { - *(.init.pi*) + KEEP(*(.init.pi*)) } .init.bss : { - *(.init.bss) /* from the EFI stub */ + KEEP(*(.init.bss*)) /* from the EFI stub */ } .exit.data : { @@ -112,7 +112,7 @@ SECTIONS . = ALIGN(8); .alternative : { __alt_start = .; - *(.alternative) + KEEP(*(.alternative)) __alt_end = .; } __init_end = .;