From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 5171C3EDAA2 for ; Thu, 19 Mar 2026 16:04:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773936279; cv=none; b=cuofHS6D5cfVYT4ZDO94O1Mh9Vxy3MPcMDAVtWEpPI1hnRe5Uz7+qGqMJs0ofspKWFc7alAWNyFK+HRtWHJsL56NICcJKK2ICkyOb3YcErn4ydMgFDJpKaBzlvTMOzI6VxwtSZldQJVBoR+kaYphXqIr9er0nIkMAuNBTh08aT8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773936279; c=relaxed/simple; bh=dfS2Q8fq6arO/G/n+oqxc0mTgErVibxYeHUwv2jGQuo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=qmYJz875YbQ8igSvzO8GpzGdJ3fn7rjaJ4GiXixbxCmdz5TGnAe/Wx1NhQXv1h4iEyLGsH5qeJTohRr4qhIZFHTD3wI2ZLTEndrwc/OLQ1ZHeLXV6ncXaJN3p8Yvm9b759LW+G77Ud/3syhZ9dqcqb8SoKksNr0Q4vqiyWfJamQ= 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=N+yIEz4p; arc=none smtp.client-ip=209.85.214.172 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="N+yIEz4p" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2aeab6ff148so86175ad.1 for ; Thu, 19 Mar 2026 09:04:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773936277; x=1774541077; 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=NSymXHBx0EVLNRB8aixQ7qsvbdQ8KkgdXax/b9Pc2mw=; b=N+yIEz4pWSeRTgSzyCk3qQKxPomVvtNJGofGvDbDRK9Li9UjLLajkj1vd3lS0L09sS dxBvGFbINs5Ln9iLC9nypeoItu0ie2y889J3nacO3yt2qXjiHwhJZpmxkm8V6CVVPisW Byr8cwI+eUlyJJ6HmZTl1CiAkjMQU6joLDXYJBjmSPk3L8ICLoYTBglGRIsFA2enXAVV qTXLtzDV+ybd45vCNdhRkZUoqrEb8mgjbsjU53QQqfyB82SL9RT4fWkLmJiotandMA64 VOx66eEoJ+Fw1e4sElFkgtPtiz4Jn4BNYPEt63ZjP4IOHKMOg1ypObSrEQPDqfiq33Ug Z0+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773936277; x=1774541077; 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=NSymXHBx0EVLNRB8aixQ7qsvbdQ8KkgdXax/b9Pc2mw=; b=UXoF37eCEuAFvGwz7aFxRng9duJzAu9tAaVxfrvFvtXYjzquuvmZEI57CeOohMoWee 4hAHfBzH4oD8tWTiXMpQggIe/Nv0x/xMNl32ihkilCCGRuP0NVQ1DZ0b6p303455MlSo fZK6Ww73vIQqsBLgJSdp0EqrlxdclJYBOnUgoYPcr1CM1m2+8PxEgPLf8LrJKTZm6rXM ZUU70xuo+qOk+b43LBgoNpf78T5Z/rgg75/kVoai5dlsTYY74POL09xi84rLz9s9QSaT 7T6GKUjZ/fi1fM7FZjRuA+17UjMVRqBGasmuaLij0pxE7/DWpqI3gNq4zFAN1bRPgSpX BGfA== X-Forwarded-Encrypted: i=1; AJvYcCU7nu32+sPu2PCL9ngMe3DwXSxF/v8GDzu6LC1jffFsKKjJRWlVPJKQqxMMd/FAnuLx9t5gNiLWl2hyzNM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2GAurA3EZh92+4ADb3wQsYf3tuwts42cH0wOb/Bui3Hq9t1yM th2ya0V5L8Nj4wBiXPxb7OZqbirO9d8kzAeqsjDRKf4Td649F3pVoqvDts22RBBv+A== X-Gm-Gg: ATEYQzxS07IIulNEhHFpeB8v4FPuxz/IHqi+tpm6xG+HeQpfc+bq8kfsfhPCMg7n0xg fqmA8x3PjUO9XSOGJyeIY6mwIJyT+8nt1XcphTGgnHaVmOZ4t3RbOkMeMAG5YwyYnn+rGZGIdIW NMjn4UT2a8B1tizC/woTxIQm3F/h3dqHJsC9vGuXAaQEJkgx+aOKmqeuq3ETsJnGKFkt3P1LVpZ cB42MYXAjaKrGwl0pw5O1b8jg2Cv7LcnFpdj1DQPo7fC0VlOLa0FchCWzMkPW3cUhVf49ZZeGmb tpRk5HJro/I8InruWNPrvMFD/mO5NJSGui/oiPJEcVwaWrRLsyD+9ydH5GbEPVm6dvC5hrUjNPP tLfQZxh0sNF/DgI5jqoDpS3bgNArUC7GQB6oHr7xlH+Lkaf3YUnpHr7u8VEVVImQiUUCVs9z2Up b0bX9adPvSQxqQCGSqA+oNXBwqHau2tsUkyzHv2bIoyoMP754/rupvTxktbTui/BV2ECETmy0= X-Received: by 2002:a17:902:da8a:b0:2a1:3cda:8e99 with SMTP id d9443c01a7336-2b079fd1340mr2824065ad.21.1773936276089; Thu, 19 Mar 2026 09:04:36 -0700 (PDT) Received: from google.com (176.13.105.34.bc.googleusercontent.com. [34.105.13.176]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c741e0b2015sm5917787a12.6.2026.03.19.09.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 09:04:35 -0700 (PDT) Date: Thu, 19 Mar 2026 09:04:31 -0700 From: Vipin Sharma To: Samiullah Khawaja 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 , Pranjal Shrivastava , YiFei Zhu Subject: Re: [PATCH 06/14] iommu/vt-d: Implement device and iommu preserve/unpreserve ops Message-ID: <20260317221907.GD2582517.vipinsh@google.com> References: <20260203220948.2176157-1-skhawaja@google.com> <20260203220948.2176157-7-skhawaja@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260203220948.2176157-7-skhawaja@google.com> On Tue, Feb 03, 2026 at 10:09:40PM +0000, Samiullah Khawaja wrote: > /* > * Take a root_entry and return the Lower Context Table Pointer (LCTP) > * if marked present. > @@ -2378,8 +2379,10 @@ void intel_iommu_shutdown(void) > /* Disable PMRs explicitly here. */ > iommu_disable_protect_mem_regions(iommu); > > - /* Make sure the IOMMUs are switched off */ > - iommu_disable_translation(iommu); > + if (!__maybe_clean_unpreserved_context_entries(iommu)) { > + /* Make sure the IOMMUs are switched off */ > + iommu_disable_translation(iommu); > + } I think instead of having a "maybe" function where it might or might not clear the context entry, it will be simpler to just make if-else explicit here. @@ -2375,8 +2375,11 @@ void intel_iommu_shutdown(void) /* Disable PMRs explicitly here. */ iommu_disable_protect_mem_regions(iommu); - /* Make sure the IOMMUs are switched off */ - iommu_disable_translation(iommu); + if (iommu->iommu.outgoing_preserved_state) + clear_unpreserved_context_entries(); + else + /* Make sure the IOMMUs are switched off */ + iommu_disable_translation(iommu); } } clear_unpreserved_context_entries() will explicitly do what __maybe_clean_unpreserved_context_entries() is doing. > } > } > > @@ -2902,6 +2905,38 @@ static const struct iommu_dirty_ops intel_second_stage_dirty_ops = { > .set_dirty_tracking = intel_iommu_set_dirty_tracking, > }; > > +#ifdef CONFIG_IOMMU_LIVEUPDATE > +static bool __maybe_clean_unpreserved_context_entries(struct intel_iommu *iommu) Nit: s/clean/clear, this matches domain_context_clear(). > +{ > + struct device_domain_info *info; > + struct pci_dev *pdev = NULL; > + > + if (!iommu->iommu.outgoing_preserved_state) > + return false; > + > + for_each_pci_dev(pdev) { > + info = dev_iommu_priv_get(&pdev->dev); > + if (!info) > + continue; > + > + if (info->iommu != iommu) > + continue; > + > + if (dev_iommu_preserved_state(&pdev->dev)) > + continue; > + > + domain_context_clear(info); > + } > + > + return true; > +} > +++ b/drivers/iommu/intel/liveupdate.c > @@ -0,0 +1,134 @@ > +// SPDX-License-Identifier: GPL-2.0-only > + > +/* > + * Copyright (C) 2025, Google LLC > + * Author: Samiullah Khawaja > + */ > + > +#define pr_fmt(fmt) "iommu: liveupdate: " fmt Should this be 'DMAR: liveupdate' to be consistent with other files in intel iommu? > + > +#include > +#include > +#include > +#include > +#include > + > +#include "iommu.h" > +#include "../iommu-pages.h" > + > +static void unpreserve_iommu_context(struct intel_iommu *iommu, int end) Nit: Can this be unpreserve_iommu_context_table(), similar to existing free_context_table()? Same for corresponding preserve function > +{ > + struct context_entry *context; > + int i; > + > + if (end < 0) > + end = ROOT_ENTRY_NR; Can't we just pass ROOT_ENTRY_NR as end value instead of -1?