From patchwork Thu Jan 13 17:20:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 12712999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E8F6C433F5 for ; Thu, 13 Jan 2022 17:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230310AbiAMRU0 (ORCPT ); Thu, 13 Jan 2022 12:20:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbiAMRU0 (ORCPT ); Thu, 13 Jan 2022 12:20:26 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9F01C061574 for ; Thu, 13 Jan 2022 09:20:25 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6259F61CBC for ; Thu, 13 Jan 2022 17:20:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C866C36AE9; Thu, 13 Jan 2022 17:20:24 +0000 (UTC) From: Chuck Lever To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/3] xprtrdma: Remove final dprintk call sites from xprtrdma Date: Thu, 13 Jan 2022 12:20:23 -0500 Message-Id: <164209442350.12592.14921966531121954143.stgit@morisot.1015granger.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <164209428615.12592.12164353310787172940.stgit@morisot.1015granger.net> References: <164209428615.12592.12164353310787172940.stgit@morisot.1015granger.net> User-Agent: StGit/1.4 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1629; h=from:subject:message-id; bh=4si20t/QRYTiDqfiL8DdGptX3J5TbdpGyoqEdXgQ93s=; b=owEBbQKS/ZANAwAIATNqszNvZn+XAcsmYgBh4F9XJKOBfn6Q5Tl+W3acod/Ud/g4C3W6Hy/tiiCU QjkyZ7aJAjMEAAEIAB0WIQQosuWwEobfJDzyPv4zarMzb2Z/lwUCYeBfVwAKCRAzarMzb2Z/l/a9EA CJD6ulTUf/C1Zbklz38ddJwCbTyFHjHXAJaJELr43NJ2xvhUX2PZkoxHSbNPDiMDxSFTVR9tQ9D66R mI8nU2XDfgkV6vLb+HHm2jHjdyWrSUO7Uzn4MabqCIHpIxZutNvszZUEwdsXJs/4oHXTw6KFJxl2Y4 84OVhTqCD5IMyQsTp81XHyaKBkq+oMnCW3m9NBP2RDUxs7pIJRxyBQ+pJOtHPs7QcZde+2ozLRKgL0 19u/WIXujsvPpateG+e1stR50zMx9UdCkXArKBe2UtBGg3cHxrqR6D9zcZDjHNtI8UPZeyu5WqeU66 4T82MnRvyAHuV46YpB+5YYkhzptXb//80sucRrfJ/KkIk5vWdEoYM/OvBVyGuzgIEprs08Q6YFWSLc wMKzigWv/WxoPHPubKxrtqEtmF3Iu5kho9B8Ek6dhPGkhoZ4TfE/b4d/o51WQ9dEFITcvT91rsPwvl 2E+6/Ao9OAdcPCpnvcngrfSOLOtAvSfYTExlKz7pWWMYi41nK/o/1jdCVyvW1KW56gCxVo4HCSCgg4 I5pZfQCaJ90x5NWbbT3O7hNT6ZAxqTBHDnzn/XIfkyea6EudbsH1iRTTpqXUEiSauiPGeFVCoxHCLo MlYxZ1wjSVSlAqB5N2JOFwmIbYXI+aDnvadwqiBUICReYWjFNAw7zmgF0nxw== X-Developer-Key: i=chuck.lever@oracle.com; a=openpgp; fpr=28B2E5B01286DF243CF23EFE336AB3336F667F97 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Deprecated. This information is available via tracepoints. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 3d3673ba9e1e..1d6e85fe3133 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -274,8 +274,6 @@ rpcrdma_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event) ep->re_connect_status = -ENETUNREACH; goto wake_connect_worker; case RDMA_CM_EVENT_REJECTED: - dprintk("rpcrdma: connection to %pISpc rejected: %s\n", - sap, rdma_reject_msg(id, event->status)); ep->re_connect_status = -ECONNREFUSED; if (event->status == IB_CM_REJ_STALE_CONN) ep->re_connect_status = -ENOTCONN; @@ -291,8 +289,6 @@ rpcrdma_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event) break; } - dprintk("RPC: %s: %pISpc on %s/frwr: %s\n", __func__, sap, - ep->re_id->device->name, rdma_event_msg(event->event)); return 0; } @@ -419,14 +415,6 @@ static int rpcrdma_ep_create(struct rpcrdma_xprt *r_xprt) ep->re_attr.qp_type = IB_QPT_RC; ep->re_attr.port_num = ~0; - dprintk("RPC: %s: requested max: dtos: send %d recv %d; " - "iovs: send %d recv %d\n", - __func__, - ep->re_attr.cap.max_send_wr, - ep->re_attr.cap.max_recv_wr, - ep->re_attr.cap.max_send_sge, - ep->re_attr.cap.max_recv_sge); - ep->re_send_batch = ep->re_max_requests >> 3; ep->re_send_count = ep->re_send_batch; init_waitqueue_head(&ep->re_connect_wait); From patchwork Thu Jan 13 17:20:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 12713000 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95600C433EF for ; Thu, 13 Jan 2022 17:20:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231357AbiAMRUd (ORCPT ); Thu, 13 Jan 2022 12:20:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbiAMRUc (ORCPT ); Thu, 13 Jan 2022 12:20:32 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D329C061574 for ; Thu, 13 Jan 2022 09:20:32 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DF0FE61CF2 for ; Thu, 13 Jan 2022 17:20:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20C76C36AE9; Thu, 13 Jan 2022 17:20:31 +0000 (UTC) From: Chuck Lever To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/3] xprtrdma: Remove definitions of RPCDBG_FACILITY Date: Thu, 13 Jan 2022 12:20:30 -0500 Message-Id: <164209443001.12592.7286421071967605038.stgit@morisot.1015granger.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <164209428615.12592.12164353310787172940.stgit@morisot.1015granger.net> References: <164209428615.12592.12164353310787172940.stgit@morisot.1015granger.net> User-Agent: StGit/1.4 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2813; h=from:subject:message-id; bh=UuGIgobGMsAv6wx6oWJcLnaRwhlDji4i8dAYteI2do4=; b=owEBbQKS/ZANAwAIATNqszNvZn+XAcsmYgBh4F9enJ2TTIK7hZ+yHiyM145PcB3w5SG6tmX1zD0/ QPO5YFiJAjMEAAEIAB0WIQQosuWwEobfJDzyPv4zarMzb2Z/lwUCYeBfXgAKCRAzarMzb2Z/l/M8EA CJQHCeKAh11Gmx1dhIfKViphzIQt4BZxo9oLsRGMKrHpYL440GyVUy/quTXaG4WGq6x618/pJeS/Ks nMxq1qfL8c/tB0EIP7aWt1Kgo3Ni8Ows0W1svjIVOVcH3Ll8s2oZutx+22R3EbaiqhiS0JkOONV/fx m/vYqNyRZtxjjCbs9gccDHrRH4VTvlcpp8N5VCs0czBODq2bgr7YVkYPbE0IxRVh5siYB40+otzNDS pbO2XyMy4Dx5aeNzaEzmstOTbAWks+JX5SeKj0mpf53gtqHT/2d2/F4btC/P+fTkZtbIiuLGOY0wSu MTjkgMRGQaTGWIrS2AAB76k7WLW3clEZk2jIe2MYTKAbWikoIBBN3aoSnR1PGOL3QQWUP2Bv6FL9hL FveYx8ATqXDIibaN2UAgjTM3JQ3S1wtqVFe6yZIdPM+YSww+AHLav+nZJe/n8pC6NxafCLVJZKIzJj VvQBDKi2TMjW5OTboillVpzziCU+R0zLiU7XI2XFYg6Le91hqexlV412hGK1xflCoiw9m3TENeJmbK M5Na+dOZ3Wul2tYVXdOLCB/J6JwVv6AeYjZNn+xmFe4QXgU1gG6mKw7pAOuHWmCkH4svV3bT8hJ6pV BU74dQFiTrgvs3VD3EzCocYZNBikPq1egghmjYop88UQOnGUe7bZaYfQ7hsw== X-Developer-Key: i=chuck.lever@oracle.com; a=openpgp; fpr=28B2E5B01286DF243CF23EFE336AB3336F667F97 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Deprecated. dprintk is no longer used in xprtrdma. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/backchannel.c | 4 ---- net/sunrpc/xprtrdma/frwr_ops.c | 4 ---- net/sunrpc/xprtrdma/rpc_rdma.c | 4 ---- net/sunrpc/xprtrdma/transport.c | 4 ---- net/sunrpc/xprtrdma/verbs.c | 11 ----------- 5 files changed, 27 deletions(-) diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c index 17f174d6ea3b..faba7136dd9a 100644 --- a/net/sunrpc/xprtrdma/backchannel.c +++ b/net/sunrpc/xprtrdma/backchannel.c @@ -13,10 +13,6 @@ #include "xprt_rdma.h" #include -#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) -# define RPCDBG_FACILITY RPCDBG_TRANS -#endif - #undef RPCRDMA_BACKCHANNEL_DEBUG /** diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c index ff699307e820..515dd7a66a04 100644 --- a/net/sunrpc/xprtrdma/frwr_ops.c +++ b/net/sunrpc/xprtrdma/frwr_ops.c @@ -45,10 +45,6 @@ #include "xprt_rdma.h" #include -#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) -# define RPCDBG_FACILITY RPCDBG_TRANS -#endif - static void frwr_cid_init(struct rpcrdma_ep *ep, struct rpcrdma_mr *mr) { diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index 8035a983c8ce..281ddb87ac8d 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -54,10 +54,6 @@ #include "xprt_rdma.h" #include -#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) -# define RPCDBG_FACILITY RPCDBG_TRANS -#endif - /* Returns size of largest RPC-over-RDMA header in a Call message * * The largest Call header contains a full-size Read list and a diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index 16e5696314a4..42e375dbdadb 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c @@ -60,10 +60,6 @@ #include "xprt_rdma.h" #include -#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) -# define RPCDBG_FACILITY RPCDBG_TRANS -#endif - /* * tunables */ diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 1d6e85fe3133..f172d1298013 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -63,17 +63,6 @@ #include "xprt_rdma.h" #include -/* - * Globals/Macros - */ - -#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) -# define RPCDBG_FACILITY RPCDBG_TRANS -#endif - -/* - * internal functions - */ static int rpcrdma_sendctxs_create(struct rpcrdma_xprt *r_xprt); static void rpcrdma_sendctxs_destroy(struct rpcrdma_xprt *r_xprt); static void rpcrdma_sendctx_put_locked(struct rpcrdma_xprt *r_xprt, From patchwork Thu Jan 13 17:20:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 12713001 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66A63C433FE for ; Thu, 13 Jan 2022 17:20:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231446AbiAMRUk (ORCPT ); Thu, 13 Jan 2022 12:20:40 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:42580 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbiAMRUk (ORCPT ); Thu, 13 Jan 2022 12:20:40 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 31F33B8230C for ; Thu, 13 Jan 2022 17:20:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6123C36AEB; Thu, 13 Jan 2022 17:20:37 +0000 (UTC) From: Chuck Lever To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 3/3] SUNRPC: Don't dereference xprt->snd_task if it's a cookie Date: Thu, 13 Jan 2022 12:20:36 -0500 Message-Id: <164209443651.12592.15374416779588678611.stgit@morisot.1015granger.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <164209428615.12592.12164353310787172940.stgit@morisot.1015granger.net> References: <164209428615.12592.12164353310787172940.stgit@morisot.1015granger.net> User-Agent: StGit/1.4 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1754; h=from:subject:message-id; bh=mktTV+jXSU4foMjfWFQa847cQjBq3wKZb0bhXly+FDg=; b=owEBbQKS/ZANAwAIATNqszNvZn+XAcsmYgBh4F9kn1M8aiGndG3ZR3qOlo2LPHdMRp5qR0YiorZ0 I5chmzmJAjMEAAEIAB0WIQQosuWwEobfJDzyPv4zarMzb2Z/lwUCYeBfZAAKCRAzarMzb2Z/l1tOEA C0S79QCAi+6LvHtyINi/h+xvSstqAXGjLa8Ki1dqGftd74afldaYocvJ0ckt0j37GAYu5Objda0qSp 4NHsPZPibbFbppAINVI64aRJiJ6F1F8afzzSRTEHZxr0IDfDb7iF2sHxhDoZ8Vrm9D4rAqJiW9+yT2 Hh01DYxFW3/W7WAkWDks9ZbGUZspS8TPhzcaLyW2Jr/3VaPqXLw6PDZ9QKfuSmL5O7dwLi504gGYJ/ tBoWW4td89lLX0vxaaJwkzYFttfRO4TM37Yp7vGGQAjNXulZnvdj/mzhAVoriYWkC4VM7kaATN0iwQ 1pBkZyOAxzsctq/5ZPxyNHy5akALdNyVhljxUFZnEoW9h0PSboHLOUw0e1JJkF3mSj9oCv7yLgquXf HZhlKgvzQvkmkDVDYe3uvyQ+TkbsGxY65Sk4zM58ss9fyfM+p5zh1yOHTQk81C13gvgAEgkYhFW3aC 7nqtIeEyi8QL8Zt0PDV51halL7kmQyVBETVfRgGo0xU00+NCFfm330VOjP5MA6hkGI7lL21yHyE04R E1tPHU7cM3cttCfa7yfqqZNl6fEqi1LKrCJKHAwlm8imDNW1HGqGBaKWsuWORSzVFC2/wzZKbMkBPf DWlVGvoNDv9ejp8wJ4O9fbjtMPuldyRD6sZ1AgeRtQ0iK1wvUQv8FmN1/EVg== X-Developer-Key: i=chuck.lever@oracle.com; a=openpgp; fpr=28B2E5B01286DF243CF23EFE336AB3336F667F97 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Fixes: e26d9972720e ("SUNRPC: Clean up scheduling of autoclose") Signed-off-by: Chuck Lever --- include/trace/events/sunrpc.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index 3a99358c262b..28433c9f3306 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -953,7 +953,8 @@ TRACE_EVENT(rpc_socket_nospace, { BIT(XPRT_REMOVE), "REMOVE" }, \ { BIT(XPRT_CONGESTED), "CONGESTED" }, \ { BIT(XPRT_CWND_WAIT), "CWND_WAIT" }, \ - { BIT(XPRT_WRITE_SPACE), "WRITE_SPACE" }) + { BIT(XPRT_WRITE_SPACE), "WRITE_SPACE" }, \ + { BIT(XPRT_SND_IS_COOKIE), "SND_IS_COOKIE" }) DECLARE_EVENT_CLASS(rpc_xprt_lifetime_class, TP_PROTO( @@ -1150,8 +1151,11 @@ DECLARE_EVENT_CLASS(xprt_writelock_event, __entry->task_id = -1; __entry->client_id = -1; } - __entry->snd_task_id = xprt->snd_task ? - xprt->snd_task->tk_pid : -1; + if (xprt->snd_task && + !test_bit(XPRT_SND_IS_COOKIE, &xprt->state)) + __entry->snd_task_id = xprt->snd_task->tk_pid; + else + __entry->snd_task_id = -1; ), TP_printk(SUNRPC_TRACE_TASK_SPECIFIER @@ -1196,8 +1200,12 @@ DECLARE_EVENT_CLASS(xprt_cong_event, __entry->task_id = -1; __entry->client_id = -1; } - __entry->snd_task_id = xprt->snd_task ? - xprt->snd_task->tk_pid : -1; + if (xprt->snd_task && + !test_bit(XPRT_SND_IS_COOKIE, &xprt->state)) + __entry->snd_task_id = xprt->snd_task->tk_pid; + else + __entry->snd_task_id = -1; + __entry->cong = xprt->cong; __entry->cwnd = xprt->cwnd; __entry->wait = test_bit(XPRT_CWND_WAIT, &xprt->state);