Message ID | 20231214091947.395892-4-avkrasnov@salutedevices.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8418963dys; Thu, 14 Dec 2023 01:28:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IEbF74ksmbse42RlER4Yg3kdQ70BhJXXzFLXtRkOqqF3a7zKSg8upLWpIxV+xHbFDb0UopI X-Received: by 2002:a05:6830:1d8b:b0:6d9:da9f:fc53 with SMTP id y11-20020a0568301d8b00b006d9da9ffc53mr6430235oti.64.1702546129024; Thu, 14 Dec 2023 01:28:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702546128; cv=none; d=google.com; s=arc-20160816; b=ZZjf5Qlhlc4NxvruAi3aVesKnNN0rnYZOUcrMyiVowbxzvM/DI0/45kEw7aU79Kczj IRMDi1zCeKrrleW5uTBm8jaK/SoRIbDujTJFnIRYzB5/3OlPXn8PvmFU27gFFsOhx98e rv8xxpYIdgr0gTTQeFrU1XwVfXSDqj7RdTuNc+n4X0PjuibaL5/V/dXR/M2qfpy+zYVI P7yPYc2xjNJKlNfnUYGWDLTA7I4brQLacJ4rpxSl3Eat/txp7UMHR4RX7+ix1atS1n2Z CEbYqeGjt4b6qMy7VHn8vpk9jX+K83Kw9BLhwNE5jB+DGspqpBJtYHtPJX+xr3dfOaP6 uPrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=0RBX1gSVKWX3UaxLBIe2hHTepu0A3XDcBCnChfkFvN0=; fh=wIHqZpOIuzcidDZ82yQbOZuyHJty7uvaWDEh/efoVzA=; b=wHlddc1HiqIQaCMVcH9UwXdHHsBa3yLG+EDcsQ/WPW9Pu4XOz+D92w7k+j78am9frn 4ip1u2Bcvgy21Jiwx2+G9w1wgUh5Z4IlqtBi+OXwz0ecACRm/auG9NurRUny4dPw6cf5 qVQWh7uxkI0fmaowOkak79QWLGGOga/IKTD/BTeyRi4HhSMoywn1wnBgmqqSR5HbQJIm GV3DtzZv9y9Gw2q2ryiNQPC5EIp29+GLYjNarrtpJT/2XB9UTHn6hKwgRw9TEIZUePk0 vCvGz2QHWJP4BeR5TKYlm2AjB9uLAz5EOJ/tvr3WJf0ZiHN1At3gKp8nc1SfLVSwoNvD VoNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=AJ3TwmWl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id w189-20020a6362c6000000b005c6b97e40c4si10492039pgb.297.2023.12.14.01.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 01:28:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=AJ3TwmWl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 37ADA81F3837; Thu, 14 Dec 2023 01:28:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235600AbjLNJ2d (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Thu, 14 Dec 2023 04:28:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235450AbjLNJ2T (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 14 Dec 2023 04:28:19 -0500 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2D6F11A; Thu, 14 Dec 2023 01:28:24 -0800 (PST) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 4302610006E; Thu, 14 Dec 2023 12:28:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 4302610006E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1702546103; bh=0RBX1gSVKWX3UaxLBIe2hHTepu0A3XDcBCnChfkFvN0=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=AJ3TwmWlpDjjeHPt+ZUgTzYHK9Z7uErs4buAMpd08JOTT/ZFnEe+NNsQ4CU1gqXsU tXQ5Q7Q/+DtUn8rvA6RvO2yFQ4PTLz4XCMqQ+xZhwa1ObsnxGWRQ46ZDNKzSOW/CD6 jWiDqoM7xtA2NvNTpEBZSCreSpwrtCxusxYe9s79HsGVdIPlWXnL+NRLdTlWgR+IfK ExX8jxTV6hv/t000lwTmi8cPuR8Sr0QTUxNWtABUN/QvCQ1VsWZDuNu0ckIsS4WxEr nSf0bgYXOFk4I1og+l0Z4Su9OVsOebOpHRUurixN1n42FqNu0lV3DOrHAhIY5cy7JU /pbQQW5nUK/LA== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Thu, 14 Dec 2023 12:28:23 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Thu, 14 Dec 2023 12:28:22 +0300 From: Arseniy Krasnov <avkrasnov@salutedevices.com> 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>, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, Bobby Eshleman <bobby.eshleman@bytedance.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@salutedevices.com> Subject: [PATCH net-next v9 3/4] vsock: update SO_RCVLOWAT setting callback Date: Thu, 14 Dec 2023 12:19:46 +0300 Message-ID: <20231214091947.395892-4-avkrasnov@salutedevices.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20231214091947.395892-1-avkrasnov@salutedevices.com> References: <20231214091947.395892-1-avkrasnov@salutedevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 182105 [Dec 14 2023] X-KSMG-AntiSpam-Version: 6.1.0.3 X-KSMG-AntiSpam-Envelope-From: avkrasnov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;smtp.sberdevices.ru:5.0.1,7.1.1;100.64.160.123:7.1.2;salutedevices.com:7.1.1;127.0.0.199:7.1.2, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/12/14 08:33:00 #22688916 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 14 Dec 2023 01:28:46 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785249010132983359 X-GMAIL-MSGID: 1785249010132983359 |
Series |
send credit update during setting SO_RCVLOWAT
|
|
Commit Message
Arseniy Krasnov
Dec. 14, 2023, 9:19 a.m. UTC
Do not return if transport callback for SO_RCVLOWAT is set (only in error case). In this case we don't need to set 'sk_rcvlowat' field in each transport - only in 'vsock_set_rcvlowat()'. Also, if 'sk_rcvlowat' is now set only in af_vsock.c, change callback name from 'set_rcvlowat' to 'notify_set_rcvlowat'. Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> --- Changelog: v3 -> v4: * Rename 'set_rcvlowat' to 'notify_set_rcvlowat'. * Commit message updated. include/net/af_vsock.h | 2 +- net/vmw_vsock/af_vsock.c | 9 +++++++-- net/vmw_vsock/hyperv_transport.c | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-)
Comments
On Thu, Dec 14, 2023 at 12:19:46PM +0300, Arseniy Krasnov wrote: > Do not return if transport callback for SO_RCVLOWAT is set (only in > error case). In this case we don't need to set 'sk_rcvlowat' field in > each transport - only in 'vsock_set_rcvlowat()'. Also, if 'sk_rcvlowat' > is now set only in af_vsock.c, change callback name from 'set_rcvlowat' > to 'notify_set_rcvlowat'. > > Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> > Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> > Acked-by: Michael S. Tsirkin <mst@redhat.com> Maybe squash this with patch 2/4? > --- > Changelog: > v3 -> v4: > * Rename 'set_rcvlowat' to 'notify_set_rcvlowat'. > * Commit message updated. > > include/net/af_vsock.h | 2 +- > net/vmw_vsock/af_vsock.c | 9 +++++++-- > net/vmw_vsock/hyperv_transport.c | 4 ++-- > 3 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h > index e302c0e804d0..535701efc1e5 100644 > --- a/include/net/af_vsock.h > +++ b/include/net/af_vsock.h > @@ -137,7 +137,6 @@ struct vsock_transport { > u64 (*stream_rcvhiwat)(struct vsock_sock *); > bool (*stream_is_active)(struct vsock_sock *); > bool (*stream_allow)(u32 cid, u32 port); > - int (*set_rcvlowat)(struct vsock_sock *vsk, int val); > > /* SEQ_PACKET. */ > ssize_t (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg, > @@ -168,6 +167,7 @@ struct vsock_transport { > struct vsock_transport_send_notify_data *); > /* sk_lock held by the caller */ > void (*notify_buffer_size)(struct vsock_sock *, u64 *); > + int (*notify_set_rcvlowat)(struct vsock_sock *vsk, int val); > > /* Shutdown. */ > int (*shutdown)(struct vsock_sock *, int); > diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c > index 816725af281f..54ba7316f808 100644 > --- a/net/vmw_vsock/af_vsock.c > +++ b/net/vmw_vsock/af_vsock.c > @@ -2264,8 +2264,13 @@ static int vsock_set_rcvlowat(struct sock *sk, int val) > > transport = vsk->transport; > > - if (transport && transport->set_rcvlowat) > - return transport->set_rcvlowat(vsk, val); > + if (transport && transport->notify_set_rcvlowat) { > + int err; > + > + err = transport->notify_set_rcvlowat(vsk, val); > + if (err) > + return err; > + } > > WRITE_ONCE(sk->sk_rcvlowat, val ? : 1); > return 0; I would s > diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c > index 7cb1a9d2cdb4..e2157e387217 100644 > --- a/net/vmw_vsock/hyperv_transport.c > +++ b/net/vmw_vsock/hyperv_transport.c > @@ -816,7 +816,7 @@ int hvs_notify_send_post_enqueue(struct vsock_sock *vsk, ssize_t written, > } > > static > -int hvs_set_rcvlowat(struct vsock_sock *vsk, int val) > +int hvs_notify_set_rcvlowat(struct vsock_sock *vsk, int val) > { > return -EOPNOTSUPP; > } > @@ -856,7 +856,7 @@ static struct vsock_transport hvs_transport = { > .notify_send_pre_enqueue = hvs_notify_send_pre_enqueue, > .notify_send_post_enqueue = hvs_notify_send_post_enqueue, > > - .set_rcvlowat = hvs_set_rcvlowat > + .notify_set_rcvlowat = hvs_notify_set_rcvlowat > }; > > static bool hvs_check_transport(struct vsock_sock *vsk) > -- > 2.25.1
On 14.12.2023 13:29, Michael S. Tsirkin wrote: > On Thu, Dec 14, 2023 at 12:19:46PM +0300, Arseniy Krasnov wrote: >> Do not return if transport callback for SO_RCVLOWAT is set (only in >> error case). In this case we don't need to set 'sk_rcvlowat' field in >> each transport - only in 'vsock_set_rcvlowat()'. Also, if 'sk_rcvlowat' >> is now set only in af_vsock.c, change callback name from 'set_rcvlowat' >> to 'notify_set_rcvlowat'. >> >> Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> >> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> >> Acked-by: Michael S. Tsirkin <mst@redhat.com> > > Maybe squash this with patch 2/4? You mean just do 'git squash' without updating commit message manually? Thanks, Arseniy > >> --- >> Changelog: >> v3 -> v4: >> * Rename 'set_rcvlowat' to 'notify_set_rcvlowat'. >> * Commit message updated. >> >> include/net/af_vsock.h | 2 +- >> net/vmw_vsock/af_vsock.c | 9 +++++++-- >> net/vmw_vsock/hyperv_transport.c | 4 ++-- >> 3 files changed, 10 insertions(+), 5 deletions(-) >> >> diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h >> index e302c0e804d0..535701efc1e5 100644 >> --- a/include/net/af_vsock.h >> +++ b/include/net/af_vsock.h >> @@ -137,7 +137,6 @@ struct vsock_transport { >> u64 (*stream_rcvhiwat)(struct vsock_sock *); >> bool (*stream_is_active)(struct vsock_sock *); >> bool (*stream_allow)(u32 cid, u32 port); >> - int (*set_rcvlowat)(struct vsock_sock *vsk, int val); >> >> /* SEQ_PACKET. */ >> ssize_t (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg, >> @@ -168,6 +167,7 @@ struct vsock_transport { >> struct vsock_transport_send_notify_data *); >> /* sk_lock held by the caller */ >> void (*notify_buffer_size)(struct vsock_sock *, u64 *); >> + int (*notify_set_rcvlowat)(struct vsock_sock *vsk, int val); >> >> /* Shutdown. */ >> int (*shutdown)(struct vsock_sock *, int); >> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >> index 816725af281f..54ba7316f808 100644 >> --- a/net/vmw_vsock/af_vsock.c >> +++ b/net/vmw_vsock/af_vsock.c >> @@ -2264,8 +2264,13 @@ static int vsock_set_rcvlowat(struct sock *sk, int val) >> >> transport = vsk->transport; >> >> - if (transport && transport->set_rcvlowat) >> - return transport->set_rcvlowat(vsk, val); >> + if (transport && transport->notify_set_rcvlowat) { >> + int err; >> + >> + err = transport->notify_set_rcvlowat(vsk, val); >> + if (err) >> + return err; >> + } >> >> WRITE_ONCE(sk->sk_rcvlowat, val ? : 1); >> return 0; > > > > I would s > >> diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c >> index 7cb1a9d2cdb4..e2157e387217 100644 >> --- a/net/vmw_vsock/hyperv_transport.c >> +++ b/net/vmw_vsock/hyperv_transport.c >> @@ -816,7 +816,7 @@ int hvs_notify_send_post_enqueue(struct vsock_sock *vsk, ssize_t written, >> } >> >> static >> -int hvs_set_rcvlowat(struct vsock_sock *vsk, int val) >> +int hvs_notify_set_rcvlowat(struct vsock_sock *vsk, int val) >> { >> return -EOPNOTSUPP; >> } >> @@ -856,7 +856,7 @@ static struct vsock_transport hvs_transport = { >> .notify_send_pre_enqueue = hvs_notify_send_pre_enqueue, >> .notify_send_post_enqueue = hvs_notify_send_post_enqueue, >> >> - .set_rcvlowat = hvs_set_rcvlowat >> + .notify_set_rcvlowat = hvs_notify_set_rcvlowat >> }; >> >> static bool hvs_check_transport(struct vsock_sock *vsk) >> -- >> 2.25.1 >
On Thu, Dec 14, 2023 at 01:52:50PM +0300, Arseniy Krasnov wrote: > > > On 14.12.2023 13:29, Michael S. Tsirkin wrote: > > On Thu, Dec 14, 2023 at 12:19:46PM +0300, Arseniy Krasnov wrote: > >> Do not return if transport callback for SO_RCVLOWAT is set (only in > >> error case). In this case we don't need to set 'sk_rcvlowat' field in > >> each transport - only in 'vsock_set_rcvlowat()'. Also, if 'sk_rcvlowat' > >> is now set only in af_vsock.c, change callback name from 'set_rcvlowat' > >> to 'notify_set_rcvlowat'. > >> > >> Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> > >> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> > >> Acked-by: Michael S. Tsirkin <mst@redhat.com> > > > > Maybe squash this with patch 2/4? > > You mean just do 'git squash' without updating commit message manually? > > Thanks, Arseniy commit message should reflect all that patch does. > > > >> --- > >> Changelog: > >> v3 -> v4: > >> * Rename 'set_rcvlowat' to 'notify_set_rcvlowat'. > >> * Commit message updated. > >> > >> include/net/af_vsock.h | 2 +- > >> net/vmw_vsock/af_vsock.c | 9 +++++++-- > >> net/vmw_vsock/hyperv_transport.c | 4 ++-- > >> 3 files changed, 10 insertions(+), 5 deletions(-) > >> > >> diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h > >> index e302c0e804d0..535701efc1e5 100644 > >> --- a/include/net/af_vsock.h > >> +++ b/include/net/af_vsock.h > >> @@ -137,7 +137,6 @@ struct vsock_transport { > >> u64 (*stream_rcvhiwat)(struct vsock_sock *); > >> bool (*stream_is_active)(struct vsock_sock *); > >> bool (*stream_allow)(u32 cid, u32 port); > >> - int (*set_rcvlowat)(struct vsock_sock *vsk, int val); > >> > >> /* SEQ_PACKET. */ > >> ssize_t (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg, > >> @@ -168,6 +167,7 @@ struct vsock_transport { > >> struct vsock_transport_send_notify_data *); > >> /* sk_lock held by the caller */ > >> void (*notify_buffer_size)(struct vsock_sock *, u64 *); > >> + int (*notify_set_rcvlowat)(struct vsock_sock *vsk, int val); > >> > >> /* Shutdown. */ > >> int (*shutdown)(struct vsock_sock *, int); > >> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c > >> index 816725af281f..54ba7316f808 100644 > >> --- a/net/vmw_vsock/af_vsock.c > >> +++ b/net/vmw_vsock/af_vsock.c > >> @@ -2264,8 +2264,13 @@ static int vsock_set_rcvlowat(struct sock *sk, int val) > >> > >> transport = vsk->transport; > >> > >> - if (transport && transport->set_rcvlowat) > >> - return transport->set_rcvlowat(vsk, val); > >> + if (transport && transport->notify_set_rcvlowat) { > >> + int err; > >> + > >> + err = transport->notify_set_rcvlowat(vsk, val); > >> + if (err) > >> + return err; > >> + } > >> > >> WRITE_ONCE(sk->sk_rcvlowat, val ? : 1); > >> return 0; > > > > > > > > I would s > > > >> diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c > >> index 7cb1a9d2cdb4..e2157e387217 100644 > >> --- a/net/vmw_vsock/hyperv_transport.c > >> +++ b/net/vmw_vsock/hyperv_transport.c > >> @@ -816,7 +816,7 @@ int hvs_notify_send_post_enqueue(struct vsock_sock *vsk, ssize_t written, > >> } > >> > >> static > >> -int hvs_set_rcvlowat(struct vsock_sock *vsk, int val) > >> +int hvs_notify_set_rcvlowat(struct vsock_sock *vsk, int val) > >> { > >> return -EOPNOTSUPP; > >> } > >> @@ -856,7 +856,7 @@ static struct vsock_transport hvs_transport = { > >> .notify_send_pre_enqueue = hvs_notify_send_pre_enqueue, > >> .notify_send_post_enqueue = hvs_notify_send_post_enqueue, > >> > >> - .set_rcvlowat = hvs_set_rcvlowat > >> + .notify_set_rcvlowat = hvs_notify_set_rcvlowat > >> }; > >> > >> static bool hvs_check_transport(struct vsock_sock *vsk) > >> -- > >> 2.25.1 > >
On 14.12.2023 13:29, Michael S. Tsirkin wrote: > On Thu, Dec 14, 2023 at 12:19:46PM +0300, Arseniy Krasnov wrote: >> Do not return if transport callback for SO_RCVLOWAT is set (only in >> error case). In this case we don't need to set 'sk_rcvlowat' field in >> each transport - only in 'vsock_set_rcvlowat()'. Also, if 'sk_rcvlowat' >> is now set only in af_vsock.c, change callback name from 'set_rcvlowat' >> to 'notify_set_rcvlowat'. >> >> Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> >> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> >> Acked-by: Michael S. Tsirkin <mst@redhat.com> > > Maybe squash this with patch 2/4? Done in v10 Thanks, Arseniy > >> --- >> Changelog: >> v3 -> v4: >> * Rename 'set_rcvlowat' to 'notify_set_rcvlowat'. >> * Commit message updated. >> >> include/net/af_vsock.h | 2 +- >> net/vmw_vsock/af_vsock.c | 9 +++++++-- >> net/vmw_vsock/hyperv_transport.c | 4 ++-- >> 3 files changed, 10 insertions(+), 5 deletions(-) >> >> diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h >> index e302c0e804d0..535701efc1e5 100644 >> --- a/include/net/af_vsock.h >> +++ b/include/net/af_vsock.h >> @@ -137,7 +137,6 @@ struct vsock_transport { >> u64 (*stream_rcvhiwat)(struct vsock_sock *); >> bool (*stream_is_active)(struct vsock_sock *); >> bool (*stream_allow)(u32 cid, u32 port); >> - int (*set_rcvlowat)(struct vsock_sock *vsk, int val); >> >> /* SEQ_PACKET. */ >> ssize_t (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg, >> @@ -168,6 +167,7 @@ struct vsock_transport { >> struct vsock_transport_send_notify_data *); >> /* sk_lock held by the caller */ >> void (*notify_buffer_size)(struct vsock_sock *, u64 *); >> + int (*notify_set_rcvlowat)(struct vsock_sock *vsk, int val); >> >> /* Shutdown. */ >> int (*shutdown)(struct vsock_sock *, int); >> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >> index 816725af281f..54ba7316f808 100644 >> --- a/net/vmw_vsock/af_vsock.c >> +++ b/net/vmw_vsock/af_vsock.c >> @@ -2264,8 +2264,13 @@ static int vsock_set_rcvlowat(struct sock *sk, int val) >> >> transport = vsk->transport; >> >> - if (transport && transport->set_rcvlowat) >> - return transport->set_rcvlowat(vsk, val); >> + if (transport && transport->notify_set_rcvlowat) { >> + int err; >> + >> + err = transport->notify_set_rcvlowat(vsk, val); >> + if (err) >> + return err; >> + } >> >> WRITE_ONCE(sk->sk_rcvlowat, val ? : 1); >> return 0; > > > > I would s > >> diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c >> index 7cb1a9d2cdb4..e2157e387217 100644 >> --- a/net/vmw_vsock/hyperv_transport.c >> +++ b/net/vmw_vsock/hyperv_transport.c >> @@ -816,7 +816,7 @@ int hvs_notify_send_post_enqueue(struct vsock_sock *vsk, ssize_t written, >> } >> >> static >> -int hvs_set_rcvlowat(struct vsock_sock *vsk, int val) >> +int hvs_notify_set_rcvlowat(struct vsock_sock *vsk, int val) >> { >> return -EOPNOTSUPP; >> } >> @@ -856,7 +856,7 @@ static struct vsock_transport hvs_transport = { >> .notify_send_pre_enqueue = hvs_notify_send_pre_enqueue, >> .notify_send_post_enqueue = hvs_notify_send_post_enqueue, >> >> - .set_rcvlowat = hvs_set_rcvlowat >> + .notify_set_rcvlowat = hvs_notify_set_rcvlowat >> }; >> >> static bool hvs_check_transport(struct vsock_sock *vsk) >> -- >> 2.25.1 >
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index e302c0e804d0..535701efc1e5 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -137,7 +137,6 @@ struct vsock_transport { u64 (*stream_rcvhiwat)(struct vsock_sock *); bool (*stream_is_active)(struct vsock_sock *); bool (*stream_allow)(u32 cid, u32 port); - int (*set_rcvlowat)(struct vsock_sock *vsk, int val); /* SEQ_PACKET. */ ssize_t (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg, @@ -168,6 +167,7 @@ struct vsock_transport { struct vsock_transport_send_notify_data *); /* sk_lock held by the caller */ void (*notify_buffer_size)(struct vsock_sock *, u64 *); + int (*notify_set_rcvlowat)(struct vsock_sock *vsk, int val); /* Shutdown. */ int (*shutdown)(struct vsock_sock *, int); diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 816725af281f..54ba7316f808 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -2264,8 +2264,13 @@ static int vsock_set_rcvlowat(struct sock *sk, int val) transport = vsk->transport; - if (transport && transport->set_rcvlowat) - return transport->set_rcvlowat(vsk, val); + if (transport && transport->notify_set_rcvlowat) { + int err; + + err = transport->notify_set_rcvlowat(vsk, val); + if (err) + return err; + } WRITE_ONCE(sk->sk_rcvlowat, val ? : 1); return 0; diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c index 7cb1a9d2cdb4..e2157e387217 100644 --- a/net/vmw_vsock/hyperv_transport.c +++ b/net/vmw_vsock/hyperv_transport.c @@ -816,7 +816,7 @@ int hvs_notify_send_post_enqueue(struct vsock_sock *vsk, ssize_t written, } static -int hvs_set_rcvlowat(struct vsock_sock *vsk, int val) +int hvs_notify_set_rcvlowat(struct vsock_sock *vsk, int val) { return -EOPNOTSUPP; } @@ -856,7 +856,7 @@ static struct vsock_transport hvs_transport = { .notify_send_pre_enqueue = hvs_notify_send_pre_enqueue, .notify_send_post_enqueue = hvs_notify_send_post_enqueue, - .set_rcvlowat = hvs_set_rcvlowat + .notify_set_rcvlowat = hvs_notify_set_rcvlowat }; static bool hvs_check_transport(struct vsock_sock *vsk)