From patchwork Sun Apr 2 18:16:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 78289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1869331vqo; Sun, 2 Apr 2023 11:38:19 -0700 (PDT) X-Google-Smtp-Source: AKy350azYKzQ0YXWZufpjEknaS1e4wIcCpuFldEuJRzrotEbX+dmp34GfH8ijkMTC5q4AIXWxITK X-Received: by 2002:a17:907:2063:b0:933:3814:e0f4 with SMTP id qp3-20020a170907206300b009333814e0f4mr35359363ejb.16.1680460699499; Sun, 02 Apr 2023 11:38:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680460699; cv=none; d=google.com; s=arc-20160816; b=Vy9Uz/rwWjIvR72M7cWQqiTl2HPa4RUGFRy2FIDQeOb/ARBALmX7JrveQI9eLmj2XU FIpqF4Jv+9+YvEr1Az05Rtr7RbRdr+9qakVvRjBYjx+/fPgMgEynuE1LDdO4KwjLMKEY lYSNgUCOvruqUpTdSJn8xbz2wHllUVotYo59sOq3JoDM/L2MYH0PvYlZi0WJG8fVPxOn 9YR4z2ZnPnh9BReK+ynRXgwH4+KSEE69W1OxRotFyU3n+NX3FDO6ttK5oeBOnbjJpMrF 6D1G/LzazoP+Dp2q4Jm5K+SvzkqPV2vRnmVPfwJpkiKOBqv8EnndIObpl6mviz6j1Bjp GALA== 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=wK7GCYWOw+lG9q/p1ToXem8gzHNx+PH+yGZk1ens7jQ=; b=n/g1rqgD1aCgWXQQCWNNLeK7TRMsd2Pasflq3ylBALR75tzU+E6UxUJAfxzZTmd7aA LgY8fNXlpUhVnhXao+EjpwFhrrfsRmyDaGG8lQ9RzdJJ14Qe1BSaCVDqvpN7jZoFxuLw lM//gPYswGr0geeQXuqkCSy25CgASITDwSY8xGfTlsZAUJ9MRpMAWiOViW9fSpbwVzQB 8fw/oYRHI3H05iHjwIYM+kjiUUknIC5Rr1CdwZmabnlD5VQyRy419MVhEQIm7NMoNSSX 2/OYMDvAGLYsRBghHInGSspsnhoPtC51iehbJNX2V+0hquZkPWSrgM1GveaYYrgd2JU9 rD0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=TyTrPp67; 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 h27-20020a1709063b5b00b008c4abcbbddbsi5388688ejf.291.2023.04.02.11.37.56; Sun, 02 Apr 2023 11:38:19 -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=TyTrPp67; 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 S231249AbjDBSUV (ORCPT + 99 others); Sun, 2 Apr 2023 14:20:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230229AbjDBSUU (ORCPT ); Sun, 2 Apr 2023 14:20:20 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F4D29030; Sun, 2 Apr 2023 11:20:19 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 018EF5FD04; Sun, 2 Apr 2023 21:20:18 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680459618; bh=wK7GCYWOw+lG9q/p1ToXem8gzHNx+PH+yGZk1ens7jQ=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=TyTrPp67JvOTC+ooSlj9oK2/0E9LVAAMdyKSE48buIj0DYXbi859U4+r/dtYEFJ1o UAlLxs1lx8mj1TliZBnmcVuR8SqtKHjsApUtbRoN7eb3PQ6eV9SLUwfKb04LEeh/x6 p47W94NJDVV1vyVrun+TpsJNQ8sg1eodzkbJxVrqFNBKHFZzNtHemtiVAD6e3cbX+c GTpIh4mGTQfr2HZcgzto8OsFc/ugo6YP04F27G7mX7GTDY6/JTXc+ZPPKzvY714/em CBHN2EC63lSL1WwOuVHnFWGZ5Fgxk3MuBA96X9S/B+dVFQoDbmPqC6ema5fycfX33y NuM7aNJXD1eTQ== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Sun, 2 Apr 2023 21:20:17 +0300 (MSK) Message-ID: <7715fd7f-1c50-7202-03c7-9d17c7f63cab@sberdevices.ru> Date: Sun, 2 Apr 2023 21:16:46 +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: <5440aa51-8a6c-ac9f-9578-5bf9d66217a5@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman , Bryan Tan , Vishnu Dasa CC: , , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v4 2/3] vsock: return errors other than -ENOMEM to socket X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH02.sberdevices.ru (172.16.1.5) 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/04/02 13:52:00 #21029650 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?1762089998511678822?= X-GMAIL-MSGID: =?utf-8?q?1762090758217932096?= 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 Reviewed-by: Stefano Garzarella --- 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 5f2dda35c980..413407bb646c 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -2043,7 +2043,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; } @@ -2094,7 +2094,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; }