| From a0fe97b953702f102fbd1ec51f48c007395141af Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 13 Jan 2022 12:20:36 -0500 |
| Subject: SUNRPC: Don't dereference xprt->snd_task if it's a cookie |
| |
| From: Chuck Lever <chuck.lever@oracle.com> |
| |
| [ Upstream commit aed28b7a2d620cb5cd0c554cb889075c02e25e8e ] |
| |
| Fixes: e26d9972720e ("SUNRPC: Clean up scheduling of autoclose") |
| Signed-off-by: Chuck Lever <chuck.lever@oracle.com> |
| Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 7b5dcff84cf27..54eb1654d9ecc 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); |
| -- |
| 2.34.1 |
| |