From patchwork Thu Mar 30 07:05:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 76924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp937303vqo; Thu, 30 Mar 2023 00:24:27 -0700 (PDT) X-Google-Smtp-Source: AK7set/UX0IHj1kAFqbo9HJjrrj8fOOfsPpTkzsCpvv/+snmk/CR8zsOp8Cdz8Q/FcUV+LVOncRK X-Received: by 2002:a05:6a20:4904:b0:cb:c266:3f6b with SMTP id ft4-20020a056a20490400b000cbc2663f6bmr18818715pzb.12.1680161067223; Thu, 30 Mar 2023 00:24:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680161067; cv=none; d=google.com; s=arc-20160816; b=Zjld/67NplwewdF3bdtHbn7iE3yCFtp/catc4yLyC2azjpgF3U1VA/jRaLfOwYrKyO SYy6ifZH7aEu0cBTi1lvWCJVpAYAjQJf1AasUTTnW+O8ZH/AmVwBSbJsCvFvZ26QWmZx o5hsWTLXZOlE96B++W83pC3VNnexxRgXDfvhswCJm62ZRA+TzBuJoSCFj53D7LjiJ1qt JL1tMDPos5lafZwYTmMzgWIH8YAoQdDD2HdX7E1nmFMLF1In/NX7EVD4/tJwOzQmkAsI uqyVi1PKNF9FxNGqWap5R4NDMWI2GSGl2TidkOYrQghUctggvNejQk1E0Iseu/f+fmUh xxmQ== 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=NlLWW81rCyUZS2NXZJDJF9/GTkcB8rLOaHPOrPpt98ylA2XK+LJ/eQk43EaYXKnWnE mYNEX/Nyb6n+jtwsIfiuwPAcXNzeD7WdNubDLhWoRRdHkIRO6S5tsx0FHDflrzG2X3TI BbdoTPSkIWF0TolyKdJkAb5g5cFTmgCNLGkTDd91XK7EDsbK+3IIAIhrE5Sc6EGFHTdG AoTNEsH0MeDYrdIINLYc6QV1EQNPoXYd3bTNzTPxclsnv2+ohoAH/chu8cFb9HyNyYJl rZTOddXcsH5GzxRoz3N/a35jQTlq6nt7vwjFFZuMIDm/aIpL2nSrgmvTgtpCSI26W2Yu NuiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=VVKgPd2A; 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 o6-20020a056a00214600b006254bb74922si30100460pfk.328.2023.03.30.00.24.13; Thu, 30 Mar 2023 00:24:27 -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=VVKgPd2A; 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 S230407AbjC3HJO (ORCPT + 99 others); Thu, 30 Mar 2023 03:09:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229640AbjC3HJM (ORCPT ); Thu, 30 Mar 2023 03:09:12 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8F652683; Thu, 30 Mar 2023 00:09:10 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 01D9E5FD25; Thu, 30 Mar 2023 10:09:09 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680160149; bh=wK7GCYWOw+lG9q/p1ToXem8gzHNx+PH+yGZk1ens7jQ=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=VVKgPd2AY8ifTLVP7yz7hKZ9V2P668QZRPGkv+dHfSh2CJr+Tccr+gwCfa5Bd+vVH 1GD73UM4EEZvfRdubWXVW6hMWV2dXWijONQCqgb18STJ245RG3gKu0UPuyN2u6mJyr FbJ1itQszu2ZChMnNq0UfLA1nlx2BtTgSWvFB9m4cY8HoqFF2Yc0kM/3x3tTBJ3YF0 8XO5/Tq8a+bYvGhGX6HcfaqSLCtgC/lKFvQizMZHVVdLgHflAAiVdL9Wemj68swZA4 3PcsAlyoH2o2OlwGEKCZQcesrE3TPxHR8lCEPih/4aNBlhCLsFJeIdvu3dheIxaq7h +J3K0uLxfS2CA== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 30 Mar 2023 10:09:08 +0300 (MSK) Message-ID: Date: Thu, 30 Mar 2023 10:05:45 +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: <60abc0da-0412-6e25-eeb0-8e32e3ec21e7@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 v2 1/3] 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/30 01:24:00 #21043458 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?1761776571070175867?= 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 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; } From patchwork Thu Mar 30 07:07:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 76923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp935744vqo; Thu, 30 Mar 2023 00:20:45 -0700 (PDT) X-Google-Smtp-Source: AKy350aJz4ADJDnez5Yw8wUAtY5DCUMaJcA6/uHxQ1mwTIc2x1axQBvR0tlKGF30rJAl6ZDLeQ3R X-Received: by 2002:a05:6402:51d0:b0:4b6:821e:1859 with SMTP id r16-20020a05640251d000b004b6821e1859mr5421684edd.7.1680160845494; Thu, 30 Mar 2023 00:20:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680160845; cv=none; d=google.com; s=arc-20160816; b=Ga3ffWHgYXLh5x2RxNqmvcMJ3ndIz2n2VmUl6od48TPpZeCvrkdUjUmQCpg8wzZ7da Lxmc1e0xeJG4G6fq+aO6sA9dTB3buI98TARN9Kjb2ajq0fhsmCrQ95AOF9I7IJ/OVXXJ CxGD7QRpGTX0OjY0+hEMl5DddggEeQnAhIM11HWoVzEnzmgczk7KUG9kVeGcqKNiqzKj XlsVAq5e/Fs0TBQG4CBhobHFhIY3/g4h8+jwZgSgV32PlKSiDAflf5YvLH8skwFUN/9p ZnRWvWzlS4PlbOt40jq+lzP4PruOx0QIfOxkVUi/mk8nS1RXgiBi0FttDB4TpdjuxKyW 5l5w== 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=ggY0SHBEDfjLnsfC/RTR6iP6BEUZWncCZMwnfImDKoE=; b=GNc6mvTkWAylTeX4zIla+vgqT+4yonB4lNBBM0J5xkmXIMXfFKOKdmXojyW0TtbL3y N5u3o1aSTIJr9vaNfA7q0Sz/apDG410IKtEu/5locNecaF1RrVwjMV4VD8xvXUuT4Xqz BppyNEgz7GfY0dOgL42HaHbVUSkHeJsLRy7HtYDxwfIwWmM1XIdWsvNfvpiIg+TsS0p7 c95YVrAE23CM3CT1ODC7tt8JHF3gBEVBsnAap7ulA2Wq7TdnMhiUvBr62d4/J31JLEXd nmsxmcApdbrxu1nQ+FK+qmIqulotWO6lqHg+En3VExO5BAX0mONnBKOqRmOclveSyEHj QE+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=oCPL5TtB; 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 z10-20020aa7cf8a000000b0050220a6041asi46441edx.311.2023.03.30.00.20.21; Thu, 30 Mar 2023 00:20:45 -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=oCPL5TtB; 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 S230454AbjC3HLQ (ORCPT + 99 others); Thu, 30 Mar 2023 03:11:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229778AbjC3HLO (ORCPT ); Thu, 30 Mar 2023 03:11:14 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1B972683; Thu, 30 Mar 2023 00:11:01 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 2F7EE5FD25; Thu, 30 Mar 2023 10:11:00 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680160260; bh=ggY0SHBEDfjLnsfC/RTR6iP6BEUZWncCZMwnfImDKoE=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=oCPL5TtBEAP6W+v408n4Oq4bR+oEtlA6TQwuISu8BhUWeJ6vYR7TImdW1kVlgZs90 duxxYE/X8+6SNYv6N9KpE6FI8GC9n2O/SWi6Ut7VrTOXaGQJYz1+dGZe457in0uZGl y5YIbaOVdN2mC6LDK7Go27pygHxYUh9GFtoyDdTEnv1j7GfrSTYZthmfcIHj4+oYDp 8+Nc/cfKRp3GDDT6aeZzC8HZweFypZwI1O5vV3TZkCceuSj1YQjlDwNlPTV8dCGr+v Ume3wrtNEBiwc2vSiSJl8z2c0aCB7W7pvCVf5pTSGNCD7iitvuwUqLBsC5yjDvQssJ J4AQmuDNWsjnQ== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 30 Mar 2023 10:11:00 +0300 (MSK) Message-ID: <94d33849-d3c1-7468-72df-f87f897bafd2@sberdevices.ru> Date: Thu, 30 Mar 2023 10:07:36 +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: <60abc0da-0412-6e25-eeb0-8e32e3ec21e7@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 v2 2/3] vsock/vmci: convert VMCI error code to -ENOMEM 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/30 01:24:00 #21043458 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?1761776338551086813?= X-GMAIL-MSGID: =?utf-8?q?1761776338551086813?= This adds conversion of VMCI specific error code to general -ENOMEM. It is needed, because af_vsock.c passes error value returned from transport to the user. Signed-off-by: Arseniy Krasnov --- net/vmw_vsock/vmci_transport.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 36eb16a40745..45de3e75597f 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -1831,10 +1831,17 @@ static ssize_t vmci_transport_stream_dequeue( size_t len, int flags) { + int err; + if (flags & MSG_PEEK) - return vmci_qpair_peekv(vmci_trans(vsk)->qpair, msg, len, 0); + err = vmci_qpair_peekv(vmci_trans(vsk)->qpair, msg, len, 0); else - return vmci_qpair_dequev(vmci_trans(vsk)->qpair, msg, len, 0); + err = vmci_qpair_dequev(vmci_trans(vsk)->qpair, msg, len, 0); + + if (err < 0) + err = -ENOMEM; + + return err; } static ssize_t vmci_transport_stream_enqueue( @@ -1842,7 +1849,13 @@ static ssize_t vmci_transport_stream_enqueue( struct msghdr *msg, size_t len) { - return vmci_qpair_enquev(vmci_trans(vsk)->qpair, msg, len, 0); + int err; + + err = vmci_qpair_enquev(vmci_trans(vsk)->qpair, msg, len, 0); + if (err < 0) + err = -ENOMEM; + + return err; } static s64 vmci_transport_stream_has_data(struct vsock_sock *vsk) From patchwork Thu Mar 30 07:08:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 76920 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp933669vqo; Thu, 30 Mar 2023 00:15:27 -0700 (PDT) X-Google-Smtp-Source: AKy350aJw7MFYWbPRJk06e5Y0IWZCjq/msjmFiBI83H5HXG5GPQphAYI1iD+X6erOvalOj+i5gOi X-Received: by 2002:a17:907:9865:b0:91f:c7e:22ba with SMTP id ko5-20020a170907986500b0091f0c7e22bamr21878843ejc.27.1680160527666; Thu, 30 Mar 2023 00:15:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680160527; cv=none; d=google.com; s=arc-20160816; b=gXAPFPUNlmj0hw+ITv1U91pc0ElPEY8LcPN9ANfgEnNqlp2McKxAL8HcvyT/vblYrL SRlxK2J1WKGove0aKQ3myRyeldPEkIsUMdo7NGYEw0+qPaTRSP36E84lA6FqtpANKNVL GavM8LxpYq010fG8X2cSNqKE1y5jjkloOZ9kSKypirKNe+fFfqSSKoSC5l9uNbkjziRc Beq7Tn/Hws4pjLgws5DRuVRcqerwyrgcr1ErBxWqTNpKizfLP6Jpd6j6nTnEFHm0Vk5F ItPBb7mC18gXPztjm+IXrLXbGg9h2u47Nmz6ELWTtHtG55UWRrJTKVy5K5//JpbCqzI2 tD0w== 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=Q1dSLV0WkKrQTTWvKTXPk9LEK5CXRc1NRkFMGJRvt8g=; b=KjEWR6n9dFV5alRpkbt7c4kpWBI6y8qT6n8w/s2FiUlXXxkfPwqxSYbqnQJPq9wDpc xvW+zrkAjvuhQ4s1sN57kcL6DEEWXKkdhQO3ngiNw+Fz8vVgpNXywbs7KmkG2hHykWi0 Hb7j+2MKAkVeEvQEsanKrbdykr8Ihtj5Gj5iCNsFPDI/Hj4UJgTyW9tP6YgHtBtJVSnQ 5aGsJfnInWh7sN/rbhk9fPg57vRcYQHzG+lJP3TKttaxdEsGo31M6EQMe6HOqbg4qIAI 9LXM8mU5U8s6ScSq5QDuu5RbaeawB2fruMnEL2CsJi0Z4g2O+Yghxtm5JYOpYpJy1Qqr d5fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Z7s+Tc7f; 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 sb2-20020a1709076d8200b0093f6376202bsi13498679ejc.569.2023.03.30.00.15.03; Thu, 30 Mar 2023 00:15:27 -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=Z7s+Tc7f; 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 S230484AbjC3HMd (ORCPT + 99 others); Thu, 30 Mar 2023 03:12:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbjC3HMb (ORCPT ); Thu, 30 Mar 2023 03:12:31 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39E4C2686; Thu, 30 Mar 2023 00:12:26 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 9068F5FD25; Thu, 30 Mar 2023 10:12:24 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680160344; bh=Q1dSLV0WkKrQTTWvKTXPk9LEK5CXRc1NRkFMGJRvt8g=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=Z7s+Tc7fwTVfIdjgrreVorfBYwh8bKlswKxF76azvuzxau0r07Vyoa7hAXC4c0qRa 3fq1fw1Y1LV3y2MBZcXCzC2YxQJ0Tf3UxvfHffmKVV0rWYqyYzvLPG9QvNTxvLrUQf WTrNXnqtXm3FbUbgsOQaN1szRG0WaMf640RbKSGrm/MClOV6Fgb8nPHK2jsSsnU5fq 4FvkJ6CbKLTD77nBfz50JJbXWarp2UtNH9AbpDBKwIC/ZlJJO8jtDkZdifi9CCxCh/ E5v2+5O5E5lTj/8kd9mDPCa7xJiUccludrufUa6lhEUw3ddMCv+fmd9cDwxxVoTT7k 9p0PY9sHZ4Bag== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 30 Mar 2023 10:12:23 +0300 (MSK) Message-ID: <0441efbd-2138-23c8-bda1-e3e0f53c5415@sberdevices.ru> Date: Thu, 30 Mar 2023 10:08:55 +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: <60abc0da-0412-6e25-eeb0-8e32e3ec21e7@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 v2 3/3] vsock/test: update expected return values 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/30 01:24:00 #21043458 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?1761776005516774176?= X-GMAIL-MSGID: =?utf-8?q?1761776005516774176?= This updates expected return values for invalid buffer test. Now such values are returned from transport, not from af_vsock.c. Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- tools/testing/vsock/vsock_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c index 3de10dbb50f5..a91d0ef963be 100644 --- a/tools/testing/vsock/vsock_test.c +++ b/tools/testing/vsock/vsock_test.c @@ -723,7 +723,7 @@ static void test_seqpacket_invalid_rec_buffer_server(const struct test_opts *opt exit(EXIT_FAILURE); } - if (errno != ENOMEM) { + if (errno != EFAULT) { perror("unexpected errno of 'broken_buf'"); exit(EXIT_FAILURE); } @@ -887,7 +887,7 @@ static void test_inv_buf_client(const struct test_opts *opts, bool stream) exit(EXIT_FAILURE); } - if (errno != ENOMEM) { + if (errno != EFAULT) { fprintf(stderr, "unexpected recv(2) errno %d\n", errno); exit(EXIT_FAILURE); }