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 6B16DC6FA83 for ; Fri, 23 Sep 2022 20:11:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A7FCE8000F; Fri, 23 Sep 2022 16:11:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A309780007; Fri, 23 Sep 2022 16:11:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F7E78000F; Fri, 23 Sep 2022 16:11:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7E90380007 for ; Fri, 23 Sep 2022 16:11:18 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4FB6C1C16C8 for ; Fri, 23 Sep 2022 20:11:18 +0000 (UTC) X-FDA: 79944444636.11.3491AFD Received: from ale.deltatee.com (ale.deltatee.com [204.191.154.188]) by imf28.hostedemail.com (Postfix) with ESMTP id 408A8C0021 for ; Fri, 23 Sep 2022 20:11:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=deltatee.com; s=20200525; h=Subject:In-Reply-To:From:References:Cc:To: MIME-Version:Date:Message-ID:content-disposition; bh=UKGkJSDEegt6Km6YnASFgTL/rZgzcY69GV8aEjSrBsw=; b=Uk3BJ2VHv+0S4jWHSA/rtq3PWC Zj9PsoIM/Z7XnRTaL5ne1xXzusxv8rr55DkC1OmoHUwIWkaZ+Jpepoglgn0v3hyI2SvBzpQQPB7/I pOzSUqMPA2jHYvbYN7r7oL1saGjNZNZxZZl/Qa9MxLkY2XbnIcupaFB9+/ymV/qcrL0ambaJlozZA iz9rqIPUWbtwxVNqkUFYgqxw8Tw3cB3ChEfoRI9T2u9bJwQnnupTD5u0NfCsylJQb8zJCg5sMGt3b O2XS16tx23f40e3Qwgn5Q7E+PItgegCw2qWKbMcuoZvBT0Rtwht0AGeyszOrU2alxd7kuxnWVCgDG 7MWeKj5w==; Received: from s0106a84e3fe8c3f3.cg.shawcable.net ([24.64.144.200] helo=[192.168.0.10]) by ale.deltatee.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1obp0t-008yJz-3Q; Fri, 23 Sep 2022 14:11:09 -0600 Message-ID: <2327d393-af5c-3f4c-b9b9-6852b9d72f90@deltatee.com> Date: Fri, 23 Sep 2022 14:11:03 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Content-Language: en-CA To: Jason Gunthorpe Cc: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, linux-pci@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , Greg Kroah-Hartman , Dan Williams , =?UTF-8?Q?Christian_K=c3=b6nig?= , John Hubbard , Don Dutile , Matthew Wilcox , Daniel Vetter , Minturn Dave B , Jason Ekstrand , Dave Hansen , Xiong Jianxin , Bjorn Helgaas , Ira Weiny , Robin Murphy , Martin Oliveira , Chaitanya Kulkarni , Ralph Campbell , Stephen Bates References: <20220922163926.7077-1-logang@deltatee.com> <20220922163926.7077-2-logang@deltatee.com> <64f8da81-7803-4db4-73da-a158295cbc9c@deltatee.com> From: Logan Gunthorpe In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 24.64.144.200 X-SA-Exim-Rcpt-To: jgg@ziepe.ca, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, linux-pci@vger.kernel.org, linux-mm@kvack.org, hch@lst.de, gregkh@linuxfoundation.org, dan.j.williams@intel.com, christian.koenig@amd.com, jhubbard@nvidia.com, ddutile@redhat.com, willy@infradead.org, daniel.vetter@ffwll.ch, dave.b.minturn@intel.com, jason@jlekstrand.net, dave.hansen@linux.intel.com, jianxin.xiong@intel.com, helgaas@kernel.org, ira.weiny@intel.com, robin.murphy@arm.com, martin.oliveira@eideticom.com, ckulkarnilinux@gmail.com, rcampbell@nvidia.com, sbates@raithlin.com X-SA-Exim-Mail-From: logang@deltatee.com Subject: Re: [PATCH v10 1/8] mm: introduce FOLL_PCI_P2PDMA to gate getting PCI P2PDMA pages X-SA-Exim-Version: 4.2.1 (built Sat, 13 Feb 2021 17:57:42 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663963878; a=rsa-sha256; cv=none; b=PmVZUpr2lGi2+DPAwHNj9OWkTcCjm0xj/UzFObt4TgIXuF6utl4qyzQBAeDkI3e19ZRAa3 Wv5f4m7UqajADIK9YV0LhtmT7XJbhaGTZa1rfGR9RlAvzEuVyAHdEXn1UoMwiIDybgzVmJ NDZ/d1cksT3D+QsKDG1HYMiYpnwTdUc= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=deltatee.com header.s=20200525 header.b=Uk3BJ2VH; spf=pass (imf28.hostedemail.com: domain of logang@deltatee.com designates 204.191.154.188 as permitted sender) smtp.mailfrom=logang@deltatee.com; dmarc=pass (policy=none) header.from=deltatee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663963878; 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=UKGkJSDEegt6Km6YnASFgTL/rZgzcY69GV8aEjSrBsw=; b=CEHQbrlcQt2JSVB6nDgGkKTL6O4cicrAJk3tNbb9DxDCpKc+8kS3FDcpOiIupcfL31L66q K2H34b18iKBYHZ0ZuxN3wbG7/BaUB+Sde/WcnMtAM/dc0ty3OwA914gEpTU4elYnkQo36j Wi7jTPQhZZf7HfW9qNF3nOXMaOMspCw= X-Stat-Signature: 44joqmyakyaozom9onynq65ntnxgbwiy X-Rspamd-Queue-Id: 408A8C0021 X-Rspam-User: X-Rspamd-Server: rspam08 Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=deltatee.com header.s=20200525 header.b=Uk3BJ2VH; spf=pass (imf28.hostedemail.com: domain of logang@deltatee.com designates 204.191.154.188 as permitted sender) smtp.mailfrom=logang@deltatee.com; dmarc=pass (policy=none) header.from=deltatee.com X-HE-Tag: 1663963876-819671 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 2022-09-23 13:53, Jason Gunthorpe wrote: > On Fri, Sep 23, 2022 at 01:08:31PM -0600, Logan Gunthorpe wrote: > I'm encouraging Dan to work on better infrastructure in pgmap core > because every pgmap implementation has this issue currently. > > For that reason it is probably not so relavent to this series. > > Perhaps just clarify in the commit message that the FOLL_LONGTERM > restriction is to copy DAX until the pgmap page refcounts are fixed. Ok, I'll add that note. Per the fix for the try_grab_page(), to me it doesn't fit well in try_grab_page() without doing a bunch of cleanup to change the error handling, and the same would have to be added to try_grab_folio(). So I think it's better to leave it where it was, but move it below the respective grab calls. Does the incremental patch below look correct? I am confused about what happens if neither FOLL_PIN or FOLL_GET are set (which the documentation for try_grab_x() says is possible, but other documentation suggests that FOLL_GET is automatically set). In which case it'd be impossible to do the check if we can't access the page. I'm assuming that seeing there are other accesses to the page in these two instances of try_grab_x() that these spots will always have FOLL_GET or FOLL_PIN set and thus this isn't an issue. Another reason not to push the check into try_grab_x(). Logan -- diff --git a/mm/gup.c b/mm/gup.c index 108848b67f6f..f05ba3e8e29a 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -601,12 +601,6 @@ static struct page *follow_page_pte(struct vm_area_struct > goto out; } - if (unlikely(!(flags & FOLL_PCI_P2PDMA) && - is_pci_p2pdma_page(page))) { - page = ERR_PTR(-EREMOTEIO); - goto out; - } - VM_BUG_ON_PAGE((flags & FOLL_PIN) && PageAnon(page) && !PageAnonExclusive(page), page); @@ -615,6 +609,13 @@ static struct page *follow_page_pte(struct vm_area_struct > page = ERR_PTR(-ENOMEM); goto out; } + + if (unlikely(!(flags & FOLL_PCI_P2PDMA) && is_pci_p2pdma_page(page))) { + gup_put_folio(page_folio(page), 1, flags); + page = ERR_PTR(-EREMOTEIO); + goto out; + } + /* * We need to make the page accessible if and only if we are going * to access its content (the FOLL_PIN case). Please see @@ -2392,14 +2393,16 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr,> VM_BUG_ON(!pfn_valid(pte_pfn(pte))); page = pte_page(pte); - if (unlikely(!(flags & FOLL_PCI_P2PDMA) && - is_pci_p2pdma_page(page))) - goto pte_unmap; - folio = try_grab_folio(page, 1, flags); if (!folio) goto pte_unmap; + if (unlikely(!(flags & FOLL_PCI_P2PDMA) && + is_pci_p2pdma_page(page))) { + gup_put_folio(folio, 1, flags); + goto pte_unmap; + } + if (unlikely(page_is_secretmem(page))) { gup_put_folio(folio, 1, flags); goto pte_unmap;