Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1415876pxk; Fri, 25 Sep 2020 14:19:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXckCv90WRJIyOeYclnfnlR5eE9eEf75kEzqqc70jY9Jr5Aa3YRg4d/6mQtG+UrV0vRFk7 X-Received: by 2002:a17:906:cc98:: with SMTP id oq24mr4641345ejb.106.1601068760603; Fri, 25 Sep 2020 14:19:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601068760; cv=none; d=google.com; s=arc-20160816; b=iF1T82/d7crnGQge+/7G8SAa9/ym8H/CezYWRkw/tpbqV7npyFB2MzcPn+WDuieNiC ttSs/2cN4x9jvoBRZQNcHAxdcQmUxHQx37b5oO/HFbMstBDs0vd2KEr6rrdV/bw/CBp7 6mFQdrHTILYdenY4i3RtzjhnYkxVuJUW8tcfzqfELWOAECkI0iD/bOKfQ8FQ+E8pcUK/ KHBEnDfXbAo6jkoM+n+z618q1w63d+TNF4ZFoBZMkBSkuhGlrpexNSbG7DP/mffNJk8V OdsthEjoIUYBjE66lzjJAj5FfWzWgH8asc1h3CnMoYbJBkJNVPKSk2T7sCcfTtTf5nZ2 i3Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:dkim-signature:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=EgKHbA7P4sEfdcZAs8fcPF/wZN6SUEEW4m+FX39r4FY=; b=wuhgLUROfE2wDxoWIL6i+X1KN3Sq3dmP6Q2xTXOQkfCsYQrzXc+kfZI07xMb0C37Sj BiiLilc/tp+wMecXvuZ3sKlBK7PkM9bqSK2nymYXNq5XP5F2O1svHFd/U8Xy+ZSHMag1 EZSVLcULx7o8ln+skYDXUtyc2GAjSoMHqgrYfl6+rq9ESWSa4wS2xSLppZ66kJ8f49dA FKr0Kf06O5g6Yx0/vVw7zZPU7j9qJQCJzBdWljwW9rMEcN/1zCYf+LNZlzkzWf+AqOPG ORv31PjvvdBbSfoP0uU/HIonO6pD0Wr8Ts6j3EpxovUcYGZg9VQyjmcPIpB5kIHLg0Ud L1Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=mRFvt3JS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id fx6si2662220ejb.432.2020.09.25.14.18.57; Fri, 25 Sep 2020 14:19:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=mRFvt3JS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727355AbgIYVRi (ORCPT + 99 others); Fri, 25 Sep 2020 17:17:38 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:14115 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726559AbgIYVRi (ORCPT ); Fri, 25 Sep 2020 17:17:38 -0400 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Fri, 25 Sep 2020 14:16:49 -0700 Received: from rcampbell-dev.nvidia.com (172.20.13.39) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 25 Sep 2020 21:17:36 +0000 Subject: Re: [PATCH 1/2] ext4/xfs: add page refcount helper To: Dan Williams CC: Linux MM , , , Linux Kernel Mailing List , Ira Weiny , "Matthew Wilcox" , Jerome Glisse , "John Hubbard" , Alistair Popple , Christoph Hellwig , Jason Gunthorpe , "Bharata B Rao" , Zi Yan , "Kirill A . Shutemov" , Yang Shi , Paul Mackerras , Ben Skeggs , "Andrew Morton" References: <20200925204442.31348-1-rcampbell@nvidia.com> <20200925204442.31348-2-rcampbell@nvidia.com> From: Ralph Campbell X-Nvconfidentiality: public Message-ID: Date: Fri, 25 Sep 2020 14:17:36 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [172.20.13.39] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1601068610; bh=EgKHbA7P4sEfdcZAs8fcPF/wZN6SUEEW4m+FX39r4FY=; h=Subject:To:CC:References:From:X-Nvconfidentiality:Message-ID:Date: User-Agent:MIME-Version:In-Reply-To:Content-Type:Content-Language: Content-Transfer-Encoding:X-Originating-IP:X-ClientProxiedBy; b=mRFvt3JSueoEWvwICZCtnFGa+CBOawclGIrvlOOYYnVV+c9H8APX2UD5/WRg/rIpQ iRHtyRxzOIBQcaM1YW3U6CvXzczYwaaVzh4ZdnnHi9ZH5TBwj8G7a84q/pAhQmItgd jY6txErAZcfqDt2aGYSNWuU+680aNN2zQ+C9yMFoaix/5AnnoKzMacVpPtUM9SGOEm c26UgiTgZhherdWlA59r6hFrDcbu0Yqf4o4Rz0YdD7VECNxlbZY/sMD3KHkMTt+2OF RbbEbzZP2k28tHb5I9BOGFuLo3524Z0DylKGJdS3kjrUkFJsCEOHtHGEzUCBoX8Dn+ Bsn6H7P1KF+ng== Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/25/20 1:51 PM, Dan Williams wrote: > On Fri, Sep 25, 2020 at 1:45 PM Ralph Campbell wrote: >> >> There are several places where ZONE_DEVICE struct pages assume a reference >> count == 1 means the page is idle and free. Instead of open coding this, >> add a helper function to hide this detail. >> >> Signed-off-by: Ralph Campbell >> --- >> fs/dax.c | 8 ++++---- >> fs/ext4/inode.c | 2 +- >> fs/xfs/xfs_file.c | 2 +- >> include/linux/dax.h | 5 +++++ >> 4 files changed, 11 insertions(+), 6 deletions(-) >> >> diff --git a/fs/dax.c b/fs/dax.c >> index 994ab66a9907..8eddbcc0e149 100644 >> --- a/fs/dax.c >> +++ b/fs/dax.c >> @@ -358,7 +358,7 @@ static void dax_disassociate_entry(void *entry, struct address_space *mapping, >> for_each_mapped_pfn(entry, pfn) { >> struct page *page = pfn_to_page(pfn); >> >> - WARN_ON_ONCE(trunc && page_ref_count(page) > 1); >> + WARN_ON_ONCE(trunc && !dax_layout_is_idle_page(page)); >> WARN_ON_ONCE(page->mapping && page->mapping != mapping); >> page->mapping = NULL; >> page->index = 0; >> @@ -372,7 +372,7 @@ static struct page *dax_busy_page(void *entry) >> for_each_mapped_pfn(entry, pfn) { >> struct page *page = pfn_to_page(pfn); >> >> - if (page_ref_count(page) > 1) >> + if (!dax_layout_is_idle_page(page)) >> return page; >> } >> return NULL; >> @@ -560,11 +560,11 @@ static void *grab_mapping_entry(struct xa_state *xas, >> >> /** >> * dax_layout_busy_page - find first pinned page in @mapping >> - * @mapping: address space to scan for a page with ref count > 1 >> + * @mapping: address space to scan for a page with ref count > 0 >> * >> * DAX requires ZONE_DEVICE mapped pages. These pages are never >> * 'onlined' to the page allocator so they are considered idle when >> - * page->count == 1. A filesystem uses this interface to determine if >> + * page->count == 0. A filesystem uses this interface to determine if >> * any page in the mapping is busy, i.e. for DMA, or other >> * get_user_pages() usages. >> * >> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c >> index bf596467c234..d9f8ad55523a 100644 >> --- a/fs/ext4/inode.c >> +++ b/fs/ext4/inode.c >> @@ -3927,7 +3927,7 @@ int ext4_break_layouts(struct inode *inode) >> return 0; >> >> error = ___wait_var_event(&page->_refcount, >> - atomic_read(&page->_refcount) == 1, >> + dax_layout_is_idle_page(page), >> TASK_INTERRUPTIBLE, 0, 0, >> ext4_wait_dax_page(ei)); >> } while (error == 0); >> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c >> index a29f78a663ca..29ab96541bc1 100644 >> --- a/fs/xfs/xfs_file.c >> +++ b/fs/xfs/xfs_file.c >> @@ -750,7 +750,7 @@ xfs_break_dax_layouts( >> >> *retry = true; >> return ___wait_var_event(&page->_refcount, >> - atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE, >> + dax_layout_is_idle_page(page), TASK_INTERRUPTIBLE, >> 0, 0, xfs_wait_dax_page(inode)); >> } >> >> diff --git a/include/linux/dax.h b/include/linux/dax.h >> index 43b39ab9de1a..3f78ed78d1d6 100644 >> --- a/include/linux/dax.h >> +++ b/include/linux/dax.h >> @@ -238,4 +238,9 @@ static inline bool dax_mapping(struct address_space *mapping) >> return mapping->host && IS_DAX(mapping->host); >> } >> >> +static inline bool dax_layout_is_idle_page(struct page *page) >> +{ >> + return page_ref_count(page) <= 1; > > Why convert the check from "== 1" to "<= 1" and then back to the == > operator in the next patch? A refcount < 1 in this path before your > other change is a bug. > Mostly I was thinking > 1 was busy so <= 1 is idle. And yes, <=0 is never supposed to happen. Checking for == 1 is probably better though.