From nobody Sat Nov 15 14:49:47 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1750674444; cv=none; d=zohomail.com; s=zohoarc; b=CQHr/LpROifB2e9CaaXg2oslhRXrmQiBSvNeH0C+uiqVdDIzBVecU+E4nkaCYcFjiu9ytIJwruPTZKt+6PFqaZ/upgTK2abfmnrVVd65XBopVPONzi2Uhq6gK3eg1tt+bg6DSPt+zzduDCAUVUb81SkgRVUJUDILvdELq7g9PUs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750674444; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CiT88LYXoJQOz7loN5BISwfFIptHHOL2mzLReDXV1Cw=; b=KvnHARh+L2NKHtqNQZy4INrXOAr5Iyswc4tNLhxe3b5I0pc15cEY20rNTI/BqNTFwI1cOEvKo1cGSAIdXaKeebOxlAj/FCmYfSCH5Lq6ZDEk4CmJC+B8WWgWzDW/HzK05rask9IVdrKXA666I8mBMbyW+Mn/26i4u4LxREeHGG4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750674439796324.65046544287486; Mon, 23 Jun 2025 03:27:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTeNs-0005xY-8M; Mon, 23 Jun 2025 06:26:40 -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 1uTeNp-0005wS-3K for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:37 -0400 Received: from mgamail.intel.com ([192.198.163.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTeNl-0000l4-VM for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:36 -0400 Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:31 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:29 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750674394; x=1782210394; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TC0z9Q1FwXllaKpGPNdMbhIi47tz2jGUovh6tzE2h5w=; b=AuZGz5A1nKnTGLUsXEgE85OUcO2tNxFcirPQs+fh2Mt0nDgLZROLfSss YmE1vz/6atEqo7IMHUxDAqAJ4ggNCeypFRWJdFzIZGV4svbYOdxZYUWhL BFWAmuAT3HYk8fc2saRhhaVQ7DVGUzG0tXwbjf5G6ZMxognx2iMsGGoS6 zWZAOAxHEm/1R/KNpGgNoQhVu/Nmr9wCX8uxB3op1W4MJNvKUcBZ/KsP3 gjTK7tsgatcJob1esZAYc0Ol8WfwQwJ16SqGNSUSNJdFYPFLR2kWhlksv y30PIJsZi790JlZac98h/DgW6GBPdaYiZOo+Hukzpu8kmFiTsm+DLdmus w==; X-CSE-ConnectionGUID: Eh/H8FeOTeyWF/zfZ8RG7A== X-CSE-MsgGUID: ssAOnNHXRCWDKo/wusNEeQ== X-IronPort-AV: E=McAfee;i="6800,10657,11472"; a="63565451" X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="63565451" X-CSE-ConnectionGUID: oZo9Bd+CTFG2X1mhhzNnLw== X-CSE-MsgGUID: QLsLFPmCRgi1Y2qnxV1G4w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="182427937" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, steven.sistare@oracle.com, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH 1/4] vfio/container: Fix SIGSEGV when open container file fails Date: Mon, 23 Jun 2025 18:22:32 +0800 Message-Id: <20250623102235.94877-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250623102235.94877-1-zhenzhong.duan@intel.com> References: <20250623102235.94877-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=192.198.163.9; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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 @intel.com) X-ZM-MESSAGEID: 1750674445184116600 Content-Type: text/plain; charset="utf-8" When open /dev/vfio/vfio fails, SIGSEGV triggers because vfio_listener_unregister() doesn't support a NULL bcontainer pointer. Fixes: a1f267a7d4d9 ("vfio/container: reform vfio_container_connect cleanup= ") Signed-off-by: Zhenzhong Duan Reviewed-by: C=C3=A9dric Le Goater --- hw/vfio/container.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 3e8d645ebb..2853f6f08b 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -710,7 +710,9 @@ static bool vfio_container_connect(VFIOGroup *group, Ad= dressSpace *as, return true; =20 fail: - vfio_listener_unregister(bcontainer); + if (new_container) { + vfio_listener_unregister(bcontainer); + } =20 if (group_was_added) { vfio_container_group_del(container, group); --=20 2.34.1 From nobody Sat Nov 15 14:49:47 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1750674420; cv=none; d=zohomail.com; s=zohoarc; b=GxnOUFryVweUqlq51LYIvPLekfT856x9mGijin5NY2pS1XUPXDdS8HxQDZLRBQA6J4bsHmhtIVZGjLHZRHN+xFJ6XdVp+URRnJ2RephKWugZUQL4T36VruadgJwzv3dsra1EHHtXL+HJgu4Dlwmxy2kHDPaQ98x77tHBpRVQq6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750674420; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=byGMaHtbYZRNgi0T6ADQku+LFtpjJr2riRhJRobUU4U=; b=JcvMzqdPBz25Z3hpLGxa9n+kgDPnHYDvYIP7X9Rfjlb7cfekCl0/0nm/G7qZGp21inN1pwgxIwllp+LIK+Z4/nhT8D9f/GWgtSVAbII76vWrChEy2GLh2fb6q9ehlw3CbWf+DLB/sqI0ceWa8S2uHYc309SMmamECHAhlsYliog= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750674420196104.48368823756937; Mon, 23 Jun 2025 03:27:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTeNu-0005yp-CK; Mon, 23 Jun 2025 06:26:42 -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 1uTeNs-0005y5-88 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:40 -0400 Received: from mgamail.intel.com ([192.198.163.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTeNn-0000lQ-6u for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:39 -0400 Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:33 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750674395; x=1782210395; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MxMVveEJ4lElsNDpu96M/mDOZpSh974jvh00HM5eCIM=; b=VOpiQPwiX071fM34lm7n/zOFV5MGjeOUzwcPuGALAzUCoUy34z3tah5N tPEll98v8XYGqDq7qfrdbV5mrJeN4wYDImfD46YXkGaZNBpLp4pPLbdKw ccKWIjqZwTv8iMdhAv0BiVqHETBThS+jnRyPFcKzyQutvzuSKJ/O72279 B13tSHptG/6XyqjqDJO9xT8vx1OzEKonS6r+XPskg/xRyVxs+FMvyGCh+ yiF1xcOEH+w9cnNFsR9WpcvqgZhPLNmmcMRx8v0Y9rRLMo4ndgcKIxZL5 UGVrlMEvTbnqomKhqaUO1+JTbV53U58GRGO6p76yO+2z9iJ8A+tbEmW30 w==; X-CSE-ConnectionGUID: VusGftHmS5u41vyfalMqjg== X-CSE-MsgGUID: FGP9y6ZuQ7i0SRSrqfybUw== X-IronPort-AV: E=McAfee;i="6800,10657,11472"; a="63565460" X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="63565460" X-CSE-ConnectionGUID: QMyG46dgTWeX31r7d2ukVw== X-CSE-MsgGUID: 8BfRjpIASwuSv2yFwOOBWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="182427947" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, steven.sistare@oracle.com, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH 2/4] vfio/container: fails mdev hotplug if add migration blocker failed Date: Mon, 23 Jun 2025 18:22:33 +0800 Message-Id: <20250623102235.94877-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250623102235.94877-1-zhenzhong.duan@intel.com> References: <20250623102235.94877-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=192.198.163.9; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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 @intel.com) X-ZM-MESSAGEID: 1750674420868116600 Content-Type: text/plain; charset="utf-8" It's aggressive to abort a running QEMU process when hotplug a mdev and it fails migration blocker adding. Fix by just failing mdev hotplug itself. Signed-off-by: Zhenzhong Duan Reviewed-by: C=C3=A9dric Le Goater --- hw/vfio/container.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 2853f6f08b..68b4fdb401 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -992,12 +992,16 @@ static bool vfio_legacy_attach_device(const char *nam= e, VFIODevice *vbasedev, if (vbasedev->mdev) { error_setg(&vbasedev->cpr.mdev_blocker, "CPR does not support vfio mdev %s", vbasedev->name); - migrate_add_blocker_modes(&vbasedev->cpr.mdev_blocker, &error_fata= l, - MIG_MODE_CPR_TRANSFER, -1); + if (migrate_add_blocker_modes(&vbasedev->cpr.mdev_blocker, errp, + MIG_MODE_CPR_TRANSFER, -1)) { + goto hiod_unref_exit; + } } =20 return true; =20 +hiod_unref_exit: + object_unref(vbasedev->hiod); device_put_exit: vfio_device_put(vbasedev); group_put_exit: --=20 2.34.1 From nobody Sat Nov 15 14:49:47 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1750674447; cv=none; d=zohomail.com; s=zohoarc; b=YBy5RS47guBsQqGvo15IInX5ujkn4JCQAcLuM9mfBd9pL5ifmf40ELNJ9aQxhtJ9PNZp84/BY8pkvLx5cGqn9sQNGo3PulHjoP2Zfx6hHMzP5Koq4BY1AjbHmUyH/iOdLUfsQvL7z+BNeGk1J2i+7oJHsV/61F21eX9uqoB3bRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750674447; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mUaeWIxGXvM29fH39yHhMzvnt0AQQkeUrZ9/8RskN1I=; b=eBVUTQtfrFY5OiR41aVpFn+eh+GZ10i0/PRrkvX0ucXO8ufMm13/n+vB9KmsKESnxDhbFjC/00pNMiEyPhiOKge3gqWjvDQ0QQpWdlvWn7DdudkO+MX14q6IliQwJHGn6QM733PtZNp/etwQiozlA9yifVvoJBw1VhlFYVE85KA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750674447516162.97739897986753; Mon, 23 Jun 2025 03:27:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTeNv-00060J-0v; Mon, 23 Jun 2025 06:26:44 -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 1uTeNr-0005xa-Fu for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:39 -0400 Received: from mgamail.intel.com ([192.198.163.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTeNp-0000l4-FV for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:39 -0400 Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:35 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750674397; x=1782210397; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yr+7s6bCyo7u5kYfwpM0Ju13ecCPRGK8h7Rg4MDQSfo=; b=Svv0LQcoKQDqOsyT+Pi+w0EfZH81wbiZpftqDLxO9nGrpI+AasxtESjt ifkDOWjMZet9j+6P0wLPjw8IfHUdcWu40GGcsl5mwuCGpy44TSgO3vNY1 e5TWO/G9n+6JQsWc44gGXzKK8syldhrg8GIrkZS4qlmE9tQIyxj5FS5BE 2qhnlLpIpTmuOO0t2zFx36UGdvjig3Rpe4isw/Ko8htlJZyLBalGHz914 vz5q0EzS5KEbj1zgebg+OZed7RkgQTsKu9DZZdW2iJBKYk8hyXOSjoKjJ FaZ6coruPjRqwZyCfmvvXzHeaRtcp4APpTpHMuumolSRqS/rnYveM5Ve3 Q==; X-CSE-ConnectionGUID: s4N7/rkAS7Cjj87Ho+ChBQ== X-CSE-MsgGUID: vRKklP2kSHaPmeMw1HpfCw== X-IronPort-AV: E=McAfee;i="6800,10657,11472"; a="63565466" X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="63565466" X-CSE-ConnectionGUID: WO350kWCQ4iXP3VsYRCxKg== X-CSE-MsgGUID: KPKd2TP6TjWhrK3WTDys4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="182427954" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, steven.sistare@oracle.com, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH 3/4] vfio/container: Fix potential SIGSEGV when recover from unmap-all-vaddr failure Date: Mon, 23 Jun 2025 18:22:34 +0800 Message-Id: <20250623102235.94877-4-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250623102235.94877-1-zhenzhong.duan@intel.com> References: <20250623102235.94877-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=192.198.163.9; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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 @intel.com) X-ZM-MESSAGEID: 1750674449267116600 Content-Type: text/plain; charset="utf-8" cpr.saved_dma_map isn't initialized in source qemu which lead to vioc->dma_= map assigned a NULL value, this will trigger SIGSEGV. Fix it by save and restore vioc->dma_map locally. Fixes: eba1f657cbb1 ("vfio/container: recover from unmap-all-vaddr failure") Signed-off-by: Zhenzhong Duan --- include/hw/vfio/vfio-cpr.h | 8 +++++--- hw/vfio/cpr-legacy.c | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/hw/vfio/vfio-cpr.h b/include/hw/vfio/vfio-cpr.h index 8bf85b9f4e..aef542e93c 100644 --- a/include/hw/vfio/vfio-cpr.h +++ b/include/hw/vfio/vfio-cpr.h @@ -16,14 +16,16 @@ struct VFIOContainer; struct VFIOContainerBase; struct VFIOGroup; =20 +typedef int (*DMA_MAP_FUNC)(const struct VFIOContainerBase *bcontainer, + hwaddr iova, ram_addr_t size, void *vaddr, + bool readonly, MemoryRegion *mr); + typedef struct VFIOContainerCPR { Error *blocker; bool vaddr_unmapped; NotifierWithReturn transfer_notifier; MemoryListener remap_listener; - int (*saved_dma_map)(const struct VFIOContainerBase *bcontainer, - hwaddr iova, ram_addr_t size, - void *vaddr, bool readonly, MemoryRegion *mr); + DMA_MAP_FUNC saved_dma_map; } VFIOContainerCPR; =20 typedef struct VFIODeviceCPR { diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index a84c3247b7..100a8db74d 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -148,6 +148,7 @@ static int vfio_cpr_fail_notifier(NotifierWithReturn *n= otifier, */ =20 VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); + DMA_MAP_FUNC saved_dma_map =3D vioc->dma_map; vioc->dma_map =3D vfio_legacy_cpr_dma_map; =20 container->cpr.remap_listener =3D (MemoryListener) { @@ -158,7 +159,7 @@ static int vfio_cpr_fail_notifier(NotifierWithReturn *n= otifier, bcontainer->space->as); memory_listener_unregister(&container->cpr.remap_listener); container->cpr.vaddr_unmapped =3D false; - vioc->dma_map =3D container->cpr.saved_dma_map; + vioc->dma_map =3D saved_dma_map; } return 0; } --=20 2.34.1 From nobody Sat Nov 15 14:49:47 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1750674436; cv=none; d=zohomail.com; s=zohoarc; b=KNZ2jVhCno9JZcnN3yDqyMY8anezu7PkjuT26/ljGKFPyhByIAPsHI+APIEEvZFPqU6OYEhHCvtlwqKwBMuf+KbiD2PAtH5nDD2giZ0audxUaQUirf7V/jjGxSfRMDjOVMZLnD/wj5uiUdGS3vWsf/qHt8THfdDxt9uXUa8zdJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750674436; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zBJdGVosk9ryW62O9dmfPOosoxhyE7eUyarH1NmgZjI=; b=H+DCHGVGqidTrxBdjqeqo6nMmyJhhgWnSrGh7qeKmmg+9lbsnpOTvVX0QaT8alhZEUEgy3VW9Ty/jd8QK1RsavfPvpsGAvUV2ikvWGTHYGIezHf5OI9uhIANpFTad66pUW+IOrEOG+j99v6p5pvFaud7tgfnHqSCpGNPrfPVo9U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750674436104717.087156150818; Mon, 23 Jun 2025 03:27:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTeNv-00061x-Ul; Mon, 23 Jun 2025 06:26:43 -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 1uTeNu-0005yO-J4 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:42 -0400 Received: from mgamail.intel.com ([192.198.163.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTeNr-0000l4-Lj for qemu-devel@nongnu.org; Mon, 23 Jun 2025 06:26:41 -0400 Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:37 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 03:26:35 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750674399; x=1782210399; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JV8/tKIjtQekCcqphu512/XnCCpL9Gbwuue5YmsnoZE=; b=H3fzKKp7uBV73YoWDHwWqX4TQVEDX157B1vm6CGa8PDIZbftgJI2UfZ+ UO+wxrcdjVLQzbK+b6FxV9f8jINgHP0P6kpuf56DDW6RLmV2oqxrRXfpq qye1TtBIWm6ur4etUqYQb/xY7DpveN0aINPQfuQbzM3QCKQvOW3ISqTvv IsiwQmX8V/SMYjM60+Sn197YQ9GwLTzH5re3e4UCcqVqMKqYOl+JDie/5 EQqV+ZLOzq3GhLMNOyPTazgX1NMUeoxlD4m8dJKhORycgOsJ6iDwQc6oK iQFdiKu9E0YOhmiFSouMISD7/yNek99XQ34bIG/9sdNMwsT9ys2QYoIvH A==; X-CSE-ConnectionGUID: SDhFbfwURb2DwhYmdVunmA== X-CSE-MsgGUID: 9koHa9vRRYyQLYdkURqGXw== X-IronPort-AV: E=McAfee;i="6800,10657,11472"; a="63565469" X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="63565469" X-CSE-ConnectionGUID: cUj+0b/yS2uJRtiaPt8Leg== X-CSE-MsgGUID: AB91I+O7Rs6X46vTeja4RQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="182427963" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, steven.sistare@oracle.com, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH 4/4] vfio/container: Fix vfio_container_post_load() Date: Mon, 23 Jun 2025 18:22:35 +0800 Message-Id: <20250623102235.94877-5-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250623102235.94877-1-zhenzhong.duan@intel.com> References: <20250623102235.94877-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=192.198.163.9; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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 @intel.com) X-ZM-MESSAGEID: 1750674437174116600 Content-Type: text/plain; charset="utf-8" When there are multiple VFIO containers, vioc->dma_map is restored multiple times, this made only first container work and remaining containers using vioc->dma_map restored by first container. Fix it by save and restore vioc->dma_map locally. saved_dma_map in VFIOContainerCPR becomes useless and is removed. Fixes: 7e9f21411302 ("vfio/container: restore DMA vaddr") Signed-off-by: Zhenzhong Duan --- include/hw/vfio/vfio-cpr.h | 1 - hw/vfio/cpr-legacy.c | 20 +++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/include/hw/vfio/vfio-cpr.h b/include/hw/vfio/vfio-cpr.h index aef542e93c..71a1c1a70c 100644 --- a/include/hw/vfio/vfio-cpr.h +++ b/include/hw/vfio/vfio-cpr.h @@ -25,7 +25,6 @@ typedef struct VFIOContainerCPR { bool vaddr_unmapped; NotifierWithReturn transfer_notifier; MemoryListener remap_listener; - DMA_MAP_FUNC saved_dma_map; } VFIOContainerCPR; =20 typedef struct VFIODeviceCPR { diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index 100a8db74d..ff45a5128f 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -99,20 +99,21 @@ static int vfio_container_post_load(void *opaque, int v= ersion_id) { VFIOContainer *container =3D opaque; VFIOContainerBase *bcontainer =3D &container->bcontainer; - VFIOGroup *group; + VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); + DMA_MAP_FUNC saved_dma_map =3D vioc->dma_map; Error *local_err =3D NULL; =20 + /* During incoming CPR, divert calls to dma_map. */ + vioc->dma_map =3D vfio_legacy_cpr_dma_map; + if (!vfio_listener_register(bcontainer, &local_err)) { error_report_err(local_err); return -1; } =20 - QLIST_FOREACH(group, &container->group_list, container_next) { - VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); + /* Restore original dma_map function */ + vioc->dma_map =3D saved_dma_map; =20 - /* Restore original dma_map function */ - vioc->dma_map =3D container->cpr.saved_dma_map; - } return 0; } =20 @@ -180,13 +181,6 @@ bool vfio_legacy_cpr_register_container(VFIOContainer = *container, Error **errp) =20 vmstate_register(NULL, -1, &vfio_container_vmstate, container); =20 - /* During incoming CPR, divert calls to dma_map. */ - if (cpr_is_incoming()) { - VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); - container->cpr.saved_dma_map =3D vioc->dma_map; - vioc->dma_map =3D vfio_legacy_cpr_dma_map; - } - migration_add_notifier_mode(&container->cpr.transfer_notifier, vfio_cpr_fail_notifier, MIG_MODE_CPR_TRANSFER); --=20 2.34.1