From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F14CC48BD1 for ; Wed, 9 Jun 2021 23:28:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6FF78613EA for ; Wed, 9 Jun 2021 23:28:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230001AbhFIX36 (ORCPT ); Wed, 9 Jun 2021 19:29:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229966AbhFIX36 (ORCPT ); Wed, 9 Jun 2021 19:29:58 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60B92C0617A6 for ; Wed, 9 Jun 2021 16:27:49 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id mp5-20020a17090b1905b029016dd057935fso2591563pjb.5 for ; Wed, 09 Jun 2021 16:27:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ryjTh+mD4YySh21tlg0ARtI0y9ZaLutIYM7xzEboUMM=; b=PGAajtMkuQ3LaeTRZIG07olMjiCPi1sq3ITEedmcyp4kGig8kV2hTPoI3NKR1B1a+E 8MeDJ3E5rcRaw7ehm8sgbCOJZsSlU3wxL1I1kkWGJHw8GfGA2VVggWGRCQl85yUFLIaF b6VAkSQrOHIuq/euJ1bRx9Jl62SkXI8en5mJuL64oPOMb0VY6wCZYa4i/UeyG0Wvyvj5 mDL8xJiHUkGbyJxM0c/SCIaJOiUow9O3q6HgxLoYfJ8rdGG0AVCj30CRyBNcgfEPyuW2 w3KYyJg2uij3Y7S1OWR87xbEYWkKXCZrsl/v+7BehEMo1x3WTj1Yfp1LetwJ32a0eONp 18tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ryjTh+mD4YySh21tlg0ARtI0y9ZaLutIYM7xzEboUMM=; b=HFe3hoTWmyo2OLKwA6WtXKDV4pc7Riw39FT0nOE5Y23KXGTrFnDhKMGxM5hgoQAoqD pvzCnnvn46wSiymJB+NrrT82PEqcrdI+0tTTVdEODn9zJLZg7bCLpEIxqQ+c8MmnmmYK 02Tenw/+NAMSI6YenYCj6jddRLhAu+drMFtWtuITjK1pbQ5uFEJK0+TPYGLQbl3huPRo BDBr3l4exJB872b1OJSv/+WdOOamvT9YA1bdWWB4QWuwW0HWV878CMUH3gu5dRXLhqvc JWzMM1Pf4S0qy+4xV8cgfxlK2EkEUHfoIsCeo9AfL7pw0lcrWVFq6PL89wvlLk6DpDul 3MNQ== X-Gm-Message-State: AOAM532FWM3OhKxvpeUYmNbQ2dnDYg23QKw7izzgRCQedqrfyj8q1wZA gVJImjgVZ8Mr178fHtVsEZvXFg== X-Google-Smtp-Source: ABdhPJxV7dXx9oYLLYKaZWYQUOlR4GVI03/GJ5W/+RMY3mRb75ZKPONwNUoGp6uEe7gqZSngjxUlYg== X-Received: by 2002:a17:90a:398f:: with SMTP id z15mr125059pjb.183.1623281268943; Wed, 09 Jun 2021 16:27:48 -0700 (PDT) Received: from n124-121-013.byted.org (ec2-54-241-92-238.us-west-1.compute.amazonaws.com. [54.241.92.238]) by smtp.gmail.com with ESMTPSA id k1sm526783pfa.30.2021.06.09.16.27.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jun 2021 16:27:48 -0700 (PDT) From: Jiang Wang To: sgarzare@redhat.com Cc: virtualization@lists.linux-foundation.org, stefanha@redhat.com, mst@redhat.com, arseny.krasnov@kaspersky.com, jhansen@vmware.comments, cong.wang@bytedance.com, duanxiongchun@bytedance.com, xieyongji@bytedance.com, chaiwen.cc@bytedance.com, Jason Wang , "David S. Miller" , Jakub Kicinski , Steven Rostedt , Ingo Molnar , Andra Paraschiv , Norbert Slusarek , Colin Ian King , Lu Wei , Alexander Popov , kvm@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC v1 5/6] vhost/vsock: add kconfig for vhost dgram support Date: Wed, 9 Jun 2021 23:24:57 +0000 Message-Id: <20210609232501.171257-6-jiang.wang@bytedance.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210609232501.171257-1-jiang.wang@bytedance.com> References: <20210609232501.171257-1-jiang.wang@bytedance.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Also change number of vqs according to the config Signed-off-by: Jiang Wang --- drivers/vhost/Kconfig | 8 ++++++++ drivers/vhost/vsock.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index 587fbae06182..d63fffee6007 100644 --- a/drivers/vhost/Kconfig +++ b/drivers/vhost/Kconfig @@ -61,6 +61,14 @@ config VHOST_VSOCK To compile this driver as a module, choose M here: the module will be called vhost_vsock. +config VHOST_VSOCK_DGRAM + bool "vhost vsock datagram sockets support" + depends on VHOST_VSOCK + default n + help + Enable vhost-vsock to support datagram types vsock. The QEMU + and the guest must support datagram types too to use it. + config VHOST_VDPA tristate "Vhost driver for vDPA-based backend" depends on EVENTFD diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index d366463be6d4..12ca1dc0268f 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -48,7 +48,11 @@ static DEFINE_READ_MOSTLY_HASHTABLE(vhost_vsock_hash, 8); struct vhost_vsock { struct vhost_dev dev; +#ifdef CONFIG_VHOST_VSOCK_DGRAM struct vhost_virtqueue vqs[4]; +#else + struct vhost_virtqueue vqs[2]; +#endif /* Link to global vhost_vsock_hash, writes use vhost_vsock_mutex */ struct hlist_node hash; @@ -763,15 +767,16 @@ static int vhost_vsock_dev_open(struct inode *inode, struct file *file) vqs[VSOCK_VQ_TX] = &vsock->vqs[VSOCK_VQ_TX]; vqs[VSOCK_VQ_RX] = &vsock->vqs[VSOCK_VQ_RX]; - vqs[VSOCK_VQ_DGRAM_TX] = &vsock->vqs[VSOCK_VQ_DGRAM_TX]; - vqs[VSOCK_VQ_DGRAM_RX] = &vsock->vqs[VSOCK_VQ_DGRAM_RX]; vsock->vqs[VSOCK_VQ_TX].handle_kick = vhost_vsock_handle_tx_kick; vsock->vqs[VSOCK_VQ_RX].handle_kick = vhost_vsock_handle_rx_kick; +#ifdef CONFIG_VHOST_VSOCK_DGRAM + vqs[VSOCK_VQ_DGRAM_TX] = &vsock->vqs[VSOCK_VQ_DGRAM_TX]; + vqs[VSOCK_VQ_DGRAM_RX] = &vsock->vqs[VSOCK_VQ_DGRAM_RX]; vsock->vqs[VSOCK_VQ_DGRAM_TX].handle_kick = vhost_vsock_handle_tx_kick; vsock->vqs[VSOCK_VQ_DGRAM_RX].handle_kick = vhost_vsock_handle_rx_kick; - +#endif vhost_dev_init(&vsock->dev, vqs, ARRAY_SIZE(vsock->vqs), UIO_MAXIOV, VHOST_VSOCK_PKT_WEIGHT, VHOST_VSOCK_WEIGHT, true, NULL); -- 2.11.0