From patchwork Sun Jan 15 15:49:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 43868 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp801315wrn; Sun, 15 Jan 2023 08:04:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXtJ5yIPBRC1yE/SyRYU+jINRoaTtwPHTzvua1ZynQFVzCa0kK8p56lQAnD7JXCKimqBuF7E X-Received: by 2002:a17:906:899e:b0:84d:4493:c83f with SMTP id gg30-20020a170906899e00b0084d4493c83fmr19932423ejc.6.1673798648853; Sun, 15 Jan 2023 08:04:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673798648; cv=none; d=google.com; s=arc-20160816; b=n1Tx+mEzDFwb68YCJYOucQeZvECNQt1Z0TWqdAgogw4IY8LfdJHPOsAf6IjTn2Fukh o2yucmZaFgy5TpcjhpcMf9sUTk/U0D1gIjyXgJljW3GUG6dM/VCSb5J+DhdhehMCOFmI HGVDVycha7H3FEZgemMLBSwGlnadq6+qh/ZbC/EaTHv+zf62JWbWX3QT+e7hJmXItPZk 7OPKykQa4C0RKE81arPHKILshLN8wfp0mm9bE6AUYrIBETa7A1IdlfxjmOCBbB05zWux UtgzjdtsAhAurICBeeO7tjrQmQbhnDMGT+S4+dinPVrKiYhK9TbKx8lAplaifhghdHp2 uZSQ== 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=lBVSSQeAYrW/qM32j+boY2l0EknZbBODM24BZx8gwfU=; b=cHPlGypWYiosb5iv1wBMmGx9F0g2KPEACMxA5O76xCPqWItViKIwze/ddGxnsOI7sr 92vxK6uOua//pTI5LkTV2iYloMZVcyVeFz5UJRExfinHQ0aYNAs1UYC0VkxCzchOtx4Q eL+bRwD+gAclkczVOvcWwNUaSiSe3L/LvZteYBCxm/u1KVa2nlcpRUHfMXuzTrk3Hx1p C2CON2Yf9Lunet1yBsuh+XrPWivWYja4n7SBPTy0QPoxM277/qgSCChlX/y+WNxeV5K0 oU3VqsBToySSwKFhg4TedzrlSQlIxrZVlSBxXV/+Kja8N5iY9hSuIMUPVLUU9LNO315N dNJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tFgh1aNB; 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 ae10-20020a17090725ca00b007c1852c08f0si30115765ejc.658.2023.01.15.08.03.45; Sun, 15 Jan 2023 08:04:08 -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=@kernel.org header.s=k20201202 header.b=tFgh1aNB; 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 S231658AbjAOQCy (ORCPT + 99 others); Sun, 15 Jan 2023 11:02:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231512AbjAOQCU (ORCPT ); Sun, 15 Jan 2023 11:02:20 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 401A63A83; Sun, 15 Jan 2023 08:00:55 -0800 (PST) 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 6384260D45; Sun, 15 Jan 2023 16:00:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A453DC433F2; Sun, 15 Jan 2023 16:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673798443; bh=6Eu0jHWRD+88REC096NM3n9cVsx1NdyvP+EwuRbaOno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tFgh1aNBWX7PtMPjbNtcRfuhQJMNDt6Yh8ERb7riW2cXH8DUWHTL5KHn1PUsWXW5u zHpnaJXHRJdrfnmERwaDap8260Qsscd2JCjEhwYF3v8eZeIzOfZzvQILQWEvCgFepm p96715md/KsEJQ9yaTMRVkLr/Kuqm2kMm19vqpTvVb4C25T7E/mm903BiLeG9Qmi96 /DCFv1FazPVCqU+Di9lmrcZgNNgOL48cp1knIaF4O48AkH3CGyX64lUMMWMCFIAQyk LNflr8UMl8pJTZn0r3YjVQKDzfyyWwF6UyKdqPJu0JqIkvICEhLq2MNH1xRRgrlXNq pBOSJRaokHLrQ== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Conor Dooley , Andrew Jones Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Guo Ren Subject: [PATCH v4 10/13] riscv: alternative: patch alternatives in the vDSO Date: Sun, 15 Jan 2023 23:49:50 +0800 Message-Id: <20230115154953.831-11-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230115154953.831-1-jszhang@kernel.org> References: <20230115154953.831-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 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?1755105092030941360?= X-GMAIL-MSGID: =?utf-8?q?1755105092030941360?= Make it possible to use alternatives in the vDSO, so that better implementations can be used if possible. Signed-off-by: Jisheng Zhang Reviewed-by: Guo Ren Reviewed-by: Andrew Jones --- arch/riscv/include/asm/vdso.h | 4 ++++ arch/riscv/kernel/alternative.c | 29 +++++++++++++++++++++++++++++ arch/riscv/kernel/vdso.c | 5 ----- arch/riscv/kernel/vdso/vdso.lds.S | 7 +++++++ 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/arch/riscv/include/asm/vdso.h b/arch/riscv/include/asm/vdso.h index a7644f46d0e5..f891478829a5 100644 --- a/arch/riscv/include/asm/vdso.h +++ b/arch/riscv/include/asm/vdso.h @@ -28,8 +28,12 @@ #define COMPAT_VDSO_SYMBOL(base, name) \ (void __user *)((unsigned long)(base) + compat__vdso_##name##_offset) +extern char compat_vdso_start[], compat_vdso_end[]; + #endif /* CONFIG_COMPAT */ +extern char vdso_start[], vdso_end[]; + #endif /* !__ASSEMBLY__ */ #endif /* CONFIG_MMU */ diff --git a/arch/riscv/kernel/alternative.c b/arch/riscv/kernel/alternative.c index 3d4f1f32c7f6..fc341b69bf62 100644 --- a/arch/riscv/kernel/alternative.c +++ b/arch/riscv/kernel/alternative.c @@ -11,7 +11,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -160,6 +162,31 @@ static void __init_or_module _apply_alternatives(struct alt_entry *begin, stage); } +#ifdef CONFIG_MMU +static void __init apply_vdso_alternatives(void) +{ + const Elf_Ehdr *hdr; + const Elf_Shdr *shdr; + const Elf_Shdr *alt; + struct alt_entry *begin, *end; + + hdr = (Elf_Ehdr *)vdso_start; + shdr = (void *)hdr + hdr->e_shoff; + alt = find_section(hdr, shdr, ".alternative"); + if (!alt) + return; + + begin = (void *)hdr + alt->sh_offset, + end = (void *)hdr + alt->sh_offset + alt->sh_size, + + _apply_alternatives((struct alt_entry *)begin, + (struct alt_entry *)end, + RISCV_ALTERNATIVES_BOOT); +} +#else +static void __init apply_vdso_alternatives(void) { } +#endif + void __init apply_boot_alternatives(void) { /* If called on non-boot cpu things could go wrong */ @@ -168,6 +195,8 @@ void __init apply_boot_alternatives(void) _apply_alternatives((struct alt_entry *)__alt_start, (struct alt_entry *)__alt_end, RISCV_ALTERNATIVES_BOOT); + + apply_vdso_alternatives(); } /* diff --git a/arch/riscv/kernel/vdso.c b/arch/riscv/kernel/vdso.c index e410275918ac..4e631c098f4d 100644 --- a/arch/riscv/kernel/vdso.c +++ b/arch/riscv/kernel/vdso.c @@ -22,11 +22,6 @@ struct vdso_data { }; #endif -extern char vdso_start[], vdso_end[]; -#ifdef CONFIG_COMPAT -extern char compat_vdso_start[], compat_vdso_end[]; -#endif - enum vvar_pages { VVAR_DATA_PAGE_OFFSET, VVAR_TIMENS_PAGE_OFFSET, diff --git a/arch/riscv/kernel/vdso/vdso.lds.S b/arch/riscv/kernel/vdso/vdso.lds.S index 150b1a572e61..4a0606633290 100644 --- a/arch/riscv/kernel/vdso/vdso.lds.S +++ b/arch/riscv/kernel/vdso/vdso.lds.S @@ -40,6 +40,13 @@ SECTIONS . = 0x800; .text : { *(.text .text.*) } :text + . = ALIGN(4); + .alternative : { + __alt_start = .; + *(.alternative) + __alt_end = .; + } + .data : { *(.got.plt) *(.got) *(.data .data.* .gnu.linkonce.d.*)