[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/11] vfio/common: Fix a small boundary issue of a trace
From: |
Alex Williamson |
Subject: |
[PULL 06/11] vfio/common: Fix a small boundary issue of a trace |
Date: |
Fri, 06 May 2022 14:48:27 -0600 |
User-agent: |
StGit/1.0-8-g6af9-dirty |
From: Xiang Chen <chenxiang66@hisilicon.com>
It uses [offset, offset + size - 1] to indicate that the length of range is
size in most places in vfio trace code (such as
trace_vfio_region_region_mmap()) execpt trace_vfio_region_sparse_mmap_entry().
So change it for trace_vfio_region_sparse_mmap_entry(), but if size is zero,
the trace will be weird with an underflow, so move the trace and trace it
only if size is not zero.
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Link:
https://lore.kernel.org/r/1650100104-130737-1-git-send-email-chenxiang66@hisilicon.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/vfio/common.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 2b1f78fdfaeb..6065834717eb 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1544,11 +1544,10 @@ static int vfio_setup_region_sparse_mmaps(VFIORegion
*region,
region->mmaps = g_new0(VFIOMmap, sparse->nr_areas);
for (i = 0, j = 0; i < sparse->nr_areas; i++) {
- trace_vfio_region_sparse_mmap_entry(i, sparse->areas[i].offset,
- sparse->areas[i].offset +
- sparse->areas[i].size);
-
if (sparse->areas[i].size) {
+ trace_vfio_region_sparse_mmap_entry(i, sparse->areas[i].offset,
+ sparse->areas[i].offset +
+ sparse->areas[i].size - 1);
region->mmaps[j].offset = sparse->areas[i].offset;
region->mmaps[j].size = sparse->areas[i].size;
j++;
- [PULL 00/11] Series short description, Alex Williamson, 2022/05/06
- [PULL 01/11] vfio: simplify the conditional statements in vfio_msi_enable, Alex Williamson, 2022/05/06
- [PULL 02/11] vfio: move re-enabling INTX out of the common helper, Alex Williamson, 2022/05/06
- [PULL 03/11] vfio: simplify the failure path in vfio_msi_enable, Alex Williamson, 2022/05/06
- [PULL 04/11] Revert "vfio: Avoid disabling and enabling vectors repeatedly in VFIO migration", Alex Williamson, 2022/05/06
- [PULL 05/11] vfio: defer to commit kvm irq routing when enable msi/msix, Alex Williamson, 2022/05/06
- [PULL 06/11] vfio/common: Fix a small boundary issue of a trace,
Alex Williamson <=
- [PULL 07/11] sysemu: tpm: Add a stub function for TPM_IS_CRB, Alex Williamson, 2022/05/06
- [PULL 08/11] vfio/common: remove spurious tpm-crb-cmd misalignment warning, Alex Williamson, 2022/05/06
- [PULL 09/11] hw/vfio/pci: fix vfio_pci_hot_reset_result trace point, Alex Williamson, 2022/05/06
- [PULL 10/11] vfio/pci: Use vbasedev local variable in vfio_realize(), Alex Williamson, 2022/05/06
- [PULL 11/11] vfio/common: Rename VFIOGuestIOMMU::iommu into ::iommu_mr, Alex Williamson, 2022/05/06
- Re: [PULL 00/11] Series short description, Richard Henderson, 2022/05/06