From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 BD5DE3E8C7C for ; Mon, 27 Apr 2026 17:56:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777312611; cv=none; b=dkAVJrw3F48Wn48k/EYn6Efo7jkI1/wN+dJwlZNFfARkJTN3A4pUd3kc+1lrSV3b7wYoN+fQ2Sc7gQyxPfdB/Z3tYIBw1Kbqz874TMZfXs3OnrIIRevgQ2y25TUepzVSOHIiro2gogKnbLQHjJgHpqNEA1coTZiHs2y6AHxigyA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777312611; c=relaxed/simple; bh=sBm8294TNdUcIBVgUwjRvPM2U1FxVSvIDKu5ER4NCvk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=u+lDANUCv352/5s4BflYSyjRiHT123JfU4b+iKJSWo/LSNiKi0M44hQDRlgSNjl0eLBIdMiH+X+RlCXR0NSjd5dd29t9ocZ3Qnmavl31ckVRBEFwWXmDE745aBehHT3lyMtYQW9VqQF5LMr0I+4QA+jxPwMOYcJ6NNCLJFGsyLE= 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=jqcmw8GL; arc=none smtp.client-ip=209.85.210.202 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="jqcmw8GL" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-82f780a13c9so7788524b3a.0 for ; Mon, 27 Apr 2026 10:56:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777312609; x=1777917409; 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=45Z53JRaHhbBRvhdHfvMVMSYTgLthbdvGJ/oBaNMAlw=; b=jqcmw8GLyUrqfLA9Sm9AiJzF7fJiGyxFiTplYxjODsQiaYCb2JNrn8talI8ZD0MdP9 a2Qp36AKSi8OWWrvmepmLS3ndM5qB9r92K8ZeQAfctqxq2dfBuaqGJFOD9H3Yj10TjsC 5n4IjuIWXjMsJxEH7dj3EZy4gL16pNXIHN1Ck7Vd+AhuD7Csz4SZGSqtbE9LzUrSSM7p nvdF9A+cJJpAwwx3dAAmRfcYDKmNCZs8tK20CtqKxlcU/g/gCYEsxFP4yko56h1M8ZaT fJjhLp3bbGis1ZWJOxIqDYqy2cLeOEyLizfqqM9FbS07B6MM3hDgrOY+tK9mzJlTlfA4 lsyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777312609; x=1777917409; 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=45Z53JRaHhbBRvhdHfvMVMSYTgLthbdvGJ/oBaNMAlw=; b=j7LLdqSwd3OSEnqoaXEdJdO1oWtq/yC3gLcnxNkjn8CN8lzg5sD8iXZtlseVi2EWuA U8elGOq45pqBHo5lCaJ4X9jwcm/h1WvrZGTtOqGOfk2L4h7L5LOWLt+KV8LHjOywLW5W 1VNvZ3ABe7ZaYoDYIwR38smIvthjweYhNhWB7IYgHf9U8D0wD2nkLESN2t4qnIJ2pu35 cmH9ndK9AoGjjohI+pW36NRfgcZlQ5jl53XX+6hqIWG+2J3FEOcs9o1nkGlBloGqbqQw PmLD4XuxhNHZ3ikru/2gOOt+BeY09OclCiDunc2RmRuYIX4pKHlCklkUvMggINQ5lcj/ bWQw== X-Forwarded-Encrypted: i=1; AFNElJ+0AYJ6FzbY+mVvHZyDrzvTxQFsEWER1VcFZGDyNjFc55qql9jE+ELdMBDRzJzficqFKLU=@vger.kernel.org X-Gm-Message-State: AOJu0YwjbOQWHpNXUgJekio94FkIfWOoWgldGNZ/NKkrsZ9n+QkevTLv F2JZFFIzuZn667z6S0RUGTihp592xHIxP0RW+RXrMNtHRat6ELR8Lv0EpdK6antODb3dxJprF0V bd24SCqmDh6WkMQ== X-Received: from pfbli8.prod.google.com ([2002:a05:6a00:7188:b0:82f:54e9:c13e]) (user=skhawaja job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2d27:b0:82f:3017:6168 with SMTP id d2e1a72fcca58-834daeccd4amr117065b3a.1.1777312608853; Mon, 27 Apr 2026 10:56:48 -0700 (PDT) Date: Mon, 27 Apr 2026 17:56:25 +0000 In-Reply-To: <20260427175633.1978233-1-skhawaja@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260427175633.1978233-1-skhawaja@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260427175633.1978233-9-skhawaja@google.com> Subject: [PATCH v2 08/16] iommu: Add APIs to get iommu and device preserved state From: Samiullah Khawaja To: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Jason Gunthorpe Cc: Samiullah Khawaja , 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 , Pranjal Shrivastava , Vipin Sharma , YiFei Zhu Content-Type: text/plain; charset="UTF-8" The preserved state of the device and IOMMU needs to be fetched during shutdown and boot in the next kernel. Add APIs that can be used to fetch the preserved state of a device and IOMMU. The APIs will only be used during shutdown and after liveupdate so no locking needed. Signed-off-by: Samiullah Khawaja --- drivers/iommu/liveupdate.c | 57 ++++++++++++++++++++++++++++++++ include/linux/iommu-liveupdate.h | 31 +++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/drivers/iommu/liveupdate.c b/drivers/iommu/liveupdate.c index 765d042e22e3..60ee29b0c6bd 100644 --- a/drivers/iommu/liveupdate.c +++ b/drivers/iommu/liveupdate.c @@ -17,6 +17,14 @@ #define iommu_max_objs_per_page(_array) \ ((PAGE_SIZE - sizeof(struct iommu_array_hdr_ser)) / sizeof((_array)->objects[0])) +#define iommu_liveupdate_for_each_obj(_arr, _obj, _idx) \ + for (; (_arr); \ + (_arr) = (_arr)->hdr.next_array_phys ? \ + phys_to_virt((_arr)->hdr.next_array_phys) : NULL) \ + for ((_idx) = 0, (_obj) = (_arr)->objects; \ + (_idx) < (_arr)->hdr.nr_objects; (_idx)++, (_obj)++) \ + if (!(_obj)->hdr.deleted) + static void *iommu_liveupdate_restore_array(u64 array_phys) { struct iommu_array_hdr_ser *array_hdr; @@ -201,6 +209,55 @@ void iommu_liveupdate_unregister_flb(struct liveupdate_file_handler *handler) } EXPORT_SYMBOL(iommu_liveupdate_unregister_flb); +int iommu_for_each_preserved_device(iommu_preserved_device_iter_fn fn, + void *arg) +{ + struct iommu_flb_obj *flb_obj; + struct iommu_device_array_ser *array; + struct iommu_device_ser *device_ser; + int ret, idx; + + ret = liveupdate_flb_get_incoming(&iommu_flb, (void **)&flb_obj); + if (ret) + return -ENOENT; + + array = phys_to_virt(flb_obj->ser->device_array_phys); + iommu_liveupdate_for_each_obj(array, device_ser, idx) { + ret = fn(device_ser, arg); + if (ret) + goto out; + } + +out: + liveupdate_flb_put_incoming(&iommu_flb); + return ret; +} +EXPORT_SYMBOL(iommu_for_each_preserved_device); + +struct iommu_hw_ser *iommu_get_preserved_data(u64 token, enum iommu_type_ser type) +{ + struct iommu_hw_ser *iommu_ser = NULL; + struct iommu_hw_array_ser *array; + struct iommu_flb_obj *flb_obj; + int ret, idx; + + ret = liveupdate_flb_get_incoming(&iommu_flb, (void **)&flb_obj); + if (ret) + return NULL; + + array = phys_to_virt(flb_obj->ser->iommu_array_phys); + iommu_liveupdate_for_each_obj(array, iommu_ser, idx) { + if (iommu_ser->token == token && iommu_ser->type == type) + goto out; + } + + iommu_ser = NULL; +out: + liveupdate_flb_put_incoming(&iommu_flb); + return iommu_ser; +} +EXPORT_SYMBOL(iommu_get_preserved_data); + static int alloc_object_ser(struct iommu_array_hdr_ser **curr_array_ptr, u64 max_objs) { struct iommu_array_hdr_ser *curr_array = *curr_array_ptr; diff --git a/include/linux/iommu-liveupdate.h b/include/linux/iommu-liveupdate.h index c9d75c6b3be9..0baf6bc2d93f 100644 --- a/include/linux/iommu-liveupdate.h +++ b/include/linux/iommu-liveupdate.h @@ -13,6 +13,8 @@ #include #include +typedef int (*iommu_preserved_device_iter_fn)(struct iommu_device_ser *ser, + void *arg); #ifdef CONFIG_IOMMU_LIVEUPDATE static inline void *dev_iommu_preserved_state(struct device *dev) { @@ -28,6 +30,20 @@ static inline void *dev_iommu_preserved_state(struct device *dev) return NULL; } +static inline void *iommu_domain_restored_state(struct iommu_domain *domain) +{ + struct iommu_domain_ser *ser; + + ser = domain->preserved_state; + if (ser && ser->hdr.incoming) + return ser; + + return NULL; +} + +int iommu_for_each_preserved_device(iommu_preserved_device_iter_fn fn, + void *arg); +struct iommu_hw_ser *iommu_get_preserved_data(u64 token, enum iommu_type_ser type); int iommu_domain_preserve(struct iommu_domain *domain, struct iommu_domain_ser **ser); void iommu_domain_unpreserve(struct iommu_domain *domain); int iommu_preserve_device(struct iommu_domain *domain, @@ -44,6 +60,21 @@ static inline void *dev_iommu_preserved_state(struct device *dev) return NULL; } +static inline void *iommu_domain_restored_state(struct iommu_domain *domain) +{ + return NULL; +} + +static inline int iommu_for_each_preserved_device(iommu_preserved_device_iter_fn fn, void *arg) +{ + return -EOPNOTSUPP; +} + +static inline struct iommu_hw_ser *iommu_get_preserved_data(u64 token, enum iommu_type_ser type) +{ + return NULL; +} + static inline int iommu_domain_preserve(struct iommu_domain *domain, struct iommu_domain_ser **ser) { return -EOPNOTSUPP; -- 2.54.0.545.g6539524ca2-goog