From nobody Sat May 18 21:45:28 2024 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=1714060248; cv=none; d=zohomail.com; s=zohoarc; b=SctK6aQeWTtEaCy4DL/jsbFd2veYQNRN4Y9SlzP3oYPXOMBSTFk0e/5XhIXY1T11BAVrfuGaDfpJnGRlnTZvzWklSmZZrQTa/wY4HkGdosv9cxqP9Qrhb+tTjrRmv60s4SrhBJnm6U+9/g+dI/xL6ulA14SgytEGb/U/foDF7Yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714060248; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hyNWL5Z/arkoll/9yENM8A6PHPI/XzRs+hMbp5GjFAk=; b=MdjioA6uDigqZNg793FV7R5PUnvTc8RKV23RoTxOh10KIvHTW3bi94RommAS1zwHCFBjWqOhbqFiw4wAvEnhLcWzbkez4Jn+KCb1+60BPWKSydIds1aF+Gv+qDrYQgxii6i9pgv8bc/dCgsSZ+EeB2g5QtnAD3MZ5TScxLQ0dyY= 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: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714060248145458.2984886827154; Thu, 25 Apr 2024 08:50:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s01Mp-0005ND-15; Thu, 25 Apr 2024 11:50:35 -0400 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 ) id 1s01Mk-0005LL-Rg for qemu-devel@nongnu.org; Thu, 25 Apr 2024 11:50:31 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s01Mi-00089R-RS for qemu-devel@nongnu.org; Thu, 25 Apr 2024 11:50:30 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6f074520c8cso1253252b3a.0 for ; Thu, 25 Apr 2024 08:50:26 -0700 (PDT) Received: from grind.. ([191.255.35.121]) by smtp.gmail.com with ESMTPSA id y8-20020aa78048000000b006f2e10b00d6sm7207359pfm.41.2024.04.25.08.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 08:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1714060225; x=1714665025; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hyNWL5Z/arkoll/9yENM8A6PHPI/XzRs+hMbp5GjFAk=; b=OHlVaXWMrVatf/RH/HjkJePkSGOLhrNCJm6akWbXL+Ev49/LS2R1TXyo88+XAoIYyh 6LrnlkEbCYsAug4Ke9FkDnPmtdSK+RCWWMftkIl0po6W+U6V3IXegON23sxvSE01Ozuz t3NJE4pFkoG2EBQJNaqyU9M7L43X9lBziH7krI/58MUDt0XQ0/wYQlDAKjSUYXvgYGog Oy2Ld9FmmfXXQASQj8Ju2/PJt2ObwmVI9LlDuhwDmwy9YljUora4Q/PUV0Moy+peNUn2 Zw+esRA3m9I19nLMph5guNvz8nsuaIlGiFSauPvsaU4X9ROmpDqjZt1YEqU7YGo3Mg0Q OxNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714060225; x=1714665025; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hyNWL5Z/arkoll/9yENM8A6PHPI/XzRs+hMbp5GjFAk=; b=FUKYAAD318+6jAUiK5dBJrgDTDDXl5Y14pIfWyKxPfv9YfIsb4Ao7aM+rAXGT7Pokn JUDgFAPXxOOolLHzqLQaDgACpETM6/vgc4Tn23CB5/NEuW8kNQKZgVD0u3id9Ej/ct24 UCbcqZHxFuVvM0m6QrMfxxrFAmOtDBW2JQgvksnOBnTTzjiNERbFT5kY+RpFeH7g83UY KC01PVPitXWz2kmXW6KSlyxu/KVvXz658jZMjcgjbgf0wG0rfYtOrAOLfkAvnNhJPN7v s2hGCtHh0PSfBCw1CLJfCrhAjsMfJ5LsSeprhq4xUYaormwN8tg/1GFyECM2IGBiAfar wDEw== X-Gm-Message-State: AOJu0YwZtNGnFXH6tRdsBCXkJfhZd9WC+bhQPh57OCfbGp7RetpYgXFV HOSkij54R1RYauD/WWnup/sYmwNcY5I+R72OhEPXIVZD/vZSuKhsQYA1+/h4IRWQI3saKeWy1by 8 X-Google-Smtp-Source: AGHT+IFi2cTOCGcO0kYuX20sdt1o3mYuhKmtiXh6Jzmt3ncSfs5KJEBBnhbTeA7+AeIzmE1T8KLxPA== X-Received: by 2002:a05:6a00:1ac7:b0:6e9:74d7:7092 with SMTP id f7-20020a056a001ac700b006e974d77092mr150179pfv.24.1714060225095; Thu, 25 Apr 2024 08:50:25 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza Subject: [PATCH] target/riscv/kvm: implement SBI debug console (DBCN) calls Date: Thu, 25 Apr 2024 12:50:12 -0300 Message-ID: <20240425155012.581366-1-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.44.0 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::436; envelope-from=dbarboza@ventanamicro.com; helo=mail-pf1-x436.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: 1714060249043100002 Content-Type: text/plain; charset="utf-8" SBI defines a Debug Console extension "DBCN" that will, in time, replace the legacy console putchar and getchar SBI extensions. The appeal of the DBCN extension is that it allows multiple bytes to be read/written in the SBI console in a single SBI call. As far as KVM goes, the DBCN calls are forwarded by an in-kernel KVM module to userspace. But this will only happens if the KVM module actually supports this SBI extension and we activate it. We'll check for DBCN support during init time, checking if get-reg-list is advertising KVM_RISCV_SBI_EXT_DBCN. In that case, we'll enable it via kvm_set_one_reg() during kvm_arch_init_vcpu(). Finally, change kvm_riscv_handle_sbi() to handle the incoming calls for SBI_EXT_DBCN, reading and writing as required. A simple KVM guest with 'earlycon=3Dsbi', running in an emulated RISC-V host, takes around 20 seconds to boot without using DBCN. With this patch we're taking around 14 seconds to boot due to the speed-up in the terminal output. There's no change in boot time if the guest isn't using earlycon. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/kvm/kvm-cpu.c | 111 +++++++++++++++++++++++++++++ target/riscv/sbi_ecall_interface.h | 17 +++++ 2 files changed, 128 insertions(+) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 03e3fee607..54a9ab9fd7 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -409,6 +409,12 @@ static KVMCPUConfig kvm_v_vlenb =3D { KVM_REG_RISCV_VECTOR_CSR_REG(vlenb) }; =20 +static KVMCPUConfig kvm_sbi_dbcn =3D { + .name =3D "sbi_dbcn", + .kvm_reg_id =3D KVM_REG_RISCV | KVM_REG_SIZE_U64 | + KVM_REG_RISCV_SBI_EXT | KVM_RISCV_SBI_EXT_DBCN +}; + static void kvm_riscv_update_cpu_cfg_isa_ext(RISCVCPU *cpu, CPUState *cs) { CPURISCVState *env =3D &cpu->env; @@ -1041,6 +1047,20 @@ static int uint64_cmp(const void *a, const void *b) return 0; } =20 +static void kvm_riscv_check_sbi_dbcn_support(RISCVCPU *cpu, + KVMScratchCPU *kvmcpu, + struct kvm_reg_list *reglist) +{ + struct kvm_reg_list *reg_search; + + reg_search =3D bsearch(&kvm_sbi_dbcn.kvm_reg_id, reglist->reg, reglist= ->n, + sizeof(uint64_t), uint64_cmp); + + if (reg_search) { + kvm_sbi_dbcn.supported =3D true; + } +} + static void kvm_riscv_read_vlenb(RISCVCPU *cpu, KVMScratchCPU *kvmcpu, struct kvm_reg_list *reglist) { @@ -1146,6 +1166,8 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu= , KVMScratchCPU *kvmcpu) if (riscv_has_ext(&cpu->env, RVV)) { kvm_riscv_read_vlenb(cpu, kvmcpu, reglist); } + + kvm_riscv_check_sbi_dbcn_support(cpu, kvmcpu, reglist); } =20 static void riscv_init_kvm_registers(Object *cpu_obj) @@ -1320,6 +1342,17 @@ static int kvm_vcpu_set_machine_ids(RISCVCPU *cpu, C= PUState *cs) return ret; } =20 +static int kvm_vcpu_enable_sbi_dbcn(RISCVCPU *cpu, CPUState *cs) +{ + target_ulong reg =3D 1; + + if (!kvm_sbi_dbcn.supported) { + return 0; + } + + return kvm_set_one_reg(cs, kvm_sbi_dbcn.kvm_reg_id, ®); +} + int kvm_arch_init_vcpu(CPUState *cs) { int ret =3D 0; @@ -1337,6 +1370,8 @@ int kvm_arch_init_vcpu(CPUState *cs) kvm_riscv_update_cpu_misa_ext(cpu, cs); kvm_riscv_update_cpu_cfg_isa_ext(cpu, cs); =20 + ret =3D kvm_vcpu_enable_sbi_dbcn(cpu, cs); + return ret; } =20 @@ -1394,6 +1429,79 @@ bool kvm_arch_stop_on_emulation_error(CPUState *cs) return true; } =20 +static void kvm_riscv_handle_sbi_dbcn(CPUState *cs, struct kvm_run *run) +{ + g_autofree uint8_t *buf =3D NULL; + RISCVCPU *cpu =3D RISCV_CPU(cs); + target_ulong num_bytes; + uint64_t addr; + unsigned char ch; + int ret; + + switch (run->riscv_sbi.function_id) { + case SBI_EXT_DBCN_CONSOLE_READ: + case SBI_EXT_DBCN_CONSOLE_WRITE: + num_bytes =3D run->riscv_sbi.args[0]; + + if (num_bytes =3D=3D 0) { + run->riscv_sbi.ret[0] =3D SBI_SUCCESS; + run->riscv_sbi.ret[1] =3D 0; + break; + } + + addr =3D run->riscv_sbi.args[1]; + + /* + * Handle the case where a 32 bit CPU is running in a + * 64 bit addressing env. + */ + if (riscv_cpu_mxl(&cpu->env) =3D=3D MXL_RV32) { + addr |=3D (uint64_t)run->riscv_sbi.args[2] << 32; + } + + buf =3D g_malloc0(num_bytes); + + if (run->riscv_sbi.function_id =3D=3D SBI_EXT_DBCN_CONSOLE_READ) { + ret =3D qemu_chr_fe_read_all(serial_hd(0)->be, buf, num_bytes); + if (ret < 0) { + error_report("SBI_EXT_DBCN_CONSOLE_READ: error when " + "reading chardev"); + exit(1); + } + + cpu_physical_memory_write(addr, buf, ret); + } else { + cpu_physical_memory_read(addr, buf, num_bytes); + + ret =3D qemu_chr_fe_write_all(serial_hd(0)->be, buf, num_bytes= ); + if (ret < 0) { + error_report("SBI_EXT_DBCN_CONSOLE_WRITE: error when " + "writing chardev"); + exit(1); + } + } + + run->riscv_sbi.ret[0] =3D SBI_SUCCESS; + run->riscv_sbi.ret[1] =3D ret; + break; + case SBI_EXT_DBCN_CONSOLE_WRITE_BYTE: + ch =3D run->riscv_sbi.args[0]; + ret =3D qemu_chr_fe_write(serial_hd(0)->be, &ch, sizeof(ch)); + + if (ret < 0) { + error_report("SBI_EXT_DBCN_CONSOLE_WRITE_BYTE: error when " + "writing chardev"); + exit(1); + } + + run->riscv_sbi.ret[0] =3D SBI_SUCCESS; + run->riscv_sbi.ret[1] =3D 0; + break; + default: + run->riscv_sbi.ret[0] =3D SBI_ERR_NOT_SUPPORTED; + } +} + static int kvm_riscv_handle_sbi(CPUState *cs, struct kvm_run *run) { int ret =3D 0; @@ -1412,6 +1520,9 @@ static int kvm_riscv_handle_sbi(CPUState *cs, struct = kvm_run *run) } ret =3D 0; break; + case SBI_EXT_DBCN: + kvm_riscv_handle_sbi_dbcn(cs, run); + break; default: qemu_log_mask(LOG_UNIMP, "%s: un-handled SBI EXIT, specific reasons is %lu\n", diff --git a/target/riscv/sbi_ecall_interface.h b/target/riscv/sbi_ecall_in= terface.h index 43899d08f6..7dfe5f72c6 100644 --- a/target/riscv/sbi_ecall_interface.h +++ b/target/riscv/sbi_ecall_interface.h @@ -12,6 +12,17 @@ =20 /* clang-format off */ =20 +#define SBI_SUCCESS 0 +#define SBI_ERR_FAILED -1 +#define SBI_ERR_NOT_SUPPORTED -2 +#define SBI_ERR_INVALID_PARAM -3 +#define SBI_ERR_DENIED -4 +#define SBI_ERR_INVALID_ADDRESS -5 +#define SBI_ERR_ALREADY_AVAILABLE -6 +#define SBI_ERR_ALREADY_STARTED -7 +#define SBI_ERR_ALREADY_STOPPED -8 +#define SBI_ERR_NO_SHMEM -9 + /* SBI Extension IDs */ #define SBI_EXT_0_1_SET_TIMER 0x0 #define SBI_EXT_0_1_CONSOLE_PUTCHAR 0x1 @@ -27,6 +38,7 @@ #define SBI_EXT_IPI 0x735049 #define SBI_EXT_RFENCE 0x52464E43 #define SBI_EXT_HSM 0x48534D +#define SBI_EXT_DBCN 0x4442434E =20 /* SBI function IDs for BASE extension */ #define SBI_EXT_BASE_GET_SPEC_VERSION 0x0 @@ -57,6 +69,11 @@ #define SBI_EXT_HSM_HART_STOP 0x1 #define SBI_EXT_HSM_HART_GET_STATUS 0x2 =20 +/* SBI function IDs for DBCN extension */ +#define SBI_EXT_DBCN_CONSOLE_WRITE 0x0 +#define SBI_EXT_DBCN_CONSOLE_READ 0x1 +#define SBI_EXT_DBCN_CONSOLE_WRITE_BYTE 0x2 + #define SBI_HSM_HART_STATUS_STARTED 0x0 #define SBI_HSM_HART_STATUS_STOPPED 0x1 #define SBI_HSM_HART_STATUS_START_PENDING 0x2 --=20 2.44.0