From patchwork Wed Jul 26 17:30:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 126528 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp590705vqo; Wed, 26 Jul 2023 11:37:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlF3/rptEh7BamANAFTgzbzDEIe5UH0pQuqK4fWRUqebjfND93nqlS9fLDSV6MQ8oAGz04nO X-Received: by 2002:a05:6358:6f8c:b0:133:eff:39c with SMTP id s12-20020a0563586f8c00b001330eff039cmr2620744rwn.20.1690396629572; Wed, 26 Jul 2023 11:37:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690396629; cv=none; d=google.com; s=arc-20160816; b=OOfUnyQyGq4iMevBDXmEm8cYPkc1YSQFs1SMUVY1MN8rdz9ObWqZtThOnDDwwbwfyJ JFOHdcQb6dY/IJPEBH/6M4dkRXnpRVbIg7GGZRjouZwRl9aAX1cobJ5nQM36j5gNL5s1 WnEsDkiewsrdLxaGkeyONKbnVT9tUiaKGj4jjLMYaBa+kPTHp9Pb1dW2eQTF/kd4Q+1o yhbOYZUfhFgfcJhuDr5lcKhcUr2/gfAQDP+sQz5gdyjv59Rw+J0LLl0uCmlVl0e+pWTw YIHMnyg40eancGTzo2vBXg2Ggx2OBsJ3GJf0Ns4eLv769CGVTqPMaHLmPtn2+hIykUf8 lIDQ== 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=fJAqm8CYo5YDwtRqegivwDR/mq0GNftlfWKTy9wp+Kk=; fh=2AmsHgAxkXvhtq2BfB2hBoQPDQHM9O1rz+6h2hgCO5A=; b=sHwuryah4ImKACZstQA9KuWvZsCf9QPAOEQK9Js9X5CZBOPRlm02K3mCy99AI+ILMe aQQ9A5Jf2k4GTBuizNX+qhTbdpnDDqK8keAPICyajaNDHU+RqfE2uLkv0CHV4LMbYAJm XZIfiDJCN8eJDzsST5GDrkdhxeJyYMDZeskiuBKWS/qcEj9X6UM4sbaWbleiigfu96Q2 j2bI/EC6aKObtZW2Y3oxvBWswJjrBEZcUCj7XT1PsU/pL10pKpIkvysl2t3xcczyw+v1 mEzB0PWJ56OC1LWiCyJFSec/4MuGJDz8FJFGkurDOG4sqUhU7sj6qszTsQoFXUL0nahv TaBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ouY6VDnG; 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 k14-20020a636f0e000000b0051322a8d2aesi13440041pgc.110.2023.07.26.11.36.55; Wed, 26 Jul 2023 11:37:09 -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=ouY6VDnG; 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 S230378AbjGZRmF (ORCPT + 99 others); Wed, 26 Jul 2023 13:42:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229923AbjGZRmD (ORCPT ); Wed, 26 Jul 2023 13:42:03 -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 D56292685 for ; Wed, 26 Jul 2023 10:42:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 690E561C0A for ; Wed, 26 Jul 2023 17:42:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77DC8C433C7; Wed, 26 Jul 2023 17:42:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690393321; bh=RjbahgfYdYfP9M0jz3QU7VVuCNTGt2mp4JwSqCgXXRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ouY6VDnGf9dajj2sdjAkhLvZjqW5N1Y3zgUaCyGcY/YxkW42toVnmaoC52mvBfLVW 2Pd/oCvJPFpOn8co/x0eFGsgLtnP50fcs5pfH71IqkW0LtCm/zzmgEYdBTa/qcjYIM JXxjZyVocmTsUGTNzTH1SaceWtAElLPJvk/m+yZ1+hfzj/fXXI5HAy/yHJ4a3nR+ky 1dNzuZ+/0dPDtdBTLz5Rzmz9TTCX18TMqbb8H14swnC9Ls0UnH5Qg30hW/omftwvGj LW5GQBxIwgPx/Elabnok1W/h5NzV2k0JzWDC4v8C8q14jaJCZ490JxVIJ9ZpAsgTl2 iE1Y2xKZI5ILg== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: Andrew Jones , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] riscv: vdso.lds.S: drop __alt_start and __alt_end symbols Date: Thu, 27 Jul 2023 01:30:22 +0800 Message-Id: <20230726173024.3684-2-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230726173024.3684-1-jszhang@kernel.org> References: <20230726173024.3684-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: INBOX X-GMAIL-THRID: 1772509336472060416 X-GMAIL-MSGID: 1772509336472060416 These two symbols are not used, remove them. Signed-off-by: Jisheng Zhang --- arch/riscv/kernel/vdso/vdso.lds.S | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/riscv/kernel/vdso/vdso.lds.S b/arch/riscv/kernel/vdso/vdso.lds.S index 82ce64900f3d..d43fd7c7dd11 100644 --- a/arch/riscv/kernel/vdso/vdso.lds.S +++ b/arch/riscv/kernel/vdso/vdso.lds.S @@ -42,9 +42,7 @@ SECTIONS . = ALIGN(4); .alternative : { - __alt_start = .; *(.alternative) - __alt_end = .; } .data : { From patchwork Wed Jul 26 17:30:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 126523 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp582389vqo; Wed, 26 Jul 2023 11:21:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlH4KMDHx1LrXaGW+jYWuo3eZH0p14owTsMpeRMi7ooY/WWgGk9WcXMeuzAN84Bc85G/ycWa X-Received: by 2002:a05:6512:ba8:b0:4fd:d7c7:170c with SMTP id b40-20020a0565120ba800b004fdd7c7170cmr2636738lfv.23.1690395661034; Wed, 26 Jul 2023 11:21:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690395661; cv=none; d=google.com; s=arc-20160816; b=IcWWyWkrj3CYyHDKv2ueBg8QVeIiCBMPGnFiSTYRMqiYIggJDBFVODT7A0waLwussB SaJ9i6Y9EpUs9SI7Cw6YuAW8ErVJV21GIRuYUOPPoiNPVFiAgOlaWaNEg1CGDyCLGOjh d5p6XzSJFF9PnnHOt5xjrLfCaLpkx0JlJQzdP0rxc8PDeX1MPfYRzQ1E2+1fG8Nkqyy2 y8Maj6ve/fiUe2tYQ1KQbStBDmxhAalCdoMSOfOi66Qz6YwVmdQrkP5BMn7W1DaaL01G V5VWjac1Or8Fj92dEspPKYpJ0iRP16kQI5IHknpYIG/Lo824chnmRuylvcvOUt+7Y21s WRhQ== 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=DVwxJPyF1NYlwGrMQ/sQwTaKDH4Mx/0wzHcHtSNEhTQ=; fh=2AmsHgAxkXvhtq2BfB2hBoQPDQHM9O1rz+6h2hgCO5A=; b=eEEokI2S3RpxtkJxUoaEVqHsMw59ddt8fl4CStjteJOta6s44RJPWfu6eqXpbLdMEp bZybR2W6m4o9+WvJ/gSs6kLjxKwLgBKj4gbiv9zO0MAFFj75t2/cS/vLPnnkFDSsI6nn 15CyVlNMivoPp5IBOTuf7Q4+XuPsqzcnApTR/AsMYxGw3FVSYo58CVcCc0teg6NkvEQE hKERFLvyfu4gqCFP1OFDsW+MR2cmLkw6+RdwGy8XrQrVw174VdfW1IHgYGvRRvzeviGh Vf2kZTDNhAVXViMyaJDYCfjxEl5SUBnvsMG2b9lfrFIiLMUyJVbF0XNKuU66HhzPDDF/ CW6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=K+M6E067; 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 ca2-20020aa7cd62000000b005223a5a81d1si4147447edb.247.2023.07.26.11.20.36; Wed, 26 Jul 2023 11:21:01 -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=K+M6E067; 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 S231293AbjGZRmJ (ORCPT + 99 others); Wed, 26 Jul 2023 13:42:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230342AbjGZRmF (ORCPT ); Wed, 26 Jul 2023 13:42:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82E7C2685 for ; Wed, 26 Jul 2023 10:42:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 19D9F61BE6 for ; Wed, 26 Jul 2023 17:42:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D2CAC433C8; Wed, 26 Jul 2023 17:42:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690393323; bh=fOYigNePlsrUb3dRqIC3/Ob7Qzi/aiqzn31+xV+bzaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K+M6E067FfjPCZKuJZ9lNLLwnZz6jYodnhLy8yF03C92zX0IDO+m+B0T3XW7vgkWO ohRoqa0nqbgJGOpOmKbL4G/WsqqPzBga43sKWCQuGiNdPONCwZR2FpotNJJF+VoDsG GecnymJv0fJbCrZ8cig1QeUA390l7lo07iri5hS+3Dd+IgmGCQ7+pMhqBTaMwwUqY+ bviq+VCCP4wowizlnlhzQcmp9Jkjq8YeCwvKbxVjEQysKW6NxMCTvnjLSsmtp+3a7g WYuiCHaG+Z9eK1oFo7F+f9RxSRMzM9YMqwuWgzSjTI540Z3RGbmbPFFycCmpgJ2Rgc tJeSD92FmJhXQ== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: Andrew Jones , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] riscv: vdso.lds.S: merge .data section into .rodata section Date: Thu, 27 Jul 2023 01:30:23 +0800 Message-Id: <20230726173024.3684-3-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230726173024.3684-1-jszhang@kernel.org> References: <20230726173024.3684-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: INBOX X-GMAIL-THRID: 1772508320875922682 X-GMAIL-MSGID: 1772508320875922682 The .data section doesn't need to be separate from .rodata section, they are both readonly. Signed-off-by: Jisheng Zhang --- arch/riscv/kernel/vdso/vdso.lds.S | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/riscv/kernel/vdso/vdso.lds.S b/arch/riscv/kernel/vdso/vdso.lds.S index d43fd7c7dd11..671aa21769bc 100644 --- a/arch/riscv/kernel/vdso/vdso.lds.S +++ b/arch/riscv/kernel/vdso/vdso.lds.S @@ -29,7 +29,13 @@ SECTIONS .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr .eh_frame : { KEEP (*(.eh_frame)) } :text - .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } + .rodata : { + *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.got.plt) *(.got) + *(.data .data.* .gnu.linkonce.d.*) + *(.dynbss) + *(.bss .bss.* .gnu.linkonce.b.*) + } /* * This linker script is used both with -r and with -shared. @@ -44,13 +50,6 @@ SECTIONS .alternative : { *(.alternative) } - - .data : { - *(.got.plt) *(.got) - *(.data .data.* .gnu.linkonce.d.*) - *(.dynbss) - *(.bss .bss.* .gnu.linkonce.b.*) - } } /* From patchwork Wed Jul 26 17:30:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 126530 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp594378vqo; Wed, 26 Jul 2023 11:45:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlFTbETwRGuvvofm1/7nX6UvKFbTp9DBumTQML6JtNEhv8dKJElfqO7KvUP1ZeTUfsMLbwL2 X-Received: by 2002:a17:90b:364b:b0:268:5e70:508a with SMTP id nh11-20020a17090b364b00b002685e70508amr1180244pjb.43.1690397116690; Wed, 26 Jul 2023 11:45:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690397116; cv=none; d=google.com; s=arc-20160816; b=yJfWWeda5CkW8KWAArloOcle8IWRupKZ7dmRAph7Ga3R/AAhZFnsqewIXJ37pDL9up plUuz/ATm3JbPsP46ZQIPEyxCGJOEm9dXmJ+R4tnV9Ex8gmtbgZE8U41pJTJAFW/npEA 15vTF1eucXxr4mikOpS+MVHDOD2Cj/spoedtWo7YFfdp0dbRXDgyAkgYO9XHp1TAeGLj uY3pl0KqCWjKr2XsRwCvaaf/g3ANRknRNOEh5x60vKz34mq7+lhjzf8UrFsgk+oLIIS1 vvy2uZq06rnw66F40nQqn4by2PYIj+bmPAhprGp9ijGEdw5dCs1qdLDJQ9WWO5sA0t1u 8RUA== 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=/gV6P5sd4eCqqtHETqXEx1QlMMfuhBIbV15qdOFNoqU=; fh=2AmsHgAxkXvhtq2BfB2hBoQPDQHM9O1rz+6h2hgCO5A=; b=QzL3O17rTKTRJmFSQz+o4wxLZG1+nEVbxntriklSAGDSqH1ljHVtsrRxitzRhLYcw8 ZuY0bq4IoDRzhwsqebbBENnGAHFHBA0y3o1CRyd8UP76aOuMOIzDiaXaB1gQ52FNomkH ink1N4XVEmNgiPikc6P4bvW3LM8By3O6ZXlLiOPNgnSIDgrWlNhDdcO4TX4X9TjyWQ/Z Sd7gDDEICLhTenaAkM0dDGEYqrp0nB+8yd6RLPHj1ClpRzvi015oD8RNwZqwafsPFB8R Ro+BobyQf82BHclNltqYUAesUpWPSho5xFooIqKkRBnDAgPGzgPQKNCpWk/0Iccm6Dqd udMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Hwi9cpkO; 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 j5-20020a17090a694500b002635643286fsi1423140pjm.133.2023.07.26.11.45.03; Wed, 26 Jul 2023 11:45:16 -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=Hwi9cpkO; 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 S231511AbjGZRmK (ORCPT + 99 others); Wed, 26 Jul 2023 13:42:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229545AbjGZRmH (ORCPT ); Wed, 26 Jul 2023 13:42:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35665269A for ; Wed, 26 Jul 2023 10:42:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C691E61BE2 for ; Wed, 26 Jul 2023 17:42:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E90F2C433C7; Wed, 26 Jul 2023 17:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690393325; bh=FoAwbwQLJJvL1URKvVipUOgohpgmWIsUn9uEVNXhbv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hwi9cpkOp5qyxCKXnFW+26Vq/LNWYfZRyi9CI0m8x6q9gKxP0xKNHmKHxiN3khZdO VQKVo3IQ0913QtAp52fnxpEKeegDd7NI2ubQ9fxgGDHIUfy94gjD0Z2IV8hGPgxpVb YQaY1vexRV7F9vL3/dCQMUvaSMPUXkX/uW6+7HXBep4yEXbNYkBcaOQc5DvM5MdOrV 3WJ00MF0BwFzViuZaXZPd6dDbHSZbSOCnTwivlK/bIE6ojgjAz3rET4r2/VKhdF0E3 S/uMori21qVJjlBqjHW6hAccFsvwY0+ASlLx50f9Qt9LE811HW23GU769K4alyTT2i 7MGwzfvVI3bbQ== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: Andrew Jones , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] riscv: vdso.lds.S: remove hardcoded 0x800 .text start addr Date: Thu, 27 Jul 2023 01:30:24 +0800 Message-Id: <20230726173024.3684-4-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230726173024.3684-1-jszhang@kernel.org> References: <20230726173024.3684-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: INBOX X-GMAIL-THRID: 1772509847003779474 X-GMAIL-MSGID: 1772509847003779474 I believe the hardcoded 0x800 and related comments come from the long history VDSO_TEXT_OFFSET in x86 vdso code, but commit 5b9304933730 ("x86 vDSO: generate vdso-syms.lds") and commit f6b46ebf904f ("x86 vDSO: new layout") removes the comment and hard coding for x86. Similar as x86 and other arch, riscv doesn't need the rigid layout using VDSO_TEXT_OFFSET since it "no longer matters to the kernel". so we could remove the hard coding now, and removing it brings a small vdso.so and aligns with other architectures. Also, having enough separation between data and text is important for I-cache, so similar as x86, move .note, .eh_frame_hdr, and .eh_frame between .rodata and .text. Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones --- arch/riscv/kernel/vdso/vdso.lds.S | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/riscv/kernel/vdso/vdso.lds.S b/arch/riscv/kernel/vdso/vdso.lds.S index 671aa21769bc..cbe2a179331d 100644 --- a/arch/riscv/kernel/vdso/vdso.lds.S +++ b/arch/riscv/kernel/vdso/vdso.lds.S @@ -23,12 +23,8 @@ SECTIONS .gnu.version_d : { *(.gnu.version_d) } .gnu.version_r : { *(.gnu.version_r) } - .note : { *(.note.*) } :text :note .dynamic : { *(.dynamic) } :text :dynamic - .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr - .eh_frame : { KEEP (*(.eh_frame)) } :text - .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) *(.got.plt) *(.got) @@ -37,13 +33,16 @@ SECTIONS *(.bss .bss.* .gnu.linkonce.b.*) } + .note : { *(.note.*) } :text :note + + .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr + .eh_frame : { KEEP (*(.eh_frame)) } :text + /* - * This linker script is used both with -r and with -shared. - * For the layouts to match, we need to skip more than enough - * space for the dynamic symbol table, etc. If this amount is - * insufficient, ld -shared will error; simply increase it here. + * Text is well-separated from actual data: there's plenty of + * stuff that isn't used at runtime in between. */ - . = 0x800; + . = ALIGN(16); .text : { *(.text .text.*) } :text . = ALIGN(4);