hw/i386/intel_iommu: Simplify vtd_find_as_from_bus_num() logic
PATCH v3 1/1 hw/i386/intel_iommu: Simplify vtd_find_as_from_bus_num() logic
The vtd_find_as_from_bus_num() function was introduced (in commit dbaabb25f) in a code format that could return an incorrect pointer, which was later fixed by commit a2e1cd41ccf.
We could have avoid this by writing the if() statement differently. Do it now, in case this function is re-used. The code is easier to review (harder to miss bugs).
---
Since v2: Re-worded commit description, patch sent without -w. Since v3: patch send without diff
This patch is easier to review with 'git-diff -w' (--ignore-all-space)
--- hw/i386/intel_iommu.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
hw/i386/intel_iommu.c +18 -16
@@ -987,24 +987,26 @@ static bool vtd_slpte_nonzero_rsvd(uint64_t slpte, uint32_t level)static VTDBus *vtd_find_as_from_bus_num (IntelIOMMUState *s,uint8_t bus_num) {VTDBus *vtd_bus = s->vtd_as_by_bus_num[bus_num]; -if (!vtd_bus) { -/* -* Iterate over the registered buses to find the one which -* currently hold this bus number, and update the bus_num -* lookup table: -*/ -GHashTableIter iter; +GHashTableIter iter; -g_hash_table_iter_init (&iter, s->vtd_as_by_busptr); -while (g_hash_table_iter_next (&iter,NULL , (void **)&vtd_bus)) { -if (pci_bus_num (vtd_bus->bus) == bus_num) { - s->vtd_as_by_bus_num[bus_num] = vtd_bus; -return vtd_bus; - } - } - vtd_bus =NULL ; +if (vtd_bus) { +return vtd_bus; } -return vtd_bus; + +/* +* Iterate over the registered buses to find the one which +* currently hold this bus number, and update the bus_num +* lookup table: +*/ +g_hash_table_iter_init (&iter, s->vtd_as_by_busptr); +while (g_hash_table_iter_next (&iter,NULL , (void **)&vtd_bus)) { +if (pci_bus_num (vtd_bus->bus) == bus_num) { + s->vtd_as_by_bus_num[bus_num] = vtd_bus; +return vtd_bus; + } + } + +return NULL ; }/* Given the @iova, get relevant @slptep. @slpte_level will be the last level
Signature · 1 line
2.21.1
Hi Philippe,
Quoted 4 lines · Philippe Mathieu-Daudé
The
vtd_find_as_from_bus_num()function was introduced (in commitdbaabb25f) in a code format that could return an incorrect pointer, which was later fixed by commita2e1cd41ccf.
We could have avoid this by writing theif()statement differently.
s/avoid/avoided
Quoted 19 lines
Do it now, in case this function is re-used. The code is easier to review (harder to miss bugs).
Reviewed-by Peter Xu <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Since v2: Re-worded commit description, patch sent without -w. Since v3: patch send without diffThis patch is easier to review with 'git-diff -w' (--ignore-all-space)
--- hw/i386/intel_iommu.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)hw/i386/intel_iommu.c +0
-0
hw/i386/intel_iommu.c static bool vtd_slpte_nonzero_rsvd(uint64_t slpte, uint32_t level) · line 993
Quoted 7 lines
hw/i386/intel_iommu.c +0
-4@@ -987,24 +987,26 @@ static bool vtd_slpte_nonzero_rsvd(uint64_t slpte, uint32_t level)static VTDBus *vtd_find_as_from_bus_num (IntelIOMMUState *s,uint8_t bus_num) {VTDBus *vtd_bus = s->vtd_as_by_bus_num[bus_num]; -if (!vtd_bus) { -/* -* Iterate over the registered buses to find the one which -* currently hold this bus number, and update the bus_num
s/hold/holds
hw/i386/intel_iommu.c static bool vtd_slpte_nonzero_rsvd(uint64_t slpte, uint32_t level) · line 994
Quoted 1 line
hw/i386/intel_iommu.c +0
-1-* lookup table:
I would change the comment that way
Iterate over the registered buses to find the one which currently holds this bus number and update the bus_num lookup table
Quoted 25 lines
hw/i386/intel_iommu.c +11
-11-*/ -GHashTableIter iter; +GHashTableIter iter; -g_hash_table_iter_init (&iter, s->vtd_as_by_busptr); -while (g_hash_table_iter_next (&iter,NULL , (void **)&vtd_bus)) { -if (pci_bus_num (vtd_bus->bus) == bus_num) { - s->vtd_as_by_bus_num[bus_num] = vtd_bus; -return vtd_bus; - } - } - vtd_bus =NULL ; +if (vtd_bus) { +return vtd_bus; } -return vtd_bus; + +/* +* Iterate over the registered buses to find the one which +* currently hold this bus number, and update the bus_num +* lookup table: +*/ +g_hash_table_iter_init (&iter, s->vtd_as_by_busptr); +while (g_hash_table_iter_next (&iter,NULL , (void **)&vtd_bus)) {
hw/i386/intel_iommu.c static bool vtd_slpte_nonzero_rsvd(uint64_t slpte, uint32_t level) · line 1012
Quoted 10 lines
hw/i386/intel_iommu.c +7
-0+if (pci_bus_num (vtd_bus->bus) == bus_num) { + s->vtd_as_by_bus_num[bus_num] = vtd_bus; +return vtd_bus; + } + } + +return NULL ; }/* Given the @iova, get relevant @slptep. @slpte_level will be the last level
Besides
Thanks
Eric