Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp806164pxb; Thu, 15 Apr 2021 07:06:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDfGrnB+rpxlWn5DVKMyXOe/2Mzz9s9a+r4CDzy1hco2DIfVsYj3+wrZdaqC3Kibc1gvD7 X-Received: by 2002:aa7:9190:0:b029:22d:6789:cc83 with SMTP id x16-20020aa791900000b029022d6789cc83mr3360613pfa.9.1618495559962; Thu, 15 Apr 2021 07:05:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618495559; cv=none; d=google.com; s=arc-20160816; b=wu0W1LRyN7WOTfWqSe+miRS0/t50uhbyq3SiCIrhYosyjXrmHuQtE5RRO0nH7zCM2p zhmniFzkmQlyA4cwD+HaYcL/zqpmNC/vz6Yv4Rq5onw9eqJl7Qh1z71/av5zYw21nzRE 183RRff02T+Th2fVGBDZoYsr3bQ76aud1i2GZn88I3fv7MLBawo6hxec6cOBb/cKFwrv uScKppEXifoyUCqDuv/LaJUWTuSmIHzqhtCgUvIyXWfgNUI9YDQy+CafpM45QfBu04FP FmxpUR9JUhnSMmdXAO83g8du41T+512lepH9zZPal1L+xSgi3f8hfsxbGAAkKNyl2Urj bL9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:to:from:subject; bh=8z8cIrgBkxXUn24jlhaNNxh+HV+B2K7wGj4C/xcsxqI=; b=o0NbbhZ8SaiQVOcWXJWvwqw4O49G2syYC9sFw4+qglfRBNHlSeqnR79pFuuwi017CW xUAjZ10eCR0EG2vGIsYnJtiOPxQkWatzUD8PlSwOOkTQ6lYloMteSpf+DRsTUkgbNu08 2VPvDJLrFX8TT3+lA3Dk5dRt9EwvNFTqIa5Od9lTAOLkcK1rY4sh9jLWr1/wM++qjHBp GE5W/xTFJPt4KjWoFleLJG9qGXVNjC6BwdpqUL/xXe2Xj9zsJk13iMnNCGBkKJ5xTFrZ vXmrXVgLp0tGsk0ED0GyMCBSGsFmkmKV/mRo/FuAVr0naV9dZ2zQRkMKGEWcA1ktx1Ve 5R2g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z4si3511236pgu.473.2021.04.15.07.05.43; Thu, 15 Apr 2021 07:05:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232767AbhDOOGE (ORCPT + 99 others); Thu, 15 Apr 2021 10:06:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:56110 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230056AbhDOOGE (ORCPT ); Thu, 15 Apr 2021 10:06:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 13BBD61153; Thu, 15 Apr 2021 14:05:41 +0000 (UTC) Subject: [PATCH v1 3/3] svcrdma: Pass a useful error code to the send_err tracepoint From: Chuck Lever To: linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org Date: Thu, 15 Apr 2021 10:05:40 -0400 Message-ID: <161849554037.27023.2734086457915698668.stgit@klimt.1015granger.net> In-Reply-To: <161849552807.27023.3060894326479643195.stgit@klimt.1015granger.net> References: <161849552807.27023.3060894326479643195.stgit@klimt.1015granger.net> User-Agent: StGit/1.0-5-g755c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Capture error codes in @ret, which is passed to the send_err tracepoint, so that they can be logged when something goes awry. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index a3b0f5899f03..d6bbafb773e1 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c @@ -921,6 +921,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp) struct svc_rdma_recv_ctxt *rctxt = rqstp->rq_xprt_ctxt; __be32 *rdma_argp = rctxt->rc_recv_buf; struct svc_rdma_send_ctxt *sctxt; + unsigned int rc_size; __be32 *p; int ret; @@ -933,6 +934,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp) if (!sctxt) goto drop_connection; + ret = -EMSGSIZE; p = xdr_reserve_space(&sctxt->sc_stream, rpcrdma_fixed_maxsz * sizeof(*p)); if (!p) @@ -941,17 +943,21 @@ int svc_rdma_sendto(struct svc_rqst *rqstp) ret = svc_rdma_send_reply_chunk(rdma, rctxt, &rqstp->rq_res); if (ret < 0) goto reply_chunk; + rc_size = ret; *p++ = *rdma_argp; *p++ = *(rdma_argp + 1); *p++ = rdma->sc_fc_credits; *p = pcl_is_empty(&rctxt->rc_reply_pcl) ? rdma_msg : rdma_nomsg; - if (svc_rdma_encode_read_list(sctxt) < 0) + ret = svc_rdma_encode_read_list(sctxt); + if (ret < 0) goto put_ctxt; - if (svc_rdma_encode_write_list(rctxt, sctxt) < 0) + ret = svc_rdma_encode_write_list(rctxt, sctxt); + if (ret < 0) goto put_ctxt; - if (svc_rdma_encode_reply_chunk(rctxt, sctxt, ret) < 0) + ret = svc_rdma_encode_reply_chunk(rctxt, sctxt, rc_size); + if (ret < 0) goto put_ctxt; ret = svc_rdma_send_reply_msg(rdma, sctxt, rctxt, rqstp);