From patchwork Sat Mar 25 22:13:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 74992 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp646315vqo; Sat, 25 Mar 2023 16:06:31 -0700 (PDT) X-Google-Smtp-Source: AKy350YNm9CX05LrxHEIr+tSQY8mH9z99KTDX+YuHMUkPgD7yQkuDS18hDVyZJa5cWIugmlBBaIw X-Received: by 2002:a17:90b:4b0a:b0:23f:7625:49b6 with SMTP id lx10-20020a17090b4b0a00b0023f762549b6mr8028512pjb.37.1679785591555; Sat, 25 Mar 2023 16:06:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679785591; cv=none; d=google.com; s=arc-20160816; b=CxE6bXVnG9lYKTELvc2zufnUgD69x0K5lNs1sVURt0a3YcnZVIX9tlZSHwwreRFFJG RDSbaPvspSvk+9xbxM0yxs9jhgH1Ou/gEipppnNjODRhe3wfKspBGy0aMhd+vAtTqD2k v+gepN9j0lwgIAQtKF3JwMDPgw71Trs0pth9kvPDouPKH09/gtzRedsxr5nkFJOTvWeF O4HlNaGV4baDq7rYnNNOIlxuuUsI53aWLx+/B8pjpJvdZner0hx0+2eEgxpVwUAoXtw+ owY5D6YiXkhlLuNoh84R7F1JbzLXeCWWScKPxawiXsqcWNZ4r7+7beiGC2MXkxmbWc9A IsoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:subject:from:cc:to :in-reply-to:content-language:user-agent:mime-version:date :message-id:dkim-signature; bh=bkc6d1yYqgIUYawce1wHqHL23hRQ4dzBaaa6S+OuT/c=; b=nQQ6o6tMev/2mrkQx33S4VZMT2qVi4M+80lG5qvuKJeIIqzOdT/nOYc+PliuRjev+7 5BZboGf1G9/cIFRyowlwPrCPeEt2vzF+DUU5eLHCkloQlkVgnzokOmeDT0wysD3CGWXV KPLWlsy3AiE2Z/UdUyOs6PxWrfEMggubOReo7WS9tb0L8uMllKcg5uWGQPui6dxwkUvS XlO9T23+q4e9CDPvhLY5HxyeNOZZ47qyrJzjt77QjcwX4oxfAujAI+pN4+8A2murKMGb rMGYY541tWCKCoy67wfoJmQd2K4D50cRpzWcstEhboSTSbguxkvbzqI/UfrKs9zIpPER bsRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=eyVwZfIR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z2-20020a17090a1fc200b00205da45d8a5si2775823pjz.124.2023.03.25.16.06.18; Sat, 25 Mar 2023 16:06:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=eyVwZfIR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231888AbjCYWQd (ORCPT + 99 others); Sat, 25 Mar 2023 18:16:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbjCYWQb (ORCPT ); Sat, 25 Mar 2023 18:16:31 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BB97CC30; Sat, 25 Mar 2023 15:16:30 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 8FCD45FD02; Sun, 26 Mar 2023 01:16:28 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1679782588; bh=bkc6d1yYqgIUYawce1wHqHL23hRQ4dzBaaa6S+OuT/c=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=eyVwZfIRi1ANQNCylXloNg95A3u5qjMOKvXJQlTt++/OSkQfTS34zrtLO+UUjWsXU gnvUT11dd7l+O6EZTNHBU2PJrAWk/pN+mQ37xSUQuA7U1HRkF8Ntv/cFomi96UwR2S 87SAOv5/eS5nIJc1iGeaNFHY5Xk5kJEUJHJTrcMre8uF7ffN7L3PCCBHnVyzyXCLcz JyxOXbpkCvJCIPWDmUCctdKpfwk/t2CTqQQ6Xp4qs9BtR13ZV98ZtbxdWsp644dN5n EuEw+si670/5qpFin/owGhU69ddY6OjXquroBphysgiUzdk3GTRZqeHtl6D7SyOlBw jaFPVFatlXmDQ== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Sun, 26 Mar 2023 01:16:27 +0300 (MSK) Message-ID: <99da938b-3e67-150c-2f74-41d917a95950@sberdevices.ru> Date: Sun, 26 Mar 2023 01:13:11 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US In-Reply-To: <97f19214-ba04-c47e-7486-72e8aa16c690@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v1 1/2] vsock: return errors other than -ENOMEM to socket X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/25 20:38:00 #21009968 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761382856213173177?= X-GMAIL-MSGID: =?utf-8?q?1761382856213173177?= This removes behaviour, where error code returned from any transport was always switched to ENOMEM. This works in the same way as: commit c43170b7e157 ("vsock: return errors other than -ENOMEM to socket"), but for receive calls. Signed-off-by: Arseniy Krasnov --- net/vmw_vsock/af_vsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 19aea7cba26e..9262e0b77d47 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -2007,7 +2007,7 @@ static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg, read = transport->stream_dequeue(vsk, msg, len - copied, flags); if (read < 0) { - err = -ENOMEM; + err = read; break; } @@ -2058,7 +2058,7 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg, msg_len = transport->seqpacket_dequeue(vsk, msg, flags); if (msg_len < 0) { - err = -ENOMEM; + err = msg_len; goto out; }