From patchwork Mon Jun 12 14:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13276741 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 18E0BC7EE2F for ; Mon, 12 Jun 2023 14:13:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237233AbjFLONi (ORCPT ); Mon, 12 Jun 2023 10:13:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235611AbjFLONf (ORCPT ); Mon, 12 Jun 2023 10:13:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33C58F0 for ; Mon, 12 Jun 2023 07:13:35 -0700 (PDT) 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 BCD1860D2B for ; Mon, 12 Jun 2023 14:13:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02F91C4339E; Mon, 12 Jun 2023 14:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686579214; bh=RLCI3f5juRGrnRLCVXUBLGHr06RYCTJ4vc07IPRPL2w=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=b5yMNvmadmAJ5IHLKvAu2w6yOSiy8sj384F6kvBpRGiFabCa4m1eDCPaQndQWfhJM hxau6Ugx3wNUTku4o5/ptnoe4qm/nE8RMO11cWaAUmog8hoJJW2QJ35Gcz/kcVReB1 sgIeKaMEv7Q9dXrniT/bEF30X0P60btbuum3fki5dhP/rQVzbLb9UEYXbPKEGjeXb+ /NezSrH+R62jY82FneIyULqKNk9fb7VBe5pgziKtsr/wOs3zE8Hy/Lb9a2O8dDvCE5 VH9l011B+lQYAahFp5EWNIuZUyiOYAbCHXiIWqFK2nXC63iJQiTlBrB1Ce5MS2IBMi kqXmN09q4Ackw== Subject: [PATCH v1 1/7] SUNRPC: Move initialization of rq_stime From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Mon, 12 Jun 2023 10:13:33 -0400 Message-ID: <168657921305.5674.11399334151508322408.stgit@manet.1015granger.net> In-Reply-To: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> References: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Chuck Lever Micro-optimization: Call ktime_get() only when ->xpo_recvfrom() has given us a full RPC message to process. rq_stime isn't used otherwise, so this avoids pointless work. Signed-off-by: Chuck Lever --- net/sunrpc/svc_xprt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index 45bdc2e38631..4af83a0fd395 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -852,7 +852,6 @@ static int svc_handle_xprt(struct svc_rqst *rqstp, struct svc_xprt *xprt) len = svc_deferred_recv(rqstp); else len = xprt->xpt_ops->xpo_recvfrom(rqstp); - rqstp->rq_stime = ktime_get(); rqstp->rq_reserved = serv->sv_max_mesg; atomic_add(rqstp->rq_reserved, &xprt->xpt_reserved); } else @@ -895,6 +894,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) err = -EAGAIN; if (len <= 0) goto out_release; + trace_svc_xdr_recvfrom(&rqstp->rq_arg); clear_bit(XPT_OLD, &xprt->xpt_flags); @@ -903,6 +903,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) if (serv->sv_stats) serv->sv_stats->netcnt++; + rqstp->rq_stime = ktime_get(); return len; out_release: rqstp->rq_res.len = 0; From patchwork Mon Jun 12 14:13:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13276742 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 C8E45C7EE2F for ; Mon, 12 Jun 2023 14:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237229AbjFLONq (ORCPT ); Mon, 12 Jun 2023 10:13:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237248AbjFLONn (ORCPT ); Mon, 12 Jun 2023 10:13:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BC0410F3 for ; Mon, 12 Jun 2023 07:13:41 -0700 (PDT) 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 01B6C629B3 for ; Mon, 12 Jun 2023 14:13:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CF12C4339B; Mon, 12 Jun 2023 14:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686579220; bh=waX2R5tuAZ3ZTjZvQAgFXfBb0L6qNebDCJ0stUjJHd8=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=Li/a4xv0j97uEyaLISr3qclKjO5ac/NhQrqq3yFHJhSTnIryKAQjuHXrFQNYiVCOF tweCA4K+OUeE/rPWRvjiGnnXk8x9FDhuq+RDwTN7cC3QzaOeJJwU7a8yva30QZcBRg JXNptryPWzZ5ezPCVYxupkq2Q/l0zvIKWdDlrR7sLmkyRG6vpC7cCLowa1e1EfXqXG NRBVSea65knvcjHVm3YMazzrViHxV/R436jML2CJcIoOSJjFlVB9VrQRlSMgBErLDo 99djMiuzU9hoh6eRWqnn/lujiJod/TpzVuO5CJX736pEXMkR8r81+D634DByPBcRNl +ijC6E71bJj8A== Subject: [PATCH v1 2/7] NFSD: Add an nfsd4_encode_nfstime4() helper From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Mon, 12 Jun 2023 10:13:39 -0400 Message-ID: <168657921935.5674.16164163702846685356.stgit@manet.1015granger.net> In-Reply-To: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> References: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Chuck Lever Clean up: de-duplicate some common code. Signed-off-by: Chuck Lever --- fs/nfsd/nfs4xdr.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 41234fc3b905..f3be2a6055f2 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2541,6 +2541,20 @@ static __be32 *encode_change(__be32 *p, struct kstat *stat, struct inode *inode, return p; } +static __be32 nfsd4_encode_nfstime4(struct xdr_stream *xdr, + struct timespec64 *tv) +{ + __be32 *p; + + p = xdr_reserve_space(xdr, XDR_UNIT * 3); + if (!p) + return nfserr_resource; + + p = xdr_encode_hyper(p, (s64)tv->tv_sec); + *p = cpu_to_be32(tv->tv_nsec); + return nfs_ok; +} + /* * ctime (in NFSv4, time_metadata) is not writeable, and the client * doesn't really care what resolution could theoretically be stored by @@ -3348,11 +3362,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, p = xdr_encode_hyper(p, dummy64); } if (bmval1 & FATTR4_WORD1_TIME_ACCESS) { - p = xdr_reserve_space(xdr, 12); - if (!p) - goto out_resource; - p = xdr_encode_hyper(p, (s64)stat.atime.tv_sec); - *p++ = cpu_to_be32(stat.atime.tv_nsec); + status = nfsd4_encode_nfstime4(xdr, &stat.atime); + if (status) + goto out; } if (bmval1 & FATTR4_WORD1_TIME_DELTA) { p = xdr_reserve_space(xdr, 12); @@ -3361,25 +3373,19 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, p = encode_time_delta(p, d_inode(dentry)); } if (bmval1 & FATTR4_WORD1_TIME_METADATA) { - p = xdr_reserve_space(xdr, 12); - if (!p) - goto out_resource; - p = xdr_encode_hyper(p, (s64)stat.ctime.tv_sec); - *p++ = cpu_to_be32(stat.ctime.tv_nsec); + status = nfsd4_encode_nfstime4(xdr, &stat.ctime); + if (status) + goto out; } if (bmval1 & FATTR4_WORD1_TIME_MODIFY) { - p = xdr_reserve_space(xdr, 12); - if (!p) - goto out_resource; - p = xdr_encode_hyper(p, (s64)stat.mtime.tv_sec); - *p++ = cpu_to_be32(stat.mtime.tv_nsec); + status = nfsd4_encode_nfstime4(xdr, &stat.mtime); + if (status) + goto out; } if (bmval1 & FATTR4_WORD1_TIME_CREATE) { - p = xdr_reserve_space(xdr, 12); - if (!p) - goto out_resource; - p = xdr_encode_hyper(p, (s64)stat.btime.tv_sec); - *p++ = cpu_to_be32(stat.btime.tv_nsec); + status = nfsd4_encode_nfstime4(xdr, &stat.btime); + if (status) + goto out; } if (bmval1 & FATTR4_WORD1_MOUNTED_ON_FILEID) { u64 ino = stat.ino; From patchwork Mon Jun 12 14:13:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13276743 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 15F90C7EE2F for ; Mon, 12 Jun 2023 14:13:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237222AbjFLONu (ORCPT ); Mon, 12 Jun 2023 10:13:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237238AbjFLONt (ORCPT ); Mon, 12 Jun 2023 10:13:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAB33F0 for ; Mon, 12 Jun 2023 07:13:47 -0700 (PDT) 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 4068A60D2B for ; Mon, 12 Jun 2023 14:13:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C783C433EF; Mon, 12 Jun 2023 14:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686579226; bh=KbE6zoLfCQAGiG0WVqH141hCVf5ursX0NM7hQsxSJxI=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=buv70rQB+IyufdHwVC04Lq6jkBs9sKBA56veituAtTaF7pLK9BPKSYH8lFMszRcLh pA0DKMKLg6foLOr8pecy+3MyZoeNcD21TaM+ov/2pECB248Kvlt544Uvf39JEpxFG6 6DlddxBI2yfhODuH5dy7AeGYClEc6n7iT7ss1SY9j0XzCyVhxXbfRI1CX6YRbaaX7z MfN4v4rvXITRFPDS/OKCNjbE8h0PDsoZpxqPy0XWLKfL5YTLSQEHL131GK8jGZgndI EFeygu4cbA3V6Our9/XAatDwB3ZjIQpbxjBygkCyfMxxQ2XDuUjf4U3GdiffE9ODGI HB39PvueuW97g== Subject: [PATCH v1 3/7] svcrdma: Convert "might sleep" comment into a code annotation From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Mon, 12 Jun 2023 10:13:45 -0400 Message-ID: <168657922560.5674.338395614409259561.stgit@manet.1015granger.net> In-Reply-To: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> References: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Chuck Lever Try to catch incorrect calling contexts mechanically rather than by code review. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_rw.c | 5 +++-- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c index 068c365e7812..59ea87b5f458 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_rw.c +++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c @@ -353,8 +353,7 @@ static void svc_rdma_wc_read_done(struct ib_cq *cq, struct ib_wc *wc) return; } -/* This function sleeps when the transport's Send Queue is congested. - * +/* * Assumptions: * - If ib_post_send() succeeds, only one completion is expected, * even if one or more WRs are flushed. This is true when posting @@ -369,6 +368,8 @@ static int svc_rdma_post_chunk_ctxt(struct svc_rdma_chunk_ctxt *cc) struct ib_cqe *cqe; int ret; + might_sleep(); + if (cc->cc_sqecount > rdma->sc_sq_depth) return -EINVAL; diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index 24228f3611e8..c6644cca52c5 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c @@ -315,6 +315,8 @@ int svc_rdma_send(struct svcxprt_rdma *rdma, struct svc_rdma_send_ctxt *ctxt) struct ib_send_wr *wr = &ctxt->sc_send_wr; int ret; + might_sleep(); + /* Sync the transport header buffer */ ib_dma_sync_single_for_device(rdma->sc_pd->device, wr->sg_list[0].addr, From patchwork Mon Jun 12 14:13:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13276744 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 CCC20C7EE2F for ; Mon, 12 Jun 2023 14:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235611AbjFLON5 (ORCPT ); Mon, 12 Jun 2023 10:13:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237214AbjFLONz (ORCPT ); Mon, 12 Jun 2023 10:13:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D39A110E5 for ; Mon, 12 Jun 2023 07:13:53 -0700 (PDT) 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 716DE6270D for ; Mon, 12 Jun 2023 14:13:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B204DC433D2; Mon, 12 Jun 2023 14:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686579232; bh=qWMIzXwYBmGtfY8D74b1zZ4DZ089LMbGuHNchZCMjzM=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=ul25cIl4ULi34gSrf9mVUQouFlVH3okNRgimxtlIF6Y3crPiNrT8iYmFc6DA80IfS LgujarCh37hIY+Hx0oEiCnneK+cMO8wGrWTOxSMkSoYyYArtsXrsqbmV+EO2QUlHfX 86EXXz8f9SK9IgLMbXswvpfGoddu5X/x48q9QW5tKkDThctu3cH4gPyTf7RabiWUUp vj5us7S1EBKpNE6MQrdTks6DxU/G+FFOU8qwF0JNt9aoQZv/BRvpkz1kmWIIHZS1Jv 9pnOuzFiFnUNx77FXSb5esij9ZcIdtCc0HQmm+2WAlTp640MckjNaOvRac6L3kFqVA 0VoRnuUIj6tAw== Subject: [PATCH v1 4/7] svcrdma: trace cc_release calls From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Mon, 12 Jun 2023 10:13:51 -0400 Message-ID: <168657923186.5674.5040517820045674722.stgit@manet.1015granger.net> In-Reply-To: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> References: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Chuck Lever This event brackets the svcrdma_post_* trace points. If this trace event is enabled but does not appear as expected, that indicates a chunk_ctxt leak. Signed-off-by: Chuck Lever --- include/trace/events/rpcrdma.h | 8 ++++++++ net/sunrpc/xprtrdma/svc_rdma_rw.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h index 8f461e04e5f0..f8069ef2ee0f 100644 --- a/include/trace/events/rpcrdma.h +++ b/include/trace/events/rpcrdma.h @@ -2112,6 +2112,14 @@ DEFINE_POST_CHUNK_EVENT(read); DEFINE_POST_CHUNK_EVENT(write); DEFINE_POST_CHUNK_EVENT(reply); +DEFINE_EVENT(svcrdma_post_chunk_class, svcrdma_cc_release, + TP_PROTO( + const struct rpc_rdma_cid *cid, + int sqecount + ), + TP_ARGS(cid, sqecount) +); + TRACE_EVENT(svcrdma_wc_read, TP_PROTO( const struct ib_wc *wc, diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c index 59ea87b5f458..9836406cc41e 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_rw.c +++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c @@ -191,6 +191,8 @@ static void svc_rdma_cc_release(struct svc_rdma_chunk_ctxt *cc, struct svc_rdma_rw_ctxt *ctxt; LLIST_HEAD(free); + trace_svcrdma_cc_release(&cc->cc_cid, cc->cc_sqecount); + first = last = NULL; while ((ctxt = svc_rdma_next_ctxt(&cc->cc_rwctxts)) != NULL) { list_del(&ctxt->rw_list); From patchwork Mon Jun 12 14:13:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13276745 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 34077CA9EA9 for ; Mon, 12 Jun 2023 14:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237329AbjFLOO2 (ORCPT ); Mon, 12 Jun 2023 10:14:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237333AbjFLOOC (ORCPT ); Mon, 12 Jun 2023 10:14:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 286F810E5 for ; Mon, 12 Jun 2023 07:14:00 -0700 (PDT) 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 B66B162218 for ; Mon, 12 Jun 2023 14:13:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFEC3C433A0; Mon, 12 Jun 2023 14:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686579239; bh=/YH35t8xUhMRFWicEnRfAlCdNTPpL2IxiTw+ukxgcOY=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=DoUHub86N2U6d37JC7s0nkKu6ztsCWDX6n8V+HtCtmcO2RWjlu+Mul4ULdvnt82Ps NnhgessgnLX8to68uApB82JMQbzQxDzJgRx8M49xUqvM2hcVYXCTbSPeW5KPY1Gnsh oQeuDmMN4bmLhGTiBxFKlB/Z6Yl2Nwth36TQvRmERRIz22Jg+AmTTgIG5uoKd5C7Ga Z91svhJves0SA0vfVwg7siqdF7lLcKtiI/tPAGIuAZ93fzz1lJUBfZIR+kFCVhcD6Q t4sdgA86GEJgT0j62p0zzEc7cNjM4tZ2NSHEjpG+GGhVIS7aj7ZfJLFwUL+QELSDlB te1ptRuub7liw== Subject: [PATCH v1 5/7] svcrdma: Remove an unused argument from __svc_rdma_put_rw_ctxt() From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Mon, 12 Jun 2023 10:13:58 -0400 Message-ID: <168657923806.5674.8002278565811410253.stgit@manet.1015granger.net> In-Reply-To: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> References: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Chuck Lever Clean up. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_rw.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c index 9836406cc41e..e460e25a1d6d 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_rw.c +++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c @@ -84,8 +84,7 @@ svc_rdma_get_rw_ctxt(struct svcxprt_rdma *rdma, unsigned int sges) return NULL; } -static void __svc_rdma_put_rw_ctxt(struct svcxprt_rdma *rdma, - struct svc_rdma_rw_ctxt *ctxt, +static void __svc_rdma_put_rw_ctxt(struct svc_rdma_rw_ctxt *ctxt, struct llist_head *list) { sg_free_table_chained(&ctxt->rw_sg_table, SG_CHUNK_SIZE); @@ -95,7 +94,7 @@ static void __svc_rdma_put_rw_ctxt(struct svcxprt_rdma *rdma, static void svc_rdma_put_rw_ctxt(struct svcxprt_rdma *rdma, struct svc_rdma_rw_ctxt *ctxt) { - __svc_rdma_put_rw_ctxt(rdma, ctxt, &rdma->sc_rw_ctxts); + __svc_rdma_put_rw_ctxt(ctxt, &rdma->sc_rw_ctxts); } /** @@ -200,7 +199,7 @@ static void svc_rdma_cc_release(struct svc_rdma_chunk_ctxt *cc, rdma_rw_ctx_destroy(&ctxt->rw_ctx, rdma->sc_qp, rdma->sc_port_num, ctxt->rw_sg_table.sgl, ctxt->rw_nents, dir); - __svc_rdma_put_rw_ctxt(rdma, ctxt, &free); + __svc_rdma_put_rw_ctxt(ctxt, &free); ctxt->rw_node.next = first; first = &ctxt->rw_node; From patchwork Mon Jun 12 14:14:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13276746 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 D1F8DC88CBB for ; Mon, 12 Jun 2023 14:14:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238053AbjFLOOw (ORCPT ); Mon, 12 Jun 2023 10:14:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237455AbjFLOOM (ORCPT ); Mon, 12 Jun 2023 10:14:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2F251728 for ; Mon, 12 Jun 2023 07:14:06 -0700 (PDT) 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 076E1629BA for ; Mon, 12 Jun 2023 14:14:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44717C4339E; Mon, 12 Jun 2023 14:14:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686579245; bh=8PHT9ojTIcOKf0VV5n7pIX+G+OnPi4wyyhae4q3yCDg=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=M9AqbvrP/iiI9O0zv8S5Zup5yK+sRgAS14yhavRON6p35BswArljSQ3bnHqmwy2Ua ibgf6THHxPrkm83nXQvhzNKzo0ilfvuCEZhuB8l2a8LCqpMdFGTCyGGA3bNwl0F+5D wMXLN0KL7ipCuEdoUP5jgLE7uo/BrGVxKk/GxIgeuS5jC5C/kER6K7dJ1NSpZ5ZF7q s3ttsQ0Ijrt38o8aBmLk/32gbCoivjmpWLaAuwNDXLmUVKJO8pLFg/Vux5dNe3ACob OwJDDNJ9/VmAk5MPoKFHficB+CFPd0FNZ+V08+rCLbzp0grMTMhG3q2fPBWJuDjugx EL2uu0zsqoQ1g== Subject: [PATCH v1 6/7] SUNRPC: Fix comments for transport class registration From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Mon, 12 Jun 2023 10:14:04 -0400 Message-ID: <168657924433.5674.7660984476060437991.stgit@manet.1015granger.net> In-Reply-To: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> References: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Chuck Lever The preceding block comment before svc_register_xprt_class() is not related to that function. While we're here, add proper documenting comments for these two publicly-visible functions. Signed-off-by: Chuck Lever --- net/sunrpc/svc_xprt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index 4af83a0fd395..6d70278bd88d 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -74,6 +74,13 @@ static LIST_HEAD(svc_xprt_class_list); * that no other thread will be using the transport or will * try to set XPT_DEAD. */ + +/** + * svc_reg_xprt_class - Register a server-side RPC transport class + * @xcl: New transport class to be registered + * + * Returns zero on success; otherwise a negative errno is returned. + */ int svc_reg_xprt_class(struct svc_xprt_class *xcl) { struct svc_xprt_class *cl; @@ -96,6 +103,11 @@ int svc_reg_xprt_class(struct svc_xprt_class *xcl) } EXPORT_SYMBOL_GPL(svc_reg_xprt_class); +/** + * svc_unreg_xprt_class - Unregister a server-side RPC transport class + * @xcl: Transport class to be unregistered + * + */ void svc_unreg_xprt_class(struct svc_xprt_class *xcl) { dprintk("svc: Removing svc transport class '%s'\n", xcl->xcl_name); From patchwork Mon Jun 12 14:14:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13276747 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 5AC80C88CB7 for ; Mon, 12 Jun 2023 14:14:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236387AbjFLOO4 (ORCPT ); Mon, 12 Jun 2023 10:14:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237443AbjFLOOm (ORCPT ); Mon, 12 Jun 2023 10:14:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C148A10E9 for ; Mon, 12 Jun 2023 07:14:12 -0700 (PDT) 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 47928629BD for ; Mon, 12 Jun 2023 14:14:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86EFBC4339B; Mon, 12 Jun 2023 14:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686579251; bh=JG743CB01l3liH6PP0ugd6QB/cEaMR/c5BBA4LLg4ZQ=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=C2hS5IQZSOqLSiK29HXuQOCyblf3TmTMUWLgRobMpfUWrQm+tkYyoHlVfZ+soo49T 4IAp9bcezMOylkUSdOVNw69JFjfS8gzdKSooFRz/k5feLx+gMEKhoGv4Flob/GR6jZ 5IWbhW6pPo0AMNpv6TYj/mWRadP4eSlsFivQyyfKuLsf/1qyZ8qUkXGpEQQ4ACx6gx 6E5bXsp8ZUMf4wXuf2WWKqz4ZfuhA6wXaSTyMS5kdELEnXIA3vPwiq3JW6ECO2FGe6 Et21GNLjYUKkDew2VW2qo10jsxtvJsxZOckxRJUbMOJokS686n8jTzsupSziuJSxJE h6jTepM4Egh/g== Subject: [PATCH v1 7/7] SUNRPC: Remove transport class dprintk call sites From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Mon, 12 Jun 2023 10:14:10 -0400 Message-ID: <168657925061.5674.3781063108645045001.stgit@manet.1015granger.net> In-Reply-To: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> References: <168657912781.5674.12501431304770900992.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Chuck Lever Remove a couple of dprintk call sites that are of little value. Signed-off-by: Chuck Lever --- net/sunrpc/svc_xprt.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index 6d70278bd88d..ebdc2f70af90 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -86,8 +86,6 @@ int svc_reg_xprt_class(struct svc_xprt_class *xcl) struct svc_xprt_class *cl; int res = -EEXIST; - dprintk("svc: Adding svc transport class '%s'\n", xcl->xcl_name); - INIT_LIST_HEAD(&xcl->xcl_list); spin_lock(&svc_xprt_class_lock); /* Make sure there isn't already a class with the same name */ @@ -110,7 +108,6 @@ EXPORT_SYMBOL_GPL(svc_reg_xprt_class); */ void svc_unreg_xprt_class(struct svc_xprt_class *xcl) { - dprintk("svc: Removing svc transport class '%s'\n", xcl->xcl_name); spin_lock(&svc_xprt_class_lock); list_del_init(&xcl->xcl_list); spin_unlock(&svc_xprt_class_lock);