lkml.org 
[lkml]   [2022]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 040/102] net/smc: non blocking recvmsg() return -EAGAIN when no data and signal_pending
    Date
    From: Guangguan Wang <guangguan.wang@linux.alibaba.com>

    [ 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>
    ---
    net/smc/smc_rx.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c
    index 170b733bc736..45b0575520da 100644
    --- a/net/smc/smc_rx.c
    +++ b/net/smc/smc_rx.c
    @@ -354,12 +354,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)) {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-16 22:16    [W:4.233 / U:0.380 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site