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 X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEA76C63798 for ; Fri, 20 Nov 2020 15:14:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F2E32222F for ; Fri, 20 Nov 2020 15:14:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bldI3A77" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729214AbgKTPN5 (ORCPT ); Fri, 20 Nov 2020 10:13:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56291 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729200AbgKTPN4 (ORCPT ); Fri, 20 Nov 2020 10:13:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605885235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uomWbsImiumFICDtRpb1G8QZPYUTXnwJ7BaEhbKeStk=; b=bldI3A77zv2X8pDUi/0svuimWtcxQapDKVDGxM15zxkVGyIDI6tjlz1PEEXtwMTaaCuXVO wX/oaDkFqH6MDfVJhNLdFuMViyr/Ek5QNu/kctrmXYtFAkt7azDxdf3sVBxxMvnyzMTrnS IoAyPJJxqi7AwQymZjVRUPRQhkEUMNU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-531-vWdiV8ipNHmYaGCZrhouZg-1; Fri, 20 Nov 2020 10:13:52 -0500 X-MC-Unique: vWdiV8ipNHmYaGCZrhouZg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 538EC1005D65; Fri, 20 Nov 2020 15:13:50 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-112-246.rdu2.redhat.com [10.10.112.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id 271235C1D5; Fri, 20 Nov 2020 15:13:44 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [RFC PATCH 52/76] fscache: disable cookie when doing an invalidation for DIO write From: David Howells To: Trond Myklebust , Anna Schumaker , Steve French , Dominique Martinet Cc: Jeff Layton , dhowells@redhat.com, Jeff Layton , Matthew Wilcox , Alexander Viro , linux-cachefs@redhat.com, linux-afs@lists.infradead.org, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs-developer@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 20 Nov 2020 15:13:43 +0000 Message-ID: <160588522336.3465195.4306404507840267540.stgit@warthog.procyon.org.uk> In-Reply-To: <160588455242.3465195.3214733858273019178.stgit@warthog.procyon.org.uk> References: <160588455242.3465195.3214733858273019178.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.23 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: Jeff Layton O_DIRECT I/O is probably a good indicator that we don't need to be caching this file at the moment. Disable the cookie by treating it as we would a NULL cookie after the invalidation completes. Reenable when the last unuse is done. Signed-off-by: Jeff Layton Signed-off-by: David Howells --- fs/fscache/cookie.c | 9 ++++++++- include/linux/fscache.h | 9 ++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c index 1b30b28f7cf6..d20028535a86 100644 --- a/fs/fscache/cookie.c +++ b/fs/fscache/cookie.c @@ -427,8 +427,11 @@ void __fscache_unuse_cookie(struct fscache_cookie *cookie, { if (aux_data || object_size) __fscache_update_cookie(cookie, aux_data, object_size); - if (atomic_dec_and_test(&cookie->n_active)) + if (atomic_dec_and_test(&cookie->n_active)) { + clear_bit(FSCACHE_COOKIE_DISABLED, &cookie->flags); + smp_mb__after_atomic(); wake_up_var(&cookie->n_active); + } } EXPORT_SYMBOL(__fscache_unuse_cookie); @@ -554,6 +557,10 @@ void __fscache_invalidate(struct fscache_cookie *cookie, */ ASSERTCMP(cookie->type, !=, FSCACHE_COOKIE_TYPE_INDEX); + if ((flags & FSCACHE_INVAL_DIO_WRITE) && + test_and_set_bit(FSCACHE_COOKIE_DISABLED, &cookie->flags)) + return; + spin_lock(&cookie->lock); fscache_update_aux(cookie, aux_data, &new_size); cookie->zero_point = new_size; diff --git a/include/linux/fscache.h b/include/linux/fscache.h index 1d141d17f63b..3c173fb660a6 100644 --- a/include/linux/fscache.h +++ b/include/linux/fscache.h @@ -26,11 +26,13 @@ #define fscache_available() (1) #define fscache_cookie_valid(cookie) (cookie) #define fscache_object_valid(object) (object) +#define fscache_cookie_enabled(cookie) (cookie && !test_bit(FSCACHE_COOKIE_DISABLED, &cookie->flags)) #else #define __fscache_available (0) #define fscache_available() (0) #define fscache_cookie_valid(cookie) (0) #define fscache_object_valid(object) (NULL) +#define fscache_cookie_enabled(cookie) (0) #endif @@ -127,6 +129,7 @@ struct fscache_cookie { unsigned long flags; #define FSCACHE_COOKIE_RELINQUISHED 6 /* T if cookie has been relinquished */ +#define FSCACHE_COOKIE_DISABLED 7 /* T if cookie has been disabled */ enum fscache_cookie_stage stage; enum fscache_cookie_type type:8; @@ -410,7 +413,7 @@ static inline void fscache_update_cookie(struct fscache_cookie *cookie, const void *aux_data, const loff_t *object_size) { - if (fscache_cookie_valid(cookie)) + if (fscache_cookie_enabled(cookie)) __fscache_update_cookie(cookie, aux_data, object_size); } @@ -468,7 +471,7 @@ static inline void fscache_invalidate(struct fscache_cookie *cookie, const void *aux_data, loff_t size, unsigned int flags) { - if (fscache_cookie_valid(cookie)) + if (fscache_cookie_enabled(cookie)) __fscache_invalidate(cookie, aux_data, size, flags); } @@ -492,7 +495,7 @@ int fscache_begin_operation(struct fscache_cookie *cookie, struct fscache_op_resources *opr, enum fscache_want_stage want_stage) { - if (fscache_cookie_valid(cookie)) + if (fscache_cookie_enabled(cookie)) return __fscache_begin_operation(cookie, opr, want_stage); return -ENOBUFS; }