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 4F437C38142 for ; Sat, 21 Jan 2023 06:58:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9CB9D6B007D; Sat, 21 Jan 2023 01:58:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 97C756B007B; Sat, 21 Jan 2023 01:58:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86ACF6B007D; Sat, 21 Jan 2023 01:58:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7810F6B0078 for ; Sat, 21 Jan 2023 01:58:18 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4B14A140552 for ; Sat, 21 Jan 2023 06:58:18 +0000 (UTC) X-FDA: 80377902276.18.C070E06 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf10.hostedemail.com (Postfix) with ESMTP id A5BD8C0002 for ; Sat, 21 Jan 2023 06:58:16 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=i34OoNOi; spf=none (imf10.hostedemail.com: domain of BATV+1651c3ebed9361b307e7+7090+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+1651c3ebed9361b307e7+7090+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674284296; a=rsa-sha256; cv=none; b=BJE3D9HzVmaWl3Qb2MSPCaV3IE1TcSuhmDCZVrpJZHEt3bYJF+q8+1QuJJE8aVkEx3F7qv 8dcFO26ClxEwbkLgx+uiSOh7X2nGGUBloYfCCBoWhagrN370JjaeXeFkUooRewWzbe/mqz tiuuy7pECYKuX8pT4Sjfan80EBkL9qM= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=i34OoNOi; spf=none (imf10.hostedemail.com: domain of BATV+1651c3ebed9361b307e7+7090+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+1651c3ebed9361b307e7+7090+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674284296; 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=YYpS3Y5p5Tks64mwSZy8Ca3HveuDUE7eUAUp6nFbmxA=; b=TP257Bwj40aLZ+5hLoiewAyvHOJ55WlCBh0PETyHQyEhgoEWkIwWtsJEC4v9mjGexKK3ww laIipIRgChFOLRLECEouYEZ0IIse4P2JzZ+y5wTkmiTArKoNrPtDJeTxs2RCV/CPi5J58t 4xEE2EjRI3W2zEgJV9g+4ECtvWFiWNY= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=YYpS3Y5p5Tks64mwSZy8Ca3HveuDUE7eUAUp6nFbmxA=; b=i34OoNOiuOAMqsVR5goGoV7AAN 68Fu9N8d4Dw7F1z2fIjIM+x1l580f1YXaquY4Wcl9zjTXWB6O/JrNkq55Pe95jE7djhGlJa6sDDvk CAUzPFbOqqw6RhDYLJUEnFXlj6vPwYQWaLCHnfMcnwurzh6cv9vB+okzKJoHtlY3dHYFk2Sjh8ZJ2 AvAENi9Ag/pAooPiFgszDIENS+ujLdYXF5Ajyjr46LHZ9X+EojW2hDgdnAyu1mF8ueZvkO+J2isnX y07MeXsZtQ4PV15Zxm2OTXsFJhWD28Muv18kQZKaxIVXaCsqF5IKhlIatUTuFgyOGZcDXns7qhVXX huf1HbyA==; Received: from [2001:4bb8:19a:2039:6754:cc81:9ace:36fc] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJ7pI-00DSPB-Bf; Sat, 21 Jan 2023 06:58:08 +0000 From: Christoph Hellwig To: Andrew Morton , Matthew Wilcox , Hugh Dickins Cc: linux-afs@lists.infradead.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, cluster-devel@redhat.com, linux-mm@kvack.org, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nilfs@vger.kernel.org Subject: [PATCH 4/7] shmem: remove shmem_get_partial_folio Date: Sat, 21 Jan 2023 07:57:52 +0100 Message-Id: <20230121065755.1140136-5-hch@lst.de> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230121065755.1140136-1-hch@lst.de> References: <20230121065755.1140136-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspam-User: X-Rspamd-Queue-Id: A5BD8C0002 X-Rspamd-Server: rspam01 X-Stat-Signature: 3zzxztc6zokt9epm5ddwsyx4wzqwwcfr X-HE-Tag: 1674284296-954031 X-HE-Meta: U2FsdGVkX18ndZn2vrPxaKQC1Xi+9npcdE6mntcV6D1ZLUg8723cd9zM8kruBn3EArNwbWjlNcu+diRs8Q7VWGJDGxYS7uZXgCQ5neV2u/36rys/SkCLSEIpxIv8x0Vw/zHOn0XkIUtzwsfru66e1qxYTA9WdTDApLwyw0m4go3IQErAxtK4M6MB7QW9z6JIxZEYrvflycxQSyoycC3uG5X38BRulgg2tgYkX/dV/TanP7HzOfT/5XTRn7NjLKQEZQVXjf+5AZdUTEXLfZeRJtIcRVsmhaBuv8pxgBw4m9kmI7mq0Ox6yKrKicScQWpJ6U3xT/W40RYtTyPkPEnIxhYA7mXXoFDuRrAUZNZxJ3SMjeZPLmXY335mVcP+8urQx75/DXh3mq+A4mYOFeDITJ+P1BlJQwmra9oCsSXc8v/MOqcpuD+3s0fnYCf1ehxAS4AFQrrHJrvXuoiu5wNu7wrsKfUSvwpLRFXOxREC2bDvOr0EL803Agh8lVuht1rOGgCEjSrpc9zCfA5AJJcgUSIOcUXXClaC7iWaxeRK7mazGPjfpzVCEGlegv2nEI0R1+t5jUeY4jyOzhuYBKXXz32udbDfKU7YyFtr7MU7AvrUUfHANShSfTm3Oo3aX1LrCo+v02OYeCQkdlh5SCkBpcSbEoS/wr5nIfOQx6Ix5SkNQ8QLLeXHoYvtiQ1uNtIpxIJEkOuGZro1FRUdRz5xsaDP31IK5Fvc/3oUpoUaZQelYMB5OP2hMwHxwkRya9i+40T7d420iCqeVhCLjgEOuRz/VvWJZg6GKg47uZqOas4q9DJKUw4fs6BgGTd048qaMclpUysoZkHazmOFnvxuuukrMpJyl7T8gu8cKysT4vwYPCrCrjeJ6LpQuhHcqhscxkHX/LVx4hzzH0BePkV5PnEF5uQL20L/xqDba46fvjKZ1+y72fnfY+UKX4xtMrM0NLTCErj8ucqmBKKcpou PSOW9YZK PQMGfwM55CSqrMBG4IU8cgXYE5FaxJ8vjkXVmMTaiSWsNBc+K1zy7md0NIclzRCRM0Yy6Wz9gkLeYmB3Bc7lWBROGqT8g/Mj6QJGn7TYpnSX9quAf6MVk7JdllHwfOTNfTtp4zM9EvrwC45TnoXJjntDT5jbQfAee59yjdOOKjTu5oGv83UU8d2/pLhQG0h1De0KmSFejeNBUlmgmyC9S6YB60q3WQeQ9g8X1LZatJYElEfERNRCo7cA0q2F0savH7+FcrJWPUALBYwlKjcLIqGuXuOoUFSAIWW+IHnu7sCs7szs8m79XHsXXyaxch6RuqFmpV6OdpGbuhcloxrs7k/mZaBxnx1C3non5r3KKfac+6ryTrhE7R2DKG53WQHIN4akKnIpJbjyNJ+nqsndJFhDJedoOtxmY94/UBcYlLjJuZnvutp1NcD1V3rlYIKuB8jIcP4k2g5f9rczQQR/RW0bq6S+5sJDckl30 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: Add a new SGP_FIND mode for shmem_get_partial_folio that works like SGP_READ, but does not check i_size. Use that instead of open coding the page cache lookup in shmem_get_partial_folio. Note that this is a behavior change in that it reads in swap cache entries for offsets outside i_size, possibly causing a little bit of extra work. Signed-off-by: Christoph Hellwig --- include/linux/shmem_fs.h | 1 + mm/shmem.c | 46 ++++++++++++---------------------------- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index d09d54be4ffd99..7ba160ac066e5e 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -105,6 +105,7 @@ enum sgp_type { SGP_CACHE, /* don't exceed i_size, may allocate page */ SGP_WRITE, /* may exceed i_size, may allocate !Uptodate page */ SGP_FALLOC, /* like SGP_WRITE, but make existing page Uptodate */ + SGP_FIND, /* like SGP_READ, but also read outside i_size */ }; int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop, diff --git a/mm/shmem.c b/mm/shmem.c index de6fa3980c7d6b..a8371ffeeee54a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -877,27 +877,6 @@ void shmem_unlock_mapping(struct address_space *mapping) } } -static struct folio *shmem_get_partial_folio(struct inode *inode, pgoff_t index) -{ - struct folio *folio; - - /* - * At first avoid shmem_get_folio(,,,SGP_READ): that fails - * beyond i_size, and reports fallocated pages as holes. - */ - folio = __filemap_get_folio(inode->i_mapping, index, - FGP_ENTRY | FGP_LOCK, 0); - if (!xa_is_value(folio)) - return folio; - /* - * But read a page back from swap if any of it is within i_size - * (although in some cases this is just a waste of time). - */ - folio = NULL; - shmem_get_folio(inode, index, &folio, SGP_READ); - return folio; -} - /* * Remove range of pages and swap entries from page cache, and free them. * If !unfalloc, truncate or punch hole; if unfalloc, undo failed fallocate. @@ -957,7 +936,8 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, goto whole_folios; same_folio = (lstart >> PAGE_SHIFT) == (lend >> PAGE_SHIFT); - folio = shmem_get_partial_folio(inode, lstart >> PAGE_SHIFT); + folio = NULL; + shmem_get_folio(inode, lstart >> PAGE_SHIFT, &folio, SGP_FIND); if (folio) { same_folio = lend < folio_pos(folio) + folio_size(folio); folio_mark_dirty(folio); @@ -971,14 +951,16 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, folio = NULL; } - if (!same_folio) - folio = shmem_get_partial_folio(inode, lend >> PAGE_SHIFT); - if (folio) { - folio_mark_dirty(folio); - if (!truncate_inode_partial_folio(folio, lstart, lend)) - end = folio->index; - folio_unlock(folio); - folio_put(folio); + if (!same_folio) { + folio = NULL; + shmem_get_folio(inode, lend >> PAGE_SHIFT, &folio, SGP_FIND); + if (folio) { + folio_mark_dirty(folio); + if (!truncate_inode_partial_folio(folio, lstart, lend)) + end = folio->index; + folio_unlock(folio); + folio_put(folio); + } } whole_folios: @@ -1900,7 +1882,7 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, if (folio_test_uptodate(folio)) goto out; /* fallocated folio */ - if (sgp != SGP_READ) + if (sgp != SGP_READ && sgp != SGP_FIND) goto clear; folio_unlock(folio); folio_put(folio); @@ -1911,7 +1893,7 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, * SGP_NOALLOC: fail on hole, with NULL folio, letting caller fail. */ *foliop = NULL; - if (sgp == SGP_READ) + if (sgp == SGP_READ || sgp == SGP_FIND) return 0; if (sgp == SGP_NOALLOC) return -ENOENT; -- 2.39.0