Message ID | a0915a9d-ba41-5a90-0e16-40c2315f0445@sberdevices.ru |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp128318vqo; Thu, 30 Mar 2023 13:58:43 -0700 (PDT) X-Google-Smtp-Source: AKy350bQ5S4TrKQmyUVmUoX/96cEddRW1lA6HAKBRigsmbHNZI6U/aEhQl7vCnB8+olewWgFGcQZ X-Received: by 2002:a17:902:e394:b0:1a1:903f:de61 with SMTP id g20-20020a170902e39400b001a1903fde61mr18391116ple.63.1680209923179; Thu, 30 Mar 2023 13:58:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680209923; cv=none; d=google.com; s=arc-20160816; b=qohvkX4cQz5tzRdwnzOWKQZpeUB1qEVy6zoxl+RJsfXTtawFiTlXrtrx/cHBemliuL fSeXwLQSI/iR7JNHnnQP11XblRrhUFNffuVrTuoJoBueugZRjLNjB5YrCY0NQBsnPZHj qOzGGoo6mfMWzclGFfn9j/AH7gE477uvApOVBQqGJ15Sct9EctnAXKDYs101ryHCmifB s4GGDn99+YKzpV8m4PWChlihDCW1x+2T79Rwqk0lynApdfP0YD8xE45UTPmDrv8CRfQS p1dsQFDV+SJF8xhGMuWUgaTbCYtZNhbuLvGB5PXn/Oi4LHWOSXqw0htZBn035bJZ9Wdf kk6Q== 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=Bmxyh54lX6vx3ZvD3CMgQVOYil7AZCn1e5XpBZtA3TI=; b=PqWdXd/FODjqggNEnsYMZCU0l5n5v1yCzinNGbCM/r/NRh4kco1JZHshIBG7TJPlmi G+Mj9sKlb+neAOSFmIIUfg3qrO364afM9KcPK83IGBeRhyX6vED9pleExY4N+Is1P97f TeZa70N/RXohCJQRArq9cQNMQERge7tUaEFbrZctAYTafqimE8zGFQ3U/MfAiaFhQFna aHqqeMVn0tlAhKEgcR7xueu1JYjryQoztushx6Uw5Ka6CzDeI0JHOl8W4DRC9XXYA3G/ 9VManjhKVmlHlM/olYIoXn9epfqe30hGIDqDi7pMPTT7aWGu/YgXdZ8tYvvEBJtpSNYI HJhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Dxc66ArH; 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 q5-20020a170902788500b001967d895ce0si367473pll.213.2023.03.30.13.58.30; Thu, 30 Mar 2023 13:58:43 -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=Dxc66ArH; 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 S229711AbjC3UQR (ORCPT <rfc822;rua109.linux@gmail.com> + 99 others); Thu, 30 Mar 2023 16:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjC3UQP (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 30 Mar 2023 16:16:15 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE963D53B; Thu, 30 Mar 2023 13:16:11 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 05AA75FD0B; Thu, 30 Mar 2023 23:16:10 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680207370; bh=Bmxyh54lX6vx3ZvD3CMgQVOYil7AZCn1e5XpBZtA3TI=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=Dxc66ArHyPpBcSE8UnUuR5unLlbZsRAblKuFnLSsNz4AUg/lz0wbnVaho85ynfQy+ Iha6hIM9y5EEA75Q6Q038Sxd6CJgozGZyBSL3yUuMw0+ryyXbnUaZiVftUNTfqNZkK V9hs87zr6jSqy2seEbWTJNnFCujxCi8+pc92DqtW2UrwxtKvuiLHbaJuy7DfGCH9ko GxIMZBM3n5XxhV8bV3gtkxGJGk+Bgl/P96OSsPV6uipvlflL9mPYODUFUD9SuzQwcO i4KlytpmrbFQa23Su8SHhSo4VrGy706Aue0ShC80mwm1O7s7fOFHmpQlX/GOuca7L1 9/VaVPKMSlXjw== 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 23:16:09 +0300 (MSK) Message-ID: <a0915a9d-ba41-5a90-0e16-40c2315f0445@sberdevices.ru> Date: Thu, 30 Mar 2023 23:12:44 +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: <dead4842-333a-015e-028b-302151336ff9@sberdevices.ru> To: Stefan Hajnoczi <stefanha@redhat.com>, Stefano Garzarella <sgarzare@redhat.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Bobby Eshleman <bobby.eshleman@bytedance.com>, Bryan Tan <bryantan@vmware.com>, Vishnu Dasa <vdasa@vmware.com> CC: <kvm@vger.kernel.org>, <virtualization@lists.linux-foundation.org>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <kernel@sberdevices.ru>, <oxffffaa@gmail.com>, <avkrasnov@sberdevices.ru>, <pv-drivers@vmware.com> From: Arseniy Krasnov <avkrasnov@sberdevices.ru> Subject: [RFC PATCH v3 1/4] vsock/vmci: convert VMCI error code to -ENOMEM on send Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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/03/30 18:07:00 #21069213 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761827800671182787?= X-GMAIL-MSGID: =?utf-8?q?1761827800671182787?= |
Series |
vsock: return errors other than -ENOMEM to socket
|
|
Commit Message
Arseniy Krasnov
March 30, 2023, 8:12 p.m. UTC
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, which does not expect to get VMCI_ERROR_* values.
Fixes: c43170b7e157 ("vsock: return errors other than -ENOMEM to socket")
Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
---
net/vmw_vsock/vmci_transport.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Comments
> On Mar 30, 2023, at 1:12 PM, Arseniy Krasnov <AVKrasnov@sberdevices.ru> wrote: > > !! External Email > > 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, which does not expect to get VMCI_ERROR_* values. > > Fixes: c43170b7e157 ("vsock: return errors other than -ENOMEM to socket") > Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> Thanks, looks good to me. Reviewed-by: Vishnu Dasa <vdasa@vmware.com> > --- > net/vmw_vsock/vmci_transport.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c > index 36eb16a40745..95cc4d79ba29 100644 > --- a/net/vmw_vsock/vmci_transport.c > +++ b/net/vmw_vsock/vmci_transport.c > @@ -1842,7 +1842,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); > + ssize_t 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) > -- > 2.25.1 > > !! External Email: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.
On Thu, Mar 30, 2023 at 11:12:44PM +0300, Arseniy Krasnov wrote: >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, which does not expect to get VMCI_ERROR_* values. > >Fixes: c43170b7e157 ("vsock: return errors other than -ENOMEM to socket") >Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> >--- > net/vmw_vsock/vmci_transport.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) The patch LGTM, but I suggest to extract this patch from the series and send it directly to the net tree, while other patches can be sent to net-next. Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 36eb16a40745..95cc4d79ba29 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -1842,7 +1842,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); + ssize_t 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)