Re: [PATCH] VT-d: improve RMRR validity checking

[Noboru Iwamatsu <n_iwamatsu@jp.fujitsu.com>]

[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]

Hi Weidong,

I re-send the DRHD-fix patch.

If DRHD does not have existent devices, ignore it.
If DRHD has both existent and non-existent devices, consider it invalid
and not register.

According to this patch and yours, my machine successfully booted
with vt-d enabled.

Signed-off-by: Noboru Iwamatsu <n_iwamatsu@jp.fujitsu.com>


> Keir Fraser wrote:
>> On 21/01/2010 10:19, "Weidong Han" <weidong.han@intel.com> wrote:
>>
>>>> Sorry this is typo.
>>>> I mean:
>>>> So, I think RMRR that has no-existent device is "invalid"
>>>> and whole RMRR should be ignored.
>>> looks reasonable.
>>>
>>> Keir, I Acks Noboru's rmrr patch. Or do you want us to merge them to one
>>> patch?
>>
>> Merge them up, re-send with both sign-off and acked-by all in one email.
>>
>> Thanks,
>> Keir
>>
> Sorry, I disagree with Noboru after thinking it again. If the RMRR has
> both no-existent device and also has existent devices in its scope, we
> should not ignore it because the existent devices under its scope will
> be impacted without the RMRR. so I suggest to print a warning instead of
> ignore it. Attached a patch for it.
>
> Signed-off-by: Weidong Han <weidong.han@intel.com>


[-- Attachment #2: vtd-drhd-fix-v2.patch --]
[-- Type: text/plain, Size: 1413 bytes --]

diff -r 2eee03873667 -r 65e84fc54aa5 xen/drivers/passthrough/vtd/dmar.c
--- a/xen/drivers/passthrough/vtd/dmar.c	Thu Jan 21 21:06:50 2010 +0900
+++ b/xen/drivers/passthrough/vtd/dmar.c	Thu Jan 21 20:58:12 2010 +0900
@@ -397,7 +397,42 @@
     if ( ret )
         xfree(dmaru);
     else
-        acpi_register_drhd_unit(dmaru);
+    {
+        u8 b, d, f;
+        int i, invalid_cnt = 0;
+
+        for ( i = 0; i < dmaru->scope.devices_cnt; i++ )
+        {
+            b = PCI_BUS(dmaru->scope.devices[i]);
+            d = PCI_SLOT(dmaru->scope.devices[i]);
+            f = PCI_FUNC(dmaru->scope.devices[i]);
+
+            if ( pci_device_detect(b, d, f) == 0 )
+            {
+                dprintk(XENLOG_WARNING VTDPREFIX,
+                    "  Non-existent device (%x:%x.%x) is reported "
+                    "in DRHD's scope!\n",
+                    b, d, f);
+                invalid_cnt++;
+            }
+        }
+
+        if ( invalid_cnt )
+        {
+            xfree(dmaru);
+            if ( invalid_cnt == dmaru->scope.devices_cnt )
+            {
+                dprintk(XENLOG_WARNING VTDPREFIX,
+                "  Ignore the DRHD due to "
+                "devices under its scope are not PCI discoverable!\n");
+            }
+            else
+                ret = -EINVAL;
+        }
+        else
+            acpi_register_drhd_unit(dmaru);
+    }
+
     return ret;
 }
 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel