From patchwork Mon May 16 19:36:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 573389 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C113CC433F5 for ; Mon, 16 May 2022 19:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345820AbiEPTo0 (ORCPT ); Mon, 16 May 2022 15:44:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345730AbiEPTmF (ORCPT ); Mon, 16 May 2022 15:42:05 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EFFF41318; Mon, 16 May 2022 12:40:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DE7D2B81610; Mon, 16 May 2022 19:40:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4348DC385AA; Mon, 16 May 2022 19:40:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1652730040; bh=5ozi28J2kmLWwIhXgVZZ4+UibvU1ZAKiPMUQZDvV+Fs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ml2rH8PwX5Gq4s0nmESDSFtDgLMWOoUKBPSDKNpak3eo9sN8azYw7lApEL5894zTx DBTMt2w13Yw6bRNG2MJokCAex5i+VDILRcy4umUQvFjMB1ehMbpfX7PkGTEN9HuMwd gSQ48JS2lVqaa0FSRElOuECrX9qC6jQsJgG1lk6s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guangguan Wang , Tony Lu , Karsten Graul , Jakub Kicinski , Sasha Levin Subject: [PATCH 4.19 12/32] net/smc: non blocking recvmsg() return -EAGAIN when no data and signal_pending Date: Mon, 16 May 2022 21:36:26 +0200 Message-Id: <20220516193615.140142528@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220516193614.773450018@linuxfoundation.org> References: <20220516193614.773450018@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guangguan Wang [ 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 Reviewed-by: Tony Lu Acked-by: Karsten Graul Link: https://lore.kernel.org/r/20220512030820.73848-1-guangguan.wang@linux.alibaba.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- 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 36340912df48..a7a4e3ce211a 100644 --- a/net/smc/smc_rx.c +++ b/net/smc/smc_rx.c @@ -349,12 +349,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)) {