From patchwork Thu May 11 14:12:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 92653 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp4480847rwl; Thu, 11 May 2023 07:31:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7o3Pqz7uVQdWkS9LP5RBLDHZ8Nc86Ql83FyZvCP09ExL+26gAmV2ZIg2QpuX2qI7AYvPra X-Received: by 2002:a05:6a20:8425:b0:f6:d60d:dbc2 with SMTP id c37-20020a056a20842500b000f6d60ddbc2mr27043166pzd.28.1683815475576; Thu, 11 May 2023 07:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683815475; cv=none; d=google.com; s=arc-20160816; b=YAkNyDVITwlQb+v7GYQyOtu+q7iLfHMpfKXuT7GaaVb5EgNNQnX7+dB8I3Tkqdj8l0 EVipGBoofalcmG5r2HXTOt30bAcjBPbO1KSS1wJqkSJ5dkQ24dng9ixAm4pyvM9cWYzO iu8F/KPWnCbIWfdl3VfWhluFuVPj1yrw1o3/ZEJMboqOBV2MBbAQ+jfuJDYIekn0sHE1 z5UHFYIgMUY9+QsQZwHJmKe/7N1Dy0yY9QWRuLSgixj0YePdP4bidTOvNt/VzzyJF9OT 81itADFGQI1qNT1iCFIQOLapxfGn44gQGWTQbTnKUxFYYAUgJuU0BMaPYz9bIPw/YN2N I1vg== 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=dz7XGCHjq1dzsPGGS4F6j4OR5rErWwXp5TUKHxoryWE=; b=lWV6g/bk9VXW+S8MOTBCMxIDaicX+NcDobKDjpsYW8hHQayvTN9NhhX982G9Eqo5oe LGskVCSs04I9BUNLSFYuuqCHS5wogUIlHocvJ3r4X4LQaNvbG1bqPXiK380sbJzfbg21 ylO1zvJH2j4a5treMxj2MF7OjbReYJZT+C7UloWtP7ulM3uJ4R+uVjUL/QsfYT70e7ak o75sXymdz7uvjeJF8Ia7pzjwxuNrJJx4vJQkwqRCqM16F+FWm/u/vr9RkaSLDWeMuCge cULQttMAJ6M+dYqRmc0DJOt1LDKXcH5YPUQOQgNj7WPccNtnUgjo9bp44+mto4LeZGLP yZNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DuTL2omz; 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 g4-20020a633744000000b00530725b58a1si2029570pgn.24.2023.05.11.07.31.01; Thu, 11 May 2023 07:31:15 -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=DuTL2omz; 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 S238278AbjEKOXu (ORCPT + 99 others); Thu, 11 May 2023 10:23:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238258AbjEKOXg (ORCPT ); Thu, 11 May 2023 10:23:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C9F7E66; Thu, 11 May 2023 07:23: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 0F86264DFE; Thu, 11 May 2023 14:23:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 991FBC433D2; Thu, 11 May 2023 14:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683815000; bh=RBBjQJhyNTq4SLepJRhrNnLCCMrJFLXtNe6TLcXndOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DuTL2omz4fj1qRlJSZXZGLrBNoL39rBeuQpXk/KjnbC+dCNf4/gp6IJF22P4VJuTU 5Kur7PM3FMd7AFMbVodq9zu/bH7kktW8XkJ/+PzymDCAmEDBvrAVzrwE0/Mpf1vDE1 Q2XB19rffNaqwD2DN8kZ6kNDnulVKfEHfvS3yxAbb1XgXJ5V+R3dx3NRkVLL0mar8Z +ajhWfJ0YLRTSbzTAv/aBaYgFmApf55tt4Rj18Bw1AzC6bbl+43pkg3Jr3oihI0ArN QM1onojNiOUFyt2IN193TDX3CeEGQXKyAnG5QVCT98vT4fjeFY9pIUDhiRljGoGKi4 0MOl+1qd56rVw== 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 1/4] riscv: vmlinux-xip.lds.S: remove .alternative section Date: Thu, 11 May 2023 22:12:08 +0800 Message-Id: <20230511141211.2418-2-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230511141211.2418-1-jszhang@kernel.org> References: <20230511141211.2418-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 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?1765608495939898790?= X-GMAIL-MSGID: =?utf-8?q?1765608495939898790?= 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 --- arch/riscv/kernel/vmlinux-xip.lds.S | 6 ------ 1 file 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 Thu May 11 14:12:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 92664 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4429497vqo; Thu, 11 May 2023 07:44:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4k6/mcPL6Kf2Wfr8MMInfOJOcCk/l+qfxipqKxpY/JZpJ78CnM/+Q8ZJ5C4W8jPau/wOlG X-Received: by 2002:a05:6a20:748a:b0:f0:fa9b:d4c7 with SMTP id p10-20020a056a20748a00b000f0fa9bd4c7mr28882293pzd.55.1683816286430; Thu, 11 May 2023 07:44:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683816286; cv=none; d=google.com; s=arc-20160816; b=pmH2HUEumIs3sEC/0UnKDf+racRtoeA0TAoL+3psNINxdfr//q9ZA43bM9F92ABh1W SRxCD9mn/EV9d1xGSwWn72Irjyn3oyKiggebHKA+EDiulsrcbFHgtV6YE5twF6fmTa11 3k1cLTp3Cj89dTVnDgEKhV/Dh22VJZnH7NKLyTDIOCSLuJccyDZ8L4Wzi2DiB21CyqC0 fYqsYb+N9/S8rK/mlbjqn+VkHGbqx9e8zXrpKltbohFKw2ZwvFDe2xGcJdDYh0PAYEkm 5HHtcoXmWwPTxMbe/yFszgrTGE+w324TxidgH4iujfGvZFLeNfFlLaVDDI4YV3GNjAc1 exgQ== 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=KQLkrzwE28w39a6wsJfGHr8VTTBSiVuuIFiMskHqSL0=; b=oOH8ocYJU60Y3GOQkK2olEE9N1IsZboOCqD41C4JMYrGF/QScTQc0+EBLHFGmwWuXN 8jQKJXPV+QK8PjfzBksgcHh8xOqAEj3GlpmwJd5WinhXW9QjtN1fl/LjVXenEaiPF5NO ZYoPjRc6hcypO2ZM3EUXg1KYZpTWwVrWubwsBw5rthuOufLNxi+o2ACbxFJ+OV7rs16l CPfbjpOKY0RwrvGsUuV9lFGfM3PlUuq2KjmTwG+aXdMHtDW89YraXSq2ndHc5qRG/MDV iXMpsk40VJdgG0VJMiQWrQLuZp42Or0HdlhjUK6lM+8G2QAD21ohPacSaMQJgBJSwm4f RaTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uXb2rCTo; 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 g67-20020a636b46000000b005030006a2desi6414965pgc.182.2023.05.11.07.44.34; Thu, 11 May 2023 07:44:46 -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=uXb2rCTo; 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 S238388AbjEKOXy (ORCPT + 99 others); Thu, 11 May 2023 10:23:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238130AbjEKOXh (ORCPT ); Thu, 11 May 2023 10:23:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FB45E49; Thu, 11 May 2023 07:23:25 -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 E8E1F64DFB; Thu, 11 May 2023 14:23:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCFA2C433EF; Thu, 11 May 2023 14:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683815002; bh=Qsoh2DY7RYTsIMpTH0GDqs55ax7692t2wbeau6VO2qk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uXb2rCTojbnqqTn8P5YlUMw1+SbNkb9+0LGdTYGVAsGB5VW7NiYN9ojgrezU7ny/I /4/MfKa1ZkIhiwP4Pxwvia4Fb44hFJFum1axBzCT0AunQRiQJYmqbeHky99hKG3Y4y hnlCgZd4yJo767E4hiQTcj2oSoQZWYDf4edI6H05y3e8Axa8JuV6dUrNTeQFkv/82C WFc2+SUJR7u6hIGjtwp9qNR+SpzY6xENyrESHr4WgLFQdLbO+yqP06u2gCFY0fWZZD EvQeqAUKXv2u3eUDWLZl+kZdcJYBvi+BLAY6Rch79ST0BeLCol71cqzKsN5l2GhPpX WYB2MfCiS68NQ== 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 2/4] riscv: move HAVE_RETHOOK to keep entries sorted Date: Thu, 11 May 2023 22:12:09 +0800 Message-Id: <20230511141211.2418-3-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230511141211.2418-1-jszhang@kernel.org> References: <20230511141211.2418-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 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?1765609346247466918?= X-GMAIL-MSGID: =?utf-8?q?1765609346247466918?= Commit b57c2f124098 ("riscv: add riscv rethook implementation") selects the HAVE_RETHOOK option for the first time in riscv, but it breaks the entries order. Properly move its location to keep entries sorted. Signed-off-by: Jisheng Zhang Reviewed-by: Conor Dooley --- arch/riscv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 348c0fa1fc8c..f0663b52d052 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -110,7 +110,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 +118,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 From patchwork Thu May 11 14:12:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 92647 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp4478458rwl; Thu, 11 May 2023 07:27:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5EcTV+LQBqFJ1/gbiSUUb0cty+ezpZEDuR/61yUZF1iUoMWxlDPFm/qkKfoSsQEdakpGU7 X-Received: by 2002:a05:6a00:23c4:b0:641:23df:e914 with SMTP id g4-20020a056a0023c400b0064123dfe914mr27587280pfc.13.1683815272201; Thu, 11 May 2023 07:27:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683815272; cv=none; d=google.com; s=arc-20160816; b=ExYHeW4VRRLFSam9nGuxv3CFGeDehzv+KhBey39RIq1BH1WLUPiBD0BAPv2Vv9RPw1 TrH4NsmCAvvYXd8hIBRDdq2098+si8MPwBvcp4OrW7IgEFgG2dVrDGTdOkT0qcBr/jNH M/H5IuPRAXWi/gR+cI8HLnrspZHykkoCB1HE5n/MfgoDiKYcnnCOBJh/GZZw2KKbPDHO biax5W6uAzw3FbuBeruNGh1NlGNY70S8V7h20JS/FYY9Ogy3xIRLcdTMip2TS2/SnVyJ Z3YEFqKVoXaMoEUqDsNpet7816k8MIWU/wSEC46o34AujpdHdBEHss99JzivY/rMbUpu Do6g== 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=ahGBbuHd+SO5KIlJ9PrsNST77l/iJkYrIIqjlkyd3A2aJaqKWgIqHv3EZHUYwgz/b6 CCDJKV2oqs0bek4UCBM8mFKi8kNLZJvxH6732UXNI0sxGgxXuUyyJ7VIfZBu7XFySgv6 vukCWWcivv1PHs6sDSABLMQF5voiWiNBDBZb3WNAutxZw7Q9eRC748lUU6EL+ZnpOyMW ePrd8mIDhjeQRpxxcRhTvyqIQXDD5wct7HAPtHiGCVctp7VtU7gCytkQMSt3sjkqiCyh G+1XoBg+3pLn1t33E/eRxLyQ5Vy+tlk3AjyAqBrACgpqXaSyICl5mVMfOjs6nlVAIguU BhyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qQiuEKd2; 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 i30-20020a63585e000000b0052856cec94asi6749446pgm.884.2023.05.11.07.27.40; Thu, 11 May 2023 07:27:52 -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=qQiuEKd2; 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 S238418AbjEKOX5 (ORCPT + 99 others); Thu, 11 May 2023 10:23:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238156AbjEKOXh (ORCPT ); Thu, 11 May 2023 10:23:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FCDA83DD; Thu, 11 May 2023 07:23:25 -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 D2098610A2; Thu, 11 May 2023 14:23:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6235C433D2; Thu, 11 May 2023 14:23:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683815004; bh=XDpfU4QGkxHCk0PcVXqfWjLiQT8efnUkxx2g6qxryQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qQiuEKd25qGNxzMC/VzrANFNkwAxyE7/iChs3QZIM0Bl4Uf4R84Ga0Dk42m888RVb fZ5NEuJv2QYk/nbcRcn0laW4g0chl+t0F6Ys/PVmoOzQFtoKnV8Cwq2Hnz1p/qyEdN 3VslTOtUm1M6/+smqskiwzYeuZtAeIFuxw5iJK6IfppnovvZMeSW+/RWvMFQmkKWsA QFVLYHSkX3p/xZVTibvWsP7LuGrv+ede51WSunQKrRYZ12ZZ1TEAs9KJkoCICil8WS NsAELJWQYEM/WSNI8mrXsecWykxDQQlRdYYIWKMGZ/9YsQWUpbJ9GfilidJPpuTkBl wkEaw9Qq3jlYw== 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 3/4] vmlinux.lds.h: use correct .init.data.* section name Date: Thu, 11 May 2023 22:12:10 +0800 Message-Id: <20230511141211.2418-4-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230511141211.2418-1-jszhang@kernel.org> References: <20230511141211.2418-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 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?1765608282808995376?= X-GMAIL-MSGID: =?utf-8?q?1765608282808995376?= 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 Thu May 11 14:12:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 92648 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp4478475rwl; Thu, 11 May 2023 07:27:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4j20Ua9vID1QThR1Cmr1aJTDHGI0aWDcG48DcOZOYi+X+4tDPQkocFIRGsjh83km5JPvA1 X-Received: by 2002:a05:6a21:6d98:b0:ec:c8c2:36b7 with SMTP id wl24-20020a056a216d9800b000ecc8c236b7mr28526944pzb.14.1683815274016; Thu, 11 May 2023 07:27:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683815273; cv=none; d=google.com; s=arc-20160816; b=zdYNorNz1v4+et0DpTsivHX9yWcmUN7Fs7Dv1/q+la2VTI1HiZZSEDDZmEcOAlRd+T EfZlQaBCr40jvpjJeGobNMak96H4/jS9Hgo7YIc1erI0uJNOTC8ib3nWdPDT9LatKOtE y75ANRFh4Ch9NDoj1okv3ui5l2v2OVUwkjXpPsXMoSZH0zInyzqDPV/ZWuL9LV3h+Kfj uumZJxXE+joDv6odGI50ineSLogZy+8YfleoZBwugk3yU9Aew+z6diNOnC4lMpntEVrL minMUaqEvMF2ZE0Mz11O2TBVPE2vYTf/t5Lk6kwmNKn5g49SUC3/X42IJfF6+HBnckk7 L2WQ== 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=VQWrbQyQZhlirYLdqanbcNg2P7jQBUh8fdQxrXJmbe4=; b=bye9/4RKzdL7eogb8nVaq9v2d1LT1U4nxkb7wkacp+LyybLG0+SjJC6ql0xoJO8JVl Y4l+OKANG7ZYfwJtS7iIRaC10uHmELyHwLvESkLsuh70BFlcOWiRJj2X/iICYbuL6hK9 AxrGTTLyN9JN46E3wnLod8oi7OtQVHtVd7nVoFd9jkDfWtbfpKakW7RS+FWi2L5Rh+l9 3wBSR3yXX2BLA6Bdd2DCkz7QSxr6AT24WwE/KeCen5fziRaWT9PVzMYg/jHp+Sq5GO3G bGQTzwslCQgMO6iidtjEeuwodYiUwZjSFo2GSBiwiuCQejtMRbQK7axCaH0ysQgRFLe8 TemA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aQAlhdry; 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 f26-20020a63755a000000b0051b48085aaasi6839576pgn.858.2023.05.11.07.27.40; Thu, 11 May 2023 07:27:53 -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=aQAlhdry; 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 S238445AbjEKOYA (ORCPT + 99 others); Thu, 11 May 2023 10:24:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238169AbjEKOXj (ORCPT ); Thu, 11 May 2023 10:23:39 -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 A8EB6210D; Thu, 11 May 2023 07:23:27 -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 3DBAF63335; Thu, 11 May 2023 14:23:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEFB6C433EF; Thu, 11 May 2023 14:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683815006; bh=EAl7BYyGkHSJ9u4z4v03MJVzoloTTUlxQ/6IkxdvXp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aQAlhdryVtLrijn4plCYeD8GrNC3jkYYQfYYiLdqFuCbLL01xeMxATi5/b0BGkM3s 9pL1vpl41G7btsU04qC3KrO87rvLds7PncrgXtCzI0TzlLyAxUfqxe9l6sJ8pXHMhd yhQTtQsY8s1Rz8rB2ADYYC5lq2GjgG6p1lMoJRviovB4jhO0IgiPOanGPdogFRFGKf M8lKdsRm3s25cOtf3C6WMjn6jdc7/xNC+H3pGs4NafKn5ftut5UIqYwf1d8y4dUyr/ 48sWhQwCzLUjfP7GoO7r/wnUGOitDR2Mu+i737iw2WCUlf+W9v8lzun7HeOBvYMGVS PA6Eg16UdnlTQ== 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 4/4] riscv: enable HAVE_LD_DEAD_CODE_DATA_ELIMINATION Date: Thu, 11 May 2023 22:12:11 +0800 Message-Id: <20230511141211.2418-5-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230511141211.2418-1-jszhang@kernel.org> References: <20230511141211.2418-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?1765608276799654436?= X-GMAIL-MSGID: =?utf-8?q?1765608284895528817?= 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: Jisheng Zhang --- 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 f0663b52d052..a5feab2c3037 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -110,6 +110,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 = .;