From patchwork Mon Jun 17 15:32:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 10999563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D2DA1395 for ; Mon, 17 Jun 2019 15:32:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0BE3288DA for ; Mon, 17 Jun 2019 15:32:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E50B0289DD; Mon, 17 Jun 2019 15:32:52 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 7D0A828978 for ; Mon, 17 Jun 2019 15:32:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725863AbfFQPcw (ORCPT ); Mon, 17 Jun 2019 11:32:52 -0400 Received: from mail-io1-f67.google.com ([209.85.166.67]:44937 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728381AbfFQPcv (ORCPT ); Mon, 17 Jun 2019 11:32:51 -0400 Received: by mail-io1-f67.google.com with SMTP id s7so22036341iob.11; Mon, 17 Jun 2019 08:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=Cs22RVTP9M4t5Y+In/GyaXHpttA9IFvUx3BrwLycUq0=; b=dwjFzMD+nHCmVhei4kWlvlyDYivvoB6YIV1KwwGahuvuG61oQ3/ab8bNhZ+hNenoQB oz0ORdTQv3N5amfZKZGbwf/OekoSQmK+GhDv1FyrAXwkCYG7yeCbybhfdaMPbQvLDYSP xsTIq5W3e8TPbpddIFEWVYK6fj5LgpjBgIRC0OHzdR4kqseVeDZBAM3mvHaYS3deiGng mzvQekH62DMjF+oITwt+nI3LmmSxqYCgNl4GODebVZ7VabUiOUVjjyxJVKRCM0atbgZK vevtFkGRu9zKfvxtojkYPGk9kDdMC21VuJA88hTKau4FSPrsd4R/WoNPHIUut5r+qJnX bSbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=Cs22RVTP9M4t5Y+In/GyaXHpttA9IFvUx3BrwLycUq0=; b=bM/Al68RLj/gh45sbNC3ADluIdyVWJkN/1DbJ8YQT7lX7dXk49CqPPrDOi14VSozBm 3v994J1H7/LsK1KtySbRjBagcNNorT7BLG/aUyI3aCmENIMwoHTZPcgfkvAgpT5l0iMw R4/wsvfKyaM+mFUiZ17vZNVu7PwBeOpnh+qgH4BhiC/bxDANv3SjvfuAFhcN395wFu25 5DmB3TA3oOfDcjhR3hMqk4FXzcWw/ekYdYDvo3Mk+MHeSw1O7pEeQQbK54pQVbzoKucl nORPuqydoKSijBzdVGgq39Mie5ZN7YwDQRq81QSMqDVaXPYHxp9kmhS2dydrG9iMfN+y r97g== X-Gm-Message-State: APjAAAU2r930nMOKS3TiRFcXyWS84Xa+73bwYN/PHU28aJb5M+iVLAni S6ltiF+PyNBPw0lRXrnrI4y9XFl+ X-Google-Smtp-Source: APXvYqzqQqNN7EPHqn7c0d7dUPcIXDfCzDhBvmbniNyVlZSkT1ZSA0VZ1r1CMIBJHM/43qmCFP4MUw== X-Received: by 2002:a5d:9b1a:: with SMTP id y26mr57985103ion.238.1560785570862; Mon, 17 Jun 2019 08:32:50 -0700 (PDT) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id k5sm12588739ioj.47.2019.06.17.08.32.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 08:32:50 -0700 (PDT) Received: from manet.1015granger.net (manet.1015granger.net [192.168.1.51]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id x5HFWnmu031230; Mon, 17 Jun 2019 15:32:49 GMT Subject: [PATCH v3 15/19] NFS4: Add a trace event to record invalid CB sequence IDs From: Chuck Lever To: anna.schumaker@netapp.com Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Mon, 17 Jun 2019 11:32:49 -0400 Message-ID: <20190617153249.12090.39151.stgit@manet.1015granger.net> In-Reply-To: <20190617152657.12090.11389.stgit@manet.1015granger.net> References: <20190617152657.12090.11389.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 Help debug NFSv4 callback failures. Signed-off-by: Chuck Lever --- fs/nfs/callback_proc.c | 28 ++++++++++++++++++++-------- fs/nfs/nfs4trace.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 3159673..f39924b 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -414,27 +414,39 @@ __be32 nfs4_callback_devicenotify(void *argp, void *resp, validate_seqid(const struct nfs4_slot_table *tbl, const struct nfs4_slot *slot, const struct cb_sequenceargs * args) { + __be32 ret; + + ret = cpu_to_be32(NFS4ERR_BADSLOT); if (args->csa_slotid > tbl->server_highest_slotid) - return htonl(NFS4ERR_BADSLOT); + goto out_err; /* Replay */ if (args->csa_sequenceid == slot->seq_nr) { + ret = cpu_to_be32(NFS4ERR_DELAY); if (nfs4_test_locked_slot(tbl, slot->slot_nr)) - return htonl(NFS4ERR_DELAY); + goto out_err; + /* Signal process_op to set this error on next op */ + ret = cpu_to_be32(NFS4ERR_RETRY_UNCACHED_REP); if (args->csa_cachethis == 0) - return htonl(NFS4ERR_RETRY_UNCACHED_REP); + goto out_err; /* Liar! We never allowed you to set csa_cachethis != 0 */ - return htonl(NFS4ERR_SEQ_FALSE_RETRY); + ret = cpu_to_be32(NFS4ERR_SEQ_FALSE_RETRY); + goto out_err; } /* Note: wraparound relies on seq_nr being of type u32 */ - if (likely(args->csa_sequenceid == slot->seq_nr + 1)) - return htonl(NFS4_OK); - /* Misordered request */ - return htonl(NFS4ERR_SEQ_MISORDERED); + ret = cpu_to_be32(NFS4ERR_SEQ_MISORDERED); + if (args->csa_sequenceid != slot->seq_nr + 1) + goto out_err; + + return cpu_to_be32(NFS4_OK); + +out_err: + trace_nfs4_cb_seqid_err(args, ret); + return ret; } /* diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index cd1a5c0..6beb1f2 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -490,6 +490,44 @@ __entry->highest_slotid ) ); + +TRACE_EVENT(nfs4_cb_seqid_err, + TP_PROTO( + const struct cb_sequenceargs *args, + __be32 status + ), + TP_ARGS(args, status), + + TP_STRUCT__entry( + __field(unsigned int, session) + __field(unsigned int, slot_nr) + __field(unsigned int, seq_nr) + __field(unsigned int, highest_slotid) + __field(unsigned int, cachethis) + __field(int, error) + ), + + TP_fast_assign( + __entry->session = nfs_session_id_hash(&args->csa_sessionid); + __entry->slot_nr = args->csa_slotid; + __entry->seq_nr = args->csa_sequenceid; + __entry->highest_slotid = args->csa_highestslotid; + __entry->cachethis = args->csa_cachethis; + __entry->error = -be32_to_cpu(status); + ), + + TP_printk( + "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "highest_slotid=%u", + __entry->error, + show_nfsv4_errors(__entry->error), + __entry->session, + __entry->slot_nr, + __entry->seq_nr, + __entry->highest_slotid + ) +); + #endif /* CONFIG_NFS_V4_1 */ TRACE_EVENT(nfs4_setup_sequence,