From patchwork Mon Apr 3 11:24:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 78511 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2231368vqo; Mon, 3 Apr 2023 04:36:18 -0700 (PDT) X-Google-Smtp-Source: AKy350bgjW4GstIbZO7WQJ5Omcc8l/Y8+ISvFiWc0uG6njRNAd6aR2Ozsk6LLJ3RTt7vrW1Bu4P2 X-Received: by 2002:a17:907:3e21:b0:8b1:2bde:5c70 with SMTP id hp33-20020a1709073e2100b008b12bde5c70mr42694481ejc.2.1680521777822; Mon, 03 Apr 2023 04:36:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680521777; cv=none; d=google.com; s=arc-20160816; b=Z/t1DolK93EjrHca7H9NBViQG80/x5D3PVeGsMfJbrLN35VbgXtET5PnkrXnmlgJhU JKssKfNS2tOHZabbxj4Oe/eMvKjsPAjjrZIjM5FhzUvobEQr8GzDDOJODCavh+eVDebe 0m+nK1atS5jAEp2mSsB2+PLsi424fVfKLa6Yacs6SbCkb78PWPNzQ+eoSgVHVND5CXM5 eG6Or6I154i434Ddj/peQEuWjduqCGmBAYBC378xCGei4MdP2tUqc2vE1+PpPJyfXRgh yGq2272rpS5azut6nQIUBMrGfG3w5fRF0hiBLLYyextqfonJVqvqmavyCLiN58PcZBbD +Zmw== 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=IT8v0HROiXE98eFOBlkbvJKsX4eGIdzHHzOWFB5UhsM=; b=KK+FALeXheZxlDZ0iDxHkgowmzi2xaNrrR3tGAdSxvvPY1AoAeWGR3Nw03xluR1pdG k5bilpfTYnYYM5Y47uS5UmpX8e2nJXtHQRdq8AevQl6qtKck/hzKYYr+Iplqo+J+QQMl 3uYUBg9JZ+FOLS1nI4hdX0aSbBIkPD91wp5IdrSNw5NgDo6Qp91+5XEwk4Wqoh3zvbWu 5CuOcygyo3zcILmL7rT2Bu3XDMx86C6EZUyvol9w/m7kR5i+TBmRep45SOsv8KKQXoY4 a+jGTNBeozIf8qQ924C+bMfJRAzlc3rNEf87h+FIhPpsr+zi34a7N8hKSZJRBTjwM3Ya NDZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=XpyVQ5f0; 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 a16-20020a1709066d5000b0093054f9acd9si5302415ejt.215.2023.04.03.04.35.53; Mon, 03 Apr 2023 04:36:17 -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=XpyVQ5f0; 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 S232442AbjDCL2J (ORCPT + 99 others); Mon, 3 Apr 2023 07:28:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231966AbjDCL2H (ORCPT ); Mon, 3 Apr 2023 07:28:07 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A27812053; Mon, 3 Apr 2023 04:27:51 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id C5A775FD22; Mon, 3 Apr 2023 14:27:49 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680521269; bh=IT8v0HROiXE98eFOBlkbvJKsX4eGIdzHHzOWFB5UhsM=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=XpyVQ5f0Mu7e/D8l9CfMGthvfxgoiPgxcMVZRjwL1QDaQU60hZm0Mllrk61kkNGJa o6Fm2ysFL1+9GpzLKYw5Jy3/Usl/tlzMYXM8dRWwN1lmSCkzuTswQmMjfaHb/cXCQr j95fXPFV+YuF6g9ASaR88yvjVvG0+Hw8UB2JgUk+U/K+3TF6kAxqqrRGJlq0zwmeo6 sSvQZoWD+WsRP+cROH7TYCR4uD1HgAvjH1u/hXHiEG/tbunEami+wC2lvh1B0jM0aP lZqr/mwuyZ1T+JJ5+e/3/KGmk/FDxcBimuOe88oBgOk1GbP3Hza4tHO2Y+E2XuQOlS 4TL5GOAvEuwMw== 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:27:49 +0300 (MSK) Message-ID: <2cfe98c9-0b47-d50a-0570-70e6d4af281e@sberdevices.ru> Date: Mon, 3 Apr 2023 14:24:17 +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 1/3] vsock/vmci: convert VMCI error code to -ENOMEM on receive 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?1762154804051587639?= X-GMAIL-MSGID: =?utf-8?q?1762154804051587639?= This adds conversion of VMCI specific error code to general -ENOMEM. It is preparation for the next patch, which changes af_vsock.c behaviour on receive to pass value returned from transport to the user. Signed-off-by: Arseniy Krasnov Reviewed-by: Vishnu Dasa Reviewed-by: Stefano Garzarella --- net/vmw_vsock/vmci_transport.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 36eb16a40745..a5375c97f5b0 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) { + ssize_t 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(