All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: anna.schumaker@netapp.com
Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v3 01/24] xprtrdma: Prevent leak of rpcrdma_rep objects
Date: Mon, 10 Dec 2018 11:29:23 -0500	[thread overview]
Message-ID: <20181210162923.4198.13485.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20181210161723.4198.51071.stgit@manet.1015granger.net>

If a reply has been processed but the RPC is later retransmitted
anyway, the req->rl_reply field still contains the only pointer to
the old rpcrdma rep. When the next reply comes in, the reply handler
will stomp on the rl_reply field, leaking the old rep.

A trace event is added to capture such leaks.

This problem seems to be worsened by the restructuring of the RPC
Call path in v4.20. Fully addressing this issue will require at
least a re-architecture of the disconnect logic, which is not
appropriate during -rc.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 include/trace/events/rpcrdma.h |   28 ++++++++++++++++++++++++++++
 net/sunrpc/xprtrdma/rpc_rdma.c |    4 ++++
 2 files changed, 32 insertions(+)

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index b093058..602972d 100644
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -917,6 +917,34 @@
 DEFINE_CB_EVENT(xprtrdma_cb_call);
 DEFINE_CB_EVENT(xprtrdma_cb_reply);
 
+TRACE_EVENT(xprtrdma_leaked_rep,
+	TP_PROTO(
+		const struct rpc_rqst *rqst,
+		const struct rpcrdma_rep *rep
+	),
+
+	TP_ARGS(rqst, rep),
+
+	TP_STRUCT__entry(
+		__field(unsigned int, task_id)
+		__field(unsigned int, client_id)
+		__field(u32, xid)
+		__field(const void *, rep)
+	),
+
+	TP_fast_assign(
+		__entry->task_id = rqst->rq_task->tk_pid;
+		__entry->client_id = rqst->rq_task->tk_client->cl_clid;
+		__entry->xid = be32_to_cpu(rqst->rq_xid);
+		__entry->rep = rep;
+	),
+
+	TP_printk("task:%u@%u xid=0x%08x rep=%p",
+		__entry->task_id, __entry->client_id, __entry->xid,
+		__entry->rep
+	)
+);
+
 /**
  ** Server-side RPC/RDMA events
  **/
diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
index 9f53e02..a2eb647 100644
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@ -1356,6 +1356,10 @@ void rpcrdma_reply_handler(struct rpcrdma_rep *rep)
 	}
 
 	req = rpcr_to_rdmar(rqst);
+	if (req->rl_reply) {
+		trace_xprtrdma_leaked_rep(rqst, req->rl_reply);
+		rpcrdma_recv_buffer_put(req->rl_reply);
+	}
 	req->rl_reply = rep;
 	rep->rr_rqst = rqst;
 	clear_bit(RPCRDMA_REQ_F_PENDING, &req->rl_flags);


  reply	other threads:[~2018-12-10 16:29 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-10 16:29 [PATCH v3 00/24] NFS/RDMA client for next Chuck Lever
2018-12-10 16:29 ` Chuck Lever [this message]
2018-12-10 16:29 ` [PATCH v3 02/24] IB/rxe: IB_WR_REG_MR does not capture MR's iova field Chuck Lever
2018-12-11 14:00   ` Christoph Hellwig
2018-12-11 15:26     ` Chuck Lever
2018-12-10 16:29 ` [PATCH v3 03/24] xprtrdma: Remove support for FMR memory registration Chuck Lever
2018-12-11 14:02   ` Christoph Hellwig
2018-12-11 15:29     ` Chuck Lever
2018-12-12  7:18       ` Christoph Hellwig
2018-12-10 16:29 ` [PATCH v3 04/24] xprtrdma: Fix ri_max_segs and the result of ro_maxpages Chuck Lever
2018-12-10 16:29 ` [PATCH v3 05/24] xprtrdma: Reduce max_frwr_depth Chuck Lever
2018-12-11 14:02   ` Christoph Hellwig
2018-12-11 15:30     ` Chuck Lever
2018-12-12  7:18       ` Christoph Hellwig
2018-12-10 16:29 ` [PATCH v3 06/24] xprtrdma: Plant XID in on-the-wire RDMA offset (FRWR) Chuck Lever
2018-12-10 16:29 ` [PATCH v3 07/24] xprtrdma: Recognize XDRBUF_SPARSE_PAGES Chuck Lever
2018-12-10 16:30 ` [PATCH v3 08/24] xprtrdma: Remove request_module from backchannel Chuck Lever
2018-12-10 16:30 ` [PATCH v3 09/24] xprtrdma: Expose transport header errors Chuck Lever
2018-12-10 16:30 ` [PATCH v3 10/24] xprtrdma: Simplify locking that protects the rl_allreqs list Chuck Lever
2018-12-10 16:30 ` [PATCH v3 11/24] xprtrdma: Cull dprintk() call sites Chuck Lever
2018-12-10 16:30 ` [PATCH v3 12/24] xprtrdma: Clean up of xprtrdma chunk trace points Chuck Lever
2018-12-10 16:30 ` [PATCH v3 13/24] xprtrdma: Relocate the xprtrdma_mr_map " Chuck Lever
2018-12-10 16:30 ` [PATCH v3 14/24] xprtrdma: Add trace points for calls to transport switch methods Chuck Lever
2018-12-10 16:30 ` [PATCH v3 15/24] NFS: Make "port=" mount option optional for RDMA mounts Chuck Lever
2018-12-10 16:30 ` [PATCH v3 16/24] SUNRPC: Remove support for kerberos_v1 Chuck Lever
2018-12-12 21:20   ` Chuck Lever
2018-12-14 21:16     ` Chuck Lever
2018-12-10 16:30 ` [PATCH v3 17/24] SUNRPC: Fix some kernel doc complaints Chuck Lever
2018-12-10 16:30 ` [PATCH v3 18/24] NFS: Fix NFSv4 symbolic trace point output Chuck Lever
     [not found]   ` <632f5635-4c37-16ae-cdd0-65679d21c9ec@oracle.com>
2018-12-11 19:19     ` Calum Mackay
2018-12-10 16:31 ` [PATCH v3 19/24] SUNRPC: Simplify defining common RPC trace events Chuck Lever
2018-12-10 16:31 ` [PATCH v3 20/24] xprtrdma: Trace mapping, alloc, and dereg failures Chuck Lever
2018-12-10 16:31 ` [PATCH v3 21/24] xprtrdma: Update comments in frwr_op_send Chuck Lever
2018-12-10 16:31 ` [PATCH v3 22/24] xprtrdma: Replace outdated comment for rpcrdma_ep_post Chuck Lever
2018-12-10 16:31 ` [PATCH v3 23/24] xprtrdma: Add documenting comment for rpcrdma_buffer_destroy Chuck Lever
2018-12-10 16:31 ` [PATCH v3 24/24] xprtrdma: Clarify comments in rpcrdma_ia_remove Chuck Lever
2018-12-10 17:55 ` [PATCH v3 00/24] NFS/RDMA client for next Jason Gunthorpe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181210162923.4198.13485.stgit@manet.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=anna.schumaker@netapp.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.