diff options
| author | Guangguan Wang <guangguan.wang@linux.alibaba.com> | 2022-05-12 11:08:20 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-18 09:18:06 +0200 |
| commit | dc25553cc697a1b9e2bb911f74a114c1ba9d76d4 (patch) | |
| tree | eb546de98ccfb5f2deec39d3535f817c190f7817 /net | |
| parent | c555d4827af4ecd093c9602e3af6ce8a8863638d (diff) | |
| download | linux-dc25553cc697a1b9e2bb911f74a114c1ba9d76d4.tar.gz linux-dc25553cc697a1b9e2bb911f74a114c1ba9d76d4.tar.bz2 linux-dc25553cc697a1b9e2bb911f74a114c1ba9d76d4.zip | |
net/smc: non blocking recvmsg() return -EAGAIN when no data and signal_pending
[ Upstream commit f3c46e41b32b6266cf60b0985c61748f53bf1c61 ]
Non blocking sendmsg will return -EAGAIN when any signal pending
and no send space left, while non blocking recvmsg return -EINTR
when signal pending and no data received. This may makes confused.
As TCP returns -EAGAIN in the conditions described above. Align the
behavior of smc with TCP.
Fixes: 846e344eb722 ("net/smc: add receive timeout check")
Signed-off-by: Guangguan Wang <guangguan.wang@linux.alibaba.com>
Reviewed-by: Tony Lu <tonylu@linux.alibaba.com>
Acked-by: Karsten Graul <kgraul@linux.ibm.com>
Link: https://lore.kernel.org/r/20220512030820.73848-1-guangguan.wang@linux.alibaba.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/smc/smc_rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c index cbf58637ee14..0d5146d6d105 100644 --- a/net/smc/smc_rx.c +++ b/net/smc/smc_rx.c @@ -145,12 +145,12 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg, size_t len, } break; } + if (!timeo) + return -EAGAIN; if (signal_pending(current)) { read_done = sock_intr_errno(timeo); break; } - if (!timeo) - return -EAGAIN; } if (!atomic_read(&conn->bytes_to_rcv)) { |