From patchwork Sun Feb 12 02:15:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 55874 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1745077wrn; Sat, 11 Feb 2023 18:49:55 -0800 (PST) X-Google-Smtp-Source: AK7set+uTsXoPZg7R8tugRyQ0jWLL60AFZqLlPN2TzBeSC73WIl1x3MpQuBp39UtmzuoKI4BVoEB X-Received: by 2002:a17:906:2b47:b0:878:6675:d07c with SMTP id b7-20020a1709062b4700b008786675d07cmr23015521ejg.37.1676170194847; Sat, 11 Feb 2023 18:49:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676170194; cv=none; d=google.com; s=arc-20160816; b=iFfvmmJ0AyPAuxhFYbCjIE0lqYRwELFpEeKlxC8w1ZKB7L27qz4KyAb+n2yA3CDPpx JBvN85XoTxBcfR0eGovtmzD1vweyEROF+oH9wZ7K8iSlFdWY/klLe2kZvZLIjNxEMz/c PYiBhkxfwkKDQz5K/Sbgy57UsV/Ci4eG3DQm6AIwaw7wbs3Sx2sH9UGDfn5KQ7y0FjqQ HQ08UWrQvZeVLbJn/Q52X4AhFEy/nGu1txdrQiLOX3yzxe/gi66GHUf071xQDX1PB7zT 8Zy1k/ETr6es3HN3b9py5VYIm+Wz4mEiMtWtVsY4LTX3wP3Tpcty4QEkC9EzpLHkCnLC ykxw== 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 :feedback-id:dkim-signature:dkim-signature; bh=XFd2itQ9Q8tRMCuANmPpVcUQz7tHsp9UVd1TrH5jLFM=; b=HghRZ4Nb+uTUGXekAwjxPiqqlJBSvZZaGi5z54iO7aTk4ICH2vB3Tr+0C9opyEaN2V f4SNXta28S5CFkmhunoHE8F3O2+QZIiiaVaWNfDlD4TQlRYBeaBo7X4isB3f/0m25ZGZ R4oPqHsdmTu/ZvyHcJz3dZqvS4nHKczbFoBA26JHuhvQ3S3Mj6lp3cqoVzchWIaJ+ntm x5Va8JBYTuSu3ppf+AKHpgqVq0J8sYK+cVmc72BH3GuZAHiGhZXv85jG30LQKgfcl1an eLeMI3nwFCy5O4UFO4cekdcV8LvzzFDncyVFb+8MfiUfgWSw72D/eLd+CdOWcxNhP+ml 4y1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=bDR6b4n0; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=KLEtnz0+; 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=sholland.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n29-20020a17090673dd00b0088eefdc75c8si11120919ejl.732.2023.02.11.18.49.31; Sat, 11 Feb 2023 18:49:54 -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=@sholland.org header.s=fm2 header.b=bDR6b4n0; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=KLEtnz0+; 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=sholland.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229630AbjBLCPi (ORCPT + 99 others); Sat, 11 Feb 2023 21:15:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229476AbjBLCPh (ORCPT ); Sat, 11 Feb 2023 21:15:37 -0500 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1957F1422A for ; Sat, 11 Feb 2023 18:15:34 -0800 (PST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 7B88F5C00B2; Sat, 11 Feb 2023 21:15:32 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 11 Feb 2023 21:15:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1676168132; x=1676254532; bh=XF d2itQ9Q8tRMCuANmPpVcUQz7tHsp9UVd1TrH5jLFM=; b=bDR6b4n0NG+2t72sIG VAH6ziPmwqPxQxLfm1jzqnPrshKt7OXIccm/Gr8vEnAX+VnkyNyrA2s8PZCabm4z 4M4FEHh5osWWgS1UrmO5YK4HpFRGWG15l5ZgclBxrkALRG6tG8sqZWtEWLkB0pkz LHGMJsdKmISsZOZllphS/lJZbadEp/hymDNckm/2gTRKyeygpDoqUJPFqnQEZ6V1 Ib6mvL1GjdhoVPF1gaDSskqx7tfp10dz0shDtHX5zPE6Ui5qt1hCHwMT+gCFlF44 NhLEBHRLml30VP1TUvrVErscqm3ZiUtiwe1iLP7v4NPHOkDStH0wFFe4+OUeEub6 MvJw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1676168132; x=1676254532; bh=XFd2itQ9Q8tRM CuANmPpVcUQz7tHsp9UVd1TrH5jLFM=; b=KLEtnz0+tCfMFjMxGOhUF5UGpmLT9 E2k+2D7fWrC3t31yEROpLLQOiyem0XfuNqRlgKtuGX0Uq0zdKgvCdUkOvl3K21Qn p2+cSuMAhjljl6r7nJEISPFAmW2YTQdIXqGx6GBFxoLoUot90pOxQMvCgrH5WJPk WzEyK/jETrR6HMD4JzR6yxNuH3OOkkcPmHS4PQPnd4KH32IAUy14FFQ61Mh3Ucr4 A7dpgCsWsouPzfenRBYOu0g/OjRbZL4sp+JbTYfEFikpC57gNNLEOYCnIR5UKpnw knAFgTlygdyEmIT2AIwa8++VVJEzmqlU8mRw5zagsvvflrPlU0dxXJlLg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudehkedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 11 Feb 2023 21:15:31 -0500 (EST) From: Samuel Holland To: Heiko Stuebner , Jisheng Zhang , Palmer Dabbelt , linux-riscv@lists.infradead.org Cc: Samuel Holland , Andrew Jones , Christoph Muellner , Conor Dooley , Guo Ren , Heiko Stuebner , Nathan Chancellor , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] riscv: Fix early alternative patching Date: Sat, 11 Feb 2023 20:15:32 -0600 Message-Id: <20230212021534.59121-2-samuel@sholland.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20230212021534.59121-1-samuel@sholland.org> References: <20230212021534.59121-1-samuel@sholland.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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?1757591837872169020?= X-GMAIL-MSGID: =?utf-8?q?1757591837872169020?= Now that the text to patch is located using a relative offset from the alternative entry, the text address should be computed without applying the kernel mapping offset, both before and after VM setup. Fixes: 8d23e94a4433 ("riscv: switch to relative alternative entries") Signed-off-by: Samuel Holland Reviewed-by: Conor Dooley Reviewed-by: Guo Ren Reviewed-by: Jisheng Zhang --- arch/riscv/errata/thead/errata.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c index c0bea5c94128..1dd90a5f86f0 100644 --- a/arch/riscv/errata/thead/errata.c +++ b/arch/riscv/errata/thead/errata.c @@ -102,9 +102,7 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al /* On vm-alternatives, the mmu isn't running yet */ if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) - memcpy((void *)__pa_symbol(oldptr), - (void *)__pa_symbol(altptr), - alt->alt_len); + memcpy(oldptr, altptr, alt->alt_len); else patch_text_nosync(oldptr, altptr, alt->alt_len); }