From patchwork Wed Jul 19 00:50:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bobby Eshleman X-Patchwork-Id: 122338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2111959vqt; Tue, 18 Jul 2023 17:53:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlGRHHDhCOwOgiwTZvtcQ6SUPGV1whFiZzjsGiXQ431vvJ5AGy4GV3c7KAFFS0tNTvGMiNjd X-Received: by 2002:a17:90a:de08:b0:263:856:fcdf with SMTP id m8-20020a17090ade0800b002630856fcdfmr13807852pjv.12.1689728012808; Tue, 18 Jul 2023 17:53:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689728012; cv=none; d=google.com; s=arc-20160816; b=dgJBxMNegyfkgwNL4TOopgM+dH5Omc2XiiPQSKphX+MPIGrAlfDw+nOYUgoIUeDE7C h0RexqRmzjWtelClkJyicqM5E/8+t4p1k75Mla4frFHcGB2OqEeadUa+1kxHNsmpccb0 9DsMBGWZlgoJAkXLD2LTGNll35NGXVBFS75QylSi2r1dcW+2zBEj6b2d/ac7QtI0GpjG 2IdYXkbCkKmM9aODJxRZOsXoScJcGlFKb5qoxuike0hwWXGBDd2U1cLk88XPgh4RE1nU Al0LkRopkFmAv49+GxDqHyRSjJ6y86sXCz0LYdcgNMy91stjkiQZGlr5fn4MwpjeHkga KC2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=YwyL60j0LwW2T2Dkd6jqyPcZMdC5174wawCzrtawFxQ=; fh=jejeGpHkr9vVlEyvdVBCSLFut92eNP6vAI+O1tx9vp4=; b=g1P/One1cZMdWIbYR/HZV36ZzKw3GIZ5DKsSJ/vukx0pmwnt4/ADekJFaHoeUoXD5q K/L+Xxc1nk5AyjOXGDZ+ygS3+etYVwzfMbEGo+TNq1l4fLROa9h/EcI4DxzyLbEYHbGE DoKAPg2TbxsyOFMA5O/OpGVxfS1JEPjDl9I5cPFicyJ9ylY1USWBDD4lMZCvW3m5u3nj Hbe+G2IuGL2fi/7VYmee0KhKyDstXe+YgdfcluRDcGqfD/qf19q12cDbeSe51eHDgyGZ U7Duu/aLR3U5x+39rfpgnbTCAi2kiaQgbVygOH6k1givuS0gyymPWskIGbmYY28VCm7g 98Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=ZkFEdOwq; 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=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c64-20020a17090a494600b0025e2c7b1808si347139pjh.53.2023.07.18.17.53.18; Tue, 18 Jul 2023 17:53:32 -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=@bytedance.com header.s=google header.b=ZkFEdOwq; 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=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230227AbjGSAvl (ORCPT + 99 others); Tue, 18 Jul 2023 20:51:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229982AbjGSAvE (ORCPT ); Tue, 18 Jul 2023 20:51:04 -0400 Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 870831BCF for ; Tue, 18 Jul 2023 17:50:21 -0700 (PDT) Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-7653bd3ff2fso692933885a.3 for ; Tue, 18 Jul 2023 17:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1689727820; x=1692319820; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=YwyL60j0LwW2T2Dkd6jqyPcZMdC5174wawCzrtawFxQ=; b=ZkFEdOwq2hZ+UH9aki+OAvh12b03IsfbbmomV42Sr1oO//aaD/ebgnltz0if5zRzRw kCGRgBejlVJSBR9faXcL/Z8lb42tToOWyKuRZ+r3kWDkLsDHjG4IF9hdeXjcgq1Ar8jo lAo/AmRop4+65XfBpTe/ZmLw1ghMlUHtIR40H3XQ2eB2SPJpch9esUCy5wXwCZQw16Qo hNgaft6pooZorRPl7hGLkwGEPqVfd8l6hmVe5xLVgj5hO4IDDZ/55DxLee2KXx8fs05/ jWkktHeT52LbTUtU39jx9vsn5jSdLBBRa4eTV8RhXslnxpjudAQmXfWck7XOMm3qbTca Zvtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689727820; x=1692319820; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YwyL60j0LwW2T2Dkd6jqyPcZMdC5174wawCzrtawFxQ=; b=OqEytgznZSSxSDRQiUKNJIdmUleRFzGLLTFVHYV7gZl3mnSJHmrjV4w8TI/KdpV6Do BX1OaKc4+KJNDuYxDsdWjsk48WKcXr0a6mjW+X9+xqGESN3Epz9gtjvwAcqay/bmv8rr NplXaJ99NEOFpwXb/r9cjIIDHKeiu6Hkgs8AQwtywH4BZgkuoCgi8QyQq8O4ERIWaw/m 4qBhifQtOXw1hjGV424W+qLe6ZD3wl1tTNTFgvDBsj1q1XNCVoeKAOguDudOblADcsT4 Td3KCsI2KmgxZDrQhOmxVhRd9N5Lp3Q69W/9Hk8Aksfso8ptWUk5d2aOqOmz0I4vKrSR wunA== X-Gm-Message-State: ABy/qLZFpNz6tMRHPmKIxYDWCrRUlBB9f1wXWLzrMlbQXgG2C4UF7zk5 vYjHe6bBSzxv4zVSx+0Ewa1p+g== X-Received: by 2002:a05:620a:2687:b0:767:3fa7:2afa with SMTP id c7-20020a05620a268700b007673fa72afamr20697364qkp.28.1689727820255; Tue, 18 Jul 2023 17:50:20 -0700 (PDT) Received: from [172.17.0.7] ([130.44.212.112]) by smtp.gmail.com with ESMTPSA id c5-20020a05620a11a500b0076738337cd1sm968696qkk.1.2023.07.18.17.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 17:50:19 -0700 (PDT) From: Bobby Eshleman Date: Wed, 19 Jul 2023 00:50:17 +0000 Subject: [PATCH RFC net-next v5 13/14] virtio/vsock: implement datagram support MIME-Version: 1.0 Message-Id: <20230413-b4-vsock-dgram-v5-13-581bd37fdb26@bytedance.com> References: <20230413-b4-vsock-dgram-v5-0-581bd37fdb26@bytedance.com> In-Reply-To: <20230413-b4-vsock-dgram-v5-0-581bd37fdb26@bytedance.com> To: Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Bryan Tan , Vishnu Dasa , VMware PV-Drivers Reviewers Cc: Dan Carpenter , Simon Horman , Krasnov Arseniy , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, bpf@vger.kernel.org, Bobby Eshleman X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1771808240551120610 X-GMAIL-MSGID: 1771808240551120610 This commit implements datagram support for virtio/vsock by teaching virtio to use the general virtio transport ->dgram_addr_init() function and implementation a new version of ->dgram_allow(). Additionally, it drops virtio_transport_dgram_allow() as an exported symbol because it is no longer used in other transports. Signed-off-by: Bobby Eshleman --- include/linux/virtio_vsock.h | 1 - net/vmw_vsock/virtio_transport.c | 24 +++++++++++++++++++++++- net/vmw_vsock/virtio_transport_common.c | 6 ------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index b3856b8a42b3..d0a4f08b12c1 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -211,7 +211,6 @@ void virtio_transport_notify_buffer_size(struct vsock_sock *vsk, u64 *val); u64 virtio_transport_stream_rcvhiwat(struct vsock_sock *vsk); bool virtio_transport_stream_is_active(struct vsock_sock *vsk); bool virtio_transport_stream_allow(u32 cid, u32 port); -bool virtio_transport_dgram_allow(u32 cid, u32 port); void virtio_transport_dgram_addr_init(struct sk_buff *skb, struct sockaddr_vm *addr); diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index ac2126c7dac5..713718861bd4 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -63,6 +63,7 @@ struct virtio_vsock { u32 guest_cid; bool seqpacket_allow; + bool dgram_allow; }; static u32 virtio_transport_get_local_cid(void) @@ -413,6 +414,7 @@ static void virtio_vsock_rx_done(struct virtqueue *vq) queue_work(virtio_vsock_workqueue, &vsock->rx_work); } +static bool virtio_transport_dgram_allow(u32 cid, u32 port); static bool virtio_transport_seqpacket_allow(u32 remote_cid); static struct virtio_transport virtio_transport = { @@ -430,6 +432,7 @@ static struct virtio_transport virtio_transport = { .dgram_enqueue = virtio_transport_dgram_enqueue, .dgram_allow = virtio_transport_dgram_allow, + .dgram_addr_init = virtio_transport_dgram_addr_init, .stream_dequeue = virtio_transport_stream_dequeue, .stream_enqueue = virtio_transport_stream_enqueue, @@ -462,6 +465,21 @@ static struct virtio_transport virtio_transport = { .send_pkt = virtio_transport_send_pkt, }; +static bool virtio_transport_dgram_allow(u32 cid, u32 port) +{ + struct virtio_vsock *vsock; + bool dgram_allow; + + dgram_allow = false; + rcu_read_lock(); + vsock = rcu_dereference(the_virtio_vsock); + if (vsock) + dgram_allow = vsock->dgram_allow; + rcu_read_unlock(); + + return dgram_allow; +} + static bool virtio_transport_seqpacket_allow(u32 remote_cid) { struct virtio_vsock *vsock; @@ -655,6 +673,9 @@ static int virtio_vsock_probe(struct virtio_device *vdev) if (virtio_has_feature(vdev, VIRTIO_VSOCK_F_SEQPACKET)) vsock->seqpacket_allow = true; + if (virtio_has_feature(vdev, VIRTIO_VSOCK_F_DGRAM)) + vsock->dgram_allow = true; + vdev->priv = vsock; ret = virtio_vsock_vqs_init(vsock); @@ -747,7 +768,8 @@ static struct virtio_device_id id_table[] = { }; static unsigned int features[] = { - VIRTIO_VSOCK_F_SEQPACKET + VIRTIO_VSOCK_F_SEQPACKET, + VIRTIO_VSOCK_F_DGRAM }; static struct virtio_driver virtio_vsock_driver = { diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 96118e258097..77898f5325cd 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -783,12 +783,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port) } EXPORT_SYMBOL_GPL(virtio_transport_stream_allow); -bool virtio_transport_dgram_allow(u32 cid, u32 port) -{ - return false; -} -EXPORT_SYMBOL_GPL(virtio_transport_dgram_allow); - int virtio_transport_connect(struct vsock_sock *vsk) { struct virtio_vsock_pkt_info info = {