From patchwork Fri Aug 26 10:56:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Xu X-Patchwork-Id: 1670656 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MDcJ3180Wz1yhX for ; Fri, 26 Aug 2022 20:58:09 +1000 (AEST) Received: from localhost ([::1]:36496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRX2L-0002nc-Cg for incoming@patchwork.ozlabs.org; Fri, 26 Aug 2022 06:58:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRX0z-0002eq-3o for qemu-devel@nongnu.org; Fri, 26 Aug 2022 06:56:41 -0400 Received: from out30-45.freemail.mail.aliyun.com ([115.124.30.45]:36495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRX0q-00014z-QE for qemu-devel@nongnu.org; Fri, 26 Aug 2022 06:56:35 -0400 X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R511e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=ay29a033018045176; MF=kangjie.xu@linux.alibaba.com; NM=1; PH=DS; RN=6; SR=0; TI=SMTPD_---0VNIuqEI_1661511380; Received: from localhost(mailfrom:kangjie.xu@linux.alibaba.com fp:SMTPD_---0VNIuqEI_1661511380) by smtp.aliyun-inc.com; Fri, 26 Aug 2022 18:56:21 +0800 From: Kangjie Xu To: qemu-devel@nongnu.org Cc: mst@redhat.com, jasowang@redhat.com, arei.gonglei@huawei.com, hengqi@linux.alibaba.com, xuanzhuo@linux.alibaba.com Subject: [PATCH 0/8] Support VIRTIO_F_RING_RESET for vhost-user in virtio pci-modern Date: Fri, 26 Aug 2022 18:56:12 +0800 Message-Id: X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=115.124.30.45; envelope-from=kangjie.xu@linux.alibaba.com; helo=out30-45.freemail.mail.aliyun.com X-Spam_score_int: -98 X-Spam_score: -9.9 X-Spam_bar: --------- X-Spam_report: (-9.9 / 5.0 requ) BAYES_00=-1.9, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch set is based on the patch set that supports VIRTIO_F_RING_RESET for vhost-kernel: https://lore.kernel.org/qemu-devel/cover.1661414345.git.kangjie.xu@linux.alibaba.com/T/ The virtio queue reset function has already been defined in the virtio spec 1.2. The relevant virtio spec information is here: https://github.com/oasis-tcs/virtio-spec/issues/124 https://github.com/oasis-tcs/virtio-spec/issues/139 This patch set is to support this function for vhost-user in QEMU. It consists of several parts: Patch 1: docs about vhost-user message VHOST_USER_RESET_VRING. Patch 2: rename vhost_set_vring_enable to vhost_set_dev_enable. Patches 3-4: support in vhost-user module. Patches 5-6: support in vhost-net module. Patch 7: support in virtio-net module. Patch 8: add feature negotitation support. The process of virtqueue reset can be concluded as: 1. The virtqueue is disabled when VIRTIO_PCI_COMMON_Q_RESET is written. 2. Then the virtqueue can be optionally restarted(re-enabled). The detailed process is listed below: 1. VIRTIO_PCI_COMMON_Q_RESET is written [virtio-pci] -> virtio_queue_reset() [virtio] -> virtio_net_queue_reset() [virtio-net] -> vhost_net_virtqueue_reset() [vhost-net] -> vhost_user_reset_vring() [vhost-user] -> send VHOST_USER_RESET_VRING to the device -> vhost_virtqueue_unmap() -> __virtio_queue_reset() 2. VIRTIO_PCI_COMMON_Q_ENABLE is written [virtio-pci] -> virtio_queue_enable() [virtio] -> virtio_net_queue_enable() [virtio-net] -> vhost_net_virtqueue_restart() [vhost-net] -> vhost_virtqueue_start() -> vhost_user_set_vring_enable [vhost-user] -> send VHOST_USER_SET_VRING_ENABLE to the device -> set enabled, reset status of vq. Test environment: Qemu: QEMU emulator version 7.0.50 Guest: 5.19.0-rc3 (With vq reset support) DPDK: 22.07-rc1 (With vq reset support) Test Cmd: ethtool -g eth1; ethtool -G eth1 rx $1 tx $2; ethtool -g eth1; The drvier can resize the virtio queue, then virtio queue reset function should be triggered. The default is split mode, modify Qemu virtio-net to add PACKED feature to test packed mode. Guest Kernel Patch: https://lore.kernel.org/bpf/20220801063902.129329-1-xuanzhuo@linux.alibaba.com/ DPDK Patch: https://github.com/middaywords/dpdk/compare/72206323a5dd3182b13f61b25a64abdddfee595c...eabadfac7953da66bc10ffb8284b490d09bb7ec7 changelog:(based the series https://lore.kernel.org/qemu-devel/cover.1658141552.git.kangjie.xu@linux.alibaba.com/T/#t) 1. rename vhost_set_vring_enable to vhost_set_dev_enable. 2. add vhost-user message VHOST_USER_RESET_VRING 3. remove restart/reset functions of virtqueue in vhost module. Kangjie Xu (8): docs: vhost-user: add VHOST_USER_RESET_VRING message net: virtio: rename vhost_set_vring_enable to vhost_set_dev_enable vhost-user: add op to enable or disable a single vring vhost-user: introduce vhost_reset_vring() interface vhost-net: vhost-user: update vhost_net_virtqueue_reset() vhost-net: vhost-user: update vhost_net_virtqueue_restart() virtio-net: vhost-user: update queue_reset and queue_enable vhost: vhost-user: enable vq reset feature backends/cryptodev-vhost.c | 12 +++--- docs/interop/vhost-user.rst | 10 +++++ hw/net/vhost_net-stub.c | 2 +- hw/net/vhost_net.c | 34 +++++++++++++--- hw/net/virtio-net.c | 10 +++-- hw/virtio/vhost-user.c | 68 +++++++++++++++++++++++++++---- include/hw/virtio/vhost-backend.h | 8 +++- include/net/vhost_net.h | 2 +- 8 files changed, 119 insertions(+), 27 deletions(-)