From: D. Wythe Date: Tue, 15 Feb 2022 08:24:50 +0000 (+0800) Subject: net/smc: return ETIMEDOUT when smc_connect_clc() timeout X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1ce22047067490c3a465808556a99b2ab95bf046;p=linux.git net/smc: return ETIMEDOUT when smc_connect_clc() timeout When smc_connect_clc() times out, it will return -EAGAIN(tcp_recvmsg retuns -EAGAIN while timeout), then this value will passed to the application, which is quite confusing to the applications, makes inconsistency with TCP. From the manual of connect, ETIMEDOUT is more suitable, and this patch try convert EAGAIN to ETIMEDOUT in that case. Signed-off-by: D. Wythe Reviewed-by: Karsten Graul Link: https://lore.kernel.org/r/1644913490-21594-1-git-send-email-alibuda@linux.alibaba.com Signed-off-by: Jakub Kicinski --- diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 246c874de629a..38a406447cd0d 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1372,8 +1372,14 @@ static int __smc_connect(struct smc_sock *smc) /* perform CLC handshake */ rc = smc_connect_clc(smc, aclc2, ini); - if (rc) + if (rc) { + /* -EAGAIN on timeout, see tcp_recvmsg() */ + if (rc == -EAGAIN) { + rc = -ETIMEDOUT; + smc->sk.sk_err = ETIMEDOUT; + } goto vlan_cleanup; + } /* check if smc modes and versions of CLC proposal and accept match */ rc = smc_connect_check_aclc(ini, aclc);