From patchwork Fri Apr 21 21:43:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13220713 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 B6E9DC7EE23 for ; Fri, 21 Apr 2023 21:44:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CE0A96B0072; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C1B266B0081; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 849CE6B0072; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 33B216B0074 for ; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id F2C01A061A for ; Fri, 21 Apr 2023 21:44:20 +0000 (UTC) X-FDA: 80706727080.20.E0BB9A0 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf03.hostedemail.com (Postfix) with ESMTP id 556BE20012 for ; Fri, 21 Apr 2023 21:44:19 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=N942EdhF; spf=none (imf03.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682113459; h=from:from:sender: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=TaEL6wJEWmG7v/Kj+xMCxG7l/Tv1LU1WrJwnB3EGy3E=; b=lcuxInIoSo6fNhJRdMibTlvrKivKGDgBfiv+usPosWdV3AErRxBKxuTZul8b4tGMgmFZwb hfX1F3A3eFJQzjcQqVzwbLsXzp5DTKHoyVTTxlY2YYo8DK8fnSDgv3ZMIlr5LjpOe59b9m 1RgAn350YyUz35oFIWCere3mu7MimJ0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682113459; a=rsa-sha256; cv=none; b=Ap+K1M88zun9or5jOeiIBsYzrcN7T9HmrJGTZxbgm16JPoejofat3MsRLSdf931Fn8jOm7 njdQbf8qI44oYr7WMVIKntFtjiChcBT5O2U2bZXGIMSpCL0I2dYdS4PFK5Ro1JM3ZNa4zB eICnQrEKL9ZG8mJAwHYivP5quHtmy2g= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=N942EdhF; spf=none (imf03.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=TaEL6wJEWmG7v/Kj+xMCxG7l/Tv1LU1WrJwnB3EGy3E=; b=N942EdhFvz8Gq8X0vru14SS2Tz NSMMc3ogGzPG2/igUrApVOD7nvcB5K/4UI28nLVYOwAB52r3+fcJXP9APHpwXmOM3q6qrw2BgTt/j caFXw1rBuZp75667SgZQedCUy2WjgaS5ME72NMg2F8DmvIV9HV4lZYCengkZYqa2jjMLpEBGuGQm3 cAzPOhEk2Y75zB3VUvyjKzHud3xR7zENlmf188YTgv99Mkb7ucqaY9iy2HJd2LE35twbd41deBG5N HX2mbF5Ndbygf6Towllz/Gv1UT754OGwbCZbye8ao31rI5EjMABW1FJPa80ME9BC2gfYF+I0GujRk iyqZUPTw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1ppyY1-00Btom-22; Fri, 21 Apr 2023 21:44:05 +0000 From: Luis Chamberlain To: hughd@google.com, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org, djwong@kernel.org Cc: p.raghav@samsung.com, da.gomez@samsung.com, a.manzanares@samsung.com, dave@stgolabs.net, yosryahmed@google.com, keescook@chromium.org, hare@suse.de, kbusch@kernel.org, mcgrof@kernel.org, patches@lists.linux.dev, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC 3/8] shmem: account for high order folios Date: Fri, 21 Apr 2023 14:43:55 -0700 Message-Id: <20230421214400.2836131-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230421214400.2836131-1-mcgrof@kernel.org> References: <20230421214400.2836131-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 556BE20012 X-Rspamd-Server: rspam09 X-Stat-Signature: j3bdf4pjpqq5p3rpfdg95f9acy3y1mjx X-HE-Tag: 1682113459-357755 X-HE-Meta: U2FsdGVkX1+3BaXJsdz1ZVNEROi9SAyWblzV5ifU9A2lel3sUJDSAHhSfbzGmZ/u2A6EX4bOFVxQbDRNXNsym45y2NpMzi9QVZJhhV1KmFRw26CcQW94KMutIwyg4yy4my9REgx1Sj34Qhc14ZYzidO1SYKHnSEPOmJDJO+sXdmUyWMk80MoJxk1zT6hVjmNUhLlf3nfefAL5mUtXyYj1clA3aONmfmfSQZsNcfwQ3k5jFFQdxHZxPT29ULa7LbNZEwaZK+JMWj1/MRK5glNjBp6JLBaGy5n1LSKuEoeFHoG1nLfDAGbghT43b6NvFVF26fV0+neYQdMC1MdMTW/jJjznEvU+WT5q68/0jCTFaoKA6KNuNzfpos/hX4OaqtQoIQzvmRR9H6pmiWRXLN4j8+x74HYB7/kFPFlHRoE9AXsMLcC0FWKrS+xPslh1kvVefYht8tlRFtas0Roi6pfTaOysYHT87Fty4IosnpnMfHN1o5ZPYTIlfFfBSOUhwF8nRXzHpv1tZfzGtVODrysifI0zAJpHKiYDlyyvRKmhNKfdfwgMNutHTJ80ARcgjl44WlHZE7VQOHa5AXf8ZjsSrt5sUh61Spp5ch7Zx7lzpTXGRuSZjFEK+caxZfna2yd3Kk3TUg3VzyfLyPGUnT6AKmDjgQTaKW59YZQ2oJvXUgYgCOTwhLRd0yb0BfKLnIhsCELLkSGIKomAHp314BSpx62TyFPh3/aAUvEeEB5LtSxZl1/+w5V1sprTse2TO+RVnb0ET+FflONyKHL02QiuArEXHT1g4TQ4h4IOHhmu9JVmkRBRiylg0LNYc0fPKkipM6ORDtsZW3DOtXo+oa1LDvJ3vNNWOAQVSTAV9arEP40JKG4ie7VZlSq5NuSll8Q++LMK1hYaRSSdow5LlPxFKMnM6oaER9DnHd5BZ6X4mLhrjnVWhujEBlfkv3VxAAaWhU/Z7AJ3DmXMgtVnCY aGNq+JQM QnSZK+aUj7Cc8NWl1FFE2SW7+8aIrXBLAKCtP1o/uXfXqhLs20SeopfXuDpHWuwz0ckVq85B6TT5TO6krepvbmiwj2HoDqFYqsfeZD1RjMFhLQOpXT4mW/QDi1seYHz81nbor3wG2fEKnhww7P5I6pdAX86I3NrKBRReGCaUSqt9XramPqlahACgT1vjhooidhtVO1yaCSRlcXSGle5uNnBF0VdKlJ50bWsnH7jVXSG72dGzXwBILmI9aMWuGa1XtrsYfuPENUy9H0hrxSs/jpkGo0T6dBNP1hIzrtnoE6ciCVqw9Xrz2pOeMcCAwiCpnK5xvBuhBNnBH/qCfM6KDqcPFH6MuPxtbBFwGVYmJ56XQOTZsQPkuFihxmoK83poUz8n4ifea0iG8xEs= 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: shmem uses the shem_info_inode alloced, swapped to account for allocated pages and swapped pages. In preparation for high order folios adjust the accounting to use folio_nr_pages(). This should produce no functional changes yet as higher order folios are not yet used or supported in shmem. Signed-off-by: Luis Chamberlain --- mm/shmem.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 6f117c3cbe89..d76e86ff356e 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -806,15 +806,15 @@ unsigned long shmem_partial_swap_usage(struct address_space *mapping, pgoff_t start, pgoff_t end) { XA_STATE(xas, &mapping->i_pages, start); - struct page *page; + struct folio *folio; unsigned long swapped = 0; rcu_read_lock(); - xas_for_each(&xas, page, end - 1) { - if (xas_retry(&xas, page)) + xas_for_each(&xas, folio, end - 1) { + if (xas_retry(&xas, folio)) continue; - if (xa_is_value(page)) - swapped++; + if (xa_is_value(folio)) + swapped+=(folio_nr_pages(folio)); if (need_resched()) { xas_pause(&xas); @@ -941,10 +941,15 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, folio = fbatch.folios[i]; if (xa_is_value(folio)) { + long swaps_freed = 0; if (unfalloc) continue; - nr_swaps_freed += !shmem_free_swap(mapping, - indices[i], folio); + swaps_freed = folio_nr_pages(folio); + if (!shmem_free_swap(mapping, indices[i], folio)) { + if (swaps_freed > 1) + pr_warn("swaps freed > 1 -- %lu\n", swaps_freed); + nr_swaps_freed += swaps_freed; + } continue; } @@ -1010,14 +1015,18 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, folio = fbatch.folios[i]; if (xa_is_value(folio)) { + long swaps_freed = 0; if (unfalloc) continue; + swaps_freed = folio_nr_pages(folio); if (shmem_free_swap(mapping, indices[i], folio)) { /* Swap was replaced by page: retry */ index = indices[i]; break; } - nr_swaps_freed++; + if (swaps_freed > 1) + pr_warn("swaps freed > 1 -- %lu\n", swaps_freed); + nr_swaps_freed+=swaps_freed; continue; } @@ -1448,7 +1457,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) NULL) == 0) { spin_lock_irq(&info->lock); shmem_recalc_inode(inode); - info->swapped++; + info->swapped+=folio_nr_pages(folio); spin_unlock_irq(&info->lock); swap_shmem_alloc(swap); @@ -1723,6 +1732,7 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index, struct shmem_inode_info *info = SHMEM_I(inode); swp_entry_t swapin_error; void *old; + long num_swap_pages; swapin_error = make_swapin_error_entry(); old = xa_cmpxchg_irq(&mapping->i_pages, index, @@ -1732,6 +1742,7 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index, return; folio_wait_writeback(folio); + num_swap_pages = folio_nr_pages(folio); delete_from_swap_cache(folio); spin_lock_irq(&info->lock); /* @@ -1739,8 +1750,8 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index, * be 0 when inode is released and thus trigger WARN_ON(inode->i_blocks) in * shmem_evict_inode. */ - info->alloced--; - info->swapped--; + info->alloced-=num_swap_pages; + info->swapped-=num_swap_pages; shmem_recalc_inode(inode); spin_unlock_irq(&info->lock); swap_free(swap); @@ -1830,7 +1841,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, goto failed; spin_lock_irq(&info->lock); - info->swapped--; + info->swapped-= folio_nr_pages(folio); shmem_recalc_inode(inode); spin_unlock_irq(&info->lock); @@ -2657,8 +2668,8 @@ int shmem_mfill_atomic_pte(pmd_t *dst_pmd, goto out_delete_from_cache; spin_lock_irq(&info->lock); - info->alloced++; - inode->i_blocks += PAGE_SECTORS; + info->alloced += folio_nr_pages(folio); + inode->i_blocks += PAGE_SECTORS << folio_order(folio); shmem_recalc_inode(inode); spin_unlock_irq(&info->lock);