From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f47.google.com (mail-dl1-f47.google.com [74.125.82.47]) (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 91E424DC553 for ; Wed, 13 May 2026 17:46:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778694389; cv=none; b=rp/EAlmW96/HnH0ixY20mwX6DPosQieSRjnuk+bw68CcSFUy/UaI/yGWYAsm1M10MNxYRqFA2u5/q8b5W8YpMfUjA4/Tq5rP1HHELGsq06CEYBVUMBAQ09Td1Qu/gAkGPWxwiJ9/gLxDQdndLFcpd+gghaGKOoUZ65VuULb99hg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778694389; c=relaxed/simple; bh=RJSvlSo8b3eU3kArKQ0tDZIFebTEAfI2/bt/cNgtTGI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=EZ8n8a6KmPUbsmNN5AH/lN+WEy/qYx0rpexSp73a2exDd9aPo3VgxvYm4tJbvZhefXq3/RPBmXSbwO0MJILVcfoY78IyWNYfV26GIrYtkD3rO1YflupxBAz+lZ+pTF89MDOKyRjSScyfhesF0PRe+9kJMGAECmM0XVceKGnoX0k= 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=COEkVT8q; arc=none smtp.client-ip=74.125.82.47 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="COEkVT8q" Received: by mail-dl1-f47.google.com with SMTP id a92af1059eb24-132cccd3d77so778c88.1 for ; Wed, 13 May 2026 10:46:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778694388; x=1779299188; 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=XeNgdwwD024w74BNPer9lil+jH8BVZwrPlFbFGxZTFc=; b=COEkVT8quN9YkxH2x2OxA2kFCkJxbVYDKRaEnaEw0yg6odEePzLO/fmbR23wz6c5LX GUErnZIKbOyO73cSgW7SeSNWk63vaj6guixVJw9bHVU7YzBcHBWQ1jbUuT/satrawfc3 pCGJSdZ7VPOpq+/O3xIRUKJOWydaphlnWhj996xAm96k6KBHNs/kTGunZLgUR61LwVaS UC72h2gfoYNAkQMKSA7+ri/n6SF+y3+kh3oag837u7w/txcT1aTDG23X/70FXSbJGrIq K49jVqpxdAmrkJT0ykyyqsEmhMLEFgP9qQBfIL9Sa4GczUc6Mn955g1Q/o+8WKXM1i5S jyOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778694388; x=1779299188; 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=XeNgdwwD024w74BNPer9lil+jH8BVZwrPlFbFGxZTFc=; b=klo5quTM02vVfMfKQV7bO4E5TanqOPeoLe3fQowUeZ9oFAzsqcnqSDNk1/HWV5AK36 XfRTsKEI+qfuYK0vuidPGEtoAq33gwqOlXz3gWbG/QBAI4OQG8MUj/Mj4N7S52UUe1lf WdDsVMaRgpkXIz6nmhWYvOVpjaTywQoLK/HgAo5ZjwoY7/OfqXmlrz/WTu5jRIkfZoFc tSnseurYNtoj5KIVYC/P3EGRTQl02+RYF7U8LT9YnPcemhTM5qmpP6rWCqzbTo1fpkyb I6ZTc8I0Qin3mpbIyLKg1tZSofqyHLi7cjrJwfxFsNbKtGyf+QyMxTb51cVE+LsrcHv0 KBDQ== X-Forwarded-Encrypted: i=1; AFNElJ8jgopmzH9U1sOF8ngn4SpBySxhSdvkBvxaU9wf5Fn2jxDJG92E3tpTbTCSsuVjHjANpKSKEXs=@vger.kernel.org X-Gm-Message-State: AOJu0Yxd85bEST4vUkMODw6ufvh9oTXHJK8zmV2tVCV82Y6qqriAxAKS xDbNqqa38o0jEOECbbjeOjDpjqVyXg1RVGjmmNNMKYc0ZZ5Yvm1ue5CwLmL+z+FraA== X-Gm-Gg: Acq92OHriIxngTVvPoICJdPd0Mpzs27DMLEk4+AbYc5vY4/ArefvXF3lX93ytXI9zIZ ONEXE6mQR3DtIfD2k27N4FqQ7W6pH2akNV57FL4jShl1r/N1hiL9c9ZTCq/jYGzmSClL2Y68qRm 2On6Fb4RDWhL/gUF9iUjKXwB1cXW7WKe2KLm9gGGdJBojWo1X3XV5nVKblzncHls5y9hWlIywkE aMy8Y68/KKr6g8J1ZKsQIonz5bKh58ejiJhvKcqq+NN8cGVIOjawLaYXnwQZuyBxmxf5VyTeP29 4nN5LjXRV/Dkb6JFfO2NKKvroWvnCPlP7uHhHo7j7m7UMtjhovtS/TsvxpFIZfYVK4+cuAv6O+v l9OrFBeKCHZVFnZ+EKikSj/QP8rzXHD8Ah4QHcxLad2xhb3NEyGqU4uY/rn2n2bCbANw6R6jBCy /H6F0EsDaC+U+ymHM48WqH1wRNCnTZvjzN/BFt50mhaU2m/U6Grq/U6UX6wEj8ZWw6MJh/yg== X-Received: by 2002:a05:7022:69a5:b0:12c:8f55:cd0d with SMTP id a92af1059eb24-134cb46941fmr20666c88.8.1778694386986; Wed, 13 May 2026 10:46:26 -0700 (PDT) Received: from google.com (153.46.83.34.bc.googleusercontent.com. [34.83.46.153]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2f8859eafc2sm29059095eec.4.2026.05.13.10.46.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 10:46:26 -0700 (PDT) Date: Wed, 13 May 2026 17:46:22 +0000 From: Samiullah Khawaja To: Jason Gunthorpe Cc: iommu@lists.linux.dev, Joerg Roedel , Robin Murphy , Will Deacon , Alejandro Jimenez , Lu Baolu , Joerg Roedel , Josua Mayer , Kevin Tian , Pasha Tatashin , patches@lists.linux.dev, Pranjal Shrivastava , Mostafa Saleh , stable@vger.kernel.org Subject: Re: [PATCH rc 4/5] iommupt: Check for missing PAGE_SIZE in the pgsize_bitmap Message-ID: References: <0-v1-44b2fef88b25+d3-iommupt_map_rc_jgg@nvidia.com> <4-v1-44b2fef88b25+d3-iommupt_map_rc_jgg@nvidia.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <4-v1-44b2fef88b25+d3-iommupt_map_rc_jgg@nvidia.com> On Tue, May 12, 2026 at 01:46:16PM -0300, Jason Gunthorpe wrote: >Sashiko pointed out that the driver could drop PAGE_SIZE from the >pgsize_bitmap. That is technically allowed but nothing does it, and >such an iommu_domain would not be used with the DMA API today. > >Still, it is against the design and it is trivial to fix up. Lift >the PT_WARN_ON to the if branch and just skip the fast path. > >Fixes: dcd6a011a8d5 ("iommupt: Add map_pages op") >Signed-off-by: Jason Gunthorpe >--- > drivers/iommu/generic_pt/iommu_pt.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/drivers/iommu/generic_pt/iommu_pt.h b/drivers/iommu/generic_pt/iommu_pt.h >index 19b6daf88f2ab1..4877b05291c9d4 100644 >--- a/drivers/iommu/generic_pt/iommu_pt.h >+++ b/drivers/iommu/generic_pt/iommu_pt.h >@@ -920,8 +920,8 @@ static int NS(map_range)(struct pt_iommu *iommu_table, dma_addr_t iova, > return ret; > > /* Calculate target page size and level for the leaves */ >- if (pt_has_system_page_size(common) && len == PAGE_SIZE) { >- PT_WARN_ON(!(pgsize_bitmap & PAGE_SIZE)); >+ if (pt_has_system_page_size(common) && len == PAGE_SIZE && >+ likely(pgsize_bitmap & PAGE_SIZE)) { > if (log2_mod(iova | paddr, PAGE_SHIFT)) > return -ENXIO; > map.leaf_pgsize_lg2 = PAGE_SHIFT; >-- >2.43.0 > Reviewed-by: Samiullah Khawaja