From nobody Sat Nov 15 10:52:09 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1752526827; cv=none; d=zohomail.com; s=zohoarc; b=KfQaGay6iEVQyqZoR37y2n5KBinsHPezi8O0E5heciPub5evZ7MaqcEMW3nF9AcAAw7glxMiHxN4K1yfUo3XieEvGQXL45xJDWzanjd795uNnPmYTo6yZacblmP7ZODpchHDF4ul0lIQJFUrfPbkHD7TR//AYATV5NV7UkA+RcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752526827; h=Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mhrRcNGI0gDZ/gk/VphnZlX1PzSw52CrVs8CCFG2lrs=; b=TIICJgVjF6Biwv+wDC/r8yYce/sQKw6tdsIdzi+6LuV7ZQ8R1WnD8s3IK8LGodvfcfn8aby4kNUWLpicE9o9zGUq0vKLA0HO0EcFsQuEplyNGtxizApO1Y/X3fCY+5CiDfCXA1gQDydv0c4C3ZkidHiHbSGhaOkLZpClYVqA3FM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752526827300370.72118183338364; Mon, 14 Jul 2025 14:00:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ubQHF-0003vF-5Y; Mon, 14 Jul 2025 16:59:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubOk8-0008CH-Ac for qemu-devel@nongnu.org; Mon, 14 Jul 2025 15:21:42 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubOk5-00080i-0C for qemu-devel@nongnu.org; Mon, 14 Jul 2025 15:21:40 -0400 Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56EGoGQ4026735; Mon, 14 Jul 2025 19:21:32 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47uhjf5d8q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jul 2025 19:21:32 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56EHhCUQ010901; Mon, 14 Jul 2025 19:21:31 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ue58ymjj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jul 2025 19:21:31 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 56EJLVFJ008168; Mon, 14 Jul 2025 19:21:31 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 47ue58ymj8-1; Mon, 14 Jul 2025 19:21:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :date:from:message-id:subject:to; s=corp-2025-04-25; bh=mhrRcNGI 0gDZ/gk/VphnZlX1PzSw52CrVs8CCFG2lrs=; b=bSmAkg5VCRoQg9QV2VkUgFZZ NUmKFq4ZrEEGItB0+4i0GkeARg5B+LdrKO1zfYtFxK/G/+e4xbkAyLSrKLdQWEHx +HrG88EYVzQHmG2LAa1Gi0CgQUBWIpdXObK7uOwCHp4x/n/GE23TxE/X2HdtmJdj AaBBPze6C5TRj7BKTmKP4oxe4yUkmHnbMzG9Ooakj9W8vYqhhdHhj+70w6YuoIdr bZvms6Uz4x0RvxU3m3/Pd1Vm9DPUmhFuSSxO5zK5pMWHQjF7vXz/wn7vKpzYo6PU MkQcv1pqvIZ8RsgauC5lASQBjyu2smuv5GUg4C7sMa2PiVj5zPaD1oFA9F1fxA== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Alex Williamson , Cedric Le Goater , Zhenzhong Duan , "Michael S. Tsirkin" , Steve Sistare Subject: [PATCH V1] vfio: fix sub-page bar after cpr Date: Mon, 14 Jul 2025 12:21:30 -0700 Message-Id: <1752520890-223356-1-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-14_02,2025-07-14_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507140126 X-Proofpoint-GUID: vEJRLgXMIESLI3XyTuRFD0-S9Fj3U6N9 X-Authority-Analysis: v=2.4 cv=O6g5vA9W c=1 sm=1 tr=0 ts=687558bc b=1 cx=c_pps a=qoll8+KPOyaMroiJ2sR5sw==:117 a=qoll8+KPOyaMroiJ2sR5sw==:17 a=Wb1JkmetP80A:10 a=yPCof4ZbAAAA:8 a=Dgv3TXsNM4mSNUuXrVQA:9 cc=ntf awl=host:12062 X-Proofpoint-ORIG-GUID: vEJRLgXMIESLI3XyTuRFD0-S9Fj3U6N9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE0MDEyNiBTYWx0ZWRfX4xglSp810Emw okbgMWozNiOal0uqZNsQ0sjC+XKPFN7sDz7LnPrRKjleV6XUQifuaEZc3j2rdvriDe5W3DDidcv k3ikdcggOe+hJOPiM9CYlQSv6SIJbQJbLayYu+Ahsf56EONo98ry4JWCY0aaEdVeO/NS87erUFw rSFVeqERclpQVdTsuFrbtqOaLGSJuhbkRCZLx9gH+bmPYOPeY7nUbe4CS7FKMFmDEHJzKWjs4rQ sRAXiwdlE9Z2YlknDNOLYnrQoR72+AmH8Vgmp0SV8bOtBKSsmEXEcj+Nu0uDcv3atARKVEIg4X6 MaRaaJWGiqmJhAqjpeRwAXJak1zR03MuxPM2zeFNClodEiTyzSXVoKuI4QfF7iWG+wXsu/OTU6N 7PvtvEWxq2ACq3/77YrF0gvBsEnm91kDhpbwTCxG5n59ekubVonNVPS7Z1z/15z0vBzJjZ6g Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.220.177.32; envelope-from=steven.sistare@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @oracle.com) X-ZM-MESSAGEID: 1752526829756116600 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Regions for sub-page BARs are normally mapped here, in response to the guest writing to PCI config space: vfio_pci_write_config() pci_default_write_config() pci_update_mappings() memory_region_add_subregion() vfio_sub_page_bar_update_mapping() ... vfio_dma_map() However, after CPR, the guest does not reconfigure the device and the code path above is not taken. To fix, in vfio_cpr_pci_post_load, call vfio_sub_page_bar_update_mapping for each sub-page BAR with a valid address. Fixes: 7e9f21411302 ("vfio/container: restore DMA vaddr") Signed-off-by: Steve Sistare Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Zhenzhong Duan --- hw/vfio/pci.h | 1 + hw/vfio/cpr.c | 2 ++ hw/vfio/pci.c | 14 ++++++++++++++ 3 files changed, 17 insertions(+) diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index 495fae7..cb1310d 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -228,6 +228,7 @@ void vfio_pci_write_config(PCIDevice *pdev, uint64_t vfio_vga_read(void *opaque, hwaddr addr, unsigned size); void vfio_vga_write(void *opaque, hwaddr addr, uint64_t data, unsigned siz= e); =20 +void vfio_sub_page_bar_update_mappings(VFIOPCIDevice *vdev); bool vfio_opt_rom_in_denylist(VFIOPCIDevice *vdev); bool vfio_config_quirk_setup(VFIOPCIDevice *vdev, Error **errp); void vfio_vga_quirk_setup(VFIOPCIDevice *vdev); diff --git a/hw/vfio/cpr.c b/hw/vfio/cpr.c index af0f12a..384b56c 100644 --- a/hw/vfio/cpr.c +++ b/hw/vfio/cpr.c @@ -116,6 +116,8 @@ static int vfio_cpr_pci_post_load(void *opaque, int ver= sion_id) PCIDevice *pdev =3D &vdev->pdev; int nr_vectors; =20 + vfio_sub_page_bar_update_mappings(vdev); + if (msix_enabled(pdev)) { vfio_pci_msix_set_notifiers(vdev); nr_vectors =3D vdev->msix->entries; diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 1093b28..9c616bd 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2826,6 +2826,20 @@ static int vfio_pci_load_config(VFIODevice *vbasedev= , QEMUFile *f) return ret; } =20 +void vfio_sub_page_bar_update_mappings(VFIOPCIDevice *vdev) +{ + PCIDevice *pdev =3D &vdev->pdev; + int page_size =3D qemu_real_host_page_size(); + int bar; + + for (bar =3D 0; bar < PCI_ROM_SLOT; bar++) { + PCIIORegion *r =3D &pdev->io_regions[bar]; + if (r->addr !=3D PCI_BAR_UNMAPPED && r->size > 0 && r->size < page= _size) { + vfio_sub_page_bar_update_mapping(pdev, bar); + } + } +} + static VFIODeviceOps vfio_pci_ops =3D { .vfio_compute_needs_reset =3D vfio_pci_compute_needs_reset, .vfio_hot_reset_multi =3D vfio_pci_hot_reset_multi, --=20 1.8.3.1