From patchwork Fri Jul 25 11:34:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4622481 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 65C419F375 for ; Fri, 25 Jul 2014 11:34:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74377201F4 for ; Fri, 25 Jul 2014 11:34:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57233201ED for ; Fri, 25 Jul 2014 11:34:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760212AbaGYLep (ORCPT ); Fri, 25 Jul 2014 07:34:45 -0400 Received: from mail-qg0-f47.google.com ([209.85.192.47]:57593 "EHLO mail-qg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751478AbaGYLeo (ORCPT ); Fri, 25 Jul 2014 07:34:44 -0400 Received: by mail-qg0-f47.google.com with SMTP id i50so4781355qgf.20 for ; Fri, 25 Jul 2014 04:34:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=C+SG0AQLYT4Ql5L9LVlgBJliGWjanBxoa3JQf6qt1M4=; b=IS3/o/KPbHMBnGHRrW+Y6Hr0g9R4j0j1FJexyJ75p/rEFeQcfkvQ24qlbfh0SYg/Ko OiQou7SCy9v2RsRy/dcFaN14z/SdUPGcpiM2Yq/5arcCs80HNMoWUuxHKQe0pOnuXC26 TDgapiKUFM37lz9DHeHrP9KhL/YJiLQuxPTt3THN/5RxVqSuASYqaa8agqWHkf3oFb/g I8vQF/wY/EXYN0Cku4XkfDcUOEL25yowAsC8qCFdHP/CplWGCySZAeuML1tVlErWu85N lkXIXXDMS4+qWGFK9tIdfDDJT3lP8OfntCPC2G6Mfm+hOic8IrBkFT1ZIBg5/yCuccVy OoHw== X-Gm-Message-State: ALoCoQlyltcIsDE6qVisTWFOVMo6H+Yb4xlcepuKc6ZOzI0iR/XmGKOqM8YyaIqslmYDQNgBfyWu X-Received: by 10.140.109.164 with SMTP id l33mr24843735qgf.72.1406288083172; Fri, 25 Jul 2014 04:34:43 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id p12sm11041561qga.0.2014.07.25.04.34.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jul 2014 04:34:42 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org Subject: [PATCH v6 2/9] nfsd: fully unhash delegations when revoking them Date: Fri, 25 Jul 2014 07:34:20 -0400 Message-Id: <1406288067-20663-3-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406288067-20663-1-git-send-email-jlayton@primarydata.com> References: <1406288067-20663-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Ensure that the delegations cannot be found by the laundromat etc once we add them to the various 'revoke' lists. Signed-off-by: Trond Myklebust Signed-off-by: Jeff Layton Reviewed-by: Christoph Hellwig --- fs/nfsd/nfs4state.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index fdbfbcb70914..618daa0d4109 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -661,13 +661,13 @@ hash_delegation_locked(struct nfs4_delegation *dp, struct nfs4_file *fp) list_add(&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations); } -/* Called under the state lock. */ static void -unhash_delegation(struct nfs4_delegation *dp) +unhash_delegation_locked(struct nfs4_delegation *dp) { struct nfs4_file *fp = dp->dl_file; - spin_lock(&state_lock); + lockdep_assert_held(&state_lock); + dp->dl_stid.sc_type = NFS4_CLOSED_DELEG_STID; /* Ensure that deleg break won't try to requeue it */ ++dp->dl_time; @@ -678,7 +678,6 @@ unhash_delegation(struct nfs4_delegation *dp) spin_unlock(&fp->fi_lock); if (fp) nfs4_put_deleg_lease(fp); - spin_unlock(&state_lock); } static void destroy_revoked_delegation(struct nfs4_delegation *dp) @@ -689,7 +688,9 @@ static void destroy_revoked_delegation(struct nfs4_delegation *dp) static void destroy_delegation(struct nfs4_delegation *dp) { - unhash_delegation(dp); + spin_lock(&state_lock); + unhash_delegation_locked(dp); + spin_unlock(&state_lock); nfs4_put_delegation(dp); } @@ -698,11 +699,10 @@ static void revoke_delegation(struct nfs4_delegation *dp) struct nfs4_client *clp = dp->dl_stid.sc_client; if (clp->cl_minorversion == 0) - destroy_delegation(dp); + destroy_revoked_delegation(dp); else { - unhash_delegation(dp); dp->dl_stid.sc_type = NFS4_REVOKED_DELEG_STID; - list_add(&dp->dl_recall_lru, &clp->cl_revoked); + list_move(&dp->dl_recall_lru, &clp->cl_revoked); } } @@ -1458,15 +1458,14 @@ destroy_client(struct nfs4_client *clp) spin_lock(&state_lock); while (!list_empty(&clp->cl_delegations)) { dp = list_entry(clp->cl_delegations.next, struct nfs4_delegation, dl_perclnt); - list_del_init(&dp->dl_perclnt); - /* Ensure that deleg break won't try to requeue it */ - ++dp->dl_time; - list_move(&dp->dl_recall_lru, &reaplist); + unhash_delegation_locked(dp); + list_add(&dp->dl_recall_lru, &reaplist); } spin_unlock(&state_lock); while (!list_empty(&reaplist)) { dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru); - destroy_delegation(dp); + list_del_init(&dp->dl_recall_lru); + nfs4_put_delegation(dp); } list_splice_init(&clp->cl_revoked, &reaplist); while (!list_empty(&reaplist)) { @@ -3662,7 +3661,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh, open->op_delegate_type = NFS4_OPEN_DELEGATE_READ; return; out_free: - destroy_delegation(dp); + nfs4_put_delegation(dp); out_no_deleg: open->op_delegate_type = NFS4_OPEN_DELEGATE_NONE; if (open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS && @@ -3900,7 +3899,8 @@ nfs4_laundromat(struct nfsd_net *nn) new_timeo = min(new_timeo, t); break; } - list_move(&dp->dl_recall_lru, &reaplist); + unhash_delegation_locked(dp); + list_add(&dp->dl_recall_lru, &reaplist); } spin_unlock(&state_lock); list_for_each_safe(pos, next, &reaplist) { @@ -5382,12 +5382,8 @@ static u64 nfsd_find_all_delegations(struct nfs4_client *clp, u64 max, if (dp->dl_time != 0) continue; - /* - * Increment dl_time to ensure that delegation breaks - * don't monkey with it now that we are. - */ - ++dp->dl_time; - list_move(&dp->dl_recall_lru, victims); + unhash_delegation_locked(dp); + list_add(&dp->dl_recall_lru, victims); } if (++count == max) break; @@ -5642,12 +5638,14 @@ nfs4_state_shutdown_net(struct net *net) spin_lock(&state_lock); list_for_each_safe(pos, next, &nn->del_recall_lru) { dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); - list_move(&dp->dl_recall_lru, &reaplist); + unhash_delegation_locked(dp); + list_add(&dp->dl_recall_lru, &reaplist); } spin_unlock(&state_lock); list_for_each_safe(pos, next, &reaplist) { dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); - destroy_delegation(dp); + list_del_init(&dp->dl_recall_lru); + nfs4_put_delegation(dp); } nfsd4_client_tracking_exit(net);