Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3685936pxb; Mon, 9 Nov 2020 19:03:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDHgioegkmzwsAUcaMtSUjZk7eLgfytU8F+BtHepSmypKJdlbBvL2vttTkAVhfGfyPROIZ X-Received: by 2002:aa7:db82:: with SMTP id u2mr18859131edt.262.1604977398332; Mon, 09 Nov 2020 19:03:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604977398; cv=none; d=google.com; s=arc-20160816; b=JDsDjhlrt2eEucZdU1NP0waJtEMneWZL3sLyTA6ojYPHl0v3sbiDZnVpJEkO/xUj8R HfDXmkfqYCAFgatOIjnyWPXzECEvwRr5a4pStKWYcn/yGkibaI4zRnhLds8b5gtb/xQB eGmFSry/Hfc79hmgzNX0jqAamiUqxmsEDsiTflZv8LV05pOb5O+fSCQN3HOHnoIvNMds Ye/uIWZKXCWKW5jDKVK6tee5vU9Qar445aKw++sJBbak6ceT0GEZpZ8AMrTLbWwLcoYZ buOEFIdwiQ6p1fiwY9wfL67Sc+74AROVvie9pXptBUTXDqLbi4TBkUhNwQjPoQjWsKnt +jEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=mIn5JHEeV0dpM2MiqXa4KRXqGAYFy/0GuoRmbaFU09o=; b=A5fHUZabZxnpy0XklKEngAltK6OfsXEQwrSOf5KJdKKraziJZS30imD7Rsh+mOMROC vn0cvPI9z9kSZnP3U2tqQhuwYAt2frcNrnvz9Z5dh1MdvkCCuELQ8KpzYGO80NPjEbO9 5Q0gCEEJBjgpfJddk5siSNqSPj3wiMuu0codSt6x9KQvIOS4Lh3zTLg2khlbxH82CNiA WkSOeo/bJiTxEShFxNI8lZLOqZXFnl5EmpxNClySSVR1vqnR6P7gwHc1TfWGC/H3qCCI yxZAvHKes8awFMt0k/i4Uw2GOJQLaUigKKunXPIcP7+h2cEjYQsAERCXb1vciz6OuD6r tv1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ce9si7649385ejb.713.2020.11.09.19.02.55; Mon, 09 Nov 2020 19:03:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731188AbgKJC7R (ORCPT + 99 others); Mon, 9 Nov 2020 21:59:17 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:64516 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729243AbgKJC7R (ORCPT ); Mon, 9 Nov 2020 21:59:17 -0500 X-IronPort-AV: E=Sophos;i="5.77,465,1596470400"; d="scan'208";a="101126857" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Nov 2020 10:59:11 +0800 Received: from G08CNEXMBPEKD05.g08.fujitsu.local (unknown [10.167.33.204]) by cn.fujitsu.com (Postfix) with ESMTP id 1D2124CE4BB7; Tue, 10 Nov 2020 10:59:09 +0800 (CST) Received: from G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) by G08CNEXMBPEKD05.g08.fujitsu.local (10.167.33.204) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 10 Nov 2020 10:59:08 +0800 Received: from localhost.localdomain (10.167.225.206) by G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 10 Nov 2020 10:59:08 +0800 From: Hao Li To: CC: , , , , Subject: [PATCH] fs: Kill DCACHE_DONTCACHE dentry even if DCACHE_REFERENCED is set Date: Tue, 10 Nov 2020 10:59:07 +0800 Message-ID: <20201110025907.5237-1-lihao2018.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-yoursite-MailScanner-ID: 1D2124CE4BB7.AC907 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: lihao2018.fnst@cn.fujitsu.com X-Spam-Status: No Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If DCACHE_REFERENCED is set, fast_dput() will return true, and then retain_dentry() have no chance to check DCACHE_DONTCACHE. As a result, the dentry won't be killed and the corresponding inode can't be evicted. In the following example, the DAX policy can't take effects unless we do a drop_caches manually. # DCACHE_LRU_LIST will be set echo abcdefg > test.txt # DCACHE_REFERENCED will be set and DCACHE_DONTCACHE can't do anything xfs_io -c 'chattr +x' test.txt # Drop caches to make DAX changing take effects echo 2 > /proc/sys/vm/drop_caches What this patch does is preventing fast_dput() from returning true if DCACHE_DONTCACHE is set. Then retain_dentry() will detect the DCACHE_DONTCACHE and will return false. As a result, the dentry will be killed and the inode will be evicted. In this way, if we change per-file DAX policy, it will take effects automatically after this file is closed by all processes. I also add some comments to make the code more clear. Signed-off-by: Hao Li Reviewed-by: Jan Kara Reviewed-by: Ira Weiny --- This patch may have been forgotten. Original patch: https://lore.kernel.org/linux-fsdevel/20200924055958.825515-1-lihao2018.fnst@cn.fujitsu.com/ fs/dcache.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/dcache.c b/fs/dcache.c index ea0485861d93..97e81a844a96 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -793,10 +793,17 @@ static inline bool fast_dput(struct dentry *dentry) * a reference to the dentry and change that, but * our work is done - we can leave the dentry * around with a zero refcount. + * + * Nevertheless, there are two cases that we should kill + * the dentry anyway. + * 1. free disconnected dentries as soon as their refcount + * reached zero. + * 2. free dentries if they should not be cached. */ smp_rmb(); d_flags = READ_ONCE(dentry->d_flags); - d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST | DCACHE_DISCONNECTED; + d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST | + DCACHE_DISCONNECTED | DCACHE_DONTCACHE; /* Nothing to do? Dropping the reference was all we needed? */ if (d_flags == (DCACHE_REFERENCED | DCACHE_LRU_LIST) && !d_unhashed(dentry)) -- 2.28.0