selftests: kvm: Mmap the entire vcpu mmap area
PATCH 1/1 selftests: kvm: Mmap the entire vcpu mmap area
The vcpu mmap area may consist of more than just the kvm_run struct. Allocate enough space for the entire vcpu mmap area. Without this, on x86, the PIO page, for example, will be missing. This is problematic when dealing with an unhandled exception from the guest as the exception vector will be incorrectly reported as 0x0.
--- tools/testing/selftests/kvm/lib/kvm_util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +4 -2
@@ -21,6 +21,8 @@#define KVM_UTIL_PGS_PER_HUGEPG 512#define KVM_UTIL_MIN_PFN 2 +static int vcpu_mmap_sz (void ); +/* Aligns x up to the next multiple of size. Size must be a power of 2. */ static void *align (void *x,size_t size) {
@@ -509,7 +511,7 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu) vcpu->dirty_gfns =NULL ; } - ret =munmap (vcpu->state,sizeof (*vcpu->state)); + ret =munmap (vcpu->state,vcpu_mmap_sz ());TEST_ASSERT (ret ==0 ,"munmap of VCPU fd failed, rc: %i " "errno: %i" , ret, errno);close (vcpu->fd);
@@ -978,7 +980,7 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid)TEST_ASSERT (vcpu_mmap_sz () >=sizeof (*vcpu->state),"vcpu mmap size " "smaller than expected, vcpu_mmap_sz: %i expected_min: %zi" ,vcpu_mmap_sz (),sizeof (*vcpu->state)); - vcpu->state = (struct kvm_run *)mmap (NULL ,sizeof (*vcpu->state), + vcpu->state = (struct kvm_run *)mmap (NULL ,vcpu_mmap_sz (),PROT_READ |PROT_WRITE ,MAP_SHARED , vcpu->fd,0 );TEST_ASSERT (vcpu->state !=MAP_FAILED ,"mmap vcpu_state failed, " "vcpu id: %u errno: %i" , vcpuid, errno);
Signature · 1 line
2.30.0.478.g8a0d178c01-goog
Quoted 46 lines · Aaron Lewis
The vcpu mmap area may consist of more than just the
kvm_runstruct. Allocate enough space for the entire vcpu mmap area. Without this, on x86, the PIO page, for example, will be missing. This is problematic when dealing with an unhandled exception from the guest as the exception vector will be incorrectly reported as0x0.Signed-off-by Aaron Lewis <[email protected]>Signed-off-by Steve Rutherford <[email protected]>--- tools/testing/selftests/kvm/lib/kvm_util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/lib/kvm_util.c +4
-2@@ -21,6 +21,8 @@#define KVM_UTIL_PGS_PER_HUGEPG 512#define KVM_UTIL_MIN_PFN 2 +static int vcpu_mmap_sz (void ); +/* Aligns x up to the next multiple of size. Size must be a power of 2. */ static void *align (void *x,size_t size) {@@ -509,7 +511,7 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu) vcpu->dirty_gfns =NULL ; } - ret =munmap (vcpu->state,sizeof (*vcpu->state)); + ret =munmap (vcpu->state,vcpu_mmap_sz ());TEST_ASSERT (ret ==0 ,"munmap of VCPU fd failed, rc: %i " "errno: %i" , ret, errno);close (vcpu->fd);@@ -978,7 +980,7 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid)TEST_ASSERT (vcpu_mmap_sz () >=sizeof (*vcpu->state),"vcpu mmap size " "smaller than expected, vcpu_mmap_sz: %i expected_min: %zi" ,vcpu_mmap_sz (),sizeof (*vcpu->state)); - vcpu->state = (struct kvm_run *)mmap (NULL ,sizeof (*vcpu->state), + vcpu->state = (struct kvm_run *)mmap (NULL ,vcpu_mmap_sz (),PROT_READ |PROT_WRITE ,MAP_SHARED , vcpu->fd,0 );TEST_ASSERT (vcpu->state !=MAP_FAILED ,"mmap vcpu_state failed, " "vcpu id: %u errno: %i" , vcpuid, errno);Signature · 1 line
2.30.0.478.g8a0d178c01-goog
Sean Christopherson
reviewerQuoted 8 lines · Aaron Lewis
The vcpu mmap area may consist of more than just the
kvm_runstruct. Allocate enough space for the entire vcpu mmap area. Without this, on x86, the PIO page, for example, will be missing. This is problematic when dealing with an unhandled exception from the guest as the exception vector will be incorrectly reported as0x0.Signed-off-by Aaron Lewis <[email protected]>Signed-off-by Steve Rutherford <[email protected]>
Assuming Steve is the Co-author, this needs Co-developed-by. And your SOB should come after Steve's since, by virtue of sending the actual email, you're the most recent handler of the patch. See 'When to use Acked-by:, Cc:, and Co-developed-by:' in Documentation/process/submitting-patches.rst.
tools/testing/selftests/kvm/lib/kvm_util.c line 24
Quoted 13 lines
--- tools/testing/selftests/kvm/lib/kvm_util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/lib/kvm_util.c +1
-0@@ -21,6 +21,8 @@#define KVM_UTIL_PGS_PER_HUGEPG 512#define KVM_UTIL_MIN_PFN 2 +static int vcpu_mmap_sz (void );
I'd vote to hoist the helper up instead of adding a forward declaration, but either way works.
Quoted 25 lines
tools/testing/selftests/kvm/lib/kvm_util.c +3
-2+/* Aligns x up to the next multiple of size. Size must be a power of 2. */ static void *align (void *x,size_t size) {@@ -509,7 +511,7 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu) vcpu->dirty_gfns =NULL ; } - ret =munmap (vcpu->state,sizeof (*vcpu->state)); + ret =munmap (vcpu->state,vcpu_mmap_sz ());TEST_ASSERT (ret ==0 ,"munmap of VCPU fd failed, rc: %i " "errno: %i" , ret, errno);close (vcpu->fd);@@ -978,7 +980,7 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid)TEST_ASSERT (vcpu_mmap_sz () >=sizeof (*vcpu->state),"vcpu mmap size " "smaller than expected, vcpu_mmap_sz: %i expected_min: %zi" ,vcpu_mmap_sz (),sizeof (*vcpu->state)); - vcpu->state = (struct kvm_run *)mmap (NULL ,sizeof (*vcpu->state), + vcpu->state = (struct kvm_run *)mmap (NULL ,vcpu_mmap_sz (),PROT_READ |PROT_WRITE ,MAP_SHARED , vcpu->fd,0 );TEST_ASSERT (vcpu->state !=MAP_FAILED ,"mmap vcpu_state failed, " "vcpu id: %u errno: %i" , vcpuid, errno);Signature · 1 line
2.30.0.478.g8a0d178c01-goog
Paolo Bonzini
maintainerQuoted 36 lines · Aaron Lewis
The vcpu mmap area may consist of more than just the
kvm_runstruct. Allocate enough space for the entire vcpu mmap area. Without this, on x86, the PIO page, for example, will be missing. This is problematic when dealing with an unhandled exception from the guest as the exception vector will be incorrectly reported as0x0.Signed-off-by Aaron Lewis <[email protected]>Signed-off-by Steve Rutherford <[email protected]>--- tools/testing/selftests/kvm/lib/kvm_util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/lib/kvm_util.c +3
-1@@ -21,6 +21,8 @@#define KVM_UTIL_PGS_PER_HUGEPG 512#define KVM_UTIL_MIN_PFN 2 +static int vcpu_mmap_sz (void ); +/* Aligns x up to the next multiple of size. Size must be a power of 2. */ static void *align (void *x,size_t size) {@@ -509,7 +511,7 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu) vcpu->dirty_gfns =NULL ; } - ret =munmap (vcpu->state,sizeof (*vcpu->state)); + ret =munmap (vcpu->state,vcpu_mmap_sz ());TEST_ASSERT (ret ==0 ,"munmap of VCPU fd failed, rc: %i " "errno: %i" , ret, errno);close (vcpu->fd);
tools/testing/selftests/kvm/lib/kvm_util.c void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid) · line 986
Quoted 8 lines
tools/testing/selftests/kvm/lib/kvm_util.c +1
-1@@ -978,7 +980,7 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid)TEST_ASSERT (vcpu_mmap_sz () >=sizeof (*vcpu->state),"vcpu mmap size " "smaller than expected, vcpu_mmap_sz: %i expected_min: %zi" ,vcpu_mmap_sz (),sizeof (*vcpu->state)); - vcpu->state = (struct kvm_run *)mmap (NULL ,sizeof (*vcpu->state), + vcpu->state = (struct kvm_run *)mmap (NULL ,vcpu_mmap_sz (),PROT_READ |PROT_WRITE ,MAP_SHARED , vcpu->fd,0 );TEST_ASSERT (vcpu->state !=MAP_FAILED ,"mmap vcpu_state failed, " "vcpu id: %u errno: %i" , vcpuid, errno);
Queued, with SoB chain fixed as suggested by Sean.
Paolo