[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 17/17] IOMMU/x86: drop pointless NULL checks


  • To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Tue, 24 Aug 2021 16:27:37 +0200
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+5yL1useIB2A88uC4gSJ+juDvytPE+ii/83FY2OaNQ4=; b=LgbRTxjQGyBQ61/punqMJbPbTRxlpvsforoMzVB6OYDDQAx7gBFOZKUXDHFaMPUoWKfqQFUIftV2ch2D+ryfGVl5AKbXztqtI/rUCHv5D7O/tbtPb6f+CdiYe6f66FhlwtJvdGMNt0+Wm3tmr3SL9mkLneB+aRlkekLqQWknGFMbKn3ufFXfRk2hnigzfNn0hK9hoBduaRliYlu6NQz62UMQi3NjvK1WD+0pPJslaRFXvdNLCjh9WhqZzV8I7nD22tFT+rQ7Nkui+ZR42+a2nXqNyPNOhBDhezNugD/eVqQNG+JpBMbGJPaTMgVg74tsW0MLGPYNDX95gIPSAAhIBw==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JVTDmUbxFi1DQ8LwjrKy6oljS1oQiVAk/Zv08EDzg4+clqg9PZbbL4UQFJLSQ62sDovuOTjwQQEFBoHmXiPmTU43zkPMcfolwCtlg1/ILVSqt+/wipHdaoMufCpJC5G0hROK6a7tc64Hmf5KbQt5eFJVeiD/A3oz7SfFyyIXhJfuPamAVd4fpQANo6/SO9jpEd612WA5RxQeYSIVnvzNP/w1A0KwF1gGMpTXGEZNjD2LtYGBb56Hr+x1AkdBPCT+Xab/FZq9U0aTvPkK8ezpaLmXeVEPoBXKqsjZ3mwGcZqK9RTR3UbrySvvwO8jM5ejQ9T/g85rIlqpJfepCsw/7g==
  • Authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=suse.com;
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Paul Durrant <paul@xxxxxxx>, Kevin Tian <kevin.tian@xxxxxxxxx>
  • Delivery-date: Tue, 24 Aug 2021 14:27:43 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

map_domain_page() et al never fail; no need to check their return values
against NULL, and no need to carry dead printk()s.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
@@ -530,12 +530,6 @@ static void amd_dump_page_table_level(st
         return;
 
     table_vaddr = __map_domain_page(pg);
-    if ( table_vaddr == NULL )
-    {
-        printk("AMD IOMMU failed to map domain page %"PRIpaddr"\n",
-                page_to_maddr(pg));
-        return;
-    }
 
     for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ )
     {
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -2800,12 +2800,6 @@ static void vtd_dump_page_table_level(pa
         return;
 
     pt_vaddr = map_vtd_domain_page(pt_maddr);
-    if ( pt_vaddr == NULL )
-    {
-        printk(VTDPREFIX " failed to map domain page %"PRIpaddr"\n",
-               pt_maddr);
-        return;
-    }
 
     next_level = level - 1;
     for ( i = 0; i < PTE_NUM; i++ )
--- a/xen/drivers/passthrough/vtd/utils.c
+++ b/xen/drivers/passthrough/vtd/utils.c
@@ -106,11 +106,6 @@ void print_vtd_entries(struct vtd_iommu
     }
 
     root_entry = (struct root_entry *)map_vtd_domain_page(iommu->root_maddr);
-    if ( root_entry == NULL )
-    {
-        printk("    root_entry == NULL\n");
-        return;
-    }
 
     printk("    root_entry[%02x] = %"PRIx64"\n", bus, root_entry[bus].val);
     if ( !root_present(root_entry[bus]) )
@@ -123,11 +118,6 @@ void print_vtd_entries(struct vtd_iommu
     val = root_entry[bus].val;
     unmap_vtd_domain_page(root_entry);
     ctxt_entry = map_vtd_domain_page(val);
-    if ( ctxt_entry == NULL )
-    {
-        printk("    ctxt_entry == NULL\n");
-        return;
-    }
 
     val = ctxt_entry[devfn].lo;
     printk("    context[%02x] = %"PRIx64"_%"PRIx64"\n",
@@ -151,11 +141,6 @@ void print_vtd_entries(struct vtd_iommu
     do
     {
         l = map_vtd_domain_page(val);
-        if ( l == NULL )
-        {
-            printk("    l%u == NULL\n", level);
-            break;
-        }
         l_index = get_level_index(gmfn, level);
         pte.val = l[l_index];
         unmap_vtd_domain_page(l);




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.