From patchwork Thu Jan 4 07:25:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Kasireddy X-Patchwork-Id: 13510850 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 B5848C47073 for ; Thu, 4 Jan 2024 07:49:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D17E6B03B2; Thu, 4 Jan 2024 02:49:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 440BA6B03B3; Thu, 4 Jan 2024 02:49:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2620B6B03B4; Thu, 4 Jan 2024 02:49:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 09D9E6B03B2 for ; Thu, 4 Jan 2024 02:49:02 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C40511A02E4 for ; Thu, 4 Jan 2024 07:49:01 +0000 (UTC) X-FDA: 81640852482.14.12404CF Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by imf13.hostedemail.com (Postfix) with ESMTP id CFB5B20005 for ; Thu, 4 Jan 2024 07:48:59 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ZKazk8Wn; spf=pass (imf13.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=vivek.kasireddy@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=1704354540; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=L3aK1QrFo7Sdzuln5p2RzT/mh+0rmXHOTlX5IlIL9BY=; b=xSahFrNsPSl7Y/z45U6JjjU2qztgYJiZ/tMk7awRF4aTsXrzRlMDIunqKJ2X6sqH1PvgmX i5SoNYcD8j8LIJUrqnnyXBjOK0jHBfK2RKFFLNYmT3433OVWIzVgx0jv6f0fL3Ky1uyjHW n1FCkET8ir8LUSskk6vR1AV30zDjLLg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704354540; a=rsa-sha256; cv=none; b=JDIORuBRp6f1ttMsE2I554GXYI94dYDayRJSvJn8SS9TFzzckIp1iMKlk1JLQXR/Q+KQMW ZBgldK6ozzYBdCVA0w8cC/J2eiloGxQplJMDt/ieLE6p+F3gYc1J+5+PEY8naW8Ml6nsES XPZOaQUZJORkGTbc0wUkwa1qhQ/noEs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ZKazk8Wn; spf=pass (imf13.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1704354539; x=1735890539; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ACMBAqooHk2c1KcIOvZNkowcRiJJyIDQFFF7e9jD5SI=; b=ZKazk8Wn6XuheAtKcD4x62CnQvkEhgFaG5/YkXm2I+45LSFmMw7fWfcd 0/qYHh16WOAQi9EMhUTIXaviizpgSLMf6br3MvM5ZFLQPCmg+vpxOup2P h1ZDH9AkX1q2TS4QW3mm+wyEAfNWd+J8QU/z1CGKK9tLxS/MkzdkFVPq2 PeRY5YDJNOuQehbdgNu/cRmieQ37YkBnHWLglI8Cm5rqUFKQjdzG3t1or m9zScig9iQSisYrp450xzQZ8DUWOAbuELGE583MEpBmUyfyjAFbyqvqxm bbDekSwyEva4syaE+AyCpX8QDEkVKlB3qyqROYjViGwEgkadVkmCR7nEN Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="483331150" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="483331150" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2024 23:48:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="14776726" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2024 23:48:47 -0800 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , David Hildenbrand , Matthew Wilcox , Christoph Hellwig , Jason Gunthorpe , Peter Xu Subject: [PATCH v10 3/8] mm/gup: Introduce unpin_folio/unpin_folios helpers Date: Wed, 3 Jan 2024 23:25:13 -0800 Message-Id: <20240104072518.807950-4-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240104072518.807950-1-vivek.kasireddy@intel.com> References: <20240104072518.807950-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: CFB5B20005 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: sj6dotj39fpszqwwhe1t7uiyzzx6d7ca X-HE-Tag: 1704354539-703018 X-HE-Meta: U2FsdGVkX1+wVWW6aKE/baUxdEilWe1HTEeZgYz5GAsU6+Fd/XoywiYw72QZdQGxrbVfPtSnou19ONaXPVvZu4PWgibGMY0J3YddlSXGKygODRo7EzaZkfHiE6fDATKrllruCRuLKSi+HGnRHr2OOjwgFFMiyuJNMkl/XsZsQmXv3UH4YvmssoORt7S/1msOZdxDHhudGYJeqET8+2RDccXxm7Uuaw7oausjX0DOjA//mGsJYVg3CW1alsbUGyFuj4uQcypAnzQOFT7NX0sSezJI8hwraXp7e3PQ6t9SuigyeGEBn2y1RE6+5Y7E8j1K6xZs6L66MsKGVRrhvTuCjRASiQe2Xg26jiS5eEqyv4lTLplrL5hFwnRq8y/iDxazwaHY/YvXHbB7qrW+szltN3qHwW/i5JdwNTIKJ/15zhjFBxW8xduDqBzufWCWqWtZ7ikcLT4NwuPwBEos1fCwF/fw1m1LVmcCoNt/Z1oNzgNPuIUnIk25iiHokr8kfgH4+eVWR77PhUNQJu8ZjoEVU3AUKyHqGXyeyKd/Y4pheWCkaP/wlGfg2N5vUevVJ4KpLNksiQna//UsFBIX4fSHqpC+Mh8wm+RxskH8tkMNhSMxRhcwrVXbWJwvIMdNqcP1tSluF9nIJ0CNdqYZa52NNbNWPfZPJ5eLbpgbcFHH7rhzwi/W+lblM/3TE/FvjmYgagdntu9yFjZ/zQL7UJcI43zx621yi9VKWP03g8RwjZUMUfSMRjdMl8HE/ESjbOvV15E8a2H8s9McFWDynU5+Otathq4IWgr1Ow5cXLNd7gebi7swdSZQyWofxuc/RMDI4RkzUqoBwQY80x3YArGQ8zS4jyleGRlT+SIFmXlh2nr5CwtsIT882t+NEsa4XJK3mwEuRFkxlTQAsNChJUdA6zDkreXYVeK2zsYL14qByUDAC8bfusBrOhr97AJLESYQF7SkZe+3iZLL54KJEqn eHYp9fk8 A161qqDvVfaSIsq0iSKdan3jFogc/Mzqp55odGn3tuAprjv8BM91EjLdsX+vXBwTXW5yHObLElGBGvhunhcwZIAVeIMU1opPhlqkdIU/DhgAP4In96Jpl4FCOWndsnJi6qSGLlzHfVSdsDVfLiaEZc/xKP7BnHjf7DJgSJSAT3pmjFzQteOWDVTJWj4FnRzAmSKMaSPpavhyiV67hGhpDX8e3q+nYnezmZrc5mO3Sb46iA09lOsB+Qvdnm/J7JLLmLQ+Mz+9u8CuHYuuRh9K7ThWIWV9RMTxHRoXfSz3TV8clUYzp70FkF4cmVg== 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: These helpers are the folio versions of unpin_user_page/unpin_user_pages. They are currently only useful for unpinning folios pinned by memfd_pin_folios() or other associated routines. However, they could find new uses in the future, when more and more folio-only helpers are added to GUP. Cc: David Hildenbrand Cc: Matthew Wilcox Cc: Christoph Hellwig Cc: Jason Gunthorpe Cc: Peter Xu Suggested-by: David Hildenbrand Signed-off-by: Vivek Kasireddy --- include/linux/mm.h | 2 ++ mm/gup.c | 81 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 74 insertions(+), 9 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 418d26608ece..4dbfdd277014 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1585,11 +1585,13 @@ static inline void put_page(struct page *page) #define GUP_PIN_COUNTING_BIAS (1U << 10) void unpin_user_page(struct page *page); +void unpin_folio(struct folio *folio); void unpin_user_pages_dirty_lock(struct page **pages, unsigned long npages, bool make_dirty); void unpin_user_page_range_dirty_lock(struct page *page, unsigned long npages, bool make_dirty); void unpin_user_pages(struct page **pages, unsigned long npages); +void unpin_folios(struct folio **folios, unsigned long nfolios); static inline bool is_cow_mapping(vm_flags_t flags) { diff --git a/mm/gup.c b/mm/gup.c index 231711efa390..4d7bc4453819 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -30,6 +30,23 @@ struct follow_page_context { unsigned int page_mask; }; +static inline void sanity_check_pinned_folios(struct folio **folios, + unsigned long nfolios) +{ + if (!IS_ENABLED(CONFIG_DEBUG_VM)) + return; + + for (; nfolios; nfolios--, folios++) { + struct folio *folio = *folios; + + if (is_zero_folio(folio) || + !folio_test_anon(folio)) + continue; + + VM_BUG_ON_FOLIO(!PageAnonExclusive(&folio->page), folio); + } +} + static inline void sanity_check_pinned_pages(struct page **pages, unsigned long npages) { @@ -52,15 +69,11 @@ static inline void sanity_check_pinned_pages(struct page **pages, struct page *page = *pages; struct folio *folio = page_folio(page); - if (is_zero_page(page) || - !folio_test_anon(folio)) - continue; - if (!folio_test_large(folio) || folio_test_hugetlb(folio)) - VM_BUG_ON_PAGE(!PageAnonExclusive(&folio->page), page); - else - /* Either a PTE-mapped or a PMD-mapped THP. */ - VM_BUG_ON_PAGE(!PageAnonExclusive(&folio->page) && - !PageAnonExclusive(page), page); + sanity_check_pinned_folios(&folio, 1); + + /* Either a PTE-mapped or a PMD-mapped THP. */ + if (folio_test_large(folio) && !folio_test_hugetlb(folio)) + VM_BUG_ON_PAGE(!PageAnonExclusive(page), page); } } @@ -276,6 +289,21 @@ void unpin_user_page(struct page *page) } EXPORT_SYMBOL(unpin_user_page); +/** + * unpin_folio() - release a dma-pinned folio + * @folio: pointer to folio to be released + * + * Folios that were pinned via memfd_pin_folios() or other similar routines + * must be released either using unpin_folio() or unpin_folios(). This is so + * that such folios can be separately tracked and uniquely handled. + */ +void unpin_folio(struct folio *folio) +{ + sanity_check_pinned_folios(&folio, 1); + gup_put_folio(folio, 1, FOLL_PIN); +} +EXPORT_SYMBOL(unpin_folio); + /** * folio_add_pin - Try to get an additional pin on a pinned folio * @folio: The folio to be pinned @@ -488,6 +516,41 @@ void unpin_user_pages(struct page **pages, unsigned long npages) } EXPORT_SYMBOL(unpin_user_pages); +/** + * unpin_folios() - release an array of gup-pinned folios. + * @folios: array of folios to be marked dirty and released. + * @nfolios: number of folios in the @folios array. + * + * For each folio in the @folios array, release the folio using unpin_folio(). + * + * Please see the unpin_folio() documentation for details. + */ +void unpin_folios(struct folio **folios, unsigned long nfolios) +{ + unsigned long i = 0, j; + + /* + * If this WARN_ON() fires, then the system *might* be leaking folios + * (by leaving them pinned), but probably not. More likely, gup/pup + * returned a hard -ERRNO error to the caller, who erroneously passed + * it here. + */ + if (WARN_ON(IS_ERR_VALUE(nfolios))) + return; + + sanity_check_pinned_folios(folios, nfolios); + while (i < nfolios) { + for (j = i + 1; j < nfolios; j++) + if (folios[i] != folios[j]) + break; + + if (folios[i]) + gup_put_folio(folios[i], j - i, FOLL_PIN); + i = j; + } +} +EXPORT_SYMBOL(unpin_folios); + /* * Set the MMF_HAS_PINNED if not set yet; after set it'll be there for the mm's * lifecycle. Avoid setting the bit unless necessary, or it might cause write