From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2E8F1A04DC; Tue, 20 Oct 2020 17:22:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 62926BE27; Tue, 20 Oct 2020 17:21:14 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 527EABCEB for ; Tue, 20 Oct 2020 17:21:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603207269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mECSGPlM/k1rwIVi8bx1p8Gw94CkLMjqpMAflz15RbM=; b=JULmIgEr0TnoTxbjkpj2zqPpA1lQ8OQulo5TAlAm14IPxKUShEDNW2WryLDZzXzhhl+tC7 qJDN5w3G8z1kX2ybWwYspI19rH6R5Q4kGyh/KL26FTf0Z4bjS6YwAQExfosA68i1K+4Spl tNmrF1txO71jyE2f4DJiblXRUP44hpI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-130-T0yG9FFjNC-76CwBy5UHNQ-1; Tue, 20 Oct 2020 11:21:07 -0400 X-MC-Unique: T0yG9FFjNC-76CwBy5UHNQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E3721879515; Tue, 20 Oct 2020 15:21:05 +0000 (UTC) Received: from amorenoz.users.ipa.redhat.com (ovpn-112-202.ams2.redhat.com [10.36.112.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id 303625577A; Tue, 20 Oct 2020 15:21:04 +0000 (UTC) From: Adrian Moreno To: dev@dpdk.org Cc: yinan.wang@intel.com, patrick.fu@intel.com, amorenoz@redhat.com, maxime.coquelin@redhat.com, stable@dpdk.org, Chenbo Xia , Zhihong Wang Date: Tue, 20 Oct 2020 17:20:52 +0200 Message-Id: <20201020152052.389446-4-amorenoz@redhat.com> In-Reply-To: <20201020152052.389446-1-amorenoz@redhat.com> References: <20201020152052.389446-1-amorenoz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=amorenoz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-dev] [PATCH v2 3/3] virtio-user: set status on virtio-user reconnect X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Newer vhost-user backends will rely on SET_STATUS to start the device so this required to support them. Fixes: 57912824615f ("net/virtio-user: support vhost status setting") Cc: maxime.coquelin@redhat.com Cc: stable@dpdk.org Signed-off-by: Adrian Moreno --- drivers/net/virtio/virtio_user_ethdev.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index e870fb2ff..d8bea4537 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -78,6 +78,13 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) return -1; dev->vhostfd = connectfd; + + vtpci_reset(hw); + + vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_ACK); + + vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER); + if (dev->ops->send_request(dev, VHOST_USER_GET_FEATURES, &dev->device_features) < 0) { PMD_INIT_LOG(ERR, "get_features failed: %s", @@ -111,6 +118,8 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) dev->features &= dev->device_features; + vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_FEATURES_OK); + /* For packed ring, resetting queues is required in reconnection. */ if (vtpci_packed_queue(hw) && (vtpci_get_status(hw) & VIRTIO_CONFIG_STATUS_DRIVER_OK)) { @@ -119,8 +128,9 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) virtio_user_reset_queues_packed(eth_dev); } - ret = virtio_user_start_device(dev); - if (ret < 0) + /* Start the device */ + vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER_OK); + if (!dev->started) return -1; if (dev->queue_pairs > 1) { -- 2.26.2