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 65277C021A9 for ; Mon, 17 Feb 2025 21:52:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF41F2800A9; Mon, 17 Feb 2025 16:52:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EA44F2800A6; Mon, 17 Feb 2025 16:52:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D6B922800A9; Mon, 17 Feb 2025 16:52:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BA2E52800A6 for ; Mon, 17 Feb 2025 16:52:32 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6D1AA160F04 for ; Mon, 17 Feb 2025 21:52:32 +0000 (UTC) X-FDA: 83130786144.12.1AD46D1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 2073716000B for ; Mon, 17 Feb 2025 21:52:28 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HR+R4ZLu; spf=pass (imf08.hostedemail.com: domain of alex.williamson@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=alex.williamson@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739829149; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SxDh0EJ+8MUCjnDi1tBCK0C6PrjOgADbhlB47WIcbEI=; b=5tnx+njFUAGx0PYRT4SIj5nESxNPijREQNjRekdozJui0VFzwdHYA4uoeHvIT6PjGt1ndz tjW1pbztkyezRRmr2rlQQELFfIbIQkTS1sH8FgS4URTuPTdjSe9xW7t0v6dhViAUrHTjHv DJIObZZAXJez25e4hlHvQ616nZ/Hzsc= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HR+R4ZLu; spf=pass (imf08.hostedemail.com: domain of alex.williamson@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=alex.williamson@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739829149; a=rsa-sha256; cv=none; b=YB1NKoSKRBUu3d0/O39zPuliVT2GkGvTsKxe66yVDETpyMJJIUQSKOTygoWwBg5rkkkBki q2n6WzEPiHM1Kn1z6FSGrbC9LYVqrvVClEO5R/VxTwT52Khtc/jCGGIFo7eOuAodwnn0Oe izWQ3LTUVRrG236WNBgjhoTn1Wit1xo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739829148; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SxDh0EJ+8MUCjnDi1tBCK0C6PrjOgADbhlB47WIcbEI=; b=HR+R4ZLuiop9hUXsdYJchr+A2Xx0pG/2tAZhkvHMZGEk5SXzPPQDA7HVCcZCxHiGQXDN8C A1GVdgcjjKDavlWUu5F7jCBvrxy5KM+YNFUUtJ+D6U8DdMnKX2b4C+xmcEo1IvnKf/vlmx N2C/8S2HeiXJ/++GGeRZ1OuirZnovMs= Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-180-zFZbx0TiN7uBv3XB0X_Cvg-1; Mon, 17 Feb 2025 16:52:27 -0500 X-MC-Unique: zFZbx0TiN7uBv3XB0X_Cvg-1 X-Mimecast-MFC-AGG-ID: zFZbx0TiN7uBv3XB0X_Cvg_1739829146 Received: by mail-il1-f198.google.com with SMTP id e9e14a558f8ab-3cffc88f0cbso3046355ab.0 for ; Mon, 17 Feb 2025 13:52:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739829146; x=1740433946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SxDh0EJ+8MUCjnDi1tBCK0C6PrjOgADbhlB47WIcbEI=; b=GffKDAyfpZKsw58K5XF68c38jdDo3WV5GXHAur0PO+XaF8IwEtFGn31BCkAgtBQGbj SarK4USk7t6G+i/wmIFFXS0MeCzgTG9EE7UDgu3mFPu0JDlQzirp0MclpedSv+rvpnrR PzDGcJ0oHoa8Dfq5Ww1QL5Mh4HqGfxM4KfkDgHyexKamHVkHsQtt5Z77qdypCRs42T34 WtOFXUAJBWpY+FJKPmRITDsvdORYN3m6P1/fmjCKVa9qRNiq6TYrjK36IVYd55e8ZeaU sK3VfpzIbviuGwdvPHW8BL4mYqmB+dQxDHXCQ/865pDsOoj0kiExtkPShadCQ54rc1fT 17TQ== X-Forwarded-Encrypted: i=1; AJvYcCWaFuF5BfWhOEgcmKIiyG4UHT2NxueFAd76IJY85/3Y9jtVSKsPAhGrEK85kEw8pRM3TjtFFN8Oiw==@kvack.org X-Gm-Message-State: AOJu0YyVXAkNmzezRt5tSIWxVCN3yW4SOdIywJqO5fpeapCdOaADIdED J2IHfXtL0sQJ/G2JWr/ohMigmEUm8pMdiMY5Gh0N6SaNnvYHMQ8KI1Dq6Z6QCJLp8jqE3TlwbwU BViTtxeyyGAreloHPuXcDKTw6tZ3wvkGEXdVMu2d8oXfSWT9m X-Gm-Gg: ASbGncug1JV4/N+07FT8h7jipbspQuk3l5SgxHoNBPtpA9m5RP8fBMCj2aPkbVYWiEP 5Te+H/TNm4tvV2TpENTa74xZqcsq2J9NnLFdffO1kHz7KiVtiEZ1XnJavJm0KnOdA6VLUy+97XT F4cxgIeD4r6xFaS/+iJhhbcsXAyXu6IXgMpKx3KH2m4jGPPMixajTS4cDlKBxO8+44n0hEpvE3G LcICCo8L7mu5qNjauDRS9lyUFXjHntr920F+KzCic6aVXbBcmmIU7e6nMVla7ggPLTjdzEi6v8O 7+ITt4J7 X-Received: by 2002:a05:6e02:8:b0:3d1:9236:ca49 with SMTP id e9e14a558f8ab-3d2796851eamr27424055ab.0.1739829146278; Mon, 17 Feb 2025 13:52:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IFP4VXmbfSBjTKUdOsf+KSjwWeNwg2r4M9vtE2mjCOTGm7KPENFhTB2d63tVL9BSSKWgsj0lA== X-Received: by 2002:a05:6e02:8:b0:3d1:9236:ca49 with SMTP id e9e14a558f8ab-3d2796851eamr27423965ab.0.1739829145936; Mon, 17 Feb 2025 13:52:25 -0800 (PST) Received: from redhat.com ([38.15.36.11]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d28b060646sm10369835ab.16.2025.02.17.13.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 13:52:24 -0800 (PST) Date: Mon, 17 Feb 2025 14:52:21 -0700 From: Alex Williamson To: Jason Gunthorpe 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: <20250217145221.20f17b7a.alex.williamson@redhat.com> In-Reply-To: <20250214192704.GD3696814@ziepe.ca> References: <20250205231728.2527186-1-alex.williamson@redhat.com> <20250205231728.2527186-6-alex.williamson@redhat.com> <20250214192704.GD3696814@ziepe.ca> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.43; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: G5R4quPMbPNQAph63yufkJ0374tJ4sLQxNI4q9K4aLg_1739829146 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspam-User: X-Stat-Signature: jgasskdw7ns6bjoz3h6tdxho64tp11dr X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2073716000B X-HE-Tag: 1739829148-253709 X-HE-Meta: U2FsdGVkX189UG7b7dkQBEvjUrTBxw/LSd8aTyC0eprR5/M3rS821G6jefvKIqz3f6at7hrob+thNZd5QXcmDkQDgSjL6HpZqY9iwYOR5N3oDzB+/Rx0sbm0r5AdwPH8tHo676Feeli/KCcsHTmyGD76GWytT/jbAiP3JFEm/bzPBElPdNpzFJg91RGcOo9V1WZzCZKobfgTRqos2OvBpvS4GGrHkZh6vXZE89goQSM4abXgth7RJPX6yvvD+tIdzFVHs+3Rs/6UAmB6KbI6KdWK7L6Bvexeuo1OotB5mkl/CogTmRiGfjmCJNHy0CMAkJEW9JaFW5/oc8NdfWqGsD7MinNPwVUtKj5sACCFyEjJ4ZjqD5ScpNNAljPywtewm1ydF8bMEGHSIYlwKJDBwXpQ5ov+evOf9OOaVcJjbbpEyzHzYmeh4WO8y4KrX7EpK2467TP8o+pJ5Ak9xJKF5DMqbE6jTtV9PyLRw8Uq3GgtZ2P5jDOh1S0PU5UEnh7VRuvxVJawH09wpjB2Cw9icA9iZsOls0H3PS3CtaUe3g3bLBwL7uEo6nLG6dtQPfzCb/Bn1djy0fIc+Y8/vO8sD7PppdAe3ep/0IVxWmvRRLzTJxYLnQHdlZ4rxYswRBEEcDUY6dz2b8DiDRZ0P/Jqx8a510GESIoHYd66778c04vrdd2BtShijhO/4zQ4qcizdMr5T/OufrwtmTfkArVLBxTQ9KpLhGLtv5SAkn1E/qKKTKYTfBHKmNfGHXMtQtj84bICG7zAH2U32NI5K+e++JEr89/vXLXlz3C13876DNGxGuanvwqQSOsChhgJzu3UOKMIUxLJGgulI5VGj7QaiORgV/pLYv+gNqL95vSkB72C7E8Iu3ybEZFFMEykk/dyG7AVAknDYlLOHy+7MHq9w4jvpbqvrCcbxwe75NesDvozcy7FLYf8/79tcPSrJZK8W2eGjkXbQVjNOHBQaNq IL/l1zU+ ycs+RY0zhc8AlMiMjrD17a2EYfE35Qjf/E9P4BVHG218JAnEG7zkypzLY9tk2z+KJiC2HCV4QfDUlc8CWPCrsCKfiClhp8SvsKxlZqN8J4C4chOdcnBFESRN10DSlRHErj3GL0gh4MvUi5H8nYcTg/Ew9zX/28zeunfcX0UpQbFtYLC0buGyzLJ/Gx2eOagoZnvX0ePiqsjyo3h+k5z8Gq+6KzBOSIo045J3Pbxmf+xqb6e9Zqfzmbxt8nmCv3++xpFVdzgBeV8vVqn7/qKpFNqdIkQ/RseoZql98NJOJgMFAOCpTkAv1qFhuYrH4lFv3/MF/3i0As4ikGNikOjGeHA1rxXIo0ZzjsvSYTUQITUhDEjq2E8YMRE/Ebk3qRn9dgX85xgT2fmgJWec= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000882, 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 Fri, 14 Feb 2025 15:27:04 -0400 Jason Gunthorpe wrote: > 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; > > ? That is simpler, for sure. Thanks! > > + ret = min_t(int, npages, epfn - *pfn); > > It is nitty but the int's here should be long, and npages should be > unsigned long.. Added a new patch that uses unsigned long consistently for passed page counts and long for returns. Now we just need a system with a 16TiB huge page size. Thanks, Alex