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

[PATCH v2 4/4] vpci/header: empty the BAR range sets when modify_bars() fails


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Stefano Stabellini <stefano.stabellini@xxxxxxx>
  • Date: Tue, 17 Nov 2026 16:59:03 -0800
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9lSVKmVILWUNX9Yz9FopKb56munjdEwyjPP/YA5wEzg=; b=FkuhLoxOqMFwyf7ouxValiS9+tUwZ1hqOGzRunY3Kn/OCvs33qmeNtxPuyGCpKAYFynW/3nLZD36m/HSKYE1zuu+BtKiOnn1cRRWIGL8auPD407n3VsH6Q3PRcuUdAjR3aBKZJMnGgLALe+2fWPepWp+DwdQhr5rBr1AI/X2rFOyqOKFSrV0nSs1dkEApyKM3H51EPG0GrPXiR8h//VOMHpAs6d/3qkATSguf+dLAkLI3Sty/YR4HJMIviziZtnCGZfmY0ogNdCDDqZ9MGpxRCG1enPyRHjPQfir4Nkrp3J3kp6EtDsZI3p3yf6ZSuWSn8/Pb6Y5A/ZJ166y5eJXPQ==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yob/SdrZqF2hsNu1CgjxYHSjNpDGqh7Io3AAUehmNM0L5kf/IQNsQkk7TUMSltNN3lKuB+qgTqJNGL0L0jIxa3QH8SGYaNxkDw8nq6rPEO3JueTu7yNhMVbG6XG8F5QFh4q6sPn2/jprqAedAA/b2N3ZrrQQ/Oh1ew2BJjFbJcCSDj7y5JmVeYTj4ghxMAQ9oQ/GAz0G3wpTcmWqf66ngCWBD4XAzmR9Hu2IXLfldbZBXK9b/7ljoopjCLU0p9DftMg5HpVNreaCl5mBWxol+G2vFmyIqLy4amHHlQgMzXZugxl+CFm//zt7wEvYUDbRLimnhBmyuV35dpRyjxXQzA==
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=amd.com header.i="@amd.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck"
  • Cc: <stefano.stabellini@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Roger Pau Monné <roger@xxxxxxxxxxxxxx>, "Stewart Hildebrand" <stewart.hildebrand@xxxxxxx>
  • Delivery-date: Wed, 18 Nov 2026 00:59:21 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

On error modify_bars() returned with the ranges already collected still
in the per-BAR sets. The next request on the device then trips the
ASSERT(rangeset_is_empty()) at the start of modify_bars() in a debug
build, and in a release build maps or unmaps the stale ranges along
with its own. Purge every set when collecting the ranges fails.

Fixes: 622bdd962822 ("vpci/header: handle p2m range sets per BAR")
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxx>
Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
Cc: "Roger Pau Monné" <roger@xxxxxxxxxxxxxx>
Cc: Stewart Hildebrand <stewart.hildebrand@xxxxxxx>
Cc: Jan Beulich <jbeulich@xxxxxxxx>

Changes in v2:
- Mention the ASSERT(rangeset_is_empty()) in the commit message.
- Move the Cc list after ---.
- Add Jan's Reviewed-by.
---
 xen/drivers/vpci/header.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c
index 7e5f4b8a00..0bdc4d6a46 100644
--- a/xen/drivers/vpci/header.c
+++ b/xen/drivers/vpci/header.c
@@ -366,7 +366,8 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t 
cmd, bool rom_only)
             gprintk(XENLOG_G_WARNING,
                     "%pp: can't map BAR%u - offset mismatch: %#lx vs %#lx\n",
                     &pdev->sbdf, i, bar->guest_addr, bar->addr);
-            return -EINVAL;
+            rc = -EINVAL;
+            goto fail;
         }
 
         rc = rangeset_add_range(bar->mem, start_guest, end_guest);
@@ -374,7 +375,7 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t 
cmd, bool rom_only)
         {
             printk(XENLOG_G_WARNING "Failed to add [%lx, %lx]: %d\n",
                    start_guest, end_guest, rc);
-            return rc;
+            goto fail;
         }
 
         /* Check for overlap with the already setup BAR ranges. */
@@ -391,7 +392,7 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t 
cmd, bool rom_only)
                 gprintk(XENLOG_WARNING,
                        "%pp: failed to remove overlapping range [%lx, %lx]: 
%d\n",
                         &pdev->sbdf, start_guest, end_guest, rc);
-                return rc;
+                goto fail;
             }
         }
 
@@ -401,7 +402,7 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t 
cmd, bool rom_only)
             gprintk(XENLOG_WARNING,
                     "%pp: failed to sanitize BAR#%u memory: %d\n",
                     &pdev->sbdf, i, rc);
-            return rc;
+            goto fail;
         }
     }
 
@@ -425,7 +426,7 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t 
cmd, bool rom_only)
                 gprintk(XENLOG_WARNING,
                        "%pp: failed to remove MSIX table [%lx, %lx]: %d\n",
                         &pdev->sbdf, start, end, rc);
-                return rc;
+                goto fail;
             }
         }
     }
@@ -487,7 +488,7 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t 
cmd, bool rom_only)
                         gprintk(XENLOG_WARNING,
                                 "%pp: failed to remove [%lx, %lx]: %d\n",
                                 &pdev->sbdf, start, end, rc);
-                        return rc;
+                        goto fail;
                     }
                 }
             }
@@ -516,6 +517,18 @@ static int modify_bars(const struct pci_dev *pdev, 
uint16_t cmd, bool rom_only)
     defer_map(pdev, cmd, rom_only);
 
     return 0;
+
+ fail:
+    /*
+     * Leave no range collected for the request that failed: the next request
+     * expects every BAR's set to start empty, and a range left behind would
+     * be mapped or unmapped with it.
+     */
+    for ( i = 0; i < ARRAY_SIZE(header->bars); i++ )
+        if ( header->bars[i].mem )
+            rangeset_purge(header->bars[i].mem);
+
+    return rc;
 }
 
 static void cf_check cmd_write(
-- 
2.47.3




 


Rackspace

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