From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F4121372EC0 for ; Wed, 25 Mar 2026 20:41:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774471313; cv=none; b=sWl4tnZm20XGR91BRqmTjhJtwenCSGE0MYWtZx5kEP6IQCK5mLU2OxoyIbTOA4TrGJU4mjhN5UJWb+0B9W6bWJumWhWB58cM000p903pb7x6AzGy8e8Hl6X5h37frbGdhhV3jmtK+EupCeuAM4bYV/HfKOW7uEhn72y3Hs8fOG8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774471313; c=relaxed/simple; bh=G1E89mLoruFGE9oPJq27RLkXxKfVa/lw4yDksVV+di0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=BoiFPJ4YjzzIMfd112DkPreWMhrypq8Y1A9AYMih/nxi6jXtusQ0G9RV3yzbhsd7+caue0910BtnlBbbb8Qtq/jXQ6DymCIk7Drhsk0iie/dhsTk+bI+b9yu+QY65N/baL0AZ3RrnDxGcFo1PLepyfhwhuITjzLiuEARCvYanBI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=vzHK7V/r; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vzHK7V/r" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2b04c9e3eb7so26545ad.0 for ; Wed, 25 Mar 2026 13:41:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774471311; x=1775076111; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=PXwLIE/SIo2+NqmxnJ4XMLPsqC2QhJnG7KTzcOS0bpI=; b=vzHK7V/rdc5+Zetr9ulSWH+YPhToPlTNvTRbAQgJIS+Wjngzr96MrXuIayOti0G8OO k/Pte/7K7WfasdZr4gx87uhG3+2A5VXS7Z0ZobuNDEpm9Fcy1EkAW6RhQfsrBwpJj9Yw Mk+191/prAiOvZCCYBzwITUGIVfGkc0+auKGQxnsy3hZOCiQR9fNLU3jwpxEdQVTPXlg 09qqBB3jmnlDn3UM5tUAdOcLQM5mlT4AQSckRSDVE93clSFBQrOQtw440dtgqC2n5RT0 WfOrpxG7Mo1+hxt+ovZapaFw5eqJs4V8XdVNH+E44xhKeHqiu4KwwLn+AqjcfTAeBXmt ud0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774471311; x=1775076111; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PXwLIE/SIo2+NqmxnJ4XMLPsqC2QhJnG7KTzcOS0bpI=; b=R4Z6AKhyjXwBngucB7S+7bg0saaCvGzAQ9z+CQBhFgkEkkvT1SxNwfKLqX+Is8IM/p PpNxqYxJc6FUfLbutee5tE2fKoMIGqMtofyCg14xtvRSBBt8pxC3d25rO1t3v4yy23Jn R2L1qpHpzcFlClLz1rI8mNa8PcsnyYIbWC7GS4BHLLSRaF5j5sIPz866v3nCPVHPjIAO 8ImZrrV77VXjRh7vFRoMDD7JxGwCUQrt3xgc4RyMtLYZFkWFNUnEEHTOryjtItg4qW4Y L2qGQLi5iNeh6rhfwvExQ8kSqlfcdws20gSNaWF7xyD1ITHIrq9AmQmXkroctW+8QNkO Uo8A== X-Forwarded-Encrypted: i=1; AJvYcCXEKPRqr8s+/snmg4ZJVMBq5ZUtFYi3MjTaCFMhubEu18LAYABZVK03aDPHtysT82Yl9WM=@vger.kernel.org X-Gm-Message-State: AOJu0YyERYx96P8RzSSqjwxduk9UtuM99nRhqs7kmQJADmPENj1xNEzK zAWC1Gp3V29B8So2CpxOX+S7Owo5wRl/Jbi2BfnBzdAkfprHgc/6fCcSsr2IOm1xYg== X-Gm-Gg: ATEYQzy0qD5bW0mEFohlgJ4YKLEpo9fQS/aO60nPgD+5yQYszJPH8I1HYuOmF7ZJBp3 OMJczhupLH1MOjRCiAIdP7vCnkVxAUIR0LVGJ7ekNdezXyUDLTt9FQhv7C4sPNDtquL+up+FI82 IvvU2BlEdkM5RdDErXHVIevUKXRc82MrO9xTl9tUT4Ps4otgxnSlzGRTBuO2wC0qNnFrbCGbjjG e/+mwG7rEVv+GnTOXr8NQDY06Ct/P1dz5CgxDUtyfIx9J/5QB2AP7HFVoMqKknKdrfl0tjugN4n dB9zTaYzUPfsJAkUs8ZVxcpCAsCLX3e+q34jSG8D30KPRU1v0qrTMtbP16fxcSajrJ2mt5Kk9WC eZ21sZGXyvhw919GqZg+CH8tFAStzv2N/MrGxMBrj92dvHjwrSno1BOA4AYHa8yLxiiFDDC/0aJ 0xqegd1Nufn67lR87ZM8tY63sxMd32soetUPWHkjyhAgX1xTcxWlBo3XN0QHlHmQ== X-Received: by 2002:a17:903:1a08:b0:2ad:6f9b:7817 with SMTP id d9443c01a7336-2b0bf9a38c0mr489605ad.22.1774471310796; Wed, 25 Mar 2026 13:41:50 -0700 (PDT) Received: from google.com (168.136.83.34.bc.googleusercontent.com. [34.83.136.168]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82c7d1e1960sm554979b3a.3.2026.03.25.13.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2026 13:41:50 -0700 (PDT) Date: Wed, 25 Mar 2026 20:41:46 +0000 From: Samiullah Khawaja To: Pranjal Shrivastava Cc: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Jason Gunthorpe , Robin Murphy , Kevin Tian , Alex Williamson , Shuah Khan , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Saeed Mahameed , Adithya Jayachandran , Parav Pandit , Leon Romanovsky , William Tu , Pratyush Yadav , Pasha Tatashin , David Matlack , Andrew Morton , Chris Li , Vipin Sharma , YiFei Zhu Subject: Re: [PATCH 12/14] iommufd: Add APIs to preserve/unpreserve a vfio cdev Message-ID: References: <20260203220948.2176157-1-skhawaja@google.com> <20260203220948.2176157-13-skhawaja@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: On Wed, Mar 25, 2026 at 08:24:24PM +0000, Pranjal Shrivastava wrote: >On Tue, Feb 03, 2026 at 10:09:46PM +0000, Samiullah Khawaja wrote: >> Add APIs that can be used to preserve and unpreserve a vfio cdev. Use >> the APIs exported by the IOMMU core to preserve/unpreserve device. Pass >> the LUO preservation token of the attached iommufd into IOMMU preserve >> device API. This establishes the ownership of the device with the >> preserved iommufd. >> >> Signed-off-by: Samiullah Khawaja >> --- >> drivers/iommu/iommufd/device.c | 69 ++++++++++++++++++++++++++++++++++ >> include/linux/iommufd.h | 23 ++++++++++++ >> 2 files changed, 92 insertions(+) >> >> diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c >> index 4c842368289f..30cb5218093b 100644 >> --- a/drivers/iommu/iommufd/device.c >> +++ b/drivers/iommu/iommufd/device.c >> @@ -2,6 +2,7 @@ >> /* Copyright (c) 2021-2022, NVIDIA CORPORATION & AFFILIATES >> */ >> #include >> +#include >> #include >> #include >> #include >> @@ -1661,3 +1662,71 @@ int iommufd_get_hw_info(struct iommufd_ucmd *ucmd) >> iommufd_put_object(ucmd->ictx, &idev->obj); >> return rc; >> } >> + >> +#ifdef CONFIG_IOMMU_LIVEUPDATE >> +int iommufd_device_preserve(struct liveupdate_session *s, >> + struct iommufd_device *idev, >> + u64 *tokenp) >> +{ >> + struct iommufd_group *igroup = idev->igroup; >> + struct iommufd_hwpt_paging *hwpt_paging; >> + struct iommufd_hw_pagetable *hwpt; >> + struct iommufd_attach *attach; >> + int ret; >> + >> + mutex_lock(&igroup->lock); >> + attach = xa_load(&igroup->pasid_attach, IOMMU_NO_PASID); > >By explicitly looking up IOMMU_NO_PASID, we skip any PASID attachments >the device might have. Since PASID live update is NOT supported in this >series, should we check if the pasid_attach xarray contains anything >other than IOMMU_NO_PASID and return -EOPNOTSUPP? > >Otherwise, we silently fail to preserve those domains without informing >the VMM? VMM should be able to preserve the NO_PASID domains even if it has PASID attachments. This is the intended behaviour, I will document it in the uAPI docs. > >> + if (!attach) { >> + ret = -ENOENT; >> + goto out; >> + } >> + >> + hwpt = attach->hwpt; >> + hwpt_paging = find_hwpt_paging(hwpt); >> + if (!hwpt_paging || !hwpt_paging->lu_preserve) { >> + ret = -EINVAL; >> + goto out; >> + } >> + >> + ret = liveupdate_get_token_outgoing(s, idev->ictx->file, tokenp); >> + if (ret) >> + goto out; >> + >> + ret = iommu_preserve_device(hwpt_paging->common.domain, >> + idev->dev, >> + *tokenp); >> +out: >> + mutex_unlock(&igroup->lock); >> + return ret; >> +} >> +EXPORT_SYMBOL_NS_GPL(iommufd_device_preserve, "IOMMUFD"); >> + >> +void iommufd_device_unpreserve(struct liveupdate_session *s, >> + struct iommufd_device *idev, >> + u64 token) >> +{ >> + struct iommufd_group *igroup = idev->igroup; >> + struct iommufd_hwpt_paging *hwpt_paging; >> + struct iommufd_hw_pagetable *hwpt; >> + struct iommufd_attach *attach; >> + >> + mutex_lock(&igroup->lock); >> + attach = xa_load(&igroup->pasid_attach, IOMMU_NO_PASID); >> + if (!attach) { >> + WARN_ON(-ENOENT); > >WARN_ON takes a condition.. if we want this to be printed always, why >not WARN_ON(1, "...") ? What's the significance of having -ENOENT as a >condition? Will update this. > >> + goto out; >> + } >> + >> + hwpt = attach->hwpt; >> + hwpt_paging = find_hwpt_paging(hwpt); >> + if (!hwpt_paging || !hwpt_paging->lu_preserve) { >> + WARN_ON(-EINVAL); > >Same here for -EINVAL? Same here. > >> + goto out; >> + } >> + >> + iommu_unpreserve_device(hwpt_paging->common.domain, idev->dev); >> +out: >> + mutex_unlock(&igroup->lock); >> +} >> +EXPORT_SYMBOL_NS_GPL(iommufd_device_unpreserve, "IOMMUFD"); >> +#endif > >[ ----- >8 ----- ] > >Thanks, >Praan Thanks, Sami