From patchwork Sun Apr 2 18:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 78287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1865632vqo; Sun, 2 Apr 2023 11:27:05 -0700 (PDT) X-Google-Smtp-Source: AKy350aG/e23XbA41EwN06SeJbWqLMOeOHwgXp/5gVFKWV+2MRX61kN+SYqUhxrSYKQG1QZZzu9K X-Received: by 2002:aa7:9809:0:b0:62e:32c:b579 with SMTP id e9-20020aa79809000000b0062e032cb579mr3581100pfl.12.1680460025326; Sun, 02 Apr 2023 11:27:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680460025; cv=none; d=google.com; s=arc-20160816; b=Hs6U4JDB5C4bH8FahKxuM0hXf2dv7PuMykEjuhI2XEQa7nyPfY19PCzmCCc9qodGp3 KDAppzem9ccgVlIMfUV9Wi+WgIkYEN6R/r6AQcu34VQkaShmL+NCoNH2rjpIYcJiCAkI WAjLnjf0WsdRmsmnGUI/07vjwI/WusrV18RvYFNr5i7dooEEU1eieIgNroze5CUGZ2nj Tk4va0ROaFJ7SViiqR3IP3jx19ofFtfyL6Im0nq8iTBM8G0WZq+9jnsXQAExBjgbUGhB nVrSYnEC92U6IwMkt1NpHVQRC7Br06D4Pk8PNRfqIMaLsAcETuux/s52r9+AX9cyJtmg uG9Q== 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=ylxN7UqQ/M1z7OMhkHvFEk22Nzg7mYVbxzsd6Ok5gYk=; b=Tc0FMj+exY7QuhgrTtxCU/G8bfsnN/ulzEsOs1QZeOgHmECQ97e/j8qrUXDv64em8d OrQmLlDzEDKPwZlsSrCnlCHC4XMMlveucFDOOomJVQYkl9pOIx1f5GoPKBZxqZW4uHIn EDLHzTPYZdezUaMbVBU4B1ppRdj9eAoQamw+HrKCFhwUmgeoIvJqmkYKzpvb3x6/bfgK CoXdmJCZ5wvdQ3p/ocd3X/BNR1z30ar7JANlkICbWBRJqN9yqMWQWIpmxFjryKOsNVZ2 1Diej2Nn2NHoKVyMlNXBRfoZICAFfCogk0lqLbukNWUI0baClQSeQaf1ysxcSaI6bA2S 84gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=qkgRmy0f; 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 e7-20020a656787000000b0050be7950cf9si7058031pgr.67.2023.04.02.11.26.53; Sun, 02 Apr 2023 11:27:05 -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=qkgRmy0f; 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 S231396AbjDBSTY (ORCPT + 99 others); Sun, 2 Apr 2023 14:19:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230229AbjDBSTW (ORCPT ); Sun, 2 Apr 2023 14:19:22 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76802902A; Sun, 2 Apr 2023 11:19:21 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id CB3435FD04; Sun, 2 Apr 2023 21:19:19 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680459559; bh=ylxN7UqQ/M1z7OMhkHvFEk22Nzg7mYVbxzsd6Ok5gYk=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=qkgRmy0fCvdg4Rmxz7Bya+i2lWqY2nRMIZOJPRV3xQuTOh0NYYWde9pZi2eIlBk7w IxIOsboZr96vpG1/ydZFk8mpQ4+uBj//drk/l8sUlgo1jrFvyRG54OOK5XbF1MMsEQ ndE2yMEwJ93hcNGEGcjLRKUE4v0Tepr6TPMXD0u09Gm5z1MO3uF+x12Q87oF7n+fG5 XCJXBfGj1VQK96jDY0t/8TPTWJtcWJfBZ2YN+oe+jad9mMUN61XreMA5RkDPH3bt/x 47A4mR5cUDLwA/VfGfdybad48AZTfRSJNopp1P3zjnSZkaljt3WBKTiPbKYWRC6rzi itKp/WArm5hug== 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:19:19 +0300 (MSK) Message-ID: Date: Sun, 2 Apr 2023 21:15:49 +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 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/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?1762090051220796301?= X-GMAIL-MSGID: =?utf-8?q?1762090051220796301?= 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(