s390x/pci: some pcistb fixes
cover s390x/pci: some pcistb fixes
Here are a few fixes pulled out of the 'Fixing s390 vfio-pci ISM support' patchset.
Matthew Rosato (2):
s390x/pci: fix pcistb length
s390x/pci: Fix memory_region_access_valid call
hw/s390x/s390-pci-inst.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/2 s390x/pci: fix pcistb length
In pcistb_service_call, we are grabbing 8 bits from a guest register to indicate the length of the store operation -- but per the architecture the length is actually defined by 13 bits of the guest register.
--- hw/s390x/s390-pci-inst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/s390x/s390-pci-inst.c +2 -2
@@ -755,7 +755,7 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr,int i;uint32_t fh;uint8_t pcias; -uint8_t len; +uint16_t len;uint8_t buffer[128 ];if (env->psw.mask &PSW_MASK_PSTATE ) {
@@ -765,7 +765,7 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr, fh = env->regs[r1] >>32 ; pcias = (env->regs[r1] >>16 ) &0xf ; - len = env->regs[r1] &0xff ; + len = env->regs[r1] &0x1fff ; offset = env->regs[r3];if (!(fh &FH_MASK_ENABLE )) {
Signature · 1 line
1.8.3.1
PATCH 2/2 s390x/pci: Fix memory_region_access_valid call
In reply to Matthew RosatoIn pcistb_service_handler, a call is made to validate that the memory region can be accessed. However, the call is made using the entire length of the pcistb operation, which can be larger than the allowed memory access size (8). Since we already know that the provided buffer is a multiple of 8, fix the call to memory_region_access_valid to iterate over the memory region in the same way as the subsequent call to memory_region_dispatch_write.
--- hw/s390x/s390-pci-inst.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
hw/s390x/s390-pci-inst.c +6 -4
@@ -821,10 +821,12 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr, mr =s390_get_subregion (mr, offset, len); offset -= mr->addr; -if (!memory_region_access_valid (mr, offset, len, true, -MEMTXATTRS_UNSPECIFIED )) { -s390_program_interrupt (env,PGM_OPERAND , ra); -return 0 ; +for (i =0 ; i < len /8 ; i++) { +if (!memory_region_access_valid (mr, offset + i *8 ,8 , true, +MEMTXATTRS_UNSPECIFIED )) { +s390_program_interrupt (env,PGM_OPERAND , ra); +return 0 ; + } }if (s390_cpu_virt_mem_read (cpu, gaddr, ar, buffer, len)) {
Signature · 1 line
1.8.3.1
Re: [PATCH 2/2] s390x/pci: Fix memory_region_access_valid call
Quoted 19 lines · Matthew Rosato
In
pcistb_service_handler, a call is made to validate that the memory region can be accessed. However, the call is made using the entire length of the pcistb operation, which can be larger than the allowed memory access size (8). Since we already know that the provided buffer is a multiple of 8, fix the call tomemory_region_access_validto iterate over the memory region in the same way as the subsequent call tomemory_region_dispatch_write.Fixes 863f6f52b7 ("s390: implement pci instructions")Signed-off-by Matthew Rosato <[email protected]>--- hw/s390x/s390-pci-inst.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)hw/s390x/s390-pci-inst.c +0
-0
hw/s390x/s390-pci-inst.c int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr, · line 824
Quoted 8 lines
hw/s390x/s390-pci-inst.c +1
-4@@ -821,10 +821,12 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr, mr =s390_get_subregion (mr, offset, len); offset -= mr->addr; -if (!memory_region_access_valid (mr, offset, len, true, -MEMTXATTRS_UNSPECIFIED )) { -s390_program_interrupt (env,PGM_OPERAND , ra); -return 0 ; +for (i =0 ; i < len /8 ; i++) {
You could also do:
for (i = 0; i < len; i += 8)
then you don't have to multiply by 8 in the line below anymore.
hw/s390x/s390-pci-inst.c int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr, · line 830
Quoted 6 lines
hw/s390x/s390-pci-inst.c +5
-0+if (!memory_region_access_valid (mr, offset + i *8 ,8 , true, +MEMTXATTRS_UNSPECIFIED )) { +s390_program_interrupt (env,PGM_OPERAND , ra); +return 0 ; + } }
Anyway: