Skip to contentSkip to conversation

vtd/iommu: correct loglevel when check group divices

PATCH Superseded Tiejun Chen 2 participants 2 messages Sep 16, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vtd/iommu: correct loglevel when check group divices

Since commit 3848058e7dd6 (vtd/iommu: permit group devices to passthrough in relaxed mode) is introduced, we always print message as XENLOG_G_WARNING but its not correct in the case of strict mode. So here is making this message depending on the specific mode.

CC Yang Zhang <[email protected]>
CC Kevin Tian <[email protected]>
CC Jan Beulich <[email protected]>
CC Wei Liu <[email protected]>
---
 xen/drivers/passthrough/vtd/iommu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
xen/drivers/passthrough/vtd/iommu.c +2 -1
index 7b45bff..53aac18 100644
@@ -2314,10 +2314,11 @@ static int intel_iommu_assign_device(
         {
             bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED);
 
-            printk(XENLOG_G_WARNING VTDPREFIX
+            printk(XENLOG_GUEST "%s" VTDPREFIX
                    " It's %s to assign %04x:%02x:%02x.%u"
                    " with shared RMRR at %"PRIx64" for Dom%d.\n",
                    relaxed ? "risky" : "disallowed",
+                   relaxed ? XENLOG_WARNING : XENLOG_ERR,
                    seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
                    rmrr->base_address, d->domain_id);
             if ( !relaxed )
Signature · 1 line
1.9.1
#1 lore raw
Quoted 24 lines

From: Chen, Tiejun
Sent: Wednesday, September 16, 2015 9:00 AM

Since commit 3848058e7dd6 (vtd/iommu: permit group devices to passthrough in relaxed mode) is introduced, we always print message as XENLOG_G_WARNING but its not correct in the case of strict mode. So here is making this message depending on the specific mode.

CC Yang Zhang <[email protected]>
CC Kevin Tian <[email protected]>
CC Jan Beulich <[email protected]>
CC Wei Liu <[email protected]>
---
 xen/drivers/passthrough/vtd/iommu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
xen/drivers/passthrough/vtd/iommu.c +0 -0
index 7b45bff..53aac18 100644

xen/drivers/passthrough/vtd/iommu.c static int intel_iommu_assign_device( · line 2321

Quoted 9 lines
xen/drivers/passthrough/vtd/iommu.c +2 -1
@@ -2314,10 +2314,11 @@ static int intel_iommu_assign_device(
         {
             bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED);
 
-            printk(XENLOG_G_WARNING VTDPREFIX
+            printk(XENLOG_GUEST "%s" VTDPREFIX
                    " It's %s to assign %04x:%02x:%02x.%u"
                    " with shared RMRR at %"PRIx64" for Dom%d.\n",
                    relaxed ? "risky" : "disallowed",
+                   relaxed ? XENLOG_WARNING : XENLOG_ERR,

this line should be before risky/disallowed check.

Quoted 5 lines
xen/drivers/passthrough/vtd/iommu.c +0 -1
                    seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
                    rmrr->base_address, d->domain_id);
             if ( !relaxed )
--

1.9.1