From patchwork Sun Sep 4 02:16:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12965095 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 004E3C38145 for ; Sun, 4 Sep 2022 02:16:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FE3F80171; Sat, 3 Sep 2022 22:16:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AD348015A; Sat, 3 Sep 2022 22:16:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54DCB80171; Sat, 3 Sep 2022 22:16:21 -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 45A9D8015A for ; Sat, 3 Sep 2022 22:16:21 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 294091A0754 for ; Sun, 4 Sep 2022 02:16:21 +0000 (UTC) X-FDA: 79872788562.13.2064DE5 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf21.hostedemail.com (Postfix) with ESMTP id 65B9A1C006A for ; Sun, 4 Sep 2022 02:16:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662257779; x=1693793779; h=subject:from:to:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sipDxMIA1gHM4rUMbFjWahw5uArq5Zq1WCPqnel5xNA=; b=Qdae1fGS/7ZyShgCoYqDr93DDmZmTotqn8Gar3TDOnfG7CdGcbaRSAgT uzUclrCwv5Uh/6DXVYdKo5YPRpY/Ek4rS5DukV1W+76vN1XoKWyHtIKPG WbbSOA7Xe7VzXDMkZ7kT6k95j+N6Dd62b2WAefRlGQwIddtp+neSiwKJO Aah3BFwbrhhJT+0U4f05ci2ZdKykbuBgXdi3OGaOxS3g6GrK9zL0LLeE5 mTgU5TC4dm73odxBluDWlfRooU5+4Nz4rTRNW3pqDNhAKIl9zVd5ZNxk1 cl2GX3S80NQQBH93i3cb+UqSHDZyz/iZJNzXq1cLQIUo9tKZFlTbfqAMG A==; X-IronPort-AV: E=McAfee;i="6500,9779,10459"; a="382504015" X-IronPort-AV: E=Sophos;i="5.93,288,1654585200"; d="scan'208";a="382504015" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2022 19:16:18 -0700 X-IronPort-AV: E=Sophos;i="5.93,288,1654585200"; d="scan'208";a="643384493" Received: from pg4-mobl3.amr.corp.intel.com (HELO dwillia2-xfh.jf.intel.com) ([10.212.132.198]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2022 19:16:17 -0700 Subject: [PATCH 03/13] fsdax: Delete put_devmap_managed_page_refs() From: Dan Williams To: akpm@linux-foundation.org Cc: Matthew Wilcox , Jan Kara , "Darrick J. Wong" , Jason Gunthorpe , Christoph Hellwig , John Hubbard , linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-fsdevel@vger.kernel.org Date: Sat, 03 Sep 2022 19:16:17 -0700 Message-ID: <166225777752.2351842.10384480208879805937.stgit@dwillia2-xfh.jf.intel.com> In-Reply-To: <166225775968.2351842.11156458342486082012.stgit@dwillia2-xfh.jf.intel.com> References: <166225775968.2351842.11156458342486082012.stgit@dwillia2-xfh.jf.intel.com> User-Agent: StGit/0.18-3-g996c MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662257779; a=rsa-sha256; cv=none; b=knmr3q1GLX50CC2UJKCTvTXAgENtOSmibS1BdIsG7k24UJz//PYoubj/KxZ6AjN058zV4K mylfNmDCZNFij7Y2ktUB51DpocKLq8pLlq3m+XpFVIi4VFOYq2qpJbc6XMFzYANnEej9hP SyMHFv+5xDeT5ZH4iknAakdXy0WOeqo= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=Qdae1fGS; spf=pass (imf21.hostedemail.com: domain of dan.j.williams@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662257779; 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=SfNjKOCVvcvo92uLvcXlC3YyD3xm2NrPLRDYDBXuL6Y=; b=253BnJPDG3YdvF2Zw5kWFWN7BvHBH+YyhaoypCCA2rpyqXiJ9xSnw6G6oCejpiFZ0JatYw eKvoNKFS2pggj4mC9mEK1AlVoQWJZd6g7kMOlZ/nK05LXpXuF4RrZ4jdse+BOoakSkjyqE hR4Xkvr5x6aDZHpoGQCHVDXM1fFDgEU= X-Stat-Signature: nfscj18fmky7azq7wr7o6cenwyazp9no X-Rspamd-Queue-Id: 65B9A1C006A X-Rspam-User: Authentication-Results: imf21.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=Qdae1fGS; spf=pass (imf21.hostedemail.com: domain of dan.j.williams@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (policy=none) header.from=intel.com X-Rspamd-Server: rspam01 X-HE-Tag: 1662257779-554348 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: Now that fsdax DMA-idle detection no longer depends on catching transitions of page->_refcount to 1, remove put_devmap_managed_page_refs() and associated infrastructure. Cc: Matthew Wilcox Cc: Jan Kara Cc: "Darrick J. Wong" Cc: Jason Gunthorpe Cc: Christoph Hellwig Cc: John Hubbard Signed-off-by: Dan Williams --- include/linux/mm.h | 30 ------------------------------ mm/gup.c | 3 +-- mm/memremap.c | 18 ------------------ mm/swap.c | 2 -- 4 files changed, 1 insertion(+), 52 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 557d5447ebec..24f8682d0cd7 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1048,30 +1048,6 @@ vm_fault_t finish_mkwrite_fault(struct vm_fault *vmf); * back into memory. */ -#if defined(CONFIG_ZONE_DEVICE) && defined(CONFIG_FS_DAX) -DECLARE_STATIC_KEY_FALSE(devmap_managed_key); - -bool __put_devmap_managed_page_refs(struct page *page, int refs); -static inline bool put_devmap_managed_page_refs(struct page *page, int refs) -{ - if (!static_branch_unlikely(&devmap_managed_key)) - return false; - if (!is_zone_device_page(page)) - return false; - return __put_devmap_managed_page_refs(page, refs); -} -#else /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ -static inline bool put_devmap_managed_page_refs(struct page *page, int refs) -{ - return false; -} -#endif /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ - -static inline bool put_devmap_managed_page(struct page *page) -{ - return put_devmap_managed_page_refs(page, 1); -} - /* 127: arbitrary random number, small enough to assemble well */ #define folio_ref_zero_or_close_to_overflow(folio) \ ((unsigned int) folio_ref_count(folio) + 127u <= 127u) @@ -1168,12 +1144,6 @@ static inline void put_page(struct page *page) { struct folio *folio = page_folio(page); - /* - * For some devmap managed pages we need to catch refcount transition - * from 2 to 1: - */ - if (put_devmap_managed_page(&folio->page)) - return; folio_put(folio); } diff --git a/mm/gup.c b/mm/gup.c index 499c46296fda..67dfffe97917 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -87,8 +87,7 @@ static inline struct folio *try_get_folio(struct page *page, int refs) * belongs to this folio. */ if (unlikely(page_folio(page) != folio)) { - if (!put_devmap_managed_page_refs(&folio->page, refs)) - folio_put_refs(folio, refs); + folio_put_refs(folio, refs); goto retry; } diff --git a/mm/memremap.c b/mm/memremap.c index 58b20c3c300b..433500e955fb 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -507,21 +507,3 @@ void free_zone_device_page(struct page *page) */ set_page_count(page, 1); } - -#ifdef CONFIG_FS_DAX -bool __put_devmap_managed_page_refs(struct page *page, int refs) -{ - if (page->pgmap->type != MEMORY_DEVICE_FS_DAX) - return false; - - /* - * fsdax page refcounts are 1-based, rather than 0-based: if - * refcount is 1, then the page is free and the refcount is - * stable because nobody holds a reference on the page. - */ - if (page_ref_sub_return(page, refs) == 1) - wake_up_var(&page->_refcount); - return true; -} -EXPORT_SYMBOL(__put_devmap_managed_page_refs); -#endif /* CONFIG_FS_DAX */ diff --git a/mm/swap.c b/mm/swap.c index 9cee7f6a3809..b346dd24cde8 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -960,8 +960,6 @@ void release_pages(struct page **pages, int nr) unlock_page_lruvec_irqrestore(lruvec, flags); lruvec = NULL; } - if (put_devmap_managed_page(&folio->page)) - continue; if (folio_put_testzero(folio)) free_zone_device_page(&folio->page); continue;