Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 E6CCF35E1BF for ; Mon, 15 Jun 2026 23:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781567453; cv=none; b=rro00XXkvnTJZiGKl0AiM/NxhrwldmC1PzBF++9zbAnCbZcAT3IZQn6aD03qIsnmiGIeQTUyDFcZA/+5MGhkelTQLovRUW5/xg1JdhkM5a/IcfsqSMMfuRlFH23IdOM66+9uSCWnuG9bi5/Hsbk9DUacw1ZTbXflRcFY18Kz6QA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781567453; c=relaxed/simple; bh=uVBZNtimwbIIguHcLkZBeq/x7MZXc57E82UKcm28GYA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uXXaK0tU1Y0tyL5kp72Xyrcj5dE7U4is+BQFvTHA9HK7b+zSjuXvPCObSzsE1TpT3ilA0Unx3MUyfdSI7dBAw7VBBmVCU1E3w5pU2PmNGEk4nbOP1gHTL/8SsmWf9CFCkDykie4sIL4PMHUBA6g6HAOhnTEjJLEtkpZ7AL1LL6g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--praan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Wxm/EOea; arc=none smtp.client-ip=209.85.210.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--praan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Wxm/EOea" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-8428384f31fso2993119b3a.3 for ; Mon, 15 Jun 2026 16:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781567450; x=1782172250; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Vbp1vR0f2bRMycBRqikb36Jvottf1nd9z8DiwoyXr0k=; b=Wxm/EOea0vlfwjaEzoNmh69K9Xq7ZSo0qmSstiyGpjM72kw/pg9hLU3hsenEEXjc5+ Qc8esO8NGzODU5Cfx9yiZIy8O5AJ0MrfPXj+QD632+rgJuodSvgGD/Zcabk1kDeusewG I8RZiJnLPWjWItg0jTVK1BJasBOr9isX9kwZkLvw0l1rCXcBC8g/tUErKXPDYixG0bgT 5JLmSe79GfyBTXSiEBd2mVDutVNxXl81SeC0ICutPg6nXTg0qOlg9+exYtOl4IF+K7ws 8eDq3ou3+osMyJ+ejb+2QBoeJCtfGnI4a+yrm2Jv3Vl6CEvducNxJP1c9liHBLaEdnUM hCsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781567450; x=1782172250; 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=Vbp1vR0f2bRMycBRqikb36Jvottf1nd9z8DiwoyXr0k=; b=UtgZd6n7mqRwdQ0qX4HsKVpTgC4Q/hhKhX7j0xmgU8D1fgYgSuEzNlAexdZIoaQvwt t443A8teYpL1WRdd1hjZ3On/Gxe7KhMkwEP7HRtPUC25YIdFts6Dzuhaq2Ik9v5KLIs4 oKe8gDBEF06vdkD6yta1yxFLejQ6gHS+OB13EETKpREx5Rjl+7bD4DkMQoYS4tZUlkWF QEO0VwUtC8cZlLgDVMrBE6y3DsNlAX7A9lXhqaGd/IleU6tczJgPHo7VV+IoJypRliJg Oqg839m2nW2XBS8CVJFhUsPEb1C+r5TuS2RIejYO8LCqird2oQwatucLdaSRs14shfqq Kk3g== X-Gm-Message-State: AOJu0YxoqBVP88rqkjHgyUiIdgcuvmZKfygVBdBTsRdGarA+21AaOXXR Ydc6CgUD0ElDI2U4fPzdDDi/eSttmIZnl3fLcB431zUHRYpi39dp5Sg/4A1Gxla8MCR5f8HZ2Da pjog2r6zC/UAt8DIATtF/qrejI88hoSgHz0tzEhtwZxhLncxCfDQCold8IRnO1DSJSYLECjXZmO kAoL0RYjh83xbu3Oz19ab+qvWAKaI/Lw== X-Received: from pgac17.prod.google.com ([2002:a05:6a02:2951:b0:c85:7ee2:5d43]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6300:408a:b0:3b4:7163:a7ed with SMTP id adf61e73a8af0-3b7e4d5cd24mr1255984637.30.1781567450060; Mon, 15 Jun 2026 16:50:50 -0700 (PDT) Date: Mon, 15 Jun 2026 23:50:37 +0000 In-Reply-To: <20260615235037.259909-1-praan@google.com> Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260615235037.259909-1-praan@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260615235037.259909-5-praan@google.com> Subject: [PATCH v9 4/4] iommu/vt-d: Fail probe on ATS configuration failure From: Pranjal Shrivastava To: iommu@lists.linux.dev, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Joerg Roedel , Will Deacon , Robin Murphy , Baolu Lu , Jason Gunthorpe , Kevin Tian , Bjorn Helgaas , Samiullah Khawaja , Pranjal Shrivastava Content-Type: text/plain; charset="UTF-8" Update the Intel VT-d driver to handle ATS configuration and enablement more strictly. Specifically, update the device probe to fail if pci_prepare_ats() returns an error. This ensures that any ATS-capable master reaching the attach phase is guaranteed to have a valid config. Additionally, update iommu_enable_pci_ats() to WARN() if pci_enable_ats fails. Since earlier checks in the probe phase preclude config-related failures, any failure during hardware enablement is considered a kernel bug. Reviewed-by: Lu Baolu Reviewed-by: Kevin Tian Reviewed-by: Samiullah Khawaja Reviewed-by: Jason Gunthorpe Signed-off-by: Pranjal Shrivastava --- drivers/iommu/intel/iommu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 849d06dfe1ae..f39451323553 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -876,8 +876,14 @@ static void iommu_enable_pci_ats(struct device_domain_info *info) if (!pci_ats_page_aligned(pdev)) return; - if (!pci_enable_ats(pdev, VTD_PAGE_SHIFT)) - info->ats_enabled = 1; + /* + * pci_enable_ats() should not fail here because earlier checks + * have already verified support and configuration. + */ + if (WARN_ON(pci_enable_ats(pdev, VTD_PAGE_SHIFT))) + return; + + info->ats_enabled = 1; } static void iommu_disable_pci_ats(struct device_domain_info *info) @@ -3292,7 +3298,10 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) dev_iommu_priv_set(dev, info); if (pdev && pci_ats_supported(pdev)) { - pci_prepare_ats(pdev, VTD_PAGE_SHIFT); + ret = pci_prepare_ats(pdev, VTD_PAGE_SHIFT); + if (ret) + goto free; + ret = device_rbtree_insert(iommu, info); if (ret) goto free; -- 2.54.0.1136.gdb2ca164c4-goog