From patchwork Sat Sep 17 05:13:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336961 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 567D16089F for ; Sat, 17 Sep 2016 05:13:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 481A229FBE for ; Sat, 17 Sep 2016 05:13:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D4DA29FD2; Sat, 17 Sep 2016 05:13:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6BD229FBE for ; Sat, 17 Sep 2016 05:13:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754970AbcIQFNl (ORCPT ); Sat, 17 Sep 2016 01:13:41 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:33387 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754444AbcIQFNk (ORCPT ); Sat, 17 Sep 2016 01:13:40 -0400 Received: by mail-io0-f193.google.com with SMTP id r145so2386684ior.0 for ; Fri, 16 Sep 2016 22:13:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=pEgKg3hZFI8ws93/dhObVIEh7AqiKqtMNn/QbQgbMko=; b=D0w7Ve+CzuA8uk2hi5EALHq0KnWhjDl9diCUAgl0q6FSo0cHbol1N4LgzfgKKQESVk N4dqCZw1Xn9yJMKiYwqNpbzHkw/IB17RK/dn0EuC7OtYhgUXFbhxJTemnSF35ihkY1PW NqmXEd51ZTr2xXdTYSHCs7CKyg4Y+P8gbXF2cXgd/YYlDWb1g0VJBnIjmQ4xwg4qpW82 /EB9VsuLIeCLxXYpMZOYCAF90/ZQ302G/SP1SCSMoO0SrZn9fnpegD5eUgx2MEmQnVpl CCRboLn8FGO32tdKBstRJo1m9TLhz8jWwK7pDmA6CbNK5e2cwAKt+4BawCfJz+Pq3g4B ZnfQ== 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=pEgKg3hZFI8ws93/dhObVIEh7AqiKqtMNn/QbQgbMko=; b=KB9I0bwhHkf4X/ZHrADpBzfJeE1Cd3sJ204NZUSVcWbSL3Y7XAp469ED4/7yr8axHe UCyGv7Dqalun7yBqy20xXsUR9I8KIdG062YH7a0cI5NCbVjzOPRQx5v8fEG0fp0VYYGQ DWEgHmSFQyFEo8CF75V0q5cPelpsekH3W22J3pp1nOpkSL1qwb4MxvpKugLeeL+moEAp 7+FFQzQJcQx3fMUE7Z1/vrUGrOV20FIiN4dCIZx688mhOz+spMGXeMMVxlPbrjDdguuB UyLNY8awDFcW8I0qWTDDKMoSVjwS0FWpeooyY21XdDEB/4RIccKCekZipEch42iccf8q YlbA== X-Gm-Message-State: AE9vXwPm9VUB2tmSTkbybXRxIEhgVs6Ab44J4zRT8VfFG063D0XRQhDRdUQ/Z0kwdNarCg== X-Received: by 10.107.18.142 with SMTP id 14mr27361060ios.100.1474089219611; Fri, 16 Sep 2016 22:13:39 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id d15sm4993916ioj.19.2016.09.16.22.13.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:39 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 04/25] NFSv4.1: Allow test_stateid to handle session errors without waiting Date: Sat, 17 Sep 2016 01:13:12 -0400 Message-Id: <1474089213-104014-5-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-4-git-send-email-trond.myklebust@primarydata.com> References: <1474089213-104014-1-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-2-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-3-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-4-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the server crashes while we're testing stateids for validity, then we want to initiate session recovery. Usually, we will be calling from a state manager thread, though, so we don't really want to wait. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index a026156434ae..2b569d5fb3e2 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8598,6 +8598,23 @@ static int _nfs41_test_stateid(struct nfs_server *server, return -res.status; } +static void nfs4_handle_delay_or_session_error(struct nfs_server *server, + int err, struct nfs4_exception *exception) +{ + exception->retry = 0; + switch(err) { + case -NFS4ERR_DELAY: + nfs4_handle_exception(server, err, exception); + break; + case -NFS4ERR_BADSESSION: + case -NFS4ERR_BADSLOT: + case -NFS4ERR_BAD_HIGH_SLOT: + case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: + case -NFS4ERR_DEADSESSION: + nfs4_do_handle_exception(server, err, exception); + } +} + /** * nfs41_test_stateid - perform a TEST_STATEID operation * @@ -8617,9 +8634,7 @@ static int nfs41_test_stateid(struct nfs_server *server, int err; do { err = _nfs41_test_stateid(server, stateid, cred); - if (err != -NFS4ERR_DELAY) - break; - nfs4_handle_exception(server, err, &exception); + nfs4_handle_delay_or_session_error(server, err, &exception); } while (exception.retry); return err; }