From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 20 Oct 2022 15:34:55 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1olVhJ-001oO0-7e for lore@lore.pengutronix.de; Thu, 20 Oct 2022 15:34:55 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1olVhF-0003wG-Gb for lore@pengutronix.de; Thu, 20 Oct 2022 15:34:55 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JbgCIu3BSkouUBVA9EcblyLyRtauu2zWksML7NZ35Bk=; b=otmuekfR55yDYNqO0N7ntbAliv V3SeCKVtACa8+exUHOg32BTf66p33iv2n9R0ZT8pUYNl0kchQRVCUO5DIlBNQzD2qjpV0eF6LH6sl Uso+1m9losHJPFgPMz39xr6J0Oah0Mvo/+HNuF7Na23R1XgFZShCcXoFbWauO8GjJthRXoYtBWnot W1zB8RXzePTU4Vcb/sTcgWUkXzZkwS8W3quji7FWiNpy3gICqaf/78qEhuiBBuXv4SWS1oklHrFSu +kpmMjRBsmdsf4HSV4ce62qJ78W+LSS5slRtIncxZploOfbHhOJMPhB5x1wgtL70w9rDBLnA2ptxD Jh5zqOjw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1olVfV-00FVMv-Kb; Thu, 20 Oct 2022 13:33:06 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1olVOF-00FKgA-PF for barebox@lists.infradead.org; Thu, 20 Oct 2022 13:15:18 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1olVOC-0000lO-Se; Thu, 20 Oct 2022 15:15:12 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1olVO9-000KdQ-Uv; Thu, 20 Oct 2022 15:15:12 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1olVOB-00Ffc1-8R; Thu, 20 Oct 2022 15:15:11 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Thu, 20 Oct 2022 15:15:10 +0200 Message-Id: <20221020131510.3734338-4-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221020131510.3734338-1-a.fatoum@pengutronix.de> References: <20221020131510.3734338-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221020_061515_866976_2F0D1030 X-CRM114-Status: GOOD ( 14.53 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 3/3] RISC-V: add compiler barriers around unrelocated accesses X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) We observed on ARM miscompilation because get_runtime_offset() was cached before relocation, while address computation of symbol happened after, effectively adding the base address twice to the symbol offset. New runtime_address() hides origin of the symbol going into the address calculation and thereby thwarts this optimization. Employ it in RISC-V code as well to avoid such issues as experienced on ARM. Signed-off-by: Ahmad Fatoum --- arch/riscv/boot/uncompress.c | 4 ++-- arch/riscv/include/asm/sections.h | 3 ++- arch/riscv/lib/reloc.c | 10 +++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/riscv/boot/uncompress.c b/arch/riscv/boot/uncompress.c index 4ed9b4d37192..4addd49e7389 100644 --- a/arch/riscv/boot/uncompress.c +++ b/arch/riscv/boot/uncompress.c @@ -36,8 +36,8 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, irq_init_vector(__riscv_mode(flags)); /* piggy data is not relocated, so determine the bounds now */ - pg_start = input_data + get_runtime_offset(); - pg_end = input_data_end + get_runtime_offset(); + pg_start = runtime_address(input_data); + pg_end = runtime_address(input_data_end); pg_len = pg_end - pg_start; uncompressed_len = input_data_len(); diff --git a/arch/riscv/include/asm/sections.h b/arch/riscv/include/asm/sections.h index 6673648bcd58..cea039cc5e14 100644 --- a/arch/riscv/include/asm/sections.h +++ b/arch/riscv/include/asm/sections.h @@ -6,6 +6,7 @@ #include #include #include +#include extern char __rel_dyn_start[]; extern char __rel_dyn_end[]; @@ -19,7 +20,7 @@ unsigned long get_runtime_offset(void); static inline unsigned int input_data_len(void) { - return get_unaligned((const u32 *)(input_data_end + get_runtime_offset() - 4)); + return get_unaligned((const u32 *)runtime_address(input_data_end) - 1); } #endif diff --git a/arch/riscv/lib/reloc.c b/arch/riscv/lib/reloc.c index da53c50448d7..86a4b3719d5f 100644 --- a/arch/riscv/lib/reloc.c +++ b/arch/riscv/lib/reloc.c @@ -42,9 +42,13 @@ void relocate_to_current_adr(void) if (!offset) return; - dstart = __rel_dyn_start + offset; - dend = __rel_dyn_end + offset; - dynsym = (void *)__dynsym_start + offset; + /* + * We have yet to relocate, so using runtime_address + * to compute the relocated address + */ + dstart = runtime_address(__rel_dyn_start); + dend = runtime_address(__rel_dyn_end); + dynsym = runtime_address(__dynsym_start); for (rela = dstart; (void *)rela < dend; rela++) { unsigned long *fixup; -- 2.30.2