From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEFB2C02198 for ; Fri, 14 Feb 2025 19:27:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 200BE280002; Fri, 14 Feb 2025 14:27:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B184280001; Fri, 14 Feb 2025 14:27:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 02ACB280002; Fri, 14 Feb 2025 14:27:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D9AF4280001 for ; Fri, 14 Feb 2025 14:27:08 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 832BC140956 for ; Fri, 14 Feb 2025 19:27:08 +0000 (UTC) X-FDA: 83119533336.21.3EFC2C5 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by imf13.hostedemail.com (Postfix) with ESMTP id 9964020011 for ; Fri, 14 Feb 2025 19:27:06 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=ziepe.ca header.s=google header.b=CoSaP9pF; spf=pass (imf13.hostedemail.com: domain of jgg@ziepe.ca designates 209.85.222.174 as permitted sender) smtp.mailfrom=jgg@ziepe.ca; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739561226; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=q54C682wupKw2fn+9hJZ17sdX89XEBbDkpwzhueywsk=; b=uKV45vlSMMUvUy/7/tSzyaGsOxPseszBxiaef6N6MduuuljoJnvPLVV3oscHdF2oIRwplq j9mrAgP4EQ5CbkwnqmUBFRHVxuATbzuAZUdF2q1T6OaD+vzyLpROqmH0hVZYQfRhbyfsD8 17Vfe7j3RvSlUr6r/LJZVUStzapxrCs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=ziepe.ca header.s=google header.b=CoSaP9pF; spf=pass (imf13.hostedemail.com: domain of jgg@ziepe.ca designates 209.85.222.174 as permitted sender) smtp.mailfrom=jgg@ziepe.ca; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739561226; a=rsa-sha256; cv=none; b=unRigV7NM08joFat530UwLn94LZlPuSrHzVhvNgQ8ZwEedxm/6QwHxLDMv9X3xF0qSnJ3Y DA6BbBZ3sC5JV5qpQfuQDyr4gQ4uIAwqIdPKGa/ACrLDTZYO2Z5qMYmqXof4ca/eRu9Pty 4Qsxowm1XJNDXcWXH4r31wVjtoKcwjg= Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-7c0155af484so336852785a.0 for ; Fri, 14 Feb 2025 11:27:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; t=1739561226; x=1740166026; darn=kvack.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=q54C682wupKw2fn+9hJZ17sdX89XEBbDkpwzhueywsk=; b=CoSaP9pFeC6O0ke5T9hgmFfX3wHf5+Yhp/tyknG9P6Mr27/xG610GiNCOa6/kjqdLB cZz1ccljqtqCB6Z73XCjoKgKFdo+N+OgrOuGebfpjDVza63JYz1P28SoIBXvb3sIlDdR VAUokcE0gdPYSJYEtkOtFgKrtYogkGkcZnI50hiLQLpA8JAKfAtxT/UnzhcL/+qVmwB+ gbJaW/RjXAEeGuwdvbV13mhIhjbXAft8bGqZKcT7hDSv3SUTmv5OFWJ4Di7mdKmOgm6G 2LP2ErfVGcSE3IQ5aBY7FwQTAkDIk/jJAnYd9ybqsBMfY2jhJ533UtcuSo7w1seDr3Bk 1Bgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739561226; x=1740166026; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=q54C682wupKw2fn+9hJZ17sdX89XEBbDkpwzhueywsk=; b=pZ4bXr+1PbC3z2hNw0lqUFEBx50+r7jYTG+Umo39C8bk7P46kI9AwhvBaF1squKfW8 Scip50HL08pHQHHliU4AVtngXX8WfuTeq+vHm9Gu6PoaGO781R3rJtyBaKjw/HOYdnWq YhRh6+PwlIzDTxdtgernyoNAI7wgfYHiBa1N4jf9J4hSgxu+QhpyYFyLI8GU0GjGFzHd LTVnWeLdg6pUBWOSYDgRiqRhbq6NmWoyXrpfvHYpMVJ6Bv7ugK8sMhSUmzN8nsPs68kn QCsNZcq1hz30ENYWEsez7oCPqGFZ0gp7wzkkpD+vT0XWMFeHnVuPwqRDlCQPDkoMn9gz gaYQ== X-Forwarded-Encrypted: i=1; AJvYcCWLmASGfHgEtnlqL7cdsFAv6PaDDwipd4ULD6IczxswO9MJ0UW55zRMsAb2GKKXjaht9NqpmvBsAg==@kvack.org X-Gm-Message-State: AOJu0YyrC58Yt8n2hzgJrl2IHGNb6asiK5NRdYlFy4hMaZsvOghCRgcx yRUTlmcYrCpXg7BZiF3ieIqfraTWihehFDnDCzeYL+1z9qjRnlziH5oE7tb+6U0= X-Gm-Gg: ASbGncvK0puou5EFDArX1ZzNVfjje4DCZcCK5CEG9CWDbIryNwV1BPxckBc2Be9ujn1 g5b+L1iicirXno5/SEhuPAsb51KXPoxsAovZhc3E1zAJtsvN25BHdZHFbMRbo/FKSa8AVDhZtgW zvJl+OjNLEfZ3qekNJlCN5yDMVgmjI+4WxSOW+mpDAJSFEs0NJQ9Aa4x4IFrQ5GTGVoNa0lMzrc fS8VsZyCvpYDS1BbHtqAHankDWEKSffjKuJzYE4muIZC2JR0n4ggjHC/wJI5ghh4uscsZPd8ilL o/rwiz+x5lxKKsDhlmHdqrttXlvlWIaMLMJUhPrbtX2mB+2XLI0wYniFTrfZdaV4 X-Google-Smtp-Source: AGHT+IGP6EIu6D5/X4T1lXUP3TqCWP6QCFadGFyDUhKfkvIRhoG4FICvPgxc52H21XaC8VTPwxK1CA== X-Received: by 2002:a05:620a:2691:b0:7bc:df55:2cd0 with SMTP id af79cd13be357-7c08aa9f850mr103218785a.48.1739561225699; Fri, 14 Feb 2025 11:27:05 -0800 (PST) Received: from ziepe.ca (hlfxns017vw-142-68-128-5.dhcp-dynamic.fibreop.ns.bellaliant.net. [142.68.128.5]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c07c86155dsm235281185a.87.2025.02.14.11.27.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 11:27:05 -0800 (PST) Received: from jgg by wakko with local (Exim 4.97) (envelope-from ) id 1tj1L6-0000000GmO1-2uwa; Fri, 14 Feb 2025 15:27:04 -0400 Date: Fri, 14 Feb 2025 15:27:04 -0400 From: Jason Gunthorpe To: Alex Williamson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, peterx@redhat.com, mitchell.augustin@canonical.com, clg@redhat.com, akpm@linux-foundation.org, linux-mm@kvack.org Subject: Re: [PATCH 5/5] vfio/type1: Use mapping page mask for pfnmaps Message-ID: <20250214192704.GD3696814@ziepe.ca> References: <20250205231728.2527186-1-alex.williamson@redhat.com> <20250205231728.2527186-6-alex.williamson@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250205231728.2527186-6-alex.williamson@redhat.com> X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9964020011 X-Stat-Signature: wg5zfdsaye53s58rakuwkg3wdsrkgct7 X-HE-Tag: 1739561226-716259 X-HE-Meta: U2FsdGVkX1+FUC7My/o0Sf7PzJaQJ/g9TyJ7R+vW3LKHenPp1yVjCOQcWNyhoz2xXokAcft0s8DA1TghkEVAA232KZVbHypNbOSO+ybzfCMxWrlhiMRSpJuM3o6k+MCi8quKY4lvVS+KtV8PN5qqXvYzcotI1zinsH1dQSdq0SCBO/8imzsaMBssCg5ExueyjT+jhVQ16HwIZznhmHranegAWhlg7+XrcAnBj1KjxoTJlwFL74Vet2HN/3MV94KLrCCokg6NxLuuHma4iwK9IEAoYdrWR0raizxXHkL6TFB+ajvoZRHmLaY+1MxgPL9mp75Fu8fcYZy4T0x10XQ6Thbgqi5JDaE0hEFezJyaUuEHx/HA2ErTNGG7lXSV4IGHVNAEmECA54Qbjl1QLQ1cU8I7wuASDjah3wz8YUljrZByOjQg0NAlwFrjj6MogOO10+fkZC1OuFjXhajVGDlttZvFq+FXMgmDzmNBZyCfOJxzfo1McwpiXk6NISZdJKWJK8WEdL4Mxi/4ADAA9KFfTcHXa2LqsMELfTj43RWrkMf+8JFFJhPqjYtbRf/YYRgMUaj3SqjWHvCH0UdYc86dB/EzBzHXRm6QAoIQR0EbCdzhmztxLji2wbGyl+GVMguoJLHxOZqG9Y5ie4ZGr17UkKy/ll5HayCXLh6omkglnAIvgO4STzfZA5YM02OoDfb342lOXuDYNm7qXTskj1liRs2al/z+y5VvgZANtWZQzTETXMFVCkU/VNNiiYl1r19unYYV3eC2dTDw1F6xTWSAI2/EHNZxGCRBam5QcS8DrHaf8pT/Eq5TSCc7x5rMYzZFew0w12wiWxPTaHlfVcZs97rDMAcTlcDxNTwpi0FB6XHsUSsbfQb4LI6L1heSe5EOJA6RnT3CniSEVgO50kwe5ciptq4xGVUicIV1uEMwUOt/Bnrysfoo9O+5oo47GnMyeGh9+gu+Yv0dkfyBgO4 C+mGADFf rBlKBodBT7aAPsu5q9zenmhqEcRbETCbSTcP275RJ2dRiakdJWxa5hhWHd/Sq3oHYg5ohPlBfgV4ZZLcnWWErNRDazupiUtTeBexXI0Z0LcJzEfF6bf9poblYWHNkBnZCja5nyitsSYgUUTCbZzzPxUxv6V8k/ZTcacE33iURJ5o7Lthra7GIaJ72ls+3eePTICqKUkllI0qz1wH3rchaJuIvYCLXkbi1UVY+GItRuWQpel1S09EXO9+1Dz1daIvyBz41kpbRsW8P181MBxqac6jPCn7XvdgUjfwr X-Bogosity: Ham, tests=bogofilter, spamicity=0.132944, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Wed, Feb 05, 2025 at 04:17:21PM -0700, Alex Williamson wrote: > @@ -590,15 +592,23 @@ static int vaddr_get_pfns(struct mm_struct *mm, unsigned long vaddr, > vma = vma_lookup(mm, vaddr); > > if (vma && vma->vm_flags & VM_PFNMAP) { > - ret = follow_fault_pfn(vma, mm, vaddr, pfn, prot & IOMMU_WRITE); > + unsigned long pgmask; > + > + ret = follow_fault_pfn(vma, mm, vaddr, pfn, &pgmask, > + prot & IOMMU_WRITE); > if (ret == -EAGAIN) > goto retry; > > if (!ret) { > - if (is_invalid_reserved_pfn(*pfn)) > - ret = 1; > - else > + if (is_invalid_reserved_pfn(*pfn)) { > + unsigned long epfn; > + > + epfn = (((*pfn << PAGE_SHIFT) + ~pgmask + 1) > + & pgmask) >> PAGE_SHIFT; That seems a bit indirect epfn = ((*pfn) | (~pgmask >> PAGE_SHIFT)) + 1; ? > + ret = min_t(int, npages, epfn - *pfn); It is nitty but the int's here should be long, and npages should be unsigned long.. Jason