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 DA559C6FD1D for ; Mon, 27 Mar 2023 17:45:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F78B900004; Mon, 27 Mar 2023 13:45:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8CED6900002; Mon, 27 Mar 2023 13:45:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 74D58900005; Mon, 27 Mar 2023 13:45:31 -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 53100900002 for ; Mon, 27 Mar 2023 13:45:31 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2A274160591 for ; Mon, 27 Mar 2023 17:45:31 +0000 (UTC) X-FDA: 80615405262.13.845AB33 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 744B1A000E for ; Mon, 27 Mar 2023 17:45:29 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=lf+sGi73; spf=none (imf25.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=1679939129; a=rsa-sha256; cv=none; b=yzyrJZg3KO1athzzA0zHsH4tGFOgLo2ukTK4JIB9NpatLqvkmXIzxsuNtzIeNBIlPBhDcT 1u3jgngGxGlAbcmMMigG8oW4lZmTuklZHDGYv27lEDjyYEJWHks1yw/ag2U7lVel1gKlIV PaU+N1FnxE7WFUzp4HDI11SLklvh81E= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=lf+sGi73; spf=none (imf25.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=1679939129; 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=GAyshjmKzZkCN3bMmDoTxHf/sR0cear/9s9hk1TbP0k=; b=1uGD9tPvaFVoF9Y71pwFOdCWtYTjqdUVCehTS8mKnk4fs7dqswwBG9SRWw8sOmjUacDtFL OlsrWKhu+Cx7neCdhcjHW4mCC/ZMieMoVLL7wdgrCdnw9nrDVcv9UDYmPKzjzMALY+vPQV xC3zHyWe6GvVOBZ6jWc0jwrA3ynxaEs= 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=GAyshjmKzZkCN3bMmDoTxHf/sR0cear/9s9hk1TbP0k=; b=lf+sGi73/ao9HbjaotBl2pVUzS pHH+wy60rrUFTqs+ErZYZmfjokJg2KXASQ+LmXKQy0XUSYzLIxvDDEwx6xSN7FNyAH+SsfFei0bID 3S6nHNMDJuUoZblr82s8LNGOzLzyA0XAt5qx092xMNkJQ2gKXS5prSE0iQ+2BOztSnlhDFZi+Lm+7 ONzWtkKoNSC9uFiMfvXkS/DOEgqJw3Kb4NovLp+d3T9dvyrz1fVXw0tVDxktZuOCskGIG4Ftv90UH a306skCf2SweTCGwfoQxnWcS0xKPlj/el+ecfNH3Xj8ZXE2+n+06FaOrPA7n1DHTk1OQ/va8IiawA asZPxL9g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pgquI-007bGW-CW; Mon, 27 Mar 2023 17:45:22 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-xfs@vger.kernel.org, linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, David Howells Subject: [PATCH v2 2/3] afs: Split afs_pagecache_valid() out of afs_validate() Date: Mon, 27 Mar 2023 18:45:14 +0100 Message-Id: <20230327174515.1811532-3-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230327174515.1811532-1-willy@infradead.org> References: <20230327174515.1811532-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 744B1A000E X-Rspamd-Server: rspam01 X-Stat-Signature: mgr4nkij1zc6xx7hqdcq17wguc9ktsed X-HE-Tag: 1679939129-536527 X-HE-Meta: U2FsdGVkX1/G0J2TRnrRQv203eWyME6dJsKJvIBIdhS0zhHQXmKt3ghbHvcm5idZoR3vJ3jGCT8KudCEw89C3N7Gx7sWa6q/ZJvu8ympIDGueT/3NtAy29qhj+08+ggsN2xFTAtWHZOMDHOTNdDeW3nZJCA7aDppkt0nankhFxyLHTtVdEg4TpHOYT/XbLnwVYd4089Pfib1MpEUZ5es17lFbLppYiC+9HnbsbAOgEc1MT9DDj3PVckHUHVHCYZlSU0bvrNFahjfV+iEakSSm+btEepzLRqUlNar2YKx0VysKSKYIRTBY43tcwXpbKW3YLxL/uQQ1G6V3Fhyeqot1etmFCkRQ943ZK6QWFTlq8Z+a6fQ/3Cc3qCMuqvETB2iIbop/ZayAHnmyxjw/sSy+qb2JQVvSl9LiAofxMMXJLEjORXEMAOJPtFQ5soUgK8z3Ov4n1wxyWv3fPPeSitXYDPPR+hACmxZF8hm2nDSHVH+0iOwTEgMINfse1HoTcsr5bVjdjC/shgaS80PO8wT75dG5OeBe+Ps3vYcQ+CKux6htItRTpvh0vMAhUa5XfgE1/wrhyMTK8ED/xvM9aXiepxAjDm72a65S9QxKp84D00H+fJFFzTAuHzEldQXZzH6zkAo1Nq1LsNg5uyJk3PjPON+UAIvxlEm9iMbnzHH/6fI2KCG7G3g3RTjVedmMXAQG/SvXuqfdytZLBKceTlS0bq/PPxMQRNIzpnTGhJz2iADzuC3TzrdMAc8Ub+6r8ozsXYdgo3GNhhEnO1KAAE+4g4TFs2Ia7o9YzAq5UIyysUlAiHcpG9N8p06WywBK2EXLBPw+Ay/GxDKC8HWV+KYOwW1/chRk/dWFkexZHD3S2YrbhHvLRahDfVh/sNC0tn3suTdl0l+MU3YomEDh5Fy0NL/yWpxxtomppXcmNDpbqy8LdDlUkrj4mryrzPrZIlHDybN2S+UwkCl51FsSML KeLcL0SV RcL2rlfDWLekK6GHd58SaWr5JR6s5L1E3oCJbIx4cRzTHW+xFREzo0VDGn7mH9aNhpVU4T+9Hobe4WRA37TvLZgEkyImMq3jbgcS8AbPPQsDmMx4F2EvAqnEVtfcasG5kXGWqJMkQVUs73fWQmdc/e8cCXR/g00zQA2O4fO/Aq4n/QXKJsA9Igumxk8/BYxndpFcKYQwPFij4148/EJYpkBUgcbbtrTmradhLFdJjTKPInc6oR/GMzjNYVpeaSN5T66/KolkBr6Z1AFE= 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) Acked-by: David Howells Tested-by: David Howells --- 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.39.2