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 33E8FC64EC4 for ; Wed, 8 Feb 2023 14:53:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D5A1F6B0073; Wed, 8 Feb 2023 09:53:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C98B86B0075; Wed, 8 Feb 2023 09:53:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9FB766B0078; Wed, 8 Feb 2023 09:53:47 -0500 (EST) 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 83D426B0073 for ; Wed, 8 Feb 2023 09:53:47 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 475631A0B69 for ; Wed, 8 Feb 2023 14:53:47 +0000 (UTC) X-FDA: 80444418894.13.0971695 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP id 469281C001E for ; Wed, 8 Feb 2023 14:53:45 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=IdUzCc3Z; spf=none (imf18.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=1675868025; 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=TTM2LCEcKRo7ysqHQyalM6+7+sVXpuzC/6B32xfg/Y0=; b=DG3rNjv77/AiheIdDEZQhuC6YeWLlIIqr+s2JJjyOURIyj9MgLb7ep5tfxAQvVaiXmiKwt 56KU/u8JulhJiiaeMRoyNAdn5k7yTgaEhTWrMCov3z4JyW1FL1pva/cuEHXyk8F15d9NQ4 7QAtq7RYmIcWHDE35H+I9xc5tKT392E= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=IdUzCc3Z; spf=none (imf18.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=1675868025; a=rsa-sha256; cv=none; b=Z4jAnnOQn0f3eaDkJCEdfO9la3hdhFdnEzkk4s+VdXabg2mGMM7zI6HOAoGALU2GA4UWO3 obIXsKWLMWdcgbuXHZcNcrhbAhOGJM3HdnDymdiwZ8uvvD4rmCOufOolOccwx0T/u2IxXK k5Vc6qQ/XsaOynGlbqg7Zcli6b8nfUk= 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=TTM2LCEcKRo7ysqHQyalM6+7+sVXpuzC/6B32xfg/Y0=; b=IdUzCc3Zzpj0dk7Y3co7Xeb9Hu K1pFmhmbEWbghQC8l4HyI7WYZ5bqIPecSVLYqZtI3XGnLF59S92cQzcbCZzCarhz5TfeHsA6joJep e9oBXYOGl1W3+8N5ieshbvXsiS2dbNnWrTf5G4IOj2PUx7cHvVujcxiLbwQJmdNU0rp1yFtafGqG9 ci4/6P1yNZ1uBrxEfeuo6ByOQUrd5I7c2pipHz/uWlY6zWnAldLGOwR2noGeyjl1y/xz9cA0xByhX V7fH8JaTWJGILwteEObitdanCl9gv1oqgfgSKNWxnAf1cjCbr/nihjaupG2qKmuHSC8BppP2t8Tjy /sfL/PGQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pPlpK-001HwT-Ut; Wed, 08 Feb 2023 14:53:38 +0000 From: "Matthew Wilcox (Oracle)" To: linux-xfs@vger.kernel.org, linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 2/3] afs: Split afs_pagecache_valid() out of afs_validate() Date: Wed, 8 Feb 2023 14:53:34 +0000 Message-Id: <20230208145335.307287-3-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230208145335.307287-1-willy@infradead.org> References: <20230208145335.307287-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 469281C001E X-Stat-Signature: tugeq88dico3ytojjdj94z9jw49towh9 X-Rspam-User: X-HE-Tag: 1675868025-982792 X-HE-Meta: U2FsdGVkX19xwe/5Axu4JhXt1TPWc7ajs0h+6syquiGCT9Y0kfq4TFNSkBJ9rAlV9pXeuJrqV2QTuGTtmd40zfvjuQwcrGR0lOBleVyLHBphR8zwi5ZDphdiNIXhTLdvtNZbWO0AraKGqLE8GvPUOEOkpkTRz8k0CH/3f8qXjHgoAYhO1OXQpehdAGa5I/q9SjpBv2bk5Czq7eA8aLRusnDNQ+2cILgLuhtCRm2FHR0D6Lx8Hf7YAT+58YXqPP3sUEWkYOzz/fyOU/BwL+Io/6yIx0tqhzDHpoBtvtF4HZeJQKP+geXcfp3dp5X0rwtusFF2/vnSVW6cevfIZqNGXj2rG0UGYkIb5SlXFjRHhq8UnZG4sjmHEs0AoU+x0Nkv4uE78qJQNpjdo/8Oz/hrjDvLBUeB6goZQgLXUT7Njo7wdLVmHkXsaru1hl7Eh8oWPYHPlj+0proyCXSTCmL+23RcX7GvXo/tRZ30tZoHKIcx3HBQfqF+7q7uX7jnoXth5GNdyuJToDgrTxvCzVQL8/3kRTdo8cm+VQcI8d0EoIgUGp18vMFmVfwcZnqzdXLThT5vyIsv2Mm1yXZUy4gHrAEDosmVxYHah3ULDNCDwvi4Qkxk/gD3rCWIdUjkfr81EnL3C33+pj0nWR1/1oU2PoymjvHgMe5bLUMMenPp9geKr1e/nWVXmZjk3xFMS4YS52ugJEZOWcw9IAMJxmqMZAc/9GPQgX7C189u+g334j3h1jaPocgyHg3MzsDti6NtprIS6sxaMjvXYizn+oqCkCsllMuVSs7KmL15El802ubxboXGTiML+b6RTVT2fvtxf2NcefLuGQP8DLrxrw+XhsczSgwQ0GUvlljqWBV+gKiI+ezU4BBcP/0BPYHD77EopMLTf3aKKqeDgFIV6ZYIVdM23v5YKcJ9giliCxhxJ1JGttbAe2DjpbcmHYPet/zquNn/knWZQkHMGRxyob4 z6j36z/R SNQOMXuc7icomj0XM9SGSFKHOCdMjlwVrWG3/Z/5PkFTrdUbqoq3qPwIqMIKgxY0h3/qdXTG6fXLLDSrdVbatLyUzNGf9RJ8HmLvvRBJvk6pf2hnI50k2O4FI3QkcmG5W4/aaQKo6RE2IKIQZcTSC6Ie8c+RuZz+sZWVHFpeqNBsrzwGX8/noc8rnrP+FHg5FNmYU2pyfVW4lguz+4VAeYRoqbeJnq27nBE8YvIcneByDZ0qH6pnsep5cWg== 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: For the map_pages() method, we need a test that does not sleep. The page fault handler will continue to call the fault() method where we can sleep and do the full revalidation there. Signed-off-by: Matthew Wilcox (Oracle) --- fs/afs/file.c | 14 ++------------ fs/afs/inode.c | 27 +++++++++++++++++++-------- fs/afs/internal.h | 1 + 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/fs/afs/file.c b/fs/afs/file.c index 68d6d5dc608d..719b31374879 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -569,20 +569,10 @@ static void afs_vm_close(struct vm_area_struct *vma) static vm_fault_t afs_vm_map_pages(struct vm_fault *vmf, pgoff_t start_pgoff, pgoff_t end_pgoff) { struct afs_vnode *vnode = AFS_FS_I(file_inode(vmf->vma->vm_file)); - struct afs_file *af = vmf->vma->vm_file->private_data; - switch (afs_validate(vnode, af->key)) { - case 0: + if (afs_pagecache_valid(vnode)) return filemap_map_pages(vmf, start_pgoff, end_pgoff); - case -ENOMEM: - return VM_FAULT_OOM; - case -EINTR: - case -ERESTARTSYS: - return VM_FAULT_RETRY; - case -ESTALE: - default: - return VM_FAULT_SIGBUS; - } + return 0; } static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) diff --git a/fs/afs/inode.c b/fs/afs/inode.c index 0167e96e5198..b1bdffd5e888 100644 --- a/fs/afs/inode.c +++ b/fs/afs/inode.c @@ -667,6 +667,24 @@ bool afs_check_validity(struct afs_vnode *vnode) return false; } +/* + * Returns true if the pagecache is still valid. Does not sleep. + */ +bool afs_pagecache_valid(struct afs_vnode *vnode) +{ + if (unlikely(test_bit(AFS_VNODE_DELETED, &vnode->flags))) { + if (vnode->netfs.inode.i_nlink) + clear_nlink(&vnode->netfs.inode); + return true; + } + + if (test_bit(AFS_VNODE_CB_PROMISED, &vnode->flags) && + afs_check_validity(vnode)) + return true; + + return false; +} + /* * validate a vnode/inode * - there are several things we need to check @@ -684,14 +702,7 @@ int afs_validate(struct afs_vnode *vnode, struct key *key) vnode->fid.vid, vnode->fid.vnode, vnode->flags, key_serial(key)); - if (unlikely(test_bit(AFS_VNODE_DELETED, &vnode->flags))) { - if (vnode->netfs.inode.i_nlink) - clear_nlink(&vnode->netfs.inode); - goto valid; - } - - if (test_bit(AFS_VNODE_CB_PROMISED, &vnode->flags) && - afs_check_validity(vnode)) + if (afs_pagecache_valid(vnode)) goto valid; down_write(&vnode->validate_lock); diff --git a/fs/afs/internal.h b/fs/afs/internal.h index ad8523d0d038..5c95df6621f9 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -1171,6 +1171,7 @@ extern struct inode *afs_iget(struct afs_operation *, struct afs_vnode_param *); extern struct inode *afs_root_iget(struct super_block *, struct key *); extern bool afs_check_validity(struct afs_vnode *); extern int afs_validate(struct afs_vnode *, struct key *); +bool afs_pagecache_valid(struct afs_vnode *); extern int afs_getattr(struct mnt_idmap *idmap, const struct path *, struct kstat *, u32, unsigned int); extern int afs_setattr(struct mnt_idmap *idmap, struct dentry *, struct iattr *); -- 2.35.1