From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 C9C133321B1 for ; Wed, 13 May 2026 17:57:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778695042; cv=none; b=NXBab2nZtXG0+tqvNKmBScruH4hrPQrllaYsG3JPBAVAQOjUjvwY/iiX4iQNPKgen2mi0e0uf1cL9aepKPNJPtvC977TXFnH5wDFBqmx36XAQETyhXllE3klC1MtcsNrEs8i1zF1BDeteGjIs6VadSbpC3uWpcDKRhF9kxStggA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778695042; c=relaxed/simple; bh=QKN3YqFmH0/TeY985PphVsKphrajBj6NCp6nMBNJqi4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=gmSwJsh794PWfeqYEwvUCmC9yRFwNLttdd0iMx3FiYTf9QOOmU4RyGmhxSEu+Lha/d84nMqm/cdgbZusRE+ewijHJvsioXRqJ/sa85qLgJxT8+CTrrC5UIUvRazdukwAp6kRSbrz3OjywzExWQynC/zr/TMCvcNDCYlZlT5hwhU= 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=Aizmh+6j; arc=none smtp.client-ip=209.85.214.170 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="Aizmh+6j" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2ba3b9bcf69so285ad.0 for ; Wed, 13 May 2026 10:57:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778695037; x=1779299837; 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=rumaNYmYuf6e0hytuftPfqmK7NdxUKC1PH7+SuVwJzI=; b=Aizmh+6jxVDU/j0LkndlpWCUS8MbrUWZocFrPYayFzTN2pJ2cqsH5d72lhX3BTkQGu iePoJx66KvbF/mdCn0m11sMn2CHvSvmdZRQ0+aEdCJeF1/iJnWp3kyHO+zlhvVoOeEmo mR/xrV9mb/AH8pJiwvtfcFzG4moZ9+hYbL+p8/4j53w5iWQomRpKV12lIj4ZXhSZUdZG yV9gLbO5CRYc1EXiSLeMvXew07NBGsd6relyleVKcOObRa8nN5TeGVISzyWDBPx1YiB+ 3Q9IBKvpZMX5ppdJ4K9o/uHTXyV4IvqqCfk0Ok6MvENZkFm/HZIkV/D3EIdKB/kv50oa i35g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778695037; x=1779299837; 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=rumaNYmYuf6e0hytuftPfqmK7NdxUKC1PH7+SuVwJzI=; b=bK8sR1+eEaIkBMttsCgWSuL/iGwY4m10mB9SBgEUOwLk9XksZvsbZggCnwaaTDhOHg 5S7JJLsPQD2EDZwTse7rvI0gij6jKm0sPHYtU0Te87bn9Pf1j+CGqle/6jL8mIcTrHER 5W/sGaAVV05A+DbvUhkB3ZLVtPH9gsruCBbRVgj3tjfk2X47g+5fw1zAMOj8fUBQn/7U 9lCbcDLCpx4l5tZLnFM7q+hxuhN3NTsTnO8q/sMii8uo1FFgGVo8vHCZMj8m74Uvj4n5 BqbNalQ6RjKxg7bJl2x7LzauQyIVLvfIKIqWUDepZ3UfQnnIsCkV07pAAuxlrW0eziRC 8jag== X-Forwarded-Encrypted: i=1; AFNElJ8T9xFRlBpkJ+Y0BigeVVNOVneUuWbKKhT/s6m/XTj2Uu8iwTm8LsmQvTrAgWnx2gpKaR16a0U=@vger.kernel.org X-Gm-Message-State: AOJu0YwlVzXegyNpK1aD9r13MucobJVZKEQj5e+F2wJTw39HOouRzMyZ Fkvx46Z/clDTifwFfEIfiQMrPBZoDCVd+bE25aqCvdpUEW1jf19Laof61UADNPtEbw== X-Gm-Gg: Acq92OELXSXknYc64Up3EWj8Ae5AO0W8YwA3NodGgaNiEjRGxzJ17GUamMUQRkLX1in Uj6JJU/RBR5DnqGzICKxcMdzR+oew3zq1F1WYcn3AfxkalVuCyoslTb0J4Y/LP/zxV+/6F4eACu RwDixWa6/c3oIwBznJ9MrbdxM2PcF/SHLmYbTj89W6ZnBUgD6P7pYJIEOBw0rgfwOcf74JrQNru JNj+hk+uCUhXHMMw5nyBSRFtx5y+7ZBfxf8kjjbIJT/nymJKgd4ZbOiVOnTP2PzCoH8NFf5trtO vz3DIhrCbGcl1nocdYax9O7Wv0YzRq+mIR5b3SrIqBYWB1KvoSsMfG4m227qxk4F/9ST6Z6StwL 1X4HwG6GOdPKt5iUbfL42NTUn28aQp7dYVAvMd7Jpz6tDOhNziUROPfFy/EJhr9zahs9yVEpiUC 8f0+fkVefCk5+OBIzZPuCZ5XG/M/Zl2VtkhTfImbIvAC+BHdCgBRlwdIHGNeFGEv8qZjAZog== X-Received: by 2002:a17:902:ef0b:b0:2ba:dfa:328d with SMTP id d9443c01a7336-2bd55ecaa5fmr219545ad.1.1778695036910; Wed, 13 May 2026 10:57:16 -0700 (PDT) Received: from google.com (153.46.83.34.bc.googleusercontent.com. [34.83.46.153]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1e9fd64sm158045275ad.69.2026.05.13.10.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 10:57:16 -0700 (PDT) Date: Wed, 13 May 2026 17:57:13 +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: On Wed, May 13, 2026 at 05:46:22PM +0000, Samiullah Khawaja wrote: >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; After thought nit: I wonder if the error handling of iova and paddr alignment should also be deferred to non-fast path? Basically lift the iova and paddr check in the parent if? >> map.leaf_pgsize_lg2 = PAGE_SHIFT; >>-- >>2.43.0 >> > >Reviewed-by: Samiullah Khawaja