Skip to content

[nvidia_unstable-10.1] Handle KVM_CAP_ARM_RME ABI change between kernel versions #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ianm-nv wants to merge 1 commit into from
Closed

[nvidia_unstable-10.1] Handle KVM_CAP_ARM_RME ABI change between kernel versions #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux-headers/linux/kvm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ struct kvm_enable_cap {
#define KVM_CAP_ARM_EL2 240
#define KVM_CAP_ARM_EL2_E2H0 241
#define KVM_CAP_RISCV_MP_STATE_RESET 242
#define KVM_CAP_ARM_RME 243
#define KVM_CAP_ARM_RME 244

struct kvm_irq_routing_irqchip {
__u32 irqchip;
Expand Down
33 changes: 25 additions & 8 deletions target/arm/kvm-rme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "system/confidential-guest-support.h"
#include "system/kvm.h"
#include "system/runstate.h"
#include <sys/utsname.h>

#define TYPE_RME_GUEST "rme-guest"
OBJECT_DECLARE_SIMPLE_TYPE(RmeGuest, RME_GUEST)
Expand Down Expand Up @@ -86,6 +87,7 @@ struct RmeGuest {
RmeRamRegion init_ram;
uint8_t ipa_bits;
size_t num_cpus;
unsigned int rme_capable; /* Runtime-detected KVM_CAP_ARM_RME value */

RealmDmaRegion *dma_region;
QLIST_HEAD(, RealmRamDiscardListener) ram_discard_list;
Expand Down Expand Up @@ -428,7 +430,7 @@ static int rme_configure_mec(RmeGuest *guest, Error **errp)
}

/* First query if MEC is supported by the kernel */
ret = kvm_vm_enable_cap(kvm_state, KVM_CAP_ARM_RME, 0,
ret = kvm_vm_enable_cap(kvm_state, rme_guest->rme_capable, 0,
KVM_CAP_ARM_RME_CONFIG_REALM, (intptr_t)&mec_query);
if (ret) {
if (private_mec_requested) {
Expand All @@ -453,7 +455,7 @@ static int rme_configure_mec(RmeGuest *guest, Error **errp)
return 0;
}

ret = kvm_vm_enable_cap(kvm_state, KVM_CAP_ARM_RME, 0,
ret = kvm_vm_enable_cap(kvm_state, rme_guest->rme_capable, 0,
KVM_CAP_ARM_RME_CONFIG_REALM, (intptr_t)&mec_cfg);
if (ret) {
error_setg_errno(errp, -ret, "MEC configuration failed");
Expand Down Expand Up @@ -493,7 +495,7 @@ static int rme_configure_one(RmeGuest *guest, uint32_t cfg, Error **errp)
g_assert_not_reached();
}

ret = kvm_vm_enable_cap(kvm_state, KVM_CAP_ARM_RME, 0,
ret = kvm_vm_enable_cap(kvm_state, rme_guest->rme_capable, 0,
KVM_CAP_ARM_RME_CONFIG_REALM, (intptr_t)&args);
if (ret) {
error_setg_errno(errp, -ret, "failed to configure %s", cfg_str);
Expand Down Expand Up @@ -535,7 +537,7 @@ static int rme_init_ram(RmeRamRegion *ram, Error **errp)
.size = end - start,
};

ret = kvm_vm_enable_cap(kvm_state, KVM_CAP_ARM_RME, 0,
ret = kvm_vm_enable_cap(kvm_state, rme_guest->rme_capable, 0,
KVM_CAP_ARM_RME_INIT_RIPAS_REALM,
(intptr_t)&init_args);
if (ret) {
Expand All @@ -560,7 +562,7 @@ static int rme_populate_range(hwaddr base, size_t size, bool measure,
.flags = measure ? KVM_ARM_RME_POPULATE_FLAGS_MEASURE : 0,
};

ret = kvm_vm_enable_cap(kvm_state, KVM_CAP_ARM_RME, 0,
ret = kvm_vm_enable_cap(kvm_state, rme_guest->rme_capable, 0,
KVM_CAP_ARM_RME_POPULATE_REALM,
(intptr_t)&populate_args);
if (ret) {
Expand Down Expand Up @@ -629,7 +631,7 @@ static int rme_create_realm(Error **errp)
return -1;
}

ret = kvm_vm_enable_cap(kvm_state, KVM_CAP_ARM_RME, 0,
ret = kvm_vm_enable_cap(kvm_state, rme_guest->rme_capable, 0,
KVM_CAP_ARM_RME_CREATE_REALM);
if (ret) {
error_setg_errno(errp, -ret, "failed to create Realm Descriptor");
Expand Down Expand Up @@ -658,7 +660,7 @@ static int rme_create_realm(Error **errp)
return -1;
}

ret = kvm_vm_enable_cap(kvm_state, KVM_CAP_ARM_RME, 0,
ret = kvm_vm_enable_cap(kvm_state, rme_guest->rme_capable, 0,
KVM_CAP_ARM_RME_ACTIVATE_REALM);
if (ret) {
error_setg_errno(errp, -ret, "failed to activate realm");
Expand Down Expand Up @@ -786,13 +788,28 @@ static void rme_guest_class_init(ObjectClass *oc, const void *data)

static void rme_guest_init(Object *obj)
{
struct utsname buf;
int major, minor;

if (rme_guest) {
error_report("a single instance of RmeGuest is supported");
exit(1);
}

rme_guest = RME_GUEST(obj);
rme_guest->measurement_algo = RME_GUEST_MEASUREMENT_ALGORITHM_SHA512;
rme_guest->mec_specified = false;

rme_guest->rme_capable = KVM_CAP_ARM_RME;

if (uname(&buf) == 0) {
if (sscanf(buf.release, "%d.%d", &major, &minor) == 2) {
/* For Linux kernel v6.16, KVM_CAP_ARM_RME == 243 */
if ((major == 6) && (minor == 16)) {
rme_guest->rme_capable = 243;
}
}
}
}

static void rme_guest_finalize(Object *obj)
Expand Down Expand Up @@ -865,7 +882,7 @@ int kvm_arm_rme_init(MachineState *ms)
return -EINVAL;
}

if (!kvm_check_extension(kvm_state, KVM_CAP_ARM_RME)) {
if (!kvm_check_extension(kvm_state, rme_guest->rme_capable)) {
return -ENODEV;
}

Expand Down