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 073D541D4F for ; Thu, 23 Feb 2023 10:38:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02B4A43164; Thu, 23 Feb 2023 10:38:01 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id 520D7427E9 for ; Thu, 23 Feb 2023 10:37:59 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id 6so9727349wrb.11 for ; Thu, 23 Feb 2023 01:37:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xqyn4shh6bKezembEReoLSi54UMpSBQnwVpl3xBeYIQ=; b=Q0p9NH1jkBwkg3Nlxxl2EUqVJ0dy0QYp5nCyjPKI1xtmvxyYLyIQCKU4mwaCrXLZFA ajCAbc81gcHUHwQ5bFVNIDaNPCWhxMYU9A4hctpRXr12+KV/j8bDMjb8DdGF9IQJSuJJ r4WeS9x5kDmVV4uxK6Lju6+nUAoVAjHt5Z5O7q4WOvdIt5rsNQ9mtcnEYAv8e4csvHWO i6JWs5eB4FK07xV+kQhd3oxVjZBBe+oc1IPCM8uQfsbNsyG6jpdP8dosl7BAHXEDOTT7 1NmHHZ4MDfFbzO/k7SjZWzzkgefuk2pyym8R/oF2nqhDM+xhbOfCUruZUlRS3WdJXKm4 B21g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xqyn4shh6bKezembEReoLSi54UMpSBQnwVpl3xBeYIQ=; b=znK+jnVm+LLLOaBocECu8ClLZHAmc+0oi3QcjqKQAf1mlPQirqnV9frlb1hPkiLVQA A2DLhKRuBuelGUzJojedlHTM+ddGNwVJ32d5hRssV3fsp6vjnS3U1XLOjNFfDwWG49SQ MmhRXit8atZWhDy8s5+/76UK6+t0Yu4x7o9B/wWQdh6xzb/7LhZbv0hsFvnLf9RVS6ZD Wh4+Vm3VNEBFjFmnOw3OYrAgEwJiVWMkpg9r78UgTzx0bs99xJTdPTEMoQX7Qs6Me+iP fOk9UfUdg8PYlZqWLKNdfTB3+Y5IzxsPie0R9NAAwkNvfy+pBfXvG49W7puhnegJFOWC ZqRA== X-Gm-Message-State: AO0yUKWIosog/EfR/OJWXcN3saNAXYd1qfMXWAdgw3L2JhIUHdE064+r +7n3U8XvI9dsh0dzcAFguew= X-Google-Smtp-Source: AK7set/br0yTURbI+LnoMdeP/DSUiKQqfl8vl4oJWeOR0pEzUXAnC6xqegKbOVjJ9fKEOz+sn2XFSA== X-Received: by 2002:a5d:4645:0:b0:2c4:67b:36b7 with SMTP id j5-20020a5d4645000000b002c4067b36b7mr10527299wrs.54.1677145079046; Thu, 23 Feb 2023 01:37:59 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id r8-20020a05600c458800b003db01178b62sm4324098wmo.40.2023.02.23.01.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:37:58 -0800 (PST) From: luca.boccassi@gmail.com To: Andy Pei Cc: Maxime Coquelin , dpdk stable Subject: patch 'vdpa/ifc: fix argument compatibility check' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:18 +0000 Message-Id: <20230223093715.3926893-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.8 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/25/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/cb31fb020c20ebbfe74013c93774b025cc33c1a6 Thanks. Luca Boccassi --- >From cb31fb020c20ebbfe74013c93774b025cc33c1a6 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 4dbfd1a71d..371be23ace 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -1253,6 +1253,11 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, goto error; } 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); if (internal->vdev == NULL) { -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:28.854919185 +0000 +++ 0014-vdpa-ifc-fix-argument-compatibility-check.patch 2023-02-23 09:36:28.186169203 +0000 @@ -1 +1 @@ -From 97d2dfc4e15caf654eb84ede24f4c1a43793e850 Mon Sep 17 00:00:00 2001 +From cb31fb020c20ebbfe74013c93774b025cc33c1a6 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 4dbfd1a71d..371be23ace 100644 @@ -24 +25 @@ -@@ -1746,6 +1746,11 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, +@@ -1253,6 +1253,11 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, @@ -34,2 +35,2 @@ - pthread_mutex_lock(&internal_list_lock); - TAILQ_INSERT_TAIL(&internal_list, list, next); + internal->vdev = rte_vdpa_register_device(&pci_dev->device, &ifcvf_ops); + if (internal->vdev == NULL) {