Skip to contentSkip to conversation

vfio/common: remove spurious tpm-crb-cmd misalignment warning

PATCH Superseded Eric Auger 4 participants 8 messages Apr 28, 2022 – May 6, 2022

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Eric Auger

author
#0 lore raw

PATCH v4 1/1 vfio/common: remove spurious tpm-crb-cmd misalignment warning

The CRB command buffer currently is a RAM MemoryRegion and given its base address alignment, it causes an error report on vfio_listener_region_add(). This region could have been a RAM device region, easing the detection of such safe situation but this option was not well received. So let's add a helper function that uses the memory region owner type to detect the situation is safe wrt the assignment. Other device types can be checked here if such kind of problem occurs again.

---

v3 -> v4:
- rebase on top of qemu_real_host_page_size() and qemu_real_host_page_size(). Print the size and make the message consistent
- Added Stefan's A-b and Connie R-b (despite the changes)

---
 hw/vfio/common.c     | 27 ++++++++++++++++++++++++++-
 hw/vfio/trace-events |  1 +
 2 files changed, 27 insertions(+), 1 deletion(-)
hw/vfio/common.c +26 -1
index 2b1f78fdfa..f6b9bb6d71 100644
@@ -40,6 +40,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "migration/migration.h"
+#include "sysemu/tpm.h"
 
 VFIOGroupList vfio_group_list =
     QLIST_HEAD_INITIALIZER(vfio_group_list);
@@ -861,6 +862,22 @@ static void vfio_unregister_ram_discard_listener(VFIOContainer *container,
     g_free(vrdl);
 }
 
+static bool vfio_known_safe_misalignment(MemoryRegionSection *section)
+{
+    MemoryRegion *mr = section->mr;
+
+    if (!TPM_IS_CRB(mr->owner)) {
+        return false;
+    }
+
+    /* this is a known safe misaligned region, just trace for debug purpose */
+    trace_vfio_known_safe_misalignment(memory_region_name(mr),
+                                       section->offset_within_address_space,
+                                       section->offset_within_region,
+                                       qemu_real_host_page_size());
+    return true;
+}
+
 static void vfio_listener_region_add(MemoryListener *listener,
                                      MemoryRegionSection *section)
 {
@@ -884,7 +901,15 @@ static void vfio_listener_region_add(MemoryListener *listener,
     if (unlikely((section->offset_within_address_space &
                   ~qemu_real_host_page_mask()) !=
                  (section->offset_within_region & ~qemu_real_host_page_mask()))) {
-        error_report("%s received unaligned region", __func__);
+        if (!vfio_known_safe_misalignment(section)) {
+            error_report("%s received unaligned region %s iova=0x%"PRIx64
+                         " offset_within_region=0x%"PRIx64
+                         " qemu_real_host_page_size=0x%"PRIxPTR,
+                         __func__, memory_region_name(section->mr),
+                         section->offset_within_address_space,
+                         section->offset_within_region,
+                         qemu_real_host_page_size());
+        }
         return;
     }
 
hw/vfio/trace-events +1 -0
index 0ef1b5f4a6..582882db91 100644
@@ -100,6 +100,7 @@ vfio_listener_region_add_skip(uint64_t start, uint64_t end) "SKIPPING region_add
 vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to liobn fd %d"
 vfio_listener_region_add_iommu(uint64_t start, uint64_t end) "region_add [iommu] 0x%"PRIx64" - 0x%"PRIx64
 vfio_listener_region_add_ram(uint64_t iova_start, uint64_t iova_end, void *vaddr) "region_add [ram] 0x%"PRIx64" - 0x%"PRIx64" [%p]"
+vfio_known_safe_misalignment(const char *name, uint64_t iova, uint64_t offset_within_region, uintptr_t page_size) "Region \"%s\" iova=0x%"PRIx64" offset_within_region=0x%"PRIx64" qemu_real_host_page_size=0x%"PRIxPTR ": cannot be mapped for DMA"
 vfio_listener_region_add_no_dma_map(const char *name, uint64_t iova, uint64_t size, uint64_t page_size) "Region \"%s\" 0x%"PRIx64" size=0x%"PRIx64" is not aligned to 0x%"PRIx64" and cannot be mapped for DMA"
 vfio_listener_region_del_skip(uint64_t start, uint64_t end) "SKIPPING region_del 0x%"PRIx64" - 0x%"PRIx64
 vfio_listener_region_del(uint64_t start, uint64_t end) "region_del 0x%"PRIx64" - 0x%"PRIx64
Signature · 1 line
2.34.1
#1 lore raw
Quoted 14 lines · Eric Auger

The CRB command buffer currently is a RAM MemoryRegion and given its base address alignment, it causes an error report on vfio_listener_region_add(). This region could have been a RAM device region, easing the detection of such safe situation but this option was not well received. So let's add a helper function that uses the memory region owner type to detect the situation is safe wrt the assignment. Other device types can be checked here if such kind of problem occurs again.

Quoted 7 lines

---

v3 -> v4:
- rebase on top of qemu_real_host_page_size() and qemu_real_host_page_size(). Print the size and make the message consistent
- Added Stefan's A-b and Connie R-b (despite the changes)

Still fine with me.

Quoted 4 lines
---
 hw/vfio/common.c     | 27 ++++++++++++++++++++++++++-
 hw/vfio/trace-events |  1 +
 2 files changed, 27 insertions(+), 1 deletion(-)
#2 lore raw
In reply to Eric Auger
Quoted 39 lines · On Thu, 28 Apr 2022 15:49:45 +0200 Eric Auger <[email protected]> wrote:

The CRB command buffer currently is a RAM MemoryRegion and given its base address alignment, it causes an error report on vfio_listener_region_add(). This region could have been a RAM device region, easing the detection of such safe situation but this option was not well received. So let's add a helper function that uses the memory region owner type to detect the situation is safe wrt the assignment. Other device types can be checked here if such kind of problem occurs again.

---

v3 -> v4:
- rebase on top of qemu_real_host_page_size() and qemu_real_host_page_size(). Print the size and make the message consistent
- Added Stefan's A-b and Connie R-b (despite the changes)

---
 hw/vfio/common.c     | 27 ++++++++++++++++++++++++++-
 hw/vfio/trace-events |  1 +
 2 files changed, 27 insertions(+), 1 deletion(-)
hw/vfio/common.c +1 -0
index 2b1f78fdfa..f6b9bb6d71 100644
@@ -40,6 +40,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "migration/migration.h"
+#include "sysemu/tpm.h"
 
 VFIOGroupList vfio_group_list =
     QLIST_HEAD_INITIALIZER(vfio_group_list);

hw/vfio/common.c static void vfio_unregister_ram_discard_listener(VFIOContainer *container, · line 871

Quoted 10 lines
hw/vfio/common.c +7 -0
@@ -861,6 +862,22 @@ static void vfio_unregister_ram_discard_listener(VFIOContainer *container,
     g_free(vrdl);
 }
 
+static bool vfio_known_safe_misalignment(MemoryRegionSection *section)
+{
+    MemoryRegion *mr = section->mr;
+
+    if (!TPM_IS_CRB(mr->owner)) {
+        return false;
+    }

It looks like this test is going to need to be wrapped in #ifdef CONFIG_TPM:

https://gitlab.com/alex.williamson/qemu/-/jobs/2391952412

Thanks,

Alex

Quoted 41 lines
hw/vfio/common.c +18 -1
+
+    /* this is a known safe misaligned region, just trace for debug purpose */
+    trace_vfio_known_safe_misalignment(memory_region_name(mr),
+                                       section->offset_within_address_space,
+                                       section->offset_within_region,
+                                       qemu_real_host_page_size());
+    return true;
+}
+
 static void vfio_listener_region_add(MemoryListener *listener,
                                      MemoryRegionSection *section)
 {
@@ -884,7 +901,15 @@ static void vfio_listener_region_add(MemoryListener *listener,
     if (unlikely((section->offset_within_address_space &
                   ~qemu_real_host_page_mask()) !=
                  (section->offset_within_region & ~qemu_real_host_page_mask()))) {
-        error_report("%s received unaligned region", __func__);
+        if (!vfio_known_safe_misalignment(section)) {
+            error_report("%s received unaligned region %s iova=0x%"PRIx64
+                         " offset_within_region=0x%"PRIx64
+                         " qemu_real_host_page_size=0x%"PRIxPTR,
+                         __func__, memory_region_name(section->mr),
+                         section->offset_within_address_space,
+                         section->offset_within_region,
+                         qemu_real_host_page_size());
+        }
         return;
     }
 
hw/vfio/trace-events +1 -0
index 0ef1b5f4a6..582882db91 100644
@@ -100,6 +100,7 @@ vfio_listener_region_add_skip(uint64_t start, uint64_t end) "SKIPPING region_add
 vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to liobn fd %d"
 vfio_listener_region_add_iommu(uint64_t start, uint64_t end) "region_add [iommu] 0x%"PRIx64" - 0x%"PRIx64
 vfio_listener_region_add_ram(uint64_t iova_start, uint64_t iova_end, void *vaddr) "region_add [ram] 0x%"PRIx64" - 0x%"PRIx64" [%p]"
+vfio_known_safe_misalignment(const char *name, uint64_t iova, uint64_t offset_within_region, uintptr_t page_size) "Region \"%s\" iova=0x%"PRIx64" offset_within_region=0x%"PRIx64" qemu_real_host_page_size=0x%"PRIxPTR ": cannot be mapped for DMA"
 vfio_listener_region_add_no_dma_map(const char *name, uint64_t iova, uint64_t size, uint64_t page_size) "Region \"%s\" 0x%"PRIx64" size=0x%"PRIx64" is not aligned to 0x%"PRIx64" and cannot be mapped for DMA"
 vfio_listener_region_del_skip(uint64_t start, uint64_t end) "SKIPPING region_del 0x%"PRIx64" - 0x%"PRIx64
 vfio_listener_region_del(uint64_t start, uint64_t end) "region_del 0x%"PRIx64" - 0x%"PRIx64
author
#3 lore raw

Hi Alex,

Quoted 45 lines · Alex Williamson
Quoted 42 lines · On Thu, 28 Apr 2022 15:49:45 +0200 Eric Auger <[email protected]> wrote:

The CRB command buffer currently is a RAM MemoryRegion and given its base address alignment, it causes an error report on vfio_listener_region_add(). This region could have been a RAM device region, easing the detection of such safe situation but this option was not well received. So let's add a helper function that uses the memory region owner type to detect the situation is safe wrt the assignment. Other device types can be checked here if such kind of problem occurs again.

---

v3 -> v4:
- rebase on top of qemu_real_host_page_size() and qemu_real_host_page_size(). Print the size and make the message consistent
- Added Stefan's A-b and Connie R-b (despite the changes)

---
 hw/vfio/common.c     | 27 ++++++++++++++++++++++++++-
 hw/vfio/trace-events |  1 +
 2 files changed, 27 insertions(+), 1 deletion(-)
hw/vfio/common.c +1 -0
index 2b1f78fdfa..f6b9bb6d71 100644
@@ -40,6 +40,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "migration/migration.h"
+#include "sysemu/tpm.h"
 
 VFIOGroupList vfio_group_list =
     QLIST_HEAD_INITIALIZER(vfio_group_list);
@@ -861,6 +862,22 @@ static void vfio_unregister_ram_discard_listener(VFIOContainer *container,
     g_free(vrdl);
 }
 
Quoted 9 lines

hw/vfio/common.c static void vfio_unregister_ram_discard_listener(VFIOContainer *container, · line 871

Quoted 7 lines
hw/vfio/common.c +7 -0
+static bool vfio_known_safe_misalignment(MemoryRegionSection *section)
+{
+    MemoryRegion *mr = section->mr;
+
+    if (!TPM_IS_CRB(mr->owner)) {
+        return false;
+    }

It looks like this test is going to need to be wrapped in #ifdef CONFIG_TPM:

sorry for the delay. Your message fell though the cracks :-(

if I put an '#ifdef CONFIG_TPM' I need to inverse the logic because by default the function shall return false.

solution #1

#ifdef CONFIG_TPM
 if (TPM_IS_CRB(mr->owner)) {

    /* this is a known safe misaligned region, just trace for debug purpose */
    trace_vfio_known_safe_misalignment(memory_region_name(mr),
                                       section->offset_within_address_space,
                                       section->offset_within_region,
                                       qemu_real_host_page_size());

    return true;

}

#endif
return false;

This looks weird to me.

+ if (!object_dynamic_cast(mr->owner, TYPE_TPM_CRB)) {
+ return false;
+ }

solution #2
replace !object_dynamic_cast(mr->owner, TYPE_TPM_CRB) by !object_dynamic_cast(mr->owner, "tpm-crb")
and add a comment saying that we don't use TYPE_TPM_CRB on purpose

solution #3
Move #define TPM_IS_CRB(chr) and related defined out of #ifdef CONFIG_TPM hoping it does not have other side effects

Thoughts?
Eric

Quoted 48 lines

https://gitlab.com/alex.williamson/qemu/-/jobs/2391952412

Thanks,

Alex

Quoted 41 lines
hw/vfio/common.c +18 -1
+
+    /* this is a known safe misaligned region, just trace for debug purpose */
+    trace_vfio_known_safe_misalignment(memory_region_name(mr),
+                                       section->offset_within_address_space,
+                                       section->offset_within_region,
+                                       qemu_real_host_page_size());
+    return true;
+}
+
 static void vfio_listener_region_add(MemoryListener *listener,
                                      MemoryRegionSection *section)
 {
@@ -884,7 +901,15 @@ static void vfio_listener_region_add(MemoryListener *listener,
     if (unlikely((section->offset_within_address_space &
                   ~qemu_real_host_page_mask()) !=
                  (section->offset_within_region & ~qemu_real_host_page_mask()))) {
-        error_report("%s received unaligned region", __func__);
+        if (!vfio_known_safe_misalignment(section)) {
+            error_report("%s received unaligned region %s iova=0x%"PRIx64
+                         " offset_within_region=0x%"PRIx64
+                         " qemu_real_host_page_size=0x%"PRIxPTR,
+                         __func__, memory_region_name(section->mr),
+                         section->offset_within_address_space,
+                         section->offset_within_region,
+                         qemu_real_host_page_size());
+        }
         return;
     }
 
hw/vfio/trace-events +1 -0
index 0ef1b5f4a6..582882db91 100644
@@ -100,6 +100,7 @@ vfio_listener_region_add_skip(uint64_t start, uint64_t end) "SKIPPING region_add
 vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to liobn fd %d"
 vfio_listener_region_add_iommu(uint64_t start, uint64_t end) "region_add [iommu] 0x%"PRIx64" - 0x%"PRIx64
 vfio_listener_region_add_ram(uint64_t iova_start, uint64_t iova_end, void *vaddr) "region_add [ram] 0x%"PRIx64" - 0x%"PRIx64" [%p]"
+vfio_known_safe_misalignment(const char *name, uint64_t iova, uint64_t offset_within_region, uintptr_t page_size) "Region \"%s\" iova=0x%"PRIx64" offset_within_region=0x%"PRIx64" qemu_real_host_page_size=0x%"PRIxPTR ": cannot be mapped for DMA"
 vfio_listener_region_add_no_dma_map(const char *name, uint64_t iova, uint64_t size, uint64_t page_size) "Region \"%s\" 0x%"PRIx64" size=0x%"PRIx64" is not aligned to 0x%"PRIx64" and cannot be mapped for DMA"
 vfio_listener_region_del_skip(uint64_t start, uint64_t end) "SKIPPING region_del 0x%"PRIx64" - 0x%"PRIx64
 vfio_listener_region_del(uint64_t start, uint64_t end) "region_del 0x%"PRIx64" - 0x%"PRIx64
#4 lore raw
Quoted 50 lines · Eric Auger

Hi Alex,

Quoted 12 lines · Alex Williamson

hw/vfio/common.c static void vfio_unregister_ram_discard_listener(VFIOContainer *container, · line 871

Quoted 7 lines · On Thu, 28 Apr 2022 15:49:45 +0200 Eric Auger <[email protected]> wrote:
hw/vfio/common.c +7 -0
+static bool vfio_known_safe_misalignment(MemoryRegionSection *section)
+{
+    MemoryRegion *mr = section->mr;
+
+    if (!TPM_IS_CRB(mr->owner)) {
+        return false;
+    }

It looks like this test is going to need to be wrapped in #ifdef CONFIG_TPM:

sorry for the delay. Your message fell though the cracks :-(

if I put an '#ifdef CONFIG_TPM' I need to inverse the logic because by default the function shall return false.

solution #1

#ifdef CONFIG_TPM
 if (TPM_IS_CRB(mr->owner)) {

    /* this is a known safe misaligned region, just trace for debug purpose */
    trace_vfio_known_safe_misalignment(memory_region_name(mr),
                                       section->offset_within_address_space,
                                       section->offset_within_region,
                                       qemu_real_host_page_size());

    return true;

}

#endif
return false;

This looks weird to me.

hw/vfio/common.c +3 -0
+    if (!object_dynamic_cast(mr->owner, TYPE_TPM_CRB)) {
+        return false;
+    }

solution #2
replace !object_dynamic_cast(mr->owner, TYPE_TPM_CRB) by !object_dynamic_cast(mr->owner, "tpm-crb")
and add a comment saying that we don't use TYPE_TPM_CRB on purpose

Quoted 6 lines

solution #3
Move #define TPM_IS_CRB(chr) and related defined out of #ifdef CONFIG_TPM hoping it does not have other side effects

Thoughts?
Eric

solution #4

#ifndef CONFIG_TPM
/* needed for an alignment check in non-tpm code */ static inline Object *TPM_IS_CRB(Object *obj)

{
    return NULL;
}

#endif

I think it would be good if we could hide the configuration details in the header.

author
#5 lore raw

Hi Connie,

Quoted 61 lines · Cornelia Huck
Quoted 48 lines · Eric Auger

Hi Alex,

Quoted 11 lines · Alex Williamson

hw/vfio/common.c static void vfio_unregister_ram_discard_listener(VFIOContainer *container, · line 871

Quoted 7 lines · On Thu, 28 Apr 2022 15:49:45 +0200 Eric Auger <[email protected]> wrote:
hw/vfio/common.c +7 -0
+static bool vfio_known_safe_misalignment(MemoryRegionSection *section)
+{
+    MemoryRegion *mr = section->mr;
+
+    if (!TPM_IS_CRB(mr->owner)) {
+        return false;
+    }

It looks like this test is going to need to be wrapped in #ifdef CONFIG_TPM:

sorry for the delay. Your message fell though the cracks :-(

if I put an '#ifdef CONFIG_TPM' I need to inverse the logic because by default the function shall return false.

solution #1

#ifdef CONFIG_TPM
 if (TPM_IS_CRB(mr->owner)) {

    /* this is a known safe misaligned region, just trace for debug purpose */
    trace_vfio_known_safe_misalignment(memory_region_name(mr),
                                       section->offset_within_address_space,
                                       section->offset_within_region,
                                       qemu_real_host_page_size());

    return true;

}

#endif
return false;

This looks weird to me.

hw/vfio/common.c +3 -0
+    if (!object_dynamic_cast(mr->owner, TYPE_TPM_CRB)) {
+        return false;
+    }

solution #2
replace !object_dynamic_cast(mr->owner, TYPE_TPM_CRB) by !object_dynamic_cast(mr->owner, "tpm-crb")
and add a comment saying that we don't use TYPE_TPM_CRB on purpose

Quoted 6 lines

solution #3
Move #define TPM_IS_CRB(chr) and related defined out of #ifdef CONFIG_TPM hoping it does not have other side effects

Thoughts?
Eric

solution #4

#ifndef CONFIG_TPM
/* needed for an alignment check in non-tpm code */ static inline Object *TPM_IS_CRB(Object *obj)

Quoted 8 lines
{
    return NULL;
}

#endif

I think it would be good if we could hide the configuration details in the header.

Yep, I forgot to mention solution #3 also happened in include/sysemu/tpm.h. Connie, either we add your stub function or we move the following out of the #ifdef CONFIG_TPM. This should be harmless, no?
Stefan, any preference?

#define TYPE_TPM_TIS_ISA            "tpm-tis" #define TYPE_TPM_TIS_SYSBUS         "tpm-tis-device" #define TYPE_TPM_CRB                "tpm-crb" #define TYPE_TPM_SPAPR              "tpm-spapr"

#define TPM_IS_TIS_ISA(chr)                         \
    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA) #define TPM_IS_TIS_SYSBUS(chr)                      \
    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_SYSBUS) #define TPM_IS_CRB(chr)                             \
    object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB) #define TPM_IS_SPAPR(chr)                           \
    object_dynamic_cast(OBJECT(chr), TYPE_TPM_SPAPR)

Eric

#6 lore raw
Quoted 82 lines · Eric Auger

Hi Connie,

Quoted 61 lines · Cornelia Huck
Quoted 48 lines · Eric Auger

Hi Alex,

Quoted 11 lines · Alex Williamson

hw/vfio/common.c static void vfio_unregister_ram_discard_listener(VFIOContainer *container, · line 871

Quoted 7 lines · On Thu, 28 Apr 2022 15:49:45 +0200 Eric Auger <[email protected]> wrote:
hw/vfio/common.c +7 -0
+static bool vfio_known_safe_misalignment(MemoryRegionSection *section)
+{
+    MemoryRegion *mr = section->mr;
+
+    if (!TPM_IS_CRB(mr->owner)) {
+        return false;
+    }

It looks like this test is going to need to be wrapped in #ifdef CONFIG_TPM:

sorry for the delay. Your message fell though the cracks :-(

if I put an '#ifdef CONFIG_TPM' I need to inverse the logic because by default the function shall return false.

solution #1

#ifdef CONFIG_TPM
 if (TPM_IS_CRB(mr->owner)) {

    /* this is a known safe misaligned region, just trace for debug purpose */
    trace_vfio_known_safe_misalignment(memory_region_name(mr),
                                       section->offset_within_address_space,
                                       section->offset_within_region,
                                       qemu_real_host_page_size());

    return true;

}

#endif
return false;

This looks weird to me.

hw/vfio/common.c +3 -0
+    if (!object_dynamic_cast(mr->owner, TYPE_TPM_CRB)) {
+        return false;
+    }

solution #2
replace !object_dynamic_cast(mr->owner, TYPE_TPM_CRB) by !object_dynamic_cast(mr->owner, "tpm-crb")
and add a comment saying that we don't use TYPE_TPM_CRB on purpose

Quoted 6 lines

solution #3
Move #define TPM_IS_CRB(chr) and related defined out of #ifdef CONFIG_TPM hoping it does not have other side effects

Thoughts?
Eric

solution #4

#ifndef CONFIG_TPM
/* needed for an alignment check in non-tpm code */ static inline Object *TPM_IS_CRB(Object *obj)

Quoted 8 lines
{
    return NULL;
}

#endif

I think it would be good if we could hide the configuration details in the header.

Yep, I forgot to mention solution #3 also happened in include/sysemu/tpm.h. Connie, either we add your stub function or we move the following out of the #ifdef CONFIG_TPM. This should be harmless, no?
Stefan, any preference?

#define TYPE_TPM_TIS_ISA            "tpm-tis" #define TYPE_TPM_TIS_SYSBUS         "tpm-tis-device" #define TYPE_TPM_CRB                "tpm-crb" #define TYPE_TPM_SPAPR              "tpm-spapr"

Quoted 8 lines

#define TPM_IS_TIS_ISA(chr)                         \
    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA) #define TPM_IS_TIS_SYSBUS(chr)                      \
    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_SYSBUS) #define TPM_IS_CRB(chr)                             \
    object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB) #define TPM_IS_SPAPR(chr)                           \
    object_dynamic_cast(OBJECT(chr), TYPE_TPM_SPAPR)

If it's just those simple defines, I can't see how that could break things (you won't have the respective objects anyway). So yes, I think that is the best solution.

#7 lore raw
In reply to Cornelia Huck
Quoted 64 lines · Cornelia Huck
Quoted 50 lines · Eric Auger

Hi Alex,

Quoted 12 lines · Alex Williamson

hw/vfio/common.c static void vfio_unregister_ram_discard_listener(VFIOContainer *container, · line 871

Quoted 7 lines · On Thu, 28 Apr 2022 15:49:45 +0200 Eric Auger <[email protected]> wrote:
hw/vfio/common.c +7 -0
+static bool vfio_known_safe_misalignment(MemoryRegionSection *section)
+{
+    MemoryRegion *mr = section->mr;
+
+    if (!TPM_IS_CRB(mr->owner)) {
+        return false;
+    }

It looks like this test is going to need to be wrapped in #ifdef CONFIG_TPM:

sorry for the delay. Your message fell though the cracks :-(

if I put an '#ifdef CONFIG_TPM' I need to inverse the logic because by default the function shall return false.

solution #1

#ifdef CONFIG_TPM
 if (TPM_IS_CRB(mr->owner)) {

     /* this is a known safe misaligned region, just trace for debug purpose */
     trace_vfio_known_safe_misalignment(memory_region_name(mr),
                                        section->offset_within_address_space,
                                        section->offset_within_region,
                                        qemu_real_host_page_size());

     return true;
    }

#endif
return false;

This looks weird to me.

hw/vfio/common.c +3 -0
+    if (!object_dynamic_cast(mr->owner, TYPE_TPM_CRB)) {
+        return false;
+    }

solution #2
replace !object_dynamic_cast(mr->owner, TYPE_TPM_CRB) by !object_dynamic_cast(mr->owner, "tpm-crb")
and add a comment saying that we don't use TYPE_TPM_CRB on purpose

Quoted 6 lines

solution #3
Move #define TPM_IS_CRB(chr) and related defined out of #ifdef CONFIG_TPM hoping it does not have other side effects

Thoughts?
Eric

solution #4

#ifndef CONFIG_TPM
/* needed for an alignment check in non-tpm code */ static inline Object *TPM_IS_CRB(Object *obj)

Quoted 8 lines
{
     return NULL;
}

#endif

I think it would be good if we could hide the configuration details in the header.

Solution #4 looks good to me...