From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 6A1CF3019DA for ; Tue, 2 Dec 2025 23:03:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764716609; cv=none; b=Eb+t3pBe0E6UD0IR2D11LE9XQmqXIikv4oV/leMKp/52eBOv/fqdHtDL1N7bGvmV3c+6ko4lkUkN8+uE2fwDkQZYHME2Y29gKnzZ5iFiB2TPtZHb2UqDCGe08ZKYqjwrQSm4zTNgETRpsvZgqB8+JOswmQe+QdZUyFmobTZBqj0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764716609; c=relaxed/simple; bh=5EO4h0IYIljW6ybeUHco/uMBEgrKfuEgFW6VwP6trU8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=R4oXgwLk+Vse0ERFvgKvwwzsuI4IPZ3C6BSFmzNH9NWx2mF04UujYYjvbzr3PeFVXrnEzrwGr5DsCgWwA1KM8JqZ4vegYOp+ClwZFJhLXXswHNFw6WyoGGZCf2A0nqhMmJqq5cfPCeB4EA8dx9aktoYx3CkltZ0MJ3fOl1MyUvA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--skhawaja.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=IkrEzFxE; arc=none smtp.client-ip=209.85.214.201 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=flex--skhawaja.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="IkrEzFxE" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-297e1cf9aedso103437705ad.2 for ; Tue, 02 Dec 2025 15:03:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764716606; x=1765321406; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=F231xQfOrNMI7yp4iMcUXD0NMzWVqJGC997u+Z4FZI0=; b=IkrEzFxEBxz1N/kEGbKC3VesZtrDjGXLBIBj02JaKJYtujnIk3HKtguCwHjECPBacq p01txrzWgatotLnu2deDp6F7nQG4eI201z2k7MN+RQ9DcYzY0viNNXrQthh+HJ1g3f3O o6Rvh6SASqh525tfpBNsZlbRn7+1Wh/NcmO4MJ4Y9UAH262XTS9cAn+KxCmR/r0sTsTo esZMR304LguNDocK1yX2tzk8JYDnEWipwIgQ2zteJxzABtVvYiBiofKTsLDAfWhxbHzr Um6c58kuvsN66ysz7nIrps13IVEGNuDk8zCtCsuHIg+5CdsVSCMSpNqoJmK61UjV7s2z s9ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764716606; x=1765321406; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=F231xQfOrNMI7yp4iMcUXD0NMzWVqJGC997u+Z4FZI0=; b=nzbn2WBqxuRTL7/9oBbxXbskq4Rxht7WdGoP+IP+52lKF6Il9LdkY69Bi4JlB2NwP1 +LeJ5Xn1UONOmL8u9fJmbuyEL+jmcwurt7QFsG42crUwpGwPWHA2MSWEnc3yRBCAhvNv IRbHA/KFj8xx7VU0ToWC/sW8HSfK3bDYIge7xmWeE+N/2bwtv4s2xAZwYYMsk4y5h09P k0MWYfybyDyDdFKlXxxIXjSS5dO+tApMuA14zIBt+Ltrht1d1uh/y85y3RgFQ5V3R9aO xosuQPYpLj7vnQQiIBkW0VRWw7yTMMXe707bd41pXfGCYbLPGoZg1Xu2GGmOeCr5AiF2 0Zwg== X-Forwarded-Encrypted: i=1; AJvYcCVz3+POlZlyGgtoDdvSf7TVS1yi9ozaMrqRUWv5snxFTYTTLlx+N6r67SXJpcwzeP9WKzNilcQu5aIFvvM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1MQ/AxVSRdZGbkYhK9X8I/myjaQePmhP+ncOorfQXsiSYc1cv Mq0e1QDh42I73gVjKhR0OqA58+Zi3FQMxm2yL6oK669nkzsYwq2EaVBwYS9E3oazM2j+9vrfAZx I9LkByt4prf/DnA== X-Google-Smtp-Source: AGHT+IGUqs3cxHowTWSyeAdbJPGHuWbTlSkfFr0dgRLiy4bDIBar36BxyW52CazeICFSdn7wFC5FQWW+Axy82w== X-Received: from plmn10.prod.google.com ([2002:a17:903:188a:b0:297:ec3d:d08b]) (user=skhawaja job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:234d:b0:295:9b3a:16b7 with SMTP id d9443c01a7336-29d6833a7efmr2477995ad.4.1764716606410; Tue, 02 Dec 2025 15:03:26 -0800 (PST) Date: Tue, 2 Dec 2025 23:02:44 +0000 In-Reply-To: <20251202230303.1017519-1-skhawaja@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251202230303.1017519-1-skhawaja@google.com> X-Mailer: git-send-email 2.52.0.158.g65b55ccf14-goog Message-ID: <20251202230303.1017519-15-skhawaja@google.com> Subject: [RFC PATCH v2 14/32] iommufd: Use the iommu_domain_preserve/unpreserve APIs From: Samiullah Khawaja To: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Pasha Tatashin , Jason Gunthorpe , iommu@lists.linux.dev Cc: Samiullah Khawaja , Robin Murphy , Pratyush Yadav , Kevin Tian , Alex Williamson , linux-kernel@vger.kernel.org, Saeed Mahameed , Adithya Jayachandran , Parav Pandit , Leon Romanovsky , William Tu , Vipin Sharma , dmatlack@google.com, YiFei Zhu , Chris Li , praan@google.com Content-Type: text/plain; charset="UTF-8" Remove the stub implementation of iommufd_domain_preserve and unpreserve APIs and use the APIs exported by the IOMMU core. Signed-off-by: Samiullah Khawaja --- drivers/iommu/iommufd/iommufd_private.h | 2 -- drivers/iommu/iommufd/liveupdate.c | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h index 15afff6ba0ea..0d358e5486d0 100644 --- a/drivers/iommu/iommufd/iommufd_private.h +++ b/drivers/iommu/iommufd/iommufd_private.h @@ -730,8 +730,6 @@ int iommufd_hwpt_lu_set_preserved(struct iommufd_ucmd *ucmd); int iommufd_hwpt_lu_restore(struct iommufd_ucmd *ucmd); /* TODO */ -#define iommu_domain_restore(x) ERR_PTR(-EOPNOTSUPP) -#define iommu_domain_preserve(x, y) (-EOPNOTSUPP) #define iommu_domain_has_attachments(x) (false) #else static inline int iommufd_liveupdate_register_lufs(void) diff --git a/drivers/iommu/iommufd/liveupdate.c b/drivers/iommu/iommufd/liveupdate.c index 782585aff44a..5b45071d7dd2 100644 --- a/drivers/iommu/iommufd/liveupdate.c +++ b/drivers/iommu/iommufd/liveupdate.c @@ -59,6 +59,7 @@ static int iommufd_save_hwpts(struct iommufd_ctx *ictx, struct iommufd_lu *iommufd_lu) { struct iommufd_hwpt_paging *hwpt, **hwpts = NULL; + struct iommu_domain_ser *domain_ser; struct iommufd_hwpt_lu *hwpt_lu; struct iommufd_object *obj; unsigned int nr_hwpts = 0; @@ -119,8 +120,11 @@ static int iommufd_save_hwpts(struct iommufd_ctx *ictx, hwpt = hwpts[i]; hwpt_lu = &iommufd_lu->hwpts[i]; - rc = iommu_domain_preserve(hwpt->common.domain, &hwpt_lu->domain_data); - goto out; + rc = iommu_domain_preserve(hwpt->common.domain, &domain_ser); + if (rc < 0) + goto out; + + hwpt_lu->domain_data = __pa(domain_ser); } } @@ -201,7 +205,7 @@ static void iommufd_liveupdate_unpreserve(struct liveupdate_file_op_args *args) if (!hwpt->common.domain) continue; - /* TODO: WARN_ON(iommu_domain_unpreserve(hwpt->common.domain)); */ + WARN_ON(iommu_domain_unpreserve(hwpt->common.domain)); } xa_unlock(&ictx->objects); @@ -276,6 +280,7 @@ int iommufd_hwpt_lu_restore(struct iommufd_ucmd *ucmd) struct iommu_hwpt_lu_restore *cmd = ucmd->cmd; struct iommufd_hwpt_paging *hwpt = NULL; struct iommufd_ctx *ictx = ucmd->ictx; + struct iommu_domain_ser *domain_ser; struct iommufd_hwpt_lu *hwpt_lu; struct iommufd_lu *iommufd_lu; struct iommu_domain *domain; @@ -303,10 +308,10 @@ int iommufd_hwpt_lu_restore(struct iommufd_ucmd *ucmd) if (IS_ERR(hwpt)) return PTR_ERR(hwpt); - /* a successful iommu_domain_restore mars the point of no return */ - domain = iommu_domain_restore(hwpt_lu->domain_data); - if (IS_ERR(domain)) { - rc = PTR_ERR(domain); + domain_ser = __va(hwpt_lu->domain_data); + domain = domain_ser->restored_domain; + if (!domain) { + rc = -ENOENT; goto err_destroy; } -- 2.52.0.158.g65b55ccf14-goog