diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-08-31 20:21:27 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-08-31 20:21:27 +0300 |
| commit | 69fd3876a4648499dbda4707fac646dc9c69fb0a (patch) | |
| tree | 3a3c27aa8babbe8622b6c6e1bb86c77bdc27cca5 /arch/s390/mm | |
| parent | 1814db83c049f3ab3e9a185b57a82f0ab53e58d3 (diff) | |
| parent | 899e2206f46aece42d8194c350bc1de71344dbc7 (diff) | |
| download | linux-69fd3876a4648499dbda4707fac646dc9c69fb0a.tar.xz | |
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/mm')
| -rw-r--r-- | arch/s390/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 2f123429a291..7474c2059eb3 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -827,7 +827,7 @@ void do_secure_storage_access(struct pt_regs *regs) * reliable without the misc UV feature so we need to check * for that as well. */ - if (test_bit_inv(BIT_UV_FEAT_MISC, &uv_info.uv_feature_indications) && + if (uv_has_feature(BIT_UV_FEAT_MISC) && !test_bit_inv(61, ®s->int_parm_long)) { /* * When this happens, userspace did something that it |