iommu: amd: Fix IOMMU perf counter clobbering during init
PATCH 1/1 iommu: amd: Fix IOMMU perf counter clobbering during init
init_iommu_perf_ctr() clobbers the register when it checks write access to IOMMU perf counters and fails to restore when they are writable.
Add save and restore to fix it.
--- drivers/iommu/amd_iommu_init.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/iommu/amd_iommu_init.c +16 -6
@@ -1655,27 +1655,37 @@ static int iommu_pc_get_set_reg(struct amd_iommu *iommu, u8 bank, u8 cntr,static void init_iommu_perf_ctr (struct amd_iommu *iommu) {struct pci_dev *pdev = iommu->dev; -u64 val =0xabcd , val2 =0 ; +u64 val =0xabcd , val2 =0 , save_reg =0 ;if (!iommu_feature (iommu,FEATURE_PC ))return ; amd_iommu_pc_present = true; +/* save the value to restore, if writable */ +if (iommu_pc_get_set_reg (iommu,0 ,0 ,0 , &save_reg, false)) + goto pc_false; +/* Check if the performance counters can be written to */ if ((iommu_pc_get_set_reg (iommu,0 ,0 ,0 , &val, true)) || (iommu_pc_get_set_reg (iommu,0 ,0 ,0 , &val2, false)) || - (val != val2)) { -pci_err (pdev,"Unable to write to IOMMU perf counter.\n" ); - amd_iommu_pc_present = false; -return ; - } + (val != val2)) + goto pc_false; + +/* restore */ +if (iommu_pc_get_set_reg (iommu,0 ,0 ,0 , &save_reg, true)) + goto pc_false;pci_info (pdev,"IOMMU performance counters supported\n" ); val =readl (iommu->mmio_base +MMIO_CNTR_CONF_OFFSET ); iommu->max_banks = (u8) ((val >>12 ) &0x3f ); iommu->max_counters = (u8) ((val >>7 ) &0xf ); + +pc_false: +pci_err (pdev,"Unable to read/write to IOMMU perf counter.\n" ); + amd_iommu_pc_present = false; +return ; } static ssize_t amd_iommu_show_cap(struct device *dev,
Signature · 1 line
2.20.1
Joerg Roedel
maintainerAdding Suravee, who wrote the IOMMU Perf Counter code.
Quoted 9 lines · Shuah Khan
init_iommu_perf_ctr()clobbers the register when it checks write access to IOMMU perf counters and fails to restore when they are writable.Add save and restore to fix it.
Signed-off-by Shuah Khan <[email protected]>--- drivers/iommu/amd_iommu_init.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
Suravee, can you please review this patch?
Quoted 51 lines
drivers/iommu/amd_iommu_init.c +16
-6@@ -1655,27 +1655,37 @@ static int iommu_pc_get_set_reg(struct amd_iommu *iommu, u8 bank, u8 cntr,static void init_iommu_perf_ctr (struct amd_iommu *iommu) {struct pci_dev *pdev = iommu->dev; -u64 val =0xabcd , val2 =0 ; +u64 val =0xabcd , val2 =0 , save_reg =0 ;if (!iommu_feature (iommu,FEATURE_PC ))return ; amd_iommu_pc_present = true; +/* save the value to restore, if writable */ +if (iommu_pc_get_set_reg (iommu,0 ,0 ,0 , &save_reg, false)) + goto pc_false; +/* Check if the performance counters can be written to */ if ((iommu_pc_get_set_reg (iommu,0 ,0 ,0 , &val, true)) || (iommu_pc_get_set_reg (iommu,0 ,0 ,0 , &val2, false)) || - (val != val2)) { -pci_err (pdev,"Unable to write to IOMMU perf counter.\n" ); - amd_iommu_pc_present = false; -return ; - } + (val != val2)) + goto pc_false; + +/* restore */ +if (iommu_pc_get_set_reg (iommu,0 ,0 ,0 , &save_reg, true)) + goto pc_false;pci_info (pdev,"IOMMU performance counters supported\n" ); val =readl (iommu->mmio_base +MMIO_CNTR_CONF_OFFSET ); iommu->max_banks = (u8) ((val >>12 ) &0x3f ); iommu->max_counters = (u8) ((val >>7 ) &0xf ); + +pc_false: +pci_err (pdev,"Unable to read/write to IOMMU perf counter.\n" ); + amd_iommu_pc_present = false; +return ; } static ssize_t amd_iommu_show_cap(struct device *dev,Signature · 1 line
2.20.1
Suravee Suthikulpanit
Reviewed-byQuoted 6 lines · Joerg Roedel
Adding Suravee, who wrote the IOMMU Perf Counter code.
Quoted 3 lines · Shuah Khan
init_iommu_perf_ctr()clobbers the register when it checks write access to IOMMU perf counters and fails to restore when they are writable.
Quoted 8 lines
Quoted 6 lines
Add save and restore to fix it.
Signed-off-by Shuah Khan<[email protected]>--- drivers/iommu/amd_iommu_init.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)Suravee, can you please review this patch?
This looks ok. Does this fix certain issues? Or is this just for sanity.
Thanks,
Suravee
Quoted 9 lines · Suravee Suthikulpanit
Quoted 8 lines · Joerg Roedel
Adding Suravee, who wrote the IOMMU Perf Counter code.
Quoted 5 lines · Shuah Khan
init_iommu_perf_ctr()clobbers the register when it checks write access to IOMMU perf counters and fails to restore when they are writable.Add save and restore to fix it.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Signed-off-by Shuah Khan<[email protected]>---
drivers/iommu/amd_iommu_init.c| 22 ++++++++++++++++------1 file changed, 16 insertions(+), 6 deletions(-)Suravee, can you please review this patch?
This looks ok. Does this fix certain issues? Or is this just for sanity.
I didn't notice any problems. Counters aren't writable on my system. However, it certainly looks like a bog since registers aren't restored like in other places in this file where such checks are done on other registers.
I see 2 banks and 4 counters on my system. Is it sufficient to check the first bank and first counter? In other words, if the first one isn't writable, are all counters non-writable?
Should we read the config first and then, try to see if any of the counters are writable? I have a patch that does that, I can send it out for review.
Quoted 2 lines
Reviewed-by Suravee Suthikulpanit <[email protected]>
Thanks for the review.
thanks,
-- Shuah
Quoted 24 lines · Shuah Khan
Quoted 9 lines · Suravee Suthikulpanit
Quoted 8 lines · Joerg Roedel
Adding Suravee, who wrote the IOMMU Perf Counter code.
Quoted 5 lines · Shuah Khan
init_iommu_perf_ctr()clobbers the register when it checks write access to IOMMU perf counters and fails to restore when they are writable.Add save and restore to fix it.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Signed-off-by Shuah Khan<[email protected]>---
drivers/iommu/amd_iommu_init.c| 22 ++++++++++++++++------1 file changed, 16 insertions(+), 6 deletions(-)Suravee, can you please review this patch?
This looks ok. Does this fix certain issues? Or is this just for sanity.
I didn't notice any problems. Counters aren't writable on my system. However, it certainly looks like a bog since registers aren't restored like in other places in this file where such checks are done on other registers.
Quoted 10 lines
I see 2 banks and 4 counters on my system. Is it sufficient to check the first bank and first counter? In other words, if the first one isn't writable, are all counters non-writable?
Should we read the config first and then, try to see if any of the counters are writable? I have a patch that does that, I can send it out for review.
Quoted 2 lines
Reviewed-by Suravee Suthikulpanit <[email protected]>
Joerg,
Please don't pull this in. I introduced a bug in this patch. It always returns amd_iommu_pc_present false even when it can write to the counters. My bad.
I will send v2.
thanks,
-- Shuah