From nobody Sun May 11 15:17:07 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
ARC-Seal: i=1; a=rsa-sha256; t=1675346047; cv=none;
d=zohomail.com; s=zohoarc;
b=flexv0EB4TyVqvGbUJtzZNlu/rW2qw5yfXXp1LIpRbjukb9qlrsG/N64oZYs0mHvi0oZ55fY8K1Lz/sMrp3F5SM5dPIDUGeaj40YF4QDrNivgf1Jiq0ao9/8DP5rmdPee8h0P2nkyONFqej9D85IajgOHTELw7CglwIvRy+cndc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1675346047;
h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=l8MFiuXQ/g3MbPgHOjlwsj1LmKvLQxTFmOdqR/jzwkI=;
b=Xwtsqyj8lFXLXFdSPFekUf/cTOKxMx20kBlZMhTMOLUyDFKhGhwIM4oQbnAGmBPN6rRvlQNXCrZbEWSty0ybEVvFcA6U6h3n+M80tBB10nUrDXealqRefPngHhSwPwOXjKXOd9lZ3Oy0hSQCKxJrkxQeedqfOP0nefrZ3+FrY5s=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 167534604752772.5932617050679;
Thu, 2 Feb 2023 05:54:07 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1pNa1k-0001Zv-Jf; Thu, 02 Feb 2023 08:53:24 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <dbarboza@ventanamicro.com>)
id 1pNa1d-0001WW-3H
for qemu-devel@nongnu.org; Thu, 02 Feb 2023 08:53:17 -0500
Received: from mail-ot1-x341.google.com ([2607:f8b0:4864:20::341])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <dbarboza@ventanamicro.com>)
id 1pNa1Z-0007Xb-SX
for qemu-devel@nongnu.org; Thu, 02 Feb 2023 08:53:16 -0500
Received: by mail-ot1-x341.google.com with SMTP id
p24-20020a056830131800b0068d4b30536aso467298otq.9
for <qemu-devel@nongnu.org>; Thu, 02 Feb 2023 05:53:08 -0800 (PST)
Received: from grind.. ([177.102.69.207]) by smtp.gmail.com with ESMTPSA id
45-20020a9d0330000000b00684e55f4541sm6547416otv.70.2023.02.02.05.53.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 02 Feb 2023 05:53:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=ventanamicro.com; s=google;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=l8MFiuXQ/g3MbPgHOjlwsj1LmKvLQxTFmOdqR/jzwkI=;
b=K9ro37ipgBhTpYDCF3zGqueoYp/ImFhCS84j272QKIiRRtEsD161uXF/y8rD92RTFc
gYmYOVwTpH5DGAMWpg/3NDZ85akD8qfC2aeNAqgpaagXCQO99uhhDWk1p56LorT3WxhV
oIhLDFt/6tFwILTyWYet0Y95TFVj+O/rXWXqr7GGGrN7Cs5dBS2cDebDSw8nzTYw843Z
SivxIDwBysQgVD5ftsFmKUWwDhjdfdZl+TSa+A3VapMrG17h57Xx6J0ckxrFAv1eK25p
ws5eWJo9AdJ1C/Pdc5AIJxzJ4o56CAc1NqkAtGkawkFIR8mye2kFJn2tDVgVLCy82sE4
8V3Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=l8MFiuXQ/g3MbPgHOjlwsj1LmKvLQxTFmOdqR/jzwkI=;
b=JLnHOJYCkSf8c8Zwlt56DF8D53pupthL/mylYsuX+kzGdk8Y85blKY+e3w222UABJ8
3AePcAEIghWOpf++dsQFjZFR2i0Yj8bvYqzcCU0TdP6sHnwNtXfgPrLRyWsOIF0kNvBr
Lea8jiLJWLxo8waq5mPqetikVGoCRKmOHVfSYIPpQ/SS/i1/o8IanGbaumoWmbIuH+Ds
oQ957SJFcnjzCfopvRPbrd1i0sZsXFF5R81Lr4jgWNU4nP926bYv88JP8XSoqBHV756E
zDqbi1646IZFNP1wYs/14r/yXW4NK9Lq78pVeyKc55+Nn7U0y2f47sMEitokpI6EGxeu
v0GQ==
X-Gm-Message-State: AO0yUKXDfdHvoFfWJRE4XK0SzDxEqVec+QhaClvG2UErWLNJ8Zr5gIgQ
gNEGItf3hU+5d8+i0joJz2X4KrZLiXOn+FwFDF0=
X-Google-Smtp-Source:
AK7set8FRhvdduGZgrbpT/Iag6OXRUvsPIZ1e48WBin6pP8H/Dmfmza/aF/cPmI9IcCATacZfkI8Ew==
X-Received: by 2002:a9d:644e:0:b0:68b:d30e:7a9f with SMTP id
m14-20020a9d644e000000b0068bd30e7a9fmr2709587otl.28.1675345987681;
Thu, 02 Feb 2023 05:53:07 -0800 (PST)
From: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
To: qemu-devel@nongnu.org
Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com,
Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Subject: [PATCH v10 1/3] hw/riscv: handle 32 bit CPUs kernel_addr in
riscv_load_kernel()
Date: Thu, 2 Feb 2023 10:52:55 -0300
Message-Id: <20230202135257.1657482-2-dbarboza@ventanamicro.com>
X-Mailer: git-send-email 2.39.1
In-Reply-To: <20230202135257.1657482-1-dbarboza@ventanamicro.com>
References: <20230202135257.1657482-1-dbarboza@ventanamicro.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2607:f8b0:4864:20::341;
envelope-from=dbarboza@ventanamicro.com; helo=mail-ot1-x341.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @ventanamicro.com)
X-ZM-MESSAGEID: 1675346049361100003
Content-Type: text/plain; charset="utf-8"
load_elf_ram_sym() will sign-extend 32 bit addresses. If a 32 bit QEMU
guest happens to be running in a hypervisor that are using 64 bits to
encode its address, kernel_entry can be padded with '1's and create
problems [1].
Using a translate_fn() callback in load_elf_ram_sym() to filter the
padding from the address doesn't work. A more detailed explanation can
be found in [2]. The short version is that glue(load_elf, SZ), from
include/hw/elf_ops.h, will calculate 'pentry' (mapped into the
'kernel_load_base' var in riscv_load_Kernel()) before using
translate_fn(), and will not recalculate it after executing it. This
means that the callback does not prevent the padding from
kernel_load_base to appear.
Let's instead use a kernel_low var to capture the 'lowaddr' value from
load_elf_ram_sim(), and return it when we're dealing with 32 bit CPUs.
[1] https://lists.gnu.org/archive/html/qemu-devel/2023-01/msg02281.html
[2] https://lists.gnu.org/archive/html/qemu-devel/2023-02/msg00099.html
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
---
hw/riscv/boot.c | 15 +++++++++++----
hw/riscv/microchip_pfsoc.c | 3 ++-
hw/riscv/opentitan.c | 3 ++-
hw/riscv/sifive_e.c | 3 ++-
hw/riscv/sifive_u.c | 3 ++-
hw/riscv/spike.c | 3 ++-
hw/riscv/virt.c | 3 ++-
include/hw/riscv/boot.h | 1 +
8 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index c7e0e50bd8..5ec6d32165 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -174,11 +174,12 @@ target_ulong riscv_load_firmware(const char *firmware=
_filename,
}
=20
target_ulong riscv_load_kernel(MachineState *machine,
+ RISCVHartArrayState *harts,
target_ulong kernel_start_addr,
symbol_fn_t sym_cb)
{
const char *kernel_filename =3D machine->kernel_filename;
- uint64_t kernel_load_base, kernel_entry;
+ uint64_t kernel_load_base, kernel_entry, kernel_low;
=20
g_assert(kernel_filename !=3D NULL);
=20
@@ -189,10 +190,16 @@ target_ulong riscv_load_kernel(MachineState *machine,
* the (expected) load address load address. This allows kernels to ha=
ve
* separate SBI and ELF entry points (used by FreeBSD, for example).
*/
- if (load_elf_ram_sym(kernel_filename, NULL, NULL, NULL,
- NULL, &kernel_load_base, NULL, NULL, 0,
+ if (load_elf_ram_sym(kernel_filename, NULL, NULL, NULL, NULL,
+ &kernel_load_base, &kernel_low, NULL, 0,
EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) {
- return kernel_load_base;
+ kernel_entry =3D kernel_load_base;
+
+ if (riscv_is_32bit(harts)) {
+ kernel_entry =3D kernel_low;
+ }
+
+ return kernel_entry;
}
=20
if (load_uimage_as(kernel_filename, &kernel_entry, NULL, NULL,
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index 2b91e49561..712625d2a4 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -629,7 +629,8 @@ static void microchip_icicle_kit_machine_init(MachineSt=
ate *machine)
kernel_start_addr =3D riscv_calc_kernel_start_addr(&s->soc.u_cpus,
firmware_end_addr=
);
=20
- kernel_entry =3D riscv_load_kernel(machine, kernel_start_addr, NUL=
L);
+ kernel_entry =3D riscv_load_kernel(machine, &s->soc.u_cpus,
+ kernel_start_addr, NULL);
=20
if (machine->initrd_filename) {
riscv_load_initrd(machine, kernel_entry);
diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
index 353f030d80..7fe4fb5628 100644
--- a/hw/riscv/opentitan.c
+++ b/hw/riscv/opentitan.c
@@ -101,7 +101,8 @@ static void opentitan_board_init(MachineState *machine)
}
=20
if (machine->kernel_filename) {
- riscv_load_kernel(machine, memmap[IBEX_DEV_RAM].base, NULL);
+ riscv_load_kernel(machine, &s->soc.cpus,
+ memmap[IBEX_DEV_RAM].base, NULL);
}
}
=20
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index 3e3f4b0088..1a7d381514 100644
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -114,7 +114,8 @@ static void sifive_e_machine_init(MachineState *machine)
memmap[SIFIVE_E_DEV_MROM].base, &address_space_m=
emory);
=20
if (machine->kernel_filename) {
- riscv_load_kernel(machine, memmap[SIFIVE_E_DEV_DTIM].base, NULL);
+ riscv_load_kernel(machine, &s->soc.cpus,
+ memmap[SIFIVE_E_DEV_DTIM].base, NULL);
}
}
=20
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index d3ab7a9cda..71be442a50 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -598,7 +598,8 @@ static void sifive_u_machine_init(MachineState *machine)
kernel_start_addr =3D riscv_calc_kernel_start_addr(&s->soc.u_cpus,
firmware_end_addr=
);
=20
- kernel_entry =3D riscv_load_kernel(machine, kernel_start_addr, NUL=
L);
+ kernel_entry =3D riscv_load_kernel(machine, &s->soc.u_cpus,
+ kernel_start_addr, NULL);
=20
if (machine->initrd_filename) {
riscv_load_initrd(machine, kernel_entry);
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index cc3f6dac17..1fa91167ab 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -305,7 +305,8 @@ static void spike_board_init(MachineState *machine)
kernel_start_addr =3D riscv_calc_kernel_start_addr(&s->soc[0],
firmware_end_addr=
);
=20
- kernel_entry =3D riscv_load_kernel(machine, kernel_start_addr,
+ kernel_entry =3D riscv_load_kernel(machine, &s->soc[0],
+ kernel_start_addr,
htif_symbol_callback);
=20
if (machine->initrd_filename) {
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index a061151a6f..d0531cc641 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -1277,7 +1277,8 @@ static void virt_machine_done(Notifier *notifier, voi=
d *data)
kernel_start_addr =3D riscv_calc_kernel_start_addr(&s->soc[0],
firmware_end_addr=
);
=20
- kernel_entry =3D riscv_load_kernel(machine, kernel_start_addr, NUL=
L);
+ kernel_entry =3D riscv_load_kernel(machine, &s->soc[0],
+ kernel_start_addr, NULL);
=20
if (machine->initrd_filename) {
riscv_load_initrd(machine, kernel_entry);
diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h
index 511390f60e..6295316afb 100644
--- a/include/hw/riscv/boot.h
+++ b/include/hw/riscv/boot.h
@@ -44,6 +44,7 @@ target_ulong riscv_load_firmware(const char *firmware_fil=
ename,
hwaddr firmware_load_addr,
symbol_fn_t sym_cb);
target_ulong riscv_load_kernel(MachineState *machine,
+ RISCVHartArrayState *harts,
target_ulong firmware_end_addr,
symbol_fn_t sym_cb);
void riscv_load_initrd(MachineState *machine, uint64_t kernel_entry);
--=20
2.39.1