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 2C142C6FA82 for ; Fri, 2 Sep 2022 19:48:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC6BA8011D; Fri, 2 Sep 2022 15:47:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D761680119; Fri, 2 Sep 2022 15:47:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3DFF8011D; Fri, 2 Sep 2022 15:47:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AC6A180119 for ; Fri, 2 Sep 2022 15:47:17 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 822071607F7 for ; Fri, 2 Sep 2022 19:47:17 +0000 (UTC) X-FDA: 79868179314.15.2631DE2 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id 175531C0067 for ; Fri, 2 Sep 2022 19:47:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=m/c5IH76eaSvTQjuEmr5q/GNmfcy3v7SI+fS5ZP5tJ0=; b=AsslQU7hlS5ImomAwi42+TRdq6 ZZZtUxZTXFqS7pQQHhrcSDNkN9OlENAmGyDkQDaFy4Pwyj59SRM9jMDtL41etBCcOZmknuyDdGQjT es6oL2Ob1GAvXa/M6COT8Ey0TIhbGs+7JhWW/oc5rLH/kn/4xk6ee2oqLnXuk0KxG1esvGLuCYXEm qlG9o4fMc71tx0VQQNLg0N2kMTzMc05KpZROX/cwEqoPh3HzgOz95Cxv0tCXfgU0VetiQztYqqhlT HOXjw9AlTn4jMAhyUuPFbcjUFvWOxGtU7ddfgQeY7WmU/DskMkF8EmWUqDf2LwlCQGV99eOAswN/y ZrrzKkCw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd0-007Ibp-Fq; Fri, 02 Sep 2022 19:46:58 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 07/57] shmem: Convert shmem_delete_from_page_cache() to take a folio Date: Fri, 2 Sep 2022 20:46:03 +0100 Message-Id: <20220902194653.1739778-8-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AsslQU7h; spf=none (imf20.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148037; a=rsa-sha256; cv=none; b=JEoIxluuFCQC1Nc29SZ8nnTveEeK1TX9PIGgru+hZnnOml9+TS7K1+lxrcnRa3fdHRX1N+ wk4di9GDh8ezisNXZehKwexltIUKnEyXzlMt7xVQ0Jy9qgdEviGgBVT4E0CuNu0VH63sCE ejuaWfIRVmN46FH2ejVMyss4kAKZY+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148037; 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=m/c5IH76eaSvTQjuEmr5q/GNmfcy3v7SI+fS5ZP5tJ0=; b=t4tWLKk+O1F420Tqm5MpqOSi/1tRBeNcAGg8eyHCu4FvtRmigrV1v+Aegv7V+A31vP+rWI zLk6m+NtP6BqsmhDvk7Uwss/jy6kEy1r0IRtFBFYhHzO/1xQOTr3E1JQN7Pv3/asSFuiGb BpuK7y1Yc7AqGQc/6uMeo1Q1w9ukeZA= X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 175531C0067 X-Stat-Signature: 95hq1ws5roac7ncccpcn9u5nsbucnxzm Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AsslQU7h; spf=none (imf20.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1662148036-888611 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: Remove the assertion that the page is not Compound as this function now handles large folios correctly. Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 3d2d35728793..9e851fc87601 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -763,23 +763,22 @@ static int shmem_add_to_page_cache(struct folio *folio, } /* - * Like delete_from_page_cache, but substitutes swap for page. + * Like delete_from_page_cache, but substitutes swap for @folio. */ -static void shmem_delete_from_page_cache(struct page *page, void *radswap) +static void shmem_delete_from_page_cache(struct folio *folio, void *radswap) { - struct address_space *mapping = page->mapping; + struct address_space *mapping = folio->mapping; + long nr = folio_nr_pages(folio); int error; - VM_BUG_ON_PAGE(PageCompound(page), page); - xa_lock_irq(&mapping->i_pages); - error = shmem_replace_entry(mapping, page->index, page, radswap); - page->mapping = NULL; - mapping->nrpages--; - __dec_lruvec_page_state(page, NR_FILE_PAGES); - __dec_lruvec_page_state(page, NR_SHMEM); + error = shmem_replace_entry(mapping, folio->index, folio, radswap); + folio->mapping = NULL; + mapping->nrpages -= nr; + __lruvec_stat_mod_folio(folio, NR_FILE_PAGES, -nr); + __lruvec_stat_mod_folio(folio, NR_SHMEM, -nr); xa_unlock_irq(&mapping->i_pages); - put_page(page); + folio_put(folio); BUG_ON(error); } @@ -1416,7 +1415,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) spin_unlock_irq(&info->lock); swap_shmem_alloc(swap); - shmem_delete_from_page_cache(&folio->page, swp_to_radix_entry(swap)); + shmem_delete_from_page_cache(folio, swp_to_radix_entry(swap)); mutex_unlock(&shmem_swaplist_mutex); BUG_ON(folio_mapped(folio)); -- 2.35.1