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 EDAD141D52 for ; Thu, 23 Feb 2023 16:07:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E8DC443241; Thu, 23 Feb 2023 16:07:25 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A12674323D for ; Thu, 23 Feb 2023 16:07:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164844; 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=WCt7t+2sHveeL4gtH6Wpfv6wgprRvo1WQlC9V9qKGjo=; b=OozJyNsdOCJ0IjsGfoaxHWO8iPWmTjErb/YlgE0x65tb7knKQ3noNTvuUZCnkk+ToNsEH9 IKqR2z4k6prWE0FfmW+c++LDg7wZnDFnr7OtQsFH0VC6ds9fpsBRHHyAUR2Vjb14d5WF9k WNDBLpxxU3yUvavzlfyXbHilokl6j3M= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-231-LB4slRzzNn6Fk30R_AGYnA-1; Thu, 23 Feb 2023 10:07:20 -0500 X-MC-Unique: LB4slRzzNn6Fk30R_AGYnA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DBFD0823D6E; Thu, 23 Feb 2023 15:07:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E5062166B29; Thu, 23 Feb 2023 15:07:16 +0000 (UTC) From: Kevin Traynor To: Andy Pei Cc: Maxime Coquelin , dpdk stable Subject: patch 'vdpa/ifc: fix argument compatibility check' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:14 +0000 Message-Id: <20230223150631.723699-23-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2d551ec8dc3cbfeaa28e4be5f13f159aa98a4b30 Thanks. Kevin --- >From 2d551ec8dc3cbfeaa28e4be5f13f159aa98a4b30 Mon Sep 17 00:00:00 2001 From: Andy Pei Date: Thu, 1 Dec 2022 15:32:20 +0800 Subject: [PATCH] vdpa/ifc: fix argument compatibility check [ upstream commit 97d2dfc4e15caf654eb84ede24f4c1a43793e850 ] "sw_fallback_lm=0" means driver does not provide live migration assistance. so hardware assistance is needed to support live migration. However registers for live migration in BAR4 are not implemented. In the case, we just return error after display some logs. Fixes: 4c3f55cc23ea ("net/ifc: add LM mode parameter") Signed-off-by: Andy Pei Reviewed-by: Maxime Coquelin --- drivers/vdpa/ifc/ifcvf_vdpa.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index f061d55b06..d3c05bd3f9 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -1260,4 +1260,9 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, } internal->sw_lm = sw_fallback_lm; + if (!internal->sw_lm && !internal->hw.lm_cfg) { + DRV_LOG(ERR, "Device %s does not support HW assist live migration, please enable sw-live-migration!", + pci_dev->name); + goto error; + } internal->vdev = rte_vdpa_register_device(&pci_dev->device, &ifcvf_ops); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.400036685 +0000 +++ 0023-vdpa-ifc-fix-argument-compatibility-check.patch 2023-02-23 14:46:23.730235826 +0000 @@ -1 +1 @@ -From 97d2dfc4e15caf654eb84ede24f4c1a43793e850 Mon Sep 17 00:00:00 2001 +From 2d551ec8dc3cbfeaa28e4be5f13f159aa98a4b30 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 97d2dfc4e15caf654eb84ede24f4c1a43793e850 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 49d68ad1b1..9468f66638 100644 +index f061d55b06..d3c05bd3f9 100644 @@ -24 +25 @@ -@@ -1747,4 +1747,9 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, +@@ -1260,4 +1260,9 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, @@ -33 +34 @@ - pthread_mutex_lock(&internal_list_lock); + internal->vdev = rte_vdpa_register_device(&pci_dev->device, &ifcvf_ops);