From nobody Sat Oct 4 12:49:03 2025 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30FEF20322 for ; Sun, 17 Aug 2025 12:34:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755434043; cv=none; b=nWNWTsj0syfci/Aek9ic5jkQcI4S1tYJaEEZvcPs6wMF4Ym9Y7a6YN9oBRM5kJ7jIdj4Gt5YQ1f4E+eqcbvYUMrkWpobI1l88j6UhjUuUTLqFpioxlmRaWuqN7sATPHG6pxpJIITxqlJFWm5Pxla264FJeXmckuCN0isOT+W8Zo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755434043; c=relaxed/simple; bh=rUEDsE7OMNbrZonr7DAVZfzNpB2WUNyLAZ5gRH05Jz8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QEvzcelAq1FXhJ3K9dCgcuYgBW6fn98+2KBkOSMUZXLQrXRs5s5V5TXyzukHq3XcuHudJOm3OgVpP0dVONAEDqgYJNBeanLrCvsNeVttifk7Z64ZGjErlr+tRJ15VaHmzJTL8EVqz8nTz9K0JtJXPqQt6rj7SnagVMutlhIdsaw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=F9PlLszB; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="F9PlLszB" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-321cf75482fso3841637a91.0 for ; Sun, 17 Aug 2025 05:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1755434041; x=1756038841; darn=vger.kernel.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=GNhy8e+wcu2xj9coMjyL72gmYgwxBYToiGY6Az0bjY8=; b=F9PlLszBVpLfE+AUk98ZZqc9KP9KINCRShKbclJj8/fSxVJV1yKs8vfkSCAeIlrbTu NT+uFUT03Kms7uqmjSDF7MXZ2W2li0R5XszZk1nHL3A1/YqMFshTFC1HAeICFr9gUKdY AX5cbnnFleZ+gV2Xz6x1Ll7NChTzHkL2DGovu3JVzsQdZUvX20ZgZUrs6H/wj2XNV7JU 852NmCIH9gG/eL/ZbCfPg0P5gKm+JsyfbaNyqHuOjT5XmVTm1lWYb8i9uvmJ8JnuBseq 8Jj/QUsmV7qdztpWgbdowEYCuV3I+t+jWV736UKVpv/5LloMcdjDEJhZmioMJH8h7t/P kyrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755434041; x=1756038841; 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=GNhy8e+wcu2xj9coMjyL72gmYgwxBYToiGY6Az0bjY8=; b=kWtqYAaKOh6Nxsz1+a30WWwRe95EQkUGsZFBp57S88CTkMYNRO2bXlCHTtHe2WrH4v cvr/qVSfx1aRlC1aihM+eSW9r7MoInc/CFrCeIcaz3zf0Cqkku5+I8kh9AwWknIfmpWS m+7clIPWG7U7/7y4EYO4KQ0CAhK82/cxQV0sPOuVcbNHOXnuAa3SjO85+XRjXaBY/obr kWtYZJS3E3uTjMtk5GbgBb6zoDaF5r1IYoEmE2JLBnZk0ZxK38it+R8Qy0+jw8ZGs3Su GSLLgflxmZ5SkvS3g0rhHGYlU8XWFYRw5vrHPaHJ7Vw/fqe8N4puVL/lga6tpThkAK6C RZNg== X-Forwarded-Encrypted: i=1; AJvYcCU9DfpbtpSQt+p2TED66b3XFOcuJUbBs+1lwnJVfQuOjRkaZE1NV3sRzsZKyjOdy07HTUu2ErLIxi21xAo=@vger.kernel.org X-Gm-Message-State: AOJu0YwjQIbrXzbSsaC9zXUyJjdpKgsq4UGEVKuzqTevZ5KWb4klXE0+ tngQPUl59LB5SiRyx6mKJK3GA/oWtLZ2328X5OyJUPlVJGqqm09iPg3ZzsYX39xtaR8= X-Gm-Gg: ASbGncvfxjiwOXNu/n1SwXyM46xGJgxg2L15fOlH3ymr1G8kLPHSvrIDYw5FsOcm2h6 vd0BZe06cK/1mScUCpsuFIGiQJIS8EUUIOG/P2hIub72CB+iwMeSFtU2mMpf8sjEM7S6M9ER8af ewHXinZwOPGjz7wcOSqnd692oWG+vmDH6Qhg0uOXkR5GQx/kGSPjdqlZpXNqlI4GvH+6HNRdQoi Kswfl+nm5TFmdHC/ROLaOF55KVFoH/67s7R+A16ZXs8GvSXAtanDc3KvJfdu7DcPu4BG3II0cob wt6DbxM0Ksu7+PGOJ/Ag0zJRPRXMr4s7pe67cPWlI8sFhXQSrVlVNEogKDrsPgLGT6SgrSYaaNG mEZJ0QCn2ppXWd4fXQ7rxASzP+yGwRKUnDEtMpGptGGDthfrEjvW3xfA= X-Google-Smtp-Source: AGHT+IHh37iRS02dzFD7p73eZSbpQiOlqNZO1JoyVWCj6beSgZrt2b8qgavkosgeWIhzOEcfJ80ZCA== X-Received: by 2002:a17:90b:3b4d:b0:321:1348:4438 with SMTP id 98e67ed59e1d1-323296d963bmr17136225a91.7.1755434041279; Sun, 17 Aug 2025 05:34:01 -0700 (PDT) Received: from localhost.localdomain ([122.171.23.202]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3232b291449sm4480912a91.0.2025.08.17.05.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Aug 2025 05:34:00 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , Paolo Bonzini , Shuah Khan , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Anup Patel Subject: [PATCH v2 4/6] RISC-V: KVM: Move copy_sbi_ext_reg_indices() to SBI implementation Date: Sun, 17 Aug 2025 18:03:22 +0530 Message-ID: <20250817123324.239423-5-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250817123324.239423-1-apatel@ventanamicro.com> References: <20250817123324.239423-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ONE_REG handling of SBI extension enable/disable registers and SBI extension state registers is already under SBI implementation. On similar lines, let's move copy_sbi_ext_reg_indices() under SBI implementation. Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- arch/riscv/include/asm/kvm_vcpu_sbi.h | 2 +- arch/riscv/kvm/vcpu_onereg.c | 29 ++------------------------- arch/riscv/kvm/vcpu_sbi.c | 27 ++++++++++++++++++++++++- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm= /kvm_vcpu_sbi.h index 8970cc7530c4..d75ca45c0152 100644 --- a/arch/riscv/include/asm/kvm_vcpu_sbi.h +++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h @@ -77,6 +77,7 @@ void kvm_riscv_vcpu_sbi_request_reset(struct kvm_vcpu *vc= pu, unsigned long pc, unsigned long a1); void kvm_riscv_vcpu_sbi_load_reset_state(struct kvm_vcpu *vcpu); int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run); +int kvm_riscv_vcpu_reg_indices_sbi_ext(struct kvm_vcpu *vcpu, u64 __user *= uindices); int kvm_riscv_vcpu_set_reg_sbi_ext(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); int kvm_riscv_vcpu_get_reg_sbi_ext(struct kvm_vcpu *vcpu, @@ -86,7 +87,6 @@ int kvm_riscv_vcpu_set_reg_sbi(struct kvm_vcpu *vcpu, con= st struct kvm_one_reg * int kvm_riscv_vcpu_get_reg_sbi(struct kvm_vcpu *vcpu, const struct kvm_one= _reg *reg); const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext( struct kvm_vcpu *vcpu, unsigned long extid); -bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx); int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run); void kvm_riscv_vcpu_sbi_init(struct kvm_vcpu *vcpu); void kvm_riscv_vcpu_sbi_deinit(struct kvm_vcpu *vcpu); diff --git a/arch/riscv/kvm/vcpu_onereg.c b/arch/riscv/kvm/vcpu_onereg.c index 5843b0519224..0894ab517525 100644 --- a/arch/riscv/kvm/vcpu_onereg.c +++ b/arch/riscv/kvm/vcpu_onereg.c @@ -1060,34 +1060,9 @@ static inline unsigned long num_isa_ext_regs(const s= truct kvm_vcpu *vcpu) return copy_isa_ext_reg_indices(vcpu, NULL); } =20 -static int copy_sbi_ext_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uin= dices) -{ - unsigned int n =3D 0; - - for (int i =3D 0; i < KVM_RISCV_SBI_EXT_MAX; i++) { - u64 size =3D IS_ENABLED(CONFIG_32BIT) ? - KVM_REG_SIZE_U32 : KVM_REG_SIZE_U64; - u64 reg =3D KVM_REG_RISCV | size | KVM_REG_RISCV_SBI_EXT | - KVM_REG_RISCV_SBI_SINGLE | i; - - if (!riscv_vcpu_supports_sbi_ext(vcpu, i)) - continue; - - if (uindices) { - if (put_user(reg, uindices)) - return -EFAULT; - uindices++; - } - - n++; - } - - return n; -} - static unsigned long num_sbi_ext_regs(struct kvm_vcpu *vcpu) { - return copy_sbi_ext_reg_indices(vcpu, NULL); + return kvm_riscv_vcpu_reg_indices_sbi_ext(vcpu, NULL); } =20 static inline unsigned long num_sbi_regs(struct kvm_vcpu *vcpu) @@ -1215,7 +1190,7 @@ int kvm_riscv_vcpu_copy_reg_indices(struct kvm_vcpu *= vcpu, return ret; uindices +=3D ret; =20 - ret =3D copy_sbi_ext_reg_indices(vcpu, uindices); + ret =3D kvm_riscv_vcpu_reg_indices_sbi_ext(vcpu, uindices); if (ret < 0) return ret; uindices +=3D ret; diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c index 04903e5012d6..1b13623380e1 100644 --- a/arch/riscv/kvm/vcpu_sbi.c +++ b/arch/riscv/kvm/vcpu_sbi.c @@ -110,7 +110,7 @@ riscv_vcpu_get_sbi_ext(struct kvm_vcpu *vcpu, unsigned = long idx) return sext; } =20 -bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx) +static bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx) { struct kvm_vcpu_sbi_context *scontext =3D &vcpu->arch.sbi_context; const struct kvm_riscv_sbi_extension_entry *sext; @@ -288,6 +288,31 @@ static int riscv_vcpu_get_sbi_ext_multi(struct kvm_vcp= u *vcpu, return 0; } =20 +int kvm_riscv_vcpu_reg_indices_sbi_ext(struct kvm_vcpu *vcpu, u64 __user *= uindices) +{ + unsigned int n =3D 0; + + for (int i =3D 0; i < KVM_RISCV_SBI_EXT_MAX; i++) { + u64 size =3D IS_ENABLED(CONFIG_32BIT) ? + KVM_REG_SIZE_U32 : KVM_REG_SIZE_U64; + u64 reg =3D KVM_REG_RISCV | size | KVM_REG_RISCV_SBI_EXT | + KVM_REG_RISCV_SBI_SINGLE | i; + + if (!riscv_vcpu_supports_sbi_ext(vcpu, i)) + continue; + + if (uindices) { + if (put_user(reg, uindices)) + return -EFAULT; + uindices++; + } + + n++; + } + + return n; +} + int kvm_riscv_vcpu_set_reg_sbi_ext(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) { --=20 2.43.0