From patchwork Mon Dec 23 15:28:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 11308469 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3EC0A109A for ; Mon, 23 Dec 2019 15:28:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CAFB20709 for ; Mon, 23 Dec 2019 15:28:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZDh2F31p" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726861AbfLWP2a (ORCPT ); Mon, 23 Dec 2019 10:28:30 -0500 Received: from mail-yb1-f194.google.com ([209.85.219.194]:35856 "EHLO mail-yb1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726795AbfLWP2a (ORCPT ); Mon, 23 Dec 2019 10:28:30 -0500 Received: by mail-yb1-f194.google.com with SMTP id w126so5266698yba.3 for ; Mon, 23 Dec 2019 07:28:29 -0800 (PST) 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=T7F6czYRIpqG5UN+LaWDPcuvGw88vepT7p+4yFZ2tTs=; b=ZDh2F31pU7S+jx91JBkvQfC796x3DhcjbCPrFm0vaLubWMMcLkoV14WvXTRPBe/jxL GfOuUSh3rMBLNuvTW5Bci40Xc0+36g76GiQTMn6zhcKqPIIMtyRrLS+L1BimxTrUe9mb IPKC5R5l3no58riud+bfF+JCXe8qanh3mkrJtPxJ2A9HMELTr0bnT7QeI8I9UE3YcKfy V4HE7XVrMRQ0X45nxasTbUZb+7DKdOHVadUrx/QnlhyaQek0y3uqAS+qlj2J/5z1HVZY 6d1kPMVywovTKxSmy8jrO9mAFIleon+3kgLlOkmiWHpcrZVWIxGNKfHIHnD0u8rcn+ly falA== 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=T7F6czYRIpqG5UN+LaWDPcuvGw88vepT7p+4yFZ2tTs=; b=jqPijh1YGqkHtP0KhC72Og9BzMOMZIsOCwfltJUnypArHSHezneptir5nJqkSmloNi /PEaBS4oUjGUhQfH12alw+Pe1JLFNzOpZX7YLMhjNGdL5DsoaUs9pwL/wHFEjKQ+lb5j geOkvn9Rxqb8AR0JYtaN1ErgAv0rGzUuFL5Ub9Up5909x9mzsAO8V3vp3tksotBWkqdf 9+FWpeIyC20yePxoHPeo85hX6X5EPeJYv6aor7U+eW4nyxpzxFRQP5Rb2m0pBKs1+8EP 6U4tDuKNkduBAhKhdnFMeg04CS2p26kIRYdSjv7Ty1Vzs7cEASXKNaiKCNgy+/SW9dMt Pvmg== X-Gm-Message-State: APjAAAXMFenAYfqygmicQABiG/iP5URpzK3GtUAraXuNr2LQqKfjsAdJ p2oFK0DIfAqxgnfsyLxmYxQi0cBT X-Google-Smtp-Source: APXvYqzSIdaJRlOMpK1ccumu3rPG+iFmJzxTWQFt1RyO2PESVggGW+ogF1An4yWmZ9HFrSTEBBygnA== X-Received: by 2002:a25:f20d:: with SMTP id i13mr20763768ybe.162.1577114909572; Mon, 23 Dec 2019 07:28:29 -0800 (PST) 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 c66sm8060347ywf.96.2019.12.23.07.28.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Dec 2019 07:28:29 -0800 (PST) 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 xBNFSSZU008877; Mon, 23 Dec 2019 15:28:28 GMT Subject: [PATCH v1 1/4] SUNRPC: Capture signalled RPC tasks From: Chuck Lever To: anna.schumaker@netapp.com, trondmy@hammerspace.com Cc: linux-nfs@vger.kernel.org Date: Mon, 23 Dec 2019 10:28:28 -0500 Message-ID: <20191223152828.17724.72543.stgit@manet.1015granger.net> In-Reply-To: <20191223152539.17724.52438.stgit@manet.1015granger.net> References: <20191223152539.17724.52438.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 Signed-off-by: Chuck Lever --- include/trace/events/sunrpc.h | 1 + net/sunrpc/sched.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index 8c73ffb5f7fd..ee993575d2fa 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -185,6 +185,7 @@ DEFINE_RPC_RUNNING_EVENT(begin); DEFINE_RPC_RUNNING_EVENT(run_action); DEFINE_RPC_RUNNING_EVENT(complete); +DEFINE_RPC_RUNNING_EVENT(signalled); DEFINE_RPC_RUNNING_EVENT(end); DECLARE_EVENT_CLASS(rpc_task_queued, diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 9c79548c6847..55e900255b0c 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -846,6 +846,8 @@ void rpc_signal_task(struct rpc_task *task) if (!RPC_IS_ACTIVATED(task)) return; + + trace_rpc_task_signalled(task, task->tk_action); set_bit(RPC_TASK_SIGNALLED, &task->tk_runstate); smp_mb__after_atomic(); queue = READ_ONCE(task->tk_waitqueue); @@ -949,7 +951,7 @@ static void __rpc_execute(struct rpc_task *task) * clean up after sleeping on some queue, we don't * break the loop here, but go around once more. */ - dprintk("RPC: %5u got signal\n", task->tk_pid); + trace_rpc_task_signalled(task, task->tk_action); set_bit(RPC_TASK_SIGNALLED, &task->tk_runstate); task->tk_rpc_status = -ERESTARTSYS; rpc_exit(task, -ERESTARTSYS); From patchwork Mon Dec 23 15:28:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 11308471 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2CF8109A for ; Mon, 23 Dec 2019 15:28:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B112420709 for ; Mon, 23 Dec 2019 15:28:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AAwnr1Yy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726802AbfLWP2g (ORCPT ); Mon, 23 Dec 2019 10:28:36 -0500 Received: from mail-yw1-f66.google.com ([209.85.161.66]:47097 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726795AbfLWP2g (ORCPT ); Mon, 23 Dec 2019 10:28:36 -0500 Received: by mail-yw1-f66.google.com with SMTP id u139so7170707ywf.13 for ; Mon, 23 Dec 2019 07:28:35 -0800 (PST) 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=D4MFfx4MRc6PEgOrVL9+aKGce5wogpXJh2qY+trArWE=; b=AAwnr1YyhzO48OJt0OeZVjV6AF7jXwE7mQcsrg0WFlVLwXiTXXWVROf0nNdqJmel7W Z5hUIrdt+tpcD4LDKRajfGCJjqWc9GPsoFqG4l0APNnuuo6Ke1c3mVz6ivYILAccmqYk bHKlxiTiekVeD0wwr+bKvBJlbMjznEBMkSx+BXysWjmZJueN6fu9S8XaUmecoj+nbOO9 cAUUq4/90VNYmlwBXDdrcGz1j8JE0x6fcxCM8wGBzxy8VRGgF3ILlQeuMWZ/BUxS97wp xczzKhNq/Kbke7mcr6d03Lqd+Z/SP2T+ixxXBaVDKyJIGtkka1RuA5C/tUpzSAKpSC45 95vw== 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=D4MFfx4MRc6PEgOrVL9+aKGce5wogpXJh2qY+trArWE=; b=lCUkonGpj19pZ823TVA8xKAXX2UTJb65/vU6V65xmnizU/tFHE9PYDMDE7Su7d7yys IeEgmpiZ0JH2hwMFQse8y76V+pv5YyVd+kX5Hb459jKNHU9lfDdgB1/picNS2Q1vrs5p aKfP9Pdx+QA5EJsG3FQNEb9X0vyz03PdvVN6L3QGC1I+tO57bx/Sz68ycXYaghutyHqM 5Y65T2HqYNcvQrPCk+NVztlt72WIM9BC3Q1YNP5wOVkUnUjozqN/vr5Y8K63XYCTkAm/ DOVDc0mFdajsJf8IDI3IYEBSpdCAuT0DRd68t3lp+ZKvTJEbpLXbrzhBD6xXgBoazU2+ GZxQ== X-Gm-Message-State: APjAAAUIeZ9uSM2Aqgk5MPS8sXGCFXrxrL51x1ycRLKc4DPYWRHb3g4a jN6SVETepfzMZBDLG05+m4I= X-Google-Smtp-Source: APXvYqyI6wuPsB1lpOPdZ7qr7pAj4OrwSLI3x6QJ0fKLrcxQIuMwC8QTN3bSUHYBJFIMmJF9QLuiSg== X-Received: by 2002:a81:50c3:: with SMTP id e186mr21667538ywb.160.1577114914919; Mon, 23 Dec 2019 07:28:34 -0800 (PST) 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 w142sm8105165ywa.87.2019.12.23.07.28.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Dec 2019 07:28:34 -0800 (PST) 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 xBNFSX2N008880; Mon, 23 Dec 2019 15:28:33 GMT Subject: [PATCH v1 2/4] NFS: Introduce trace events triggered by page writeback errors From: Chuck Lever To: anna.schumaker@netapp.com, trondmy@hammerspace.com Cc: linux-nfs@vger.kernel.org Date: Mon, 23 Dec 2019 10:28:33 -0500 Message-ID: <20191223152833.17724.93664.stgit@manet.1015granger.net> In-Reply-To: <20191223152539.17724.52438.stgit@manet.1015granger.net> References: <20191223152539.17724.52438.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 Try to capture the reason for the writeback path tagging an error on a page. Signed-off-by: Chuck Lever --- fs/nfs/nfstrace.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/write.c | 3 +++ 2 files changed, 48 insertions(+) diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h index f64a33d2a1d1..4d6eb1703943 100644 --- a/fs/nfs/nfstrace.h +++ b/fs/nfs/nfstrace.h @@ -989,6 +989,51 @@ ) ); +DECLARE_EVENT_CLASS(nfs_page_error_class, + TP_PROTO( + const struct nfs_page *req, + int error + ), + + TP_ARGS(req, error), + + TP_STRUCT__entry( + __field(const void *, req) + __field(pgoff_t, index) + __field(unsigned int, offset) + __field(unsigned int, pgbase) + __field(unsigned int, bytes) + __field(int, error) + ), + + TP_fast_assign( + __entry->req = req; + __entry->index = req->wb_index; + __entry->offset = req->wb_offset; + __entry->pgbase = req->wb_pgbase; + __entry->bytes = req->wb_bytes; + __entry->error = error; + ), + + TP_printk( + "req=%p index=%lu offset=%u pgbase=%u bytes=%u error=%d", + __entry->req, __entry->index, __entry->offset, + __entry->pgbase, __entry->bytes, __entry->error + ) +); + +#define DEFINE_NFS_PAGEERR_EVENT(name) \ + DEFINE_EVENT(nfs_page_error_class, name, \ + TP_PROTO( \ + const struct nfs_page *req, \ + int error \ + ), \ + TP_ARGS(req, error)) + +DEFINE_NFS_PAGEERR_EVENT(nfs_write_error); +DEFINE_NFS_PAGEERR_EVENT(nfs_comp_error); +DEFINE_NFS_PAGEERR_EVENT(nfs_commit_error); + TRACE_EVENT(nfs_initiate_commit, TP_PROTO( const struct nfs_commit_data *data diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 52cab65f91cf..21787711e352 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -593,6 +593,7 @@ static void nfs_end_page_writeback(struct nfs_page *req) static void nfs_write_error(struct nfs_page *req, int error) { nfs_set_pageerror(page_file_mapping(req->wb_page)); + trace_nfs_write_error(req, error); nfs_mapping_set_error(req->wb_page, error); nfs_inode_remove_request(req); nfs_end_page_writeback(req); @@ -999,6 +1000,7 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr) if (test_bit(NFS_IOHDR_ERROR, &hdr->flags) && (hdr->good_bytes < bytes)) { nfs_set_pageerror(page_file_mapping(req->wb_page)); + trace_nfs_comp_error(req, hdr->error); nfs_mapping_set_error(req->wb_page, hdr->error); goto remove_req; } @@ -1847,6 +1849,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data) (long long)req_offset(req)); if (status < 0) { if (req->wb_page) { + trace_nfs_commit_error(req, status); nfs_mapping_set_error(req->wb_page, status); nfs_inode_remove_request(req); } From patchwork Mon Dec 23 15:28:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 11308473 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3426109A for ; Mon, 23 Dec 2019 15:28:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9227020709 for ; Mon, 23 Dec 2019 15:28:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jqpLdGyf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726860AbfLWP2l (ORCPT ); Mon, 23 Dec 2019 10:28:41 -0500 Received: from mail-yb1-f193.google.com ([209.85.219.193]:33088 "EHLO mail-yb1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726795AbfLWP2l (ORCPT ); Mon, 23 Dec 2019 10:28:41 -0500 Received: by mail-yb1-f193.google.com with SMTP id n66so7171372ybg.0 for ; Mon, 23 Dec 2019 07:28:40 -0800 (PST) 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=WQftTBLNl0M4X4HXciAPQ457ib26AN31HI/060U2OEE=; b=jqpLdGyfKsB51pLeTu3gEzFNMSC7lnjyzyZb4YNvRj95WVxU6pdjWqp3X/PKHaodQb R8k8MyHoJ7e4X+88pruFkv3OMU8GAs67UqwZVo+i70ur/gKgMqlLF+3uoXgRQkyb+BgZ /uo9rDrDvPCR7I8XVid134nj2wLPQ/+vOj5gszhwnimq9i+PihTu5K2+KE5lz9jGh6fk BbsZWTmPbhI83XB7zhHm+eXGECQyCiyXnrTcxJIoUXLfOgc0Pr0J09gUd5hApilhSIns 75P1rfL31mfLXQzqpmx0WYqnmplyn4u5dOrdicmXS9S/4DcdrhR5pcIArIyllPcnewST /O+Q== 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=WQftTBLNl0M4X4HXciAPQ457ib26AN31HI/060U2OEE=; b=qkeov8Q5gC16SXFngN4IX/G7uPTBuBQ0ff6MUIIReQmtSqvyXQk97L/kNo6dJ2uxJ0 3jPitrdBOM6LwBsIKCAXNhilGHIdwNJoTOTJcnr8gg5N9yJJ5MK4Uf7VyauDaXE5v4JD 95YZbstA/l4dj9jQwAz6M+yZdi7+k0kJ6mmo05SBZY+vi/KMz7shQv+1RzGTNgBoANaw l71b4YIZQ8E0LR9jEbA3a8iqHycDFlrKEX1MMuQYnPEbI5379OptFJYG0ra5jooeaHVB RB79v3NfNwYtKkeHssuR/DK0QicopL/wUc3jFfNkrrt+a0aCXKkbWDPtvkZ62fNRQtkD xiQA== X-Gm-Message-State: APjAAAWrkgZoGMDanhsjWixus3n51oJxYZt/aR3aUrHLQ4RSe2KkFnRs cvENwtC0XGV16yuakaEpXEoiameZ X-Google-Smtp-Source: APXvYqz86vc9iPk5dL3dex9WrL/p7umtvTtKSJpk/vF8SMP8RGapC/5JUTWDeIQKiMFU7yq1s5XyFw== X-Received: by 2002:a25:7b44:: with SMTP id w65mr14248431ybc.77.1577114920251; Mon, 23 Dec 2019 07:28:40 -0800 (PST) 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 c66sm8060591ywf.96.2019.12.23.07.28.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Dec 2019 07:28:39 -0800 (PST) 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 xBNFScTR008884; Mon, 23 Dec 2019 15:28:38 GMT Subject: [PATCH v1 3/4] NFS4: Report callback authentication errors From: Chuck Lever To: anna.schumaker@netapp.com, trondmy@hammerspace.com Cc: linux-nfs@vger.kernel.org Date: Mon, 23 Dec 2019 10:28:38 -0500 Message-ID: <20191223152838.17724.37546.stgit@manet.1015granger.net> In-Reply-To: <20191223152539.17724.52438.stgit@manet.1015granger.net> References: <20191223152539.17724.52438.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 This seems to be a somewhat common issue with Kerberos NFSv4.0 set-ups. Signed-off-by: Chuck Lever --- fs/nfs/callback_xdr.c | 11 ++++++++--- fs/nfs/nfs4trace.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index 03a20f5716c7..79ff172eb1c8 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -18,6 +18,7 @@ #include "callback.h" #include "internal.h" #include "nfs4session.h" +#include "nfs4trace.h" #define CB_OP_TAGLEN_MAXSZ (512) #define CB_OP_HDR_RES_MAXSZ (2 * 4) // opcode, status @@ -946,9 +947,13 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) if (hdr_arg.minorversion == 0) { cps.clp = nfs4_find_client_ident(SVC_NET(rqstp), hdr_arg.cb_ident); - if (!cps.clp || !check_gss_callback_principal(cps.clp, rqstp)) { - if (cps.clp) - nfs_put_client(cps.clp); + if (!cps.clp) { + trace_nfs_cb_no_clp(rqstp->rq_xid, hdr_arg.cb_ident); + goto out_invalidcred; + } + if (!check_gss_callback_principal(cps.clp, rqstp)) { + trace_nfs_cb_badprinc(rqstp->rq_xid, hdr_arg.cb_ident); + nfs_put_client(cps.clp); goto out_invalidcred; } } diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index e60b6fbd5ada..e3586c16ef59 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -691,6 +691,41 @@ ) ); +DECLARE_EVENT_CLASS(nfs4_cb_error_class, + TP_PROTO( + __be32 xid, + u32 cb_ident + ), + + TP_ARGS(xid, cb_ident), + + TP_STRUCT__entry( + __field(u32, xid) + __field(u32, cbident) + ), + + TP_fast_assign( + __entry->xid = be32_to_cpu(xid); + __entry->cbident = cb_ident; + ), + + TP_printk( + "xid=0x%08x cb_ident=0x%08x", + __entry->xid, __entry->cbident + ) +); + +#define DEFINE_CB_ERROR_EVENT(name) \ + DEFINE_EVENT(nfs4_cb_error_class, nfs_cb_##name, \ + TP_PROTO( \ + __be32 xid, \ + u32 cb_ident \ + ), \ + TP_ARGS(xid, cb_ident)) + +DEFINE_CB_ERROR_EVENT(no_clp); +DEFINE_CB_ERROR_EVENT(badprinc); + DECLARE_EVENT_CLASS(nfs4_open_event, TP_PROTO( const struct nfs_open_context *ctx, From patchwork Mon Dec 23 15:28:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 11308475 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 548B5109A for ; Mon, 23 Dec 2019 15:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 336F2206B7 for ; Mon, 23 Dec 2019 15:28:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TKu1kaEl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726795AbfLWP2q (ORCPT ); Mon, 23 Dec 2019 10:28:46 -0500 Received: from mail-yw1-f68.google.com ([209.85.161.68]:39911 "EHLO mail-yw1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726865AbfLWP2q (ORCPT ); Mon, 23 Dec 2019 10:28:46 -0500 Received: by mail-yw1-f68.google.com with SMTP id h126so7195619ywc.6 for ; Mon, 23 Dec 2019 07:28:46 -0800 (PST) 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=T+ADFNGa9n0HATqaY0uwOgcLmEGdFEnTBIf5g6n0X50=; b=TKu1kaElOOqo2IIcJZzbvH5fxrCm+od1JSxYQGcp3XtHo66v3dxhi4jgJBOVuvaFz0 o2Dvuh9FDELPhIoCo5RMjPvzy2LiYpTM3zuuDC6ViDPLU1/gKhz25UIcywwaRVbmH7XI eAtaU81KtX/NtWp/3rdyCLzsTk/YK9y6QUo8sTtKjXyU3S048p8gaerdGiVAx8dDrh6l J9hxfl/xJX82SVcqlUQe8dux+UmmVCxP+MgQPEa+5RAikLrlirvltO+9+HNZperaBNuh 4JXcIdCaBdufYjZe5YOylfz+A+Ctip/mVzPAB/d49+w3rbG/HzIM2N5zGaqMVB8ivRRa Bnfg== 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=T+ADFNGa9n0HATqaY0uwOgcLmEGdFEnTBIf5g6n0X50=; b=akmStVuZ+5iRf+VxEuLD/vQ34H4kzy8/O5hLqTPfM8pToiCv2fY0+8bqrefC5GnS5v KbQZn06m9KlZPGyIk7p11+azxBpTI1NCkz8QfgaFU532gCJUmFUkGXLQ7s+1w5Qrtdwl J7nVVCoNdLCee1ZGT/ryJkSuHdQZ8hVGrIPLmtN+EGJZJ7UfKdFlHD9UPg9/5zb41egX plCQSFlHxQaDqgnMkgCcBe+BL1wIywovocDJSQdzIjttCIK+csDJfpe1wnd1uJ0tQn4u +SinofGppiQcZUG+vrCowxyHZIdBsIHx9icmufiB0SN9zZs8fgH/P7LjHt31R5H9JWg2 tKOA== X-Gm-Message-State: APjAAAUgQY3YeXV0Y+dG+jvQ3cn2R5kjxl4uEyHpc8FEj6f3EWA0e3Q/ y0WHUlytHJJoKMsNqa2SYRgGRIZK X-Google-Smtp-Source: APXvYqyqoE8cfmmdtDm6QSxUD12nrSXHhFqsOeyzoWAutOdN25hURGXr1qPrwYzyn6yKzRd8pGKsLA== X-Received: by 2002:a81:1bc8:: with SMTP id b191mr22215048ywb.364.1577114925795; Mon, 23 Dec 2019 07:28:45 -0800 (PST) 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 l32sm7798651ywh.29.2019.12.23.07.28.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Dec 2019 07:28:45 -0800 (PST) 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 xBNFSi6B008888; Mon, 23 Dec 2019 15:28:44 GMT Subject: [PATCH v1 4/4] SUNRPC: call_connect_status should handle -EPROTO From: Chuck Lever To: anna.schumaker@netapp.com, trondmy@hammerspace.com Cc: linux-nfs@vger.kernel.org Date: Mon, 23 Dec 2019 10:28:44 -0500 Message-ID: <20191223152844.17724.68321.stgit@manet.1015granger.net> In-Reply-To: <20191223152539.17724.52438.stgit@manet.1015granger.net> References: <20191223152539.17724.52438.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 The xprtrdma connect logic can return -EPROTO if the underlying device or network path does not support RDMA. This can happen after a device removal/insertion. - When SOFTCONN is set, EPROTO is a permanent error. - When SOFTCONN is not set, EPROTO is treated as a temporary error. Signed-off-by: Chuck Lever --- net/sunrpc/clnt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index a3379765605d..7324b21f923e 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2130,6 +2130,7 @@ void rpc_force_rebind(struct rpc_clnt *clnt) case -ENETUNREACH: case -EHOSTUNREACH: case -EPIPE: + case -EPROTO: xprt_conditional_disconnect(task->tk_rqstp->rq_xprt, task->tk_rqstp->rq_connect_cookie); if (RPC_IS_SOFTCONN(task))