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 5AF1F3254B5 for ; Tue, 2 Dec 2025 23:03:52 +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=1764716633; cv=none; b=kbfht9JiVr62dz2AsLfIIR5rkkHoqJ2byKc5N0XS6tg+YlG8t0TwD9vFCFITtHPoOErvofOUA3h1GV7eWcjuMZ6TsE1ZBn5fBEyGHUqaht5pFfbtKryOb84Lqz1E7pv3hoBhW6L2/j0BC/09zbvwWGPlry2lEJDR2kVWwh8WuO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764716633; c=relaxed/simple; bh=6yCwLBcKiXoZq9j08KyuRZPpkWux1GUluhqH1QHBI78=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=k6XODVYJNn0dN7G1C4DmtU0QkXEsozCMiC1Ek0mVqPMNTFNHdI4n+PMaV2+86IVgsh9SUCBo8Q1ZgLhrI9JBpCsEf3jG4/TTpOjXQV4bhT2s0/R11RJUXNp5DEeOE+7FwYO7+0RzMVDwT+4BWLuBAkA5FQNmDyBxl+NgFBgHssw= 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=lnxszFgB; 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="lnxszFgB" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7b952a966d7so9640210b3a.3 for ; Tue, 02 Dec 2025 15:03:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764716632; x=1765321432; 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=HoHQCBGzPSDpvQ5DzInIR79EwOUsOY1qK0FqcY4HIv4=; b=lnxszFgBw6+nfvYoLCfBMC2JspNg10VcEeVI6RXsLax3PFH6re1Pz75+++BtYje4US Zq3Rx83YeOzKByRhzzAcuMcFXiRRE1ynDE1e69KzB9sLHO7A9Ub29xOv37V+SlkWqXlY 4tMV4C8bgEatpOGY3CEFMyyKT8XFs68CayvbvzlvSElCTZ2f+hz0jAf0/cuDCb1MQdQq s411/zkS1kMbsjwrqjJN3ex91gjydRPe/pOXE/zmVskN0EG3KNh5dYbwoCzUSgU9fnJY aw9FrDnReMcW5V/NHAEELfH/ldIXQbr+W3nTxG8elnb887MMirh54mgle/cF5jyZw6dR 31VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764716632; x=1765321432; 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=HoHQCBGzPSDpvQ5DzInIR79EwOUsOY1qK0FqcY4HIv4=; b=eOQ/W25TzUOHmZ6Xe0vJMUNVbgVOiyxb5mlcPqwh0il5sI8EajFaTGPX5mDfbXZjaH XDvIG3DBpbXzGBX89dcIpEVVsmdx45oXJMdwwnnj+AvAXwZyLhVSI/4RscHVBRp7Zp/k S23zdFtceqA7Fhh86dsf4kgJH+FiTDH5XeMGm8ZKZ1VtcvD8OJZiF0qKs5SAhs0vBZ+2 oxjMN+IQ8iG2T1AdaKVLlEG2Nn+GSwNj5ZhoNH8pOPgfTz/B9mq76NwpaaCWVrRk1ApW 5ojPYIWLyVYm5gwBQ6r9IcXNLRwwbmDTwJIYRKeQqERKD9l2VuWPnkF2lCyZ63Rd1aw5 UB+Q== X-Forwarded-Encrypted: i=1; AJvYcCW1bhHrKHlw5QzmHdjoLTqiBmQDRh4zmvV+FsJp8HU0diXEp7/lJhsgEKr/Cye091+nscgNwQM1jzp7F8w=@vger.kernel.org X-Gm-Message-State: AOJu0YxaxmnY7131uFu5mjSQtUgMvH6x+sx5ruqxFDFBfBzb8Y/r438y IIEXwQy210pOHYdiOKYd2bUzRNL4T13/rscxjKzmT1jwHsh0S2uzhF4PhExWpcguVpvshfI2YJ3 KuXbg8Ks00Lts4w== X-Google-Smtp-Source: AGHT+IGW+6rA03ZuLTRwo4SjZcwu7oAYjLwvoTqMmWo+/draSw9w3sgyh7vdayFCGmUTbGpk/CiiUpJej64Q3w== X-Received: from pfkq12.prod.google.com ([2002:a05:6a00:84c:b0:7b6:ab18:1c72]) (user=skhawaja job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:3a09:b0:7b9:a3c8:8c3a with SMTP id d2e1a72fcca58-7e00983092fmr192890b3a.7.1764716631726; Tue, 02 Dec 2025 15:03:51 -0800 (PST) Date: Tue, 2 Dec 2025 23:03:01 +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-32-skhawaja@google.com> Subject: [RFC PATCH v2 31/32] iommu: Allow replacing restored domain 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" Allow replacing the restore domain with a new domain after liveupdate as the restored domain is going to be replaced and not used for anything. Signed-off-by: Samiullah Khawaja --- drivers/iommu/iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index ad47597baa04..b3cda7d044ee 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2290,9 +2290,12 @@ static bool domain_iommu_ops_compatible(const struct iommu_ops *ops, static int __iommu_attach_group(struct iommu_domain *domain, struct iommu_group *group) { + bool allow_replace = false; struct device *dev; - if (group->domain && group->domain != group->default_domain && + allow_replace = group->domain && iommu_domain_restored_state(group->domain); + if (!allow_replace && group->domain && + group->domain != group->default_domain && group->domain != group->blocking_domain) return -EBUSY; -- 2.52.0.158.g65b55ccf14-goog