From nobody Sun Dec 14 06:15:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1764584697; cv=none; d=zohomail.com; s=zohoarc; b=dgloqQOuicA+YCSaDLeVp4sK0F7LK8bPSidXZDL516ykbsLV55AZmltqNJWkOYBg+HYgd0acDKGkScLppWVuKO/F+QrBdNdPz0ni0uo5flms1WhxvYIKF95mJ6Wi33ldeSuBlEE7EhRpUtrJzynujhLrgtVAxjMD9zh9S+bZ5iM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764584697; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kL4brVLXUEDyfmktWCJt4oVhAjrxxXr8mVfyNYUUh4g=; b=c+cBjAV5bnDWC+5QaUZkSeEcuscHEhqMCaxIz7JGFtF5AdYwDj4wB7yUG3PlToq+qkmD+mdi+Dje49oW5XKtEjj7YcEs4alyBdKDvcnPdwq4i/DzCBkNPqPyij1h6dCS18qNK4Z3MAcNcheSFo367yhDH22D7R+JMzJ09M9WXQg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1764584697148628.5204485553355; Mon, 1 Dec 2025 02:24:57 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1175650.1500270 (Exim 4.92) (envelope-from ) id 1vQ14x-0004FY-Nv; Mon, 01 Dec 2025 10:24:23 +0000 Received: by outflank-mailman (output) from mailman id 1175650.1500270; Mon, 01 Dec 2025 10:24:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQ14x-0004FR-L5; Mon, 01 Dec 2025 10:24:23 +0000 Received: by outflank-mailman (input) for mailman id 1175650; Mon, 01 Dec 2025 10:24:22 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQ14w-00041l-8H for xen-devel@lists.xenproject.org; Mon, 01 Dec 2025 10:24:22 +0000 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [2a00:1450:4864:20::531]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e5df3a98-ce9f-11f0-9d19-b5c5bf9af7f9; Mon, 01 Dec 2025 11:24:20 +0100 (CET) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-640aa1445c3so6082833a12.1 for ; Mon, 01 Dec 2025 02:24:20 -0800 (PST) Received: from fedora (user-109-243-71-38.play-internet.pl. [109.243.71.38]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-647510508e1sm12104724a12.27.2025.12.01.02.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 02:24:18 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e5df3a98-ce9f-11f0-9d19-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764584659; x=1765189459; darn=lists.xenproject.org; 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=kL4brVLXUEDyfmktWCJt4oVhAjrxxXr8mVfyNYUUh4g=; b=QyrNZBAbhL3d18StdX1x9+dFgrViHwJ41ovITKtg7LNT4mYOWdmWeBHIWKsa9WxTyI bJPuMCpLFhT2xBnnyFwLPDaWLwomKwB2XX9wGeVC2/EgPO0Y6SQlyxuOGRA2rYq2JabO CRNocLGx3Ddk4cfobOFK5xe9Je0lmzXxYiqDYoZRO0h6ONzmPBPmPkUM7kTJ1+kcERJh t+CeVvWyvygbLI3UvD1LV5YvQH5UwzC/EgmfW5FQZylK3rdqdMIIJkutycIPCbud+zIx XtWX9Fu8Ap89BPa8uJmiQ6QtAIBVUDdIVLX3EWOMn2aB0tjMbU3zp1lIstFjPtHFBwHN Jf1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764584659; x=1765189459; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kL4brVLXUEDyfmktWCJt4oVhAjrxxXr8mVfyNYUUh4g=; b=T4KqQDAhwMwBsSMqbddh0BcF16zyLTS/4bX7JWwwqGccneVzy2VsBLlM5bkMrFsmvX KwmHdgYpU9Z0fu94c7+1pSf55y1SnYTzrEe6SoDSC7Wl2SE5AtusbnqDygDE+H1WDwIX O/IwOi+/Tg6Z/kbLSYvb/e0cZatMyfWKIwMs/gADpnbLfY2h4Lj2cuyQWPYmZIjTlFaO zz4Iii+MrWy//6WSpV3QcRj2sACRgb+ydzBxE46K4e8KhrChjOhCOcaYuGe/YU2doMOV 9j7JQCUifEgws/EPCX0tDHON41ao4tsQuiLiNWQ3jId8xUMzUasobOgQkwB6EKm3W+sW Lj1A== X-Gm-Message-State: AOJu0YzKuGaIU64JtcbampMKOZkE+qYIhrl0yXa0Dc0JUx0dMal/MVtf vnHjoFGTk6b3OWZOm2QNUuar/5xaPSJ1/VeKwsuhLeV/Uun+IROYhXrAuQjAOtkD X-Gm-Gg: ASbGncszsRZOyGoTWQGp1xasgp5YIFm+N1ijxQ4YTbVgVwytCdzvlrcBgSrAaPAEip6 JcVKcPeBviN1/e+C0LQQR72DPXUZo/otUJrdfEpYHGjiokVTJnLg/WIbDLjKU6YTiH4SK9p148a uTLP7szPNtttI31RHmdrfDmog43SGrhxY6bkYakxtlDnaG23mcJXWzi2kLKAk8YTno8ZXP5oTGE SqPPkvvhj7EtDhqzxTVByNFII9Z3c8xgfqDDb3GTmCSUejuM41Bif5nr0TQ9PkRKi0dc4fKWk6J 7U7+oxXplsY6sRhr50BEvuP+jcm4FCyVp60vo/toNvddyUt4dOnJgoVaWxJkeE9x1HDbo5juUYn UgrqybTTJzTlDhcIbL8j9HnbruQIlsVHxig8L6tvj3V72iJK1CZcNO+rMgPPSHTaUCgf3sUK4kl kajXlI0hyWGRXv6RxdAf5YKZl4DmS5Zw2I0O9e4p8geQ/sTvTktGxr/Ps= X-Google-Smtp-Source: AGHT+IFZryrOYkb6E/sYYZM1iPLmqTVJAElhSu2fpr7iBRoTe37+HPbTSir8+/dPNhmm4EjTHBrQVQ== X-Received: by 2002:a05:6402:3494:b0:647:5c27:5440 with SMTP id 4fb4d7f45d1cf-6475c2754b6mr11197062a12.24.1764584659125; Mon, 01 Dec 2025 02:24:19 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Alistair Francis , Bob Eshleman , Connor Davis , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 1/3] xen/riscv: introduce vSBI extension framework Date: Mon, 1 Dec 2025 11:24:08 +0100 Message-ID: <3b67330dc4c1aa053eb15261a559e7b4eac3f493.1764582112.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1764584699440019200 Content-Type: text/plain; charset="utf-8" This commit introduces support for handling virtual SBI extensions in Xen. The changes include: - Added new vsbi.c and vsbi.h files to implement virtual SBI extension handling. - Modified traps.c to handle CAUSE_VIRTUAL_SUPERVISOR_ECALL by calling vsbi_handle_ecall() when the trap originates from VS-mode. - Updated xen.lds.S to include a new .vsbi.exts section for virtual SBI extension data. - Updated Makefile to include the new vsbi/ directory in the build. - Add hstatus register to struct cpu_user_regs as it is needed for a check that CAUSE_VIRTUAL_SUPERVISOR_ECALL happens from VS-mode. The implementation allows for registration and handling of SBI extensions via a new vsbi_ext structure and ".vsbi.exts" section, enabling extensible virtual SBI support for RISC-V guests. Signed-off-by: Oleksii Kurochko --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/include/asm/processor.h | 1 + xen/arch/riscv/include/asm/vsbi.h | 31 +++++++++++++++++ xen/arch/riscv/traps.c | 8 +++++ xen/arch/riscv/vsbi/Makefile | 1 + xen/arch/riscv/vsbi/vsbi.c | 46 ++++++++++++++++++++++++++ xen/arch/riscv/xen.lds.S | 7 ++++ 7 files changed, 95 insertions(+) create mode 100644 xen/arch/riscv/include/asm/vsbi.h create mode 100644 xen/arch/riscv/vsbi/Makefile create mode 100644 xen/arch/riscv/vsbi/vsbi.c diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index e2b8aa42c8..7bfe7024ef 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -17,6 +17,7 @@ obj-y +=3D stubs.o obj-y +=3D time.o obj-y +=3D traps.o obj-y +=3D vm_event.o +obj-y +=3D vsbi/ =20 $(TARGET): $(TARGET)-syms $(OBJCOPY) -O binary -S $< $@ diff --git a/xen/arch/riscv/include/asm/processor.h b/xen/arch/riscv/includ= e/asm/processor.h index 39696fb58d..79d02c3dd2 100644 --- a/xen/arch/riscv/include/asm/processor.h +++ b/xen/arch/riscv/include/asm/processor.h @@ -49,6 +49,7 @@ struct cpu_user_regs unsigned long t6; unsigned long sepc; unsigned long sstatus; + unsigned long hstatus; /* pointer to previous stack_cpu_regs */ unsigned long pregs; }; diff --git a/xen/arch/riscv/include/asm/vsbi.h b/xen/arch/riscv/include/asm= /vsbi.h new file mode 100644 index 0000000000..984e7acf7b --- /dev/null +++ b/xen/arch/riscv/include/asm/vsbi.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef ASM_RISCV_VSBI_H +#define ASM_RISCV_VSBI_H + +struct regs; +struct vcpu; + +struct vsbi_ext { + const char *name; + unsigned long eid_start; + unsigned long eid_end; + int (*handle)(struct vcpu *vcpu, unsigned long eid, + unsigned long fid, struct cpu_user_regs *regs); +}; + +#define VSBI_EXT_START(ext, extid_start, extid_end, extid_handle) \ +static const struct vsbi_ext vsbi_ext_##ext __used \ +__section(".vsbi.exts") =3D { \ + .name =3D #ext, \ + .eid_start =3D extid_start, \ + .eid_end =3D extid_end, \ + .handle =3D extid_handle, + +#define VSBI_EXT_END \ +}; + +void vsbi_handle_ecall(struct vcpu *vcpu, struct cpu_user_regs *regs); +const struct vsbi_ext *vsbi_find_extension(unsigned long ext_id); + +#endif diff --git a/xen/arch/riscv/traps.c b/xen/arch/riscv/traps.c index f061004d83..dfe1a5a112 100644 --- a/xen/arch/riscv/traps.c +++ b/xen/arch/riscv/traps.c @@ -15,6 +15,7 @@ #include #include #include +#include =20 /* * Initialize the trap handling. @@ -114,6 +115,13 @@ void do_trap(struct cpu_user_regs *cpu_regs) =20 switch ( cause ) { + case CAUSE_VIRTUAL_SUPERVISOR_ECALL: + if ( !(cpu_regs->hstatus & HSTATUS_SPV) ) + panic("CAUSE_VIRTUAL_SUPERVISOR_ECALL came not from VS-mode\n"= ); + + vsbi_handle_ecall(current, cpu_regs); + break; + case CAUSE_ILLEGAL_INSTRUCTION: if ( do_bug_frame(cpu_regs, pc) >=3D 0 ) { diff --git a/xen/arch/riscv/vsbi/Makefile b/xen/arch/riscv/vsbi/Makefile new file mode 100644 index 0000000000..574c8ff78d --- /dev/null +++ b/xen/arch/riscv/vsbi/Makefile @@ -0,0 +1 @@ +obj-y +=3D vsbi.o diff --git a/xen/arch/riscv/vsbi/vsbi.c b/xen/arch/riscv/vsbi/vsbi.c new file mode 100644 index 0000000000..cd119ce0d6 --- /dev/null +++ b/xen/arch/riscv/vsbi/vsbi.c @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include + +#include +#include +#include + +extern const struct vsbi_ext _svsbi_exts[], _evsbi_exts[]; + +const struct vsbi_ext *vsbi_find_extension(unsigned long ext_id) +{ + const struct vsbi_ext *vsbi_ext; + + for ( vsbi_ext =3D _svsbi_exts; vsbi_ext !=3D _evsbi_exts; vsbi_ext++ ) + if ( ext_id >=3D vsbi_ext->eid_start && + ext_id <=3D vsbi_ext->eid_end ) + return vsbi_ext; + + return NULL; +} + +void vsbi_handle_ecall(struct vcpu *vcpu, struct cpu_user_regs *regs) +{ + const unsigned long eid =3D regs->a7; + const unsigned long fid =3D regs->a6; + const struct vsbi_ext *ext =3D vsbi_find_extension(eid); + int ret; + + if ( ext && ext->handle ) + ret =3D ext->handle(vcpu, eid, fid, regs); + else + { + printk("Unsupported Guest SBI EID #%#lx, FID #%lu\n", eid, regs->a= 1); + ret =3D SBI_ERR_NOT_SUPPORTED; + } + + /* + * The ecall instruction is not part of the RISC-V C extension (compre= ssed + * instructions), so it is always 4 bytes long. Therefore, it is safe = to + * use a fixed length of 4 bytes instead of reading guest memory to + * determine the instruction length. + */ + regs->sepc +=3D 4; + regs->a0 =3D ret; +} diff --git a/xen/arch/riscv/xen.lds.S b/xen/arch/riscv/xen.lds.S index edcadff90b..2967f00ac5 100644 --- a/xen/arch/riscv/xen.lds.S +++ b/xen/arch/riscv/xen.lds.S @@ -91,6 +91,13 @@ SECTIONS =20 DT_DEV_INFO /* Devicetree based device info */ =20 + . =3D ALIGN(POINTER_ALIGN); + DECL_SECTION(.vsbi.exts) { + _svsbi_exts =3D .; + *(.vsbi.exts) + _evsbi_exts =3D .; + } :text + . =3D ALIGN(PAGE_SIZE); /* Init code and data */ __init_begin =3D .; .init.text : { --=20 2.52.0 From nobody Sun Dec 14 06:15:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1764584695; cv=none; d=zohomail.com; s=zohoarc; b=JSsUnm3uIbmNnap0S1qchiGJU1vW5k24t1no6R2AxoUu8mlQe8oGzjj5QRfeA5p5eiN9311aNI4/xF1LnTax3RIx8IjrPIAl1qeFNVNXaBA3pyiK3DgxGONZ/Dk/kN/6kiN+zNUdP9PVpM8W/BaXhkfQFoBKmWEIGJQCzHVV3nU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764584695; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lf+N5X3ZZ5bsc0bBTkOsHsGSk6FHfGVMZrI5qCr7EEo=; b=Dy3fTecWTnD+p7YURfP6T8TdriXolaXuzV8A4Wfg4F1/7ubO038O5RpB6rFLpAbWl5TzWEUJTCFwj8BzE8krg0yR5jr8RoCf4dBRSV+NbpVLeFHW6xWfPPjgBMSh9JvQEHcHtwx7ePW29f4UgGhAQBR8O/Vgqqm2RK27+nvSTVc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1764584695593360.3022251679238; Mon, 1 Dec 2025 02:24:55 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1175652.1500290 (Exim 4.92) (envelope-from ) id 1vQ14z-0004gn-5j; Mon, 01 Dec 2025 10:24:25 +0000 Received: by outflank-mailman (output) from mailman id 1175652.1500290; Mon, 01 Dec 2025 10:24:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQ14z-0004ge-2y; Mon, 01 Dec 2025 10:24:25 +0000 Received: by outflank-mailman (input) for mailman id 1175652; Mon, 01 Dec 2025 10:24:23 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQ14x-00041l-Mz for xen-devel@lists.xenproject.org; Mon, 01 Dec 2025 10:24:23 +0000 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [2a00:1450:4864:20::52c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e6704ee7-ce9f-11f0-9d19-b5c5bf9af7f9; Mon, 01 Dec 2025 11:24:21 +0100 (CET) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-640d0ec9651so7209124a12.3 for ; Mon, 01 Dec 2025 02:24:21 -0800 (PST) Received: from fedora (user-109-243-71-38.play-internet.pl. [109.243.71.38]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-647510508e1sm12104724a12.27.2025.12.01.02.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 02:24:19 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e6704ee7-ce9f-11f0-9d19-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764584660; x=1765189460; darn=lists.xenproject.org; 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=lf+N5X3ZZ5bsc0bBTkOsHsGSk6FHfGVMZrI5qCr7EEo=; b=Nz1lIuNWZ23GQzNT7uPS2A4nWBLgSYss4y63rNkQNbIZfJaP/TugtdiEDZw7FAR2wI kL6MS9F4SixHugsD+k09TDJeljwIBnzDUxVL+dfsEPVAdmMcDqMhH7wjIgCdzQg4ILir VuT3at7qQJEWm1R0wxzjB/uGeca/+gzsYmFbH0D69vwImwpo02g5BNbqT0d3bbHVp1em 1BPTOUprAxYyboY7fIyKdvFyjp55YoX2LScgAkednHqkSYTQLeVEvMA3cgumSEHIU2Yg T8xBrDoMlFxwmtxOJtGL+3kzCTRI9getG03dNavNCJzoatTwvvFa/jrYXhdvalt2Tit6 V2sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764584660; x=1765189460; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lf+N5X3ZZ5bsc0bBTkOsHsGSk6FHfGVMZrI5qCr7EEo=; b=jIvMyYZmdin1jz1rBSO/iWK+zMxxTBMgQdsU0e03WJ4Je0XwMhtUKsVdPIS/M61CNP TrMsC9nWQ7j/qc/vKzCsZyflxaMjorkmardVSthNMFLMD/fIXZxcUrsxNyDuFL/50FZL mMkYjK+NbhABxYQ/alvD4bScNBCUoiHHPj4mWROuEOPKcNeBbW+xoqmRwpkfQ9JErRU9 d/mHEEAayJBcfwV6VegrmLpPTwkAv52rZqLvkbCVXWHN1rV7krtbbbGXfX/Smi1mhskd XyUbs+o2hx+faPnD0wCzlx5cPT519w4hcQ9qbd37GmMsmWvK7mazo1PePqvgQzpCSW2S mMfA== X-Gm-Message-State: AOJu0YxOkp5JPr29spwSbCRECsgTjgVyx9wA/H2Eo7JpncWyq0a8EuFc utD6Ag8hQkcFxlJR3lpTAtXhyNooiBRq6KQIzv/VzIBjItj4jOqHsra67jaidIpc X-Gm-Gg: ASbGnctz1xabEtIGqo5m8/kNhRT2CeQnCINUrxAjJkZwA0xo9kde1+rRuzDdSfO3jbM n65pOGP1sNaNeYzfoIGsnuvNPzmOgE/sW/GaaA2E81nl47rRrKHeJJvmzKU2XRAcGHPJgfBYQ79 5ec/gZjA72bSlhtzwb2WWqW1mwzUrvPBaS/MRyEnZulwRKqUgZg8asec69dnEuet1s2VFdxL5z+ BkZwkM+9lSBPuLqn7fS+CrXmLX9ORWm0am6YllmOSAcXvyV1dQvt4SIQ2QhwTklLRLRXPU6AAaV JsnKLuJYm8kfrPN62Tk98bnRImAGrpul1F/cZR8qToIKGs34KrZbIby2/WcbYpmXbLAbrUDNoHd Y6Xf9XR7uKQlHWEN/jAYdJ+pthmN+5s28wyUAd6yltQMo1hJmwqPy8miqHhvgEadJSq5wIU9wh6 v8rVAg/U84yweCTpJq8KAc+SPF8MRiHr9zUPjx+9TJCbvcYrP0MXPxoKX6ICiH3xSTkA== X-Google-Smtp-Source: AGHT+IESPE5BRtDHOM0mPf44z/DvKR1KHQLIzguXTRd2Az3sSheaMmSW8ev4MCk0ZNllhessoEZqYw== X-Received: by 2002:a05:6402:42c7:b0:640:e791:df67 with SMTP id 4fb4d7f45d1cf-64555b9bebbmr36232781a12.10.1764584660077; Mon, 01 Dec 2025 02:24:20 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Alistair Francis , Bob Eshleman , Connor Davis , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 2/3] xen/riscv: add RISC-V legacy SBI extension support for guests Date: Mon, 1 Dec 2025 11:24:09 +0100 Message-ID: X-Mailer: git-send-email 2.52.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1764584697138019200 Content-Type: text/plain; charset="utf-8" This commit adds support for legacy SBI extensions (version 0.1) in Xen for guest domains. The changes include: 1. Define all legacy SBI extension IDs (0x0 to 0x8) for better clarity and completeness. 2. Implement handling of legacy SBI extensions, starting with support for SBI_EXT_0_1_CONSOLE_{PUT,GET}CHAR. The implementation uses the existing virtual SBI framework to handle legacy SBI ecalls, ensuring compatibility with older SBI specifications in RISC-V guests. Signed-off-by: Oleksii Kurochko --- xen/arch/riscv/include/asm/sbi.h | 11 ++++-- xen/arch/riscv/vsbi/Makefile | 1 + xen/arch/riscv/vsbi/vsbi-legacy-extension.c | 37 +++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 xen/arch/riscv/vsbi/vsbi-legacy-extension.c diff --git a/xen/arch/riscv/include/asm/sbi.h b/xen/arch/riscv/include/asm/= sbi.h index ade24a572d..e7d5d707b1 100644 --- a/xen/arch/riscv/include/asm/sbi.h +++ b/xen/arch/riscv/include/asm/sbi.h @@ -14,8 +14,15 @@ =20 #include =20 -#define SBI_EXT_0_1_CONSOLE_PUTCHAR 0x1 -#define SBI_EXT_0_1_SHUTDOWN 0x8 +#define SBI_EXT_0_1_SET_TIMER 0x0 +#define SBI_EXT_0_1_CONSOLE_PUTCHAR 0x1 +#define SBI_EXT_0_1_CONSOLE_GETCHAR 0x2 +#define SBI_EXT_0_1_CLEAR_IPI 0x3 +#define SBI_EXT_0_1_SEND_IPI 0x4 +#define SBI_EXT_0_1_REMOTE_FENCE_I 0x5 +#define SBI_EXT_0_1_REMOTE_SFENCE_VMA 0x6 +#define SBI_EXT_0_1_REMOTE_SFENCE_VMA_ASID 0x7 +#define SBI_EXT_0_1_SHUTDOWN 0x8 =20 #define SBI_EXT_BASE 0x10 #define SBI_EXT_RFENCE 0x52464E43 diff --git a/xen/arch/riscv/vsbi/Makefile b/xen/arch/riscv/vsbi/Makefile index 574c8ff78d..4da625db9a 100644 --- a/xen/arch/riscv/vsbi/Makefile +++ b/xen/arch/riscv/vsbi/Makefile @@ -1 +1,2 @@ obj-y +=3D vsbi.o +obj-y +=3D vsbi-legacy-extension.o diff --git a/xen/arch/riscv/vsbi/vsbi-legacy-extension.c b/xen/arch/riscv/v= sbi/vsbi-legacy-extension.c new file mode 100644 index 0000000000..39d65931b1 --- /dev/null +++ b/xen/arch/riscv/vsbi/vsbi-legacy-extension.c @@ -0,0 +1,37 @@ + +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +#include +#include + +static int vsbi_legacy_ecall_handler(struct vcpu *vcpu, unsigned long eid, + unsigned long fid, + struct cpu_user_regs *regs) +{ + int ret =3D 0; + + switch ( eid ) + { + case SBI_EXT_0_1_CONSOLE_PUTCHAR: + printk("%c", (char)regs->a0); + break; + + case SBI_EXT_0_1_CONSOLE_GETCHAR: + regs->a0 =3D SBI_ERR_NOT_SUPPORTED; + break; + + default: + panic("%s: Unsupported ecall: FID: #%lx, EID: #%lx\n", + __func__, fid, eid); + break; + } + + return ret; +} + +VSBI_EXT_START(legacy, SBI_EXT_0_1_SET_TIMER, SBI_EXT_0_1_SHUTDOWN, + vsbi_legacy_ecall_handler) +VSBI_EXT_END --=20 2.52.0 From nobody Sun Dec 14 06:15:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1764584687; cv=none; d=zohomail.com; s=zohoarc; b=YOrT0VBXW0LMgzX16uY4IVWz3WwYgjzipSv0joeVRo5uxITNxIfp61sOb9KQZKlkeeOF0oYDkEdEXNe7dS9Of8tf2daFGMAR4aeL/H9Yty/tbiAjOTCOWdODq8IGguttLXi08SdQQClZFyY11kDkmx7hFzjo6MwhHKacQSugUeg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764584687; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5/5qXPCww7DpyOeKc5W7T3oZxeoVMBH7UuUZDrfemqE=; b=Qjr/PeasjOsuXh5V9Am34I+26IibY8Ptf+CXPQvUK6mCfnLhtxZJ1eixfbtYZWtbLCv//g1wpy4UyGaHNrpBPtGXh0GCYjax/jYfU7fpvE6HhFvXpAeYCPghkDvcnB1NhjWkpAvVYxHc2f8L3smCNq3e3n5ug+lLLJkI90oAHz4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1764584687680106.58101460880721; Mon, 1 Dec 2025 02:24:47 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1175651.1500277 (Exim 4.92) (envelope-from ) id 1vQ14y-0004Iq-2V; Mon, 01 Dec 2025 10:24:24 +0000 Received: by outflank-mailman (output) from mailman id 1175651.1500277; Mon, 01 Dec 2025 10:24:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQ14x-0004IE-Sc; Mon, 01 Dec 2025 10:24:23 +0000 Received: by outflank-mailman (input) for mailman id 1175651; Mon, 01 Dec 2025 10:24:22 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vQ14w-00041l-UJ for xen-devel@lists.xenproject.org; Mon, 01 Dec 2025 10:24:22 +0000 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [2a00:1450:4864:20::533]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e7155d20-ce9f-11f0-9d19-b5c5bf9af7f9; Mon, 01 Dec 2025 11:24:22 +0100 (CET) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-644fcafdce9so6322263a12.1 for ; Mon, 01 Dec 2025 02:24:22 -0800 (PST) Received: from fedora (user-109-243-71-38.play-internet.pl. [109.243.71.38]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-647510508e1sm12104724a12.27.2025.12.01.02.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 02:24:20 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e7155d20-ce9f-11f0-9d19-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764584661; x=1765189461; darn=lists.xenproject.org; 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=5/5qXPCww7DpyOeKc5W7T3oZxeoVMBH7UuUZDrfemqE=; b=Z+HYFSTYsE29amSMV37ZLmgpDfuAcll5PfoSEa13APGB3tmj6magZISfgc95kfA7/1 NYulz22kA36sxYWxVUvGQ+joKDN/lOInMbAOX7SOmeoz5RLjBme9Tl709vLny2LgPtmj Co0D07gNk+kN1LOG8VSyQp939QUnAxbKNrl7CCQ93XwcOnQktK6GoDtlmX0RDcBXKze9 EnDDu+MbiuedHwjcEhp0DrVZkQoN2hX4RHKE/ZKlvRc4AlVQaD60XjwbJObLrXPOzbCM dfGxBZiR/rivysntjGBj/9swbcxk3FqCiDCpeVHgGE9wfcwFVYEOMMchWlJ4cz4B3p8l xWSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764584661; x=1765189461; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5/5qXPCww7DpyOeKc5W7T3oZxeoVMBH7UuUZDrfemqE=; b=uqq6qCNmbVLMDgXQIEs/HmAoLBgj9GCrZ55/wzX97s0kB2smsLsIicuhrnJgtGFtsk 6zWuoO7X9hRwUFpM07DqBnjQzzF3qdbYkKD6K9ne8ywGrHO+6mceCmQyPC3yUKkz062c vj5DjXSpwhqEFmVHEHbsZiSZSra9nVRPKfnc+LD6xPquL4RPpA397+Uem3BtaLiVrzEs O1Y5xeyT/E6g0IKAIRG4YeLWrjEcg+vZiP/CSsXIz9nkOVRYaq8A1cSTRpCzDm5lwFk3 YYZJd5dfYWNjZRnozyJzjW+yyljD7ZhbOrILRmNOJGl39SqEhMVEhoFaM3oizBISfhLp AFmg== X-Gm-Message-State: AOJu0YxtUU+6F4wPacoqYftBUA87/ze2au2pSsyX5AXiE/NzL0wzj91i pOjXdbnwx2YeiCzjtVEwz46ILsjMQYYWb23j3E9LW0v+PWy+1FsVRdVCSQXTen3v X-Gm-Gg: ASbGncszJqmG334mY/scY1gDf3rOSXt2tzZwJEagJN+ZXf1jPFWQcw5Ka1ysBLumKd7 e7qUpO+GqQiBQDUmHKLi+ArlN1C/OThgar4Ffe9mvGxxRI1hg3jCYPnN94FcLoT0HmQDfF71i+8 edcIMjwNIAnA/u9vRdMWMHoi8En8i5/f4Rs/Ys90TLfFzz+ChQob/k6iHF9bHWowLeeTAHJwSHE 2bJ9fLM2qVlMRm7I9n/GS2aXIa2sXFd4MpGSBwyMjpSjv0iveqUoNFzY3ADQ4xXB7Av0LzyUYu7 4i0lEY3M9+7ZJi/mmCZUUqc53qZz0j7r0XaY31C+dgaptbilTPiAoew8H5/6M8Bs3KDkkLtxEiU AsVWjY5FXLqKNqTnAVM1dpfyq5NuWKITGmeFgHocnJeVSLPYBskKrKlvUPmyrIFtO/W+8nJwXYj pgLsrRK7rQQzV9lNZknLNx7ROSXty8Cqgsmj26PnkacnxUtbzqmG0GVdk= X-Google-Smtp-Source: AGHT+IEHAkAjsx+AcYiFj6bbDfNxh05DgLlgcigwBuGP4ZsrHTsIk7PkL/MRnY4TibUboiviSfvm3Q== X-Received: by 2002:a05:6402:1d50:b0:640:ebe3:dd55 with SMTP id 4fb4d7f45d1cf-645eb23f84emr21307302a12.6.1764584661090; Mon, 01 Dec 2025 02:24:21 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Alistair Francis , Bob Eshleman , Connor Davis , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 3/3] xen/riscv: add RISC-V virtual SBI base extension support for guests Date: Mon, 1 Dec 2025 11:24:10 +0100 Message-ID: X-Mailer: git-send-email 2.52.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1764584689264019200 Content-Type: text/plain; charset="utf-8" Add support of virtual SBI base extension calls for RISC-V guests, delegati= ng hardware-specific queries to the underlying SBI and handling version and firmware ID queries directly. The changes include: 1. Define new SBI base extension function IDs (SBI_EXT_BASE_GET_MVENDORID, SBI_EXT_BASE_GET_MARCHID, SBI_EXT_BASE_GET_MIMPID). 2. Make sbi_spec_version, sbi_fw_id, and sbi_fw_version global variables for use in virtual SBI handling, removing redundant local declarations in sbi_init. 3. Implement handling of SBI base extension functions, including version, firmware ID, and machine-specific queries. Signed-off-by: Oleksii Kurochko --- xen/arch/riscv/include/asm/sbi.h | 3 ++ xen/arch/riscv/sbi.c | 8 ++-- xen/arch/riscv/vsbi/Makefile | 1 + xen/arch/riscv/vsbi/vsbi-base-extension.c | 52 +++++++++++++++++++++++ 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 xen/arch/riscv/vsbi/vsbi-base-extension.c diff --git a/xen/arch/riscv/include/asm/sbi.h b/xen/arch/riscv/include/asm/= sbi.h index e7d5d707b1..98ba872ef3 100644 --- a/xen/arch/riscv/include/asm/sbi.h +++ b/xen/arch/riscv/include/asm/sbi.h @@ -32,6 +32,9 @@ #define SBI_EXT_BASE_GET_IMP_ID 0x1 #define SBI_EXT_BASE_GET_IMP_VERSION 0x2 #define SBI_EXT_BASE_PROBE_EXT 0x3 +#define SBI_EXT_BASE_GET_MVENDORID 0x4 +#define SBI_EXT_BASE_GET_MARCHID 0x5 +#define SBI_EXT_BASE_GET_MIMPID 0x6 =20 /* SBI function IDs for RFENCE extension */ #define SBI_EXT_RFENCE_REMOTE_FENCE_I 0x0 diff --git a/xen/arch/riscv/sbi.c b/xen/arch/riscv/sbi.c index 425dce44c6..97cbf84c21 100644 --- a/xen/arch/riscv/sbi.c +++ b/xen/arch/riscv/sbi.c @@ -23,7 +23,9 @@ #include #include =20 -static unsigned long __ro_after_init sbi_spec_version =3D SBI_SPEC_VERSION= _DEFAULT; +unsigned long __ro_after_init sbi_spec_version =3D SBI_SPEC_VERSION_DEFAUL= T; +long __ro_after_init sbi_fw_id; +long __ro_after_init sbi_fw_version; =20 struct sbiret sbi_ecall(unsigned long ext, unsigned long fid, unsigned long arg0, unsigned long arg1, @@ -313,8 +315,8 @@ int __init sbi_init(void) =20 if ( !sbi_spec_is_0_1() ) { - long sbi_fw_id =3D sbi_get_firmware_id(); - long sbi_fw_version =3D sbi_get_firmware_version(); + sbi_fw_id =3D sbi_get_firmware_id(); + sbi_fw_version =3D sbi_get_firmware_version(); =20 BUG_ON((sbi_fw_id < 0) || (sbi_fw_version < 0)); =20 diff --git a/xen/arch/riscv/vsbi/Makefile b/xen/arch/riscv/vsbi/Makefile index 4da625db9a..07ae27b99e 100644 --- a/xen/arch/riscv/vsbi/Makefile +++ b/xen/arch/riscv/vsbi/Makefile @@ -1,2 +1,3 @@ obj-y +=3D vsbi.o +obj-y +=3D vsbi-base-extension.o obj-y +=3D vsbi-legacy-extension.o diff --git a/xen/arch/riscv/vsbi/vsbi-base-extension.c b/xen/arch/riscv/vsb= i/vsbi-base-extension.c new file mode 100644 index 0000000000..88f4567cb1 --- /dev/null +++ b/xen/arch/riscv/vsbi/vsbi-base-extension.c @@ -0,0 +1,52 @@ + +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +#include +#include +#include + +extern unsigned long __ro_after_init sbi_spec_version; +extern long __ro_after_init sbi_fw_id; +extern long __ro_after_init sbi_fw_version; + +static int vsbi_base_ecall_handler(struct vcpu *vcpu, unsigned long eid, + unsigned long fid, + struct cpu_user_regs *regs) +{ + int ret =3D 0; + struct sbiret sbi_ret; + + switch ( fid ) { + case SBI_EXT_BASE_GET_SPEC_VERSION: + regs->a1 =3D sbi_spec_version; + break; + case SBI_EXT_BASE_GET_IMP_ID: + regs->a1 =3D sbi_fw_id; + break; + case SBI_EXT_BASE_GET_IMP_VERSION: + regs->a1 =3D sbi_fw_version; + break; + case SBI_EXT_BASE_GET_MVENDORID: + case SBI_EXT_BASE_GET_MARCHID: + case SBI_EXT_BASE_GET_MIMPID: + sbi_ret =3D sbi_ecall(SBI_EXT_BASE, fid, 0, 0, 0, 0, 0, 0); + ret =3D sbi_ret.error; + regs->a1 =3D sbi_ret.value; + break; + case SBI_EXT_BASE_PROBE_EXT: + regs->a1 =3D vsbi_find_extension(regs->a0) ? 1 : 0; + break; + default: + panic("%s: Unsupported ecall: FID: #%lx, EID: #%lx\n", + __func__, fid, eid); + break; + } + + return ret; +} + +VSBI_EXT_START(base, SBI_EXT_BASE, SBI_EXT_BASE, vsbi_base_ecall_handler) +VSBI_EXT_END --=20 2.52.0