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 3D6A6E69186 for ; Fri, 22 Nov 2024 18:20:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C0E406B00A1; Fri, 22 Nov 2024 13:20:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BBE7B6B00A2; Fri, 22 Nov 2024 13:20:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A85846B00A3; Fri, 22 Nov 2024 13:20:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 8ACEC6B00A1 for ; Fri, 22 Nov 2024 13:20:18 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1D92B1616F4 for ; Fri, 22 Nov 2024 18:20:18 +0000 (UTC) X-FDA: 82814544708.11.AC13CF2 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf23.hostedemail.com (Postfix) with ESMTP id 9C06B140003 for ; Fri, 22 Nov 2024 18:19:40 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KuA8KUPZ; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of helgaas@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=helgaas@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732299523; 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:dkim-signature; bh=rJCH9nWJjky2yqQTB+ixJsGdpraq6q8U4lLr4lweLak=; b=aSk0e81pcCku2nHOSNQ2YvItyU8VDK9/HHronHIB3f9dzRKnS7X7wTPanBYo04f1aRBa6I ZWj+dma/8CXdZS+lVrU7dqtyJJjCRdoK76WgUKAQR/rVe8kSUJWUGRp+JhPULn6ZxE0JLd M+s559N22apKkTnkqbKl96P9e+yPP/Q= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KuA8KUPZ; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of helgaas@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=helgaas@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732299523; a=rsa-sha256; cv=none; b=ksy8Q2tkXfsB2a4bzS1HopQz2MxnArklfOOrpbXh7Uq8613eOLoasrFKXSE2TaY3a+PfRR zbXoqzrpgLI5n7/kFtdDA/Cmgjux/cM2sxFwdLrRvPw3lBzfWhXOfb/zD+smNuv//1vBZS C50VSIAGqPJI/y6+YiwmIZEHKOSZ7T4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id BA26FA41500; Fri, 22 Nov 2024 18:18:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73C30C4CECE; Fri, 22 Nov 2024 18:20:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732299614; bh=6vSGD8e+Q9TRY4zmcvouTkj38cuQb4dQn7OnYsD0ibA=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=KuA8KUPZLoQzRFFXa7LQwUfk9Y596zdnH+rzlqlv+jSr3pgHb8fCWG4T7hE+0eUT5 1O5uB4GKtJX6woemgTFladuO5a6D3vaCSKw8p63j2DW/+N+j/w3OddfrYOsGZkl/Ad y0x8A9A17LEEasDucAsf3SGTFwAYzW0Y0d8Pv/ak5CuO+WFHk3C2ofpLUPTVN2HfU2 DQkMfgOsuIzz3gES/49+Isprivya5qUI7uPl1qDQBRNL5tT5SO+LknOlUKt6zEp2uq HRYlKvMXYGt+pB3A9qnjgJUZms0Be5dlqtuq0N8/laoYEIFDcwQThrjcQPk+YuNCjH mMh7U2yQ0/qXw== Date: Fri, 22 Nov 2024 12:20:13 -0600 From: Bjorn Helgaas To: Alistair Popple Cc: dan.j.williams@intel.com, linux-mm@kvack.org, lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com Subject: Re: [PATCH v3 10/25] pci/p2pdma: Don't initialise page refcount to one Message-ID: <20241122182013.GA2435164@bhelgaas> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <27381b50b65a218da99a2448023b774dd75540df.1732239628.git-series.apopple@nvidia.com> X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 9C06B140003 X-Stat-Signature: y64dtsoou64qwgtdk5h8brbwgagh55tu X-HE-Tag: 1732299580-70557 X-HE-Meta: U2FsdGVkX19jSuvbFmgGkEgaSYi3gbUoQErBYxtoboknTMtUCDmcb++FMsSROfW8V2abbwnLoPAWS1Is50QGb2vmc1K+D1+6OV5mifwMMeGSZDLNY35+dvOm85b4ypaHpwj8mutaR7pvtYzjkDReim+H71nwN8qBQrwHkS3m+f1OvNI95iE1PJ54z5XP31dILTP+beddyrXwJ4jraZi7er6twcschCIkaH2oKbKIV/yRjDcV5PfbFtHbJnm3i+tFYB4sTuj68AnAdRqQfBoHgnOHF9hJbVMGF6SkPOLQV236Xhptg5i+sRszfPXcTMY8jEwVXVy5OAJi9X9oAQeUARYelk31DTfvlg7mKqsXiGYFAcSucL1VYlOzaCdBrQ+TjO9DP7E1EYvVTVL7Dj9js2iTzIJz9XJz++NUNrAeArvLWq2sDxs5zarc4OQy80sHM2ewC+vGP36lNQIo3mHp4TSCGP4gKoYLDHhopb8r9+cNQnmYfn3YVxUveS7eO0N26r7uVrzP/CVVFPfFcwio6L2wuNtmYfS6E4fjNkVfPlYE56Ds+9+dBFIkB3dFs3FZMBCGfcoeNTlY1KfY2AKuuuAE60Z0sYe7/zCJh4TfxDbLtJtUuZbk/KTDOpT6hResvssGN3tLN6Jt++T2D8KYmDcMhmLOW/0szoKs1s2LZEhQLIjNZPyhM2rTdb2zanIqOONfozTKOKgbo95FSUTFkQMNBEfzBPWoBh31alll4vlRmtpvBr1U6H+TIU0NKwMaACOS3pQmQZywguYAnvV566ShfXEEkwaKv5W62VAPVPJFMNMfD1DhyeYAipHOnjDxyD3n9brkHCkp8Yx6znA9tMaIIpA95NeTnefg0wsOunSfrZzWliIJvM5M3h2wjIjYeZWRMh/PWgVsHWkmT+RGTmfz5AfeE8vDdQ1LC559/khac1LzPqFk+s8MExyVEJC80w4eg69wYNHau6bRjZd 9fKAzYVr nNAS76g9IbehuqDAyjm05FMHYIDVsEBnSjz1GafU87yQRt/JEYV0w+MtJFStZPYeZD7gu5yCCeyqddFi925F/jt4Yqj8Nk1BXMBscoyG1pvhHDhBiPDr2OgREdOve5yiXa8VVAtAJEkd5CrGVAJtBRtH6n8nnn2SybUhNx7+fPdM9v6b+zmxch1HyJxmr9yJWBjt3GfQ9EfdGHwTGhtH5eOz7rz3U/YVpXLSgn66YyOVLdB+cgu5XfokUkaPyQ8gof1Z80w3SoARAH6AsfgBO2oJwm5Fo9NhC9MkKHlxeQFbIVm8q2GyYB4WhCrqQdZ9G6wTvlRaLESVGbF1fAdQ2v4NipFwgk0rPcs3QIqfIR7xdGfIh6qiogROQ54pYjh+NYk8ZowCpIAIvWXk= 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: List-Subscribe: List-Unsubscribe: On Fri, Nov 22, 2024 at 12:40:31PM +1100, Alistair Popple wrote: > The reference counts for ZONE_DEVICE private pages should be > initialised by the driver when the page is actually allocated by the > driver allocator, not when they are first created. This is currently > the case for MEMORY_DEVICE_PRIVATE and MEMORY_DEVICE_COHERENT pages > but not MEMORY_DEVICE_PCI_P2PDMA pages so fix that up. > > Signed-off-by: Alistair Popple > Reviewed-by: Dan Williams Previously suggested tweaks to subject line prefix and content: https://lore.kernel.org/all/20240629212851.GA1484889@bhelgaas/ https://lore.kernel.org/all/20240910134745.GA577955@bhelgaas/ I had the impression that you agreed there was the potential for some confusion here, but it doesn't look like it was addressed. So again, a PCI patch labeled "don't init refcount to one" where the content initializes the refcount to one in p2pdma.c is still confusing since (IIUC) the subject line refers to the NON-PCI code. Maybe some sort of "move refcount init from X to p2pdma" or addition of *who* is no longer initializing refcount to one would clear this up. > --- > > Changes since v2: > > - Initialise the page refcount for all pages covered by the kaddr > --- > drivers/pci/p2pdma.c | 13 +++++++++++-- > mm/memremap.c | 17 +++++++++++++---- > mm/mm_init.c | 22 ++++++++++++++++++---- > 3 files changed, 42 insertions(+), 10 deletions(-) > > diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c > index 4f47a13..2c5ac4a 100644 > --- a/drivers/pci/p2pdma.c > +++ b/drivers/pci/p2pdma.c > @@ -140,13 +140,22 @@ static int p2pmem_alloc_mmap(struct file *filp, struct kobject *kobj, > rcu_read_unlock(); > > for (vaddr = vma->vm_start; vaddr < vma->vm_end; vaddr += PAGE_SIZE) { > - ret = vm_insert_page(vma, vaddr, virt_to_page(kaddr)); > + struct page *page = virt_to_page(kaddr); > + > + /* > + * Initialise the refcount for the freshly allocated page. As > + * we have just allocated the page no one else should be > + * using it. > + */ > + VM_WARN_ON_ONCE_PAGE(!page_ref_count(page), page); > + set_page_count(page, 1); > + ret = vm_insert_page(vma, vaddr, page); > if (ret) { > gen_pool_free(p2pdma->pool, (uintptr_t)kaddr, len); > return ret; > } > percpu_ref_get(ref); > - put_page(virt_to_page(kaddr)); > + put_page(page); > kaddr += PAGE_SIZE; > len -= PAGE_SIZE; > } > diff --git a/mm/memremap.c b/mm/memremap.c > index 40d4547..07bbe0e 100644 > --- a/mm/memremap.c > +++ b/mm/memremap.c > @@ -488,15 +488,24 @@ void free_zone_device_folio(struct folio *folio) > folio->mapping = NULL; > folio->page.pgmap->ops->page_free(folio_page(folio, 0)); > > - if (folio->page.pgmap->type != MEMORY_DEVICE_PRIVATE && > - folio->page.pgmap->type != MEMORY_DEVICE_COHERENT) > + switch (folio->page.pgmap->type) { > + case MEMORY_DEVICE_PRIVATE: > + case MEMORY_DEVICE_COHERENT: > + put_dev_pagemap(folio->page.pgmap); > + break; > + > + case MEMORY_DEVICE_FS_DAX: > + case MEMORY_DEVICE_GENERIC: > /* > * Reset the refcount to 1 to prepare for handing out the page > * again. > */ > folio_set_count(folio, 1); > - else > - put_dev_pagemap(folio->page.pgmap); > + break; > + > + case MEMORY_DEVICE_PCI_P2PDMA: > + break; > + } > } > > void zone_device_page_init(struct page *page) > diff --git a/mm/mm_init.c b/mm/mm_init.c > index 4ba5607..0489820 100644 > --- a/mm/mm_init.c > +++ b/mm/mm_init.c > @@ -1015,12 +1015,26 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, > } > > /* > - * ZONE_DEVICE pages are released directly to the driver page allocator > - * which will set the page count to 1 when allocating the page. > + * ZONE_DEVICE pages other than MEMORY_TYPE_GENERIC and > + * MEMORY_TYPE_FS_DAX pages are released directly to the driver page > + * allocator which will set the page count to 1 when allocating the > + * page. > + * > + * MEMORY_TYPE_GENERIC and MEMORY_TYPE_FS_DAX pages automatically have > + * their refcount reset to one whenever they are freed (ie. after > + * their refcount drops to 0). > */ > - if (pgmap->type == MEMORY_DEVICE_PRIVATE || > - pgmap->type == MEMORY_DEVICE_COHERENT) > + switch (pgmap->type) { > + case MEMORY_DEVICE_PRIVATE: > + case MEMORY_DEVICE_COHERENT: > + case MEMORY_DEVICE_PCI_P2PDMA: > set_page_count(page, 0); > + break; > + > + case MEMORY_DEVICE_FS_DAX: > + case MEMORY_DEVICE_GENERIC: > + break; > + } > } > > /* > -- > git-series 0.9.1