From patchwork Mon Apr 3 11:25:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 78517 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2233883vqo; Mon, 3 Apr 2023 04:41:15 -0700 (PDT) X-Google-Smtp-Source: AKy350atvfPJ04oaagXwpHEQjIQj2TDias59dYylnGMaEoNRtvRwGDSt1SrcfGK4Ifd3cnS34HVX X-Received: by 2002:a17:907:7d91:b0:947:72bd:f72a with SMTP id oz17-20020a1709077d9100b0094772bdf72amr15228845ejc.72.1680522075029; Mon, 03 Apr 2023 04:41:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680522075; cv=none; d=google.com; s=arc-20160816; b=R6I0RP9CwsVIuK7DaSAZZPcxgO2cH7BUdzF6U3pQc+/iWWqxndbBdMsC/IjUfq8fCZ o5NyMkiVihciwTQI3oRLNNJXh4O3u8/Fin2KPFKTM7Fq8Rb5D1jesDBc3bJEJqXSV3ZO 33a8Lxq2oltbYGuC1sIRYLO4pq6GDVILkBGVMkCohpmPY5DbOaBSZ+W2JMj0wGE9Qx9q /EwmfcnUXRl37URLNZWwOghQMMWSRpnxsbmFrzSMVIAhj3uekKw6v0bVmlg35g33sjYC ZKyfOiESKEW8KvkIF0NMnfsQJcKBrB9wWGFfN5g2lhIKY/LVp3KOox41s1S+MgHaVbnr cbXw== 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=PMQoUlr6fMnlWZgvIkETHRIUvgj+Tiz5vrh8HAFCAUw=; b=MD9m0BaG3vTcD1fowsNWHFEKyji8jWAUACX79k3+U6soTYTsr66dUw2zBmqds08tYi nCoCTqjVXs7WIk4u5x0nfZNzNdaKtVfkqBDPFa+dsl/f1LHN7RQYEXiGepvt31a29VZl sh5V+sKHEcbsmG49OjwtulsrscQs5yTuNL7JWqpgIQEgtz9gcFm+mt6Gj4i1fwbOhPQ2 2qgaAa6z+RI3felhlfWvus+PGk7woSq2QN1mwnu4GIUfgBi9o5TLOmI3fGwbVZ6nv8ua PutzZW+cp8gD+NBXKkl8+24tCX+NjlOG88Y3pMLSXLhBtrqhiDfk+74dVsG9Q/j/uRF4 vG4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=smc6Tp11; 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 xo5-20020a170907bb8500b0092ff0294c61si175465ejc.710.2023.04.03.04.40.50; Mon, 03 Apr 2023 04:41:15 -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=smc6Tp11; 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 S232459AbjDCL2t (ORCPT + 99 others); Mon, 3 Apr 2023 07:28:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232238AbjDCL2r (ORCPT ); Mon, 3 Apr 2023 07:28:47 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B127C4224; Mon, 3 Apr 2023 04:28:45 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 079385FD22; Mon, 3 Apr 2023 14:28:44 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680521324; bh=PMQoUlr6fMnlWZgvIkETHRIUvgj+Tiz5vrh8HAFCAUw=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=smc6Tp11ta3Y/nEm69dGlKm9EAdjP20xwlU97Fdk7gE5GLNoyWDSl27ygH0prTMBL SgKzriCBXY0GLdzgHJnQJeS5H9xzrgm6hbczABAiFlSFmv6ccz727eDVyQlfk7Y+wv kKIDtHBRZUYyjG8r+kORqYKzC/Py8TyYwEs/yM4plsik4tyLuucW6aD6/BBxYaYgLu XLTK8RBgSOXDF1pwbE5hPdVuwiZMAY+Ng8HsRAQG2hGnBqLPNL39eNw7gHRx35Fpki SxO7lIWNn8t4GSPeXdxtO12Byav1R3VgA6cZdAUqBkc8v8J0RITmvdMawRUXG9C2xG 3GMmdICjYsuVA== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Mon, 3 Apr 2023 14:28:43 +0300 (MSK) Message-ID: <067371c8-f5a8-59a5-9485-cee85e3d27ef@sberdevices.ru> Date: Mon, 3 Apr 2023 14:25:12 +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: <0d20e25a-640c-72c1-2dcb-7a53a05e3132@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: [PATCH net-next 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/03 05:35:00 #21028078 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?1762154914589566017?= X-GMAIL-MSGID: =?utf-8?q?1762155115305525424?= 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; }