From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 116CC44151; Thu, 13 Jun 2024 13:49:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 915CE40E31; Thu, 13 Jun 2024 13:49:17 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id B8EC7402CB for ; Thu, 13 Jun 2024 13:49:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718279355; 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:autocrypt:autocrypt; bh=U/WjJHNdkPLlgtFET3EVP4mmQ4p1Yz9LG+lZVevnuk0=; b=iouWQMIQyW8HoNsA93WbRoB0K4vuMdLQte1BNDZla7ZQSAFcbme0IMlCDyvZ7C0xAYun+Q dQH9ilnbMOzI0/XM95L1K2IIf5+0bpiIeAXMq646PnGKCJ7/yzVK0Nti10PIMhtdAj3SPM CaGsW35E0n5PsS5qOD6c6ETy4uL1Bo0= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-624-caY35ea-OZ-gvRt92z7pWA-1; Thu, 13 Jun 2024 07:49:11 -0400 X-MC-Unique: caY35ea-OZ-gvRt92z7pWA-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7DE2B195608F; Thu, 13 Jun 2024 11:49:10 +0000 (UTC) Received: from [10.39.208.16] (unknown [10.39.208.16]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 222D11955E72; Thu, 13 Jun 2024 11:49:07 +0000 (UTC) Message-ID: <9d7b4d17-233d-4ade-a6dc-1528b34a6f65@redhat.com> Date: Thu, 13 Jun 2024 13:49:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 05/10] vdpa/nfp: add the live migration logic To: Chaoyong He , dev@dpdk.org Cc: oss-drivers@corigine.com, Xinying Yu , Long Wu , Peng Zhang References: <20240426074831.1729792-1-chaoyong.he@corigine.com> <20240426074831.1729792-6-chaoyong.he@corigine.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= In-Reply-To: <20240426074831.1729792-6-chaoyong.he@corigine.com> X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On 4/26/24 09:48, Chaoyong He wrote: > From: Xinying Yu > > Add the basic logic of software live migration. > > Unset the ring notify area to stop the direct IO datapath if the > device support, then we can setup the vring relay to help the > live migration. > > Signed-off-by: Xinying Yu > Reviewed-by: Chaoyong He > Reviewed-by: Long Wu > Reviewed-by: Peng Zhang > --- > drivers/vdpa/nfp/nfp_vdpa.c | 66 +++++++++++++++++++++++++++++++- > drivers/vdpa/nfp/nfp_vdpa_core.c | 3 ++ > drivers/vdpa/nfp/nfp_vdpa_core.h | 4 ++ > 3 files changed, 71 insertions(+), 2 deletions(-) > > diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c > index cef80b5476..45092cb0af 100644 > --- a/drivers/vdpa/nfp/nfp_vdpa.c > +++ b/drivers/vdpa/nfp/nfp_vdpa.c > @@ -603,6 +603,30 @@ update_datapath(struct nfp_vdpa_dev *device) > return ret; > } > > +static int > +nfp_vdpa_sw_fallback(struct nfp_vdpa_dev *device) > +{ > + int ret; > + int vid = device->vid; > + > + /* Stop the direct IO data path */ > + nfp_vdpa_unset_notify_relay(device); > + nfp_vdpa_disable_vfio_intr(device); > + > + ret = rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, false); > + if ((ret != 0) && (ret != -ENOTSUP)) { > + DRV_VDPA_LOG(ERR, "Unset the host notifier failed."); > + goto error; > + } > + > + device->hw.sw_fallback_running = true; > + > + return 0; > + > +error: > + return ret; > +} > + > static int > nfp_vdpa_dev_config(int vid) > { > @@ -646,8 +670,18 @@ nfp_vdpa_dev_close(int vid) > } > > device = node->device; > - rte_atomic_store_explicit(&device->dev_attached, 0, rte_memory_order_relaxed); > - update_datapath(device); > + if (device->hw.sw_fallback_running) { > + device->hw.sw_fallback_running = false; > + > + rte_atomic_store_explicit(&device->dev_attached, 0, > + rte_memory_order_relaxed); > + rte_atomic_store_explicit(&device->running, 0, > + rte_memory_order_relaxed); > + } else { > + rte_atomic_store_explicit(&device->dev_attached, 0, > + rte_memory_order_relaxed); > + update_datapath(device); > + } > > return 0; > } > @@ -770,7 +804,35 @@ nfp_vdpa_get_protocol_features(struct rte_vdpa_device *vdev __rte_unused, > static int > nfp_vdpa_set_features(int32_t vid) > { > + int ret; > + uint64_t features = 0; > + struct nfp_vdpa_dev *device; > + struct rte_vdpa_device *vdev; > + struct nfp_vdpa_dev_node *node; > + > DRV_VDPA_LOG(DEBUG, "Start vid=%d", vid); > + > + vdev = rte_vhost_get_vdpa_device(vid); > + node = nfp_vdpa_find_node_by_vdev(vdev); > + if (node == NULL) { > + DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p", vdev); > + return -ENODEV; > + } > + > + rte_vhost_get_negotiated_features(vid, &features); > + > + if (RTE_VHOST_NEED_LOG(features) == 0) > + return 0; > + > + device = node->device; > + if (device->hw.sw_lm) { > + ret = nfp_vdpa_sw_fallback(device); > + if (ret != 0) { > + DRV_VDPA_LOG(ERR, "Software fallback start failed"); > + return -1; > + } > + } > + > return 0; > } > > diff --git a/drivers/vdpa/nfp/nfp_vdpa_core.c b/drivers/vdpa/nfp/nfp_vdpa_core.c > index 79ecd2b4fc..82a323a6d0 100644 > --- a/drivers/vdpa/nfp/nfp_vdpa_core.c > +++ b/drivers/vdpa/nfp/nfp_vdpa_core.c > @@ -91,8 +91,11 @@ nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw, > tx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + tx_bar_off; > hw->qcp_cfg = tx_bar + NFP_QCP_QUEUE_ADDR_SZ; > > + vdpa_hw->sw_lm = true; > + > vdpa_hw->features = (1ULL << VIRTIO_F_VERSION_1) | > (1ULL << VIRTIO_F_IN_ORDER) | > + (1ULL << VHOST_F_LOG_ALL) | > (1ULL << VHOST_USER_F_PROTOCOL_FEATURES); Is the live-migration works if we stop at patch 5? If not, I would suggest to enable the feature only at the end of the series. > > return 0; > diff --git a/drivers/vdpa/nfp/nfp_vdpa_core.h b/drivers/vdpa/nfp/nfp_vdpa_core.h > index a8e0d6dd70..0f880fc0c6 100644 > --- a/drivers/vdpa/nfp/nfp_vdpa_core.h > +++ b/drivers/vdpa/nfp/nfp_vdpa_core.h > @@ -36,6 +36,10 @@ struct nfp_vdpa_hw { > uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; > uint8_t notify_region; > uint8_t nr_vring; > + > + /** Software Live Migration */ > + bool sw_lm; > + bool sw_fallback_running; > }; > > int nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw, struct rte_pci_device *dev);