From patchwork Mon Aug 8 19:33:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12939046 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 B93E4C25B08 for ; Mon, 8 Aug 2022 19:35:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4FEEC8E0006; Mon, 8 Aug 2022 15:34:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3BF77940007; Mon, 8 Aug 2022 15:34:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E8708E0009; Mon, 8 Aug 2022 15:34:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F176F8E0006 for ; Mon, 8 Aug 2022 15:34:58 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CCD2E160113 for ; Mon, 8 Aug 2022 19:34:58 +0000 (UTC) X-FDA: 79777428276.10.DA5C423 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id 7AA4D18015B for ; Mon, 8 Aug 2022 19:34:58 +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=rep9f/ggXUAP4MIsL/faNmIcRn2PrPB6iaRqYgvpAik=; b=AU0bLLNol8P9a1LDvlbedxxRJo 9QDC2TDiMLfpEZYYAj9MCNsJtcDQdzG/3vhZEZOCZtIPrhFsxPHIYhZ1CAZrmKdVwXGvF0sT2wETZ 6FL60zURQSvOzGnxpiqAD7aAGHcOGudjDrD06pHy+b1NouyAjwT+HpSUmICYGoezIrSVtEL+HXULn 1TJ9C5dGx/WxTjVspzhhFv7EIK2Rr2KYRaCHw+M3Eqm3/vbjcEaX4TER0uKlGvfMGL+seqhzckWsT tSwzcrj4y0/86cXhQ5MnDe1SVjHMXiKDWYwja5XxQmB7D+92o5m6uG3ZYGPeZ5cvahdm+asaks7qW 8iLLeGXA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8WX-00EAt2-RR; Mon, 08 Aug 2022 19:34:52 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 10/59] shmem: Convert shmem_delete_from_page_cache() to take a folio Date: Mon, 8 Aug 2022 20:33:38 +0100 Message-Id: <20220808193430.3378317-11-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987298; a=rsa-sha256; cv=none; b=fyvSdvXnO+qiStsqfzSGEPOtBlmdNetjILHX/YqWLNJEBY3mdz5clqUE3X0+VL9uruiUIq G0koXl9OFuvegEMoUwB7Vdiss7+KupcOP7WeDDQQ3sci5xoxLwrv1XbeYRm76cxhUlfTFU CyBIli6Z+OsIQy8H76i3UQl86nDLy48= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AU0bLLNo; spf=none (imf16.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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987298; 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=rep9f/ggXUAP4MIsL/faNmIcRn2PrPB6iaRqYgvpAik=; b=sD1ZaKnJwrp7zTzqIFds1mkbUNqI/C1f4dl1m2qXy5YfBB5PmjYlysRO41qnwbZzl1ZYQx z5x6jIaF+UiWQGihcKnAYcRax8moBYaWlvOTN62C9GMhLK4Lk3cW72WpAXd8AOrFhdqsPU clYhfo0hyXRh3SoiQOr7nson49gViS8= X-Stat-Signature: 6ryii6qzoz5b9puxwp8jz7d5az683smg X-Rspamd-Queue-Id: 7AA4D18015B Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AU0bLLNo; spf=none (imf16.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-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1659987298-449902 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 bcd3644eb9c3..f561f6e7f53b 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));