]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/smc: non blocking recvmsg() return -EAGAIN when no data and signal_pending
authorGuangguan Wang <guangguan.wang@linux.alibaba.com>
Thu, 12 May 2022 03:08:20 +0000 (11:08 +0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 12 May 2022 17:01:36 +0000 (10:01 -0700)
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: 45159abdee88 ("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>
net/smc/smc_rx.c

index 51e8eb2933ff47210172cbc3d607be0f32f61a3b..338b9ef806e8202c7b41a3294cf5e8ce72e4f9f8 100644 (file)
@@ -355,12 +355,12 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg,
                                }
                                break;
                        }
+                       if (!timeo)
+                               return -EAGAIN;
                        if (signal_pending(current)) {
                                read_done = sock_intr_errno(timeo);
                                break;
                        }
-                       if (!timeo)
-                               return -EAGAIN;
                }
 
                if (!smc_rx_data_available(conn)) {