diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-08-31 13:21:27 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-08-31 13:21:27 -0400 |
| commit | 69fd3876a4648499dbda4707fac646dc9c69fb0a (patch) | |
| tree | 3a3c27aa8babbe8622b6c6e1bb86c77bdc27cca5 /arch/s390/kernel | |
| parent | 1814db83c049f3ab3e9a185b57a82f0ab53e58d3 (diff) | |
| parent | 899e2206f46aece42d8194c350bc1de71344dbc7 (diff) | |
| download | linux-69fd3876a4648499dbda4707fac646dc9c69fb0a.tar.gz linux-69fd3876a4648499dbda4707fac646dc9c69fb0a.tar.bz2 linux-69fd3876a4648499dbda4707fac646dc9c69fb0a.zip | |
Merge tag 'kvm-s390-next-6.6-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
- PV crypto passthrough enablement (Tony, Steffen, Viktor, Janosch)
Allows a PV guest to use crypto cards. Card access is governed by
the firmware and once a crypto queue is "bound" to a PV VM every
other entity (PV or not) looses access until it is not bound
anymore. Enablement is done via flags when creating the PV VM.
- Guest debug fixes (Ilya)
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/uv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c index 66f0eb1c872b..fc07bc39e698 100644 --- a/arch/s390/kernel/uv.c +++ b/arch/s390/kernel/uv.c @@ -88,7 +88,7 @@ fail: * Requests the Ultravisor to pin the page in the shared state. This will * cause an intercept when the guest attempts to unshare the pinned page. */ -static int uv_pin_shared(unsigned long paddr) +int uv_pin_shared(unsigned long paddr) { struct uv_cb_cfs uvcb = { .header.cmd = UVC_CMD_PIN_PAGE_SHARED, @@ -100,6 +100,7 @@ static int uv_pin_shared(unsigned long paddr) return -EINVAL; return 0; } +EXPORT_SYMBOL_GPL(uv_pin_shared); /* * Requests the Ultravisor to destroy a guest page and make it @@ -257,7 +258,7 @@ static bool should_export_before_import(struct uv_cb_header *uvcb, struct mm_str * shared page from a different protected VM will automatically also * transfer its ownership. */ - if (test_bit_inv(BIT_UV_FEAT_MISC, &uv_info.uv_feature_indications)) + if (uv_has_feature(BIT_UV_FEAT_MISC)) return false; if (uvcb->cmd == UVC_CMD_UNPIN_PAGE_SHARED) return false; |
