[dpdk-stable] patch 'drivers/qat: fix queue pair NUMA node' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/01/19. 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 can be viewed on the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From 43db0facdc4f211f1aee7667b73a6e921c0cd2cf Mon Sep 17 00:00:00 2001
From: Tomasz Jozwiak <tomaszx.jozwiak at intel.com>
Date: Tue, 26 Mar 2019 15:20:48 +0100
Subject: [PATCH] drivers/qat: fix queue pair NUMA node

[ upstream commit 1e796b11febb8fd3fa380f762aadadd6cc5a11e8 ]

This patch assigns QAT queue pair resources to the correct NUMA nodes.
Any DMA'able memory should use NUMA node of QAT device
rather than socket_id of the initializing process.

Fixes: 98c4a35c736f ("crypto/qat: move common qat files to common dir")
Fixes: a795248d740b ("compress/qat: add configure and clear functions")

Signed-off-by: Tomasz Jozwiak <tomaszx.jozwiak at intel.com>
Acked-by: Fiona Trahe <fiona.trahe at intel.com>
---
 drivers/common/qat/qat_qp.c         | 14 ++++++++------
 drivers/compress/qat/qat_comp_pmd.c |  7 ++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
index 4e66c583b..935ec3fb5 100644
--- a/drivers/common/qat/qat_qp.c
+++ b/drivers/common/qat/qat_qp.c
@@ -212,6 +212,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
 
 	/* Allocate the queue pair data structure. */
-	qp = rte_zmalloc("qat PMD qp metadata",
-			sizeof(*qp), RTE_CACHE_LINE_SIZE);
+	qp = rte_zmalloc_socket("qat PMD qp metadata",
+				sizeof(*qp), RTE_CACHE_LINE_SIZE,
+				qat_qp_conf->socket_id);
 	if (qp == NULL) {
 		QAT_LOG(ERR, "Failed to alloc mem for qp struct");
@@ -219,7 +220,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
 	}
 	qp->nb_descriptors = qat_qp_conf->nb_descriptors;
-	qp->op_cookies = rte_zmalloc("qat PMD op cookie pointer",
+	qp->op_cookies = rte_zmalloc_socket("qat PMD op cookie pointer",
 			qat_qp_conf->nb_descriptors * sizeof(*qp->op_cookies),
-			RTE_CACHE_LINE_SIZE);
+			RTE_CACHE_LINE_SIZE, qat_qp_conf->socket_id);
 	if (qp->op_cookies == NULL) {
 		QAT_LOG(ERR, "Failed to alloc mem for cookie");
@@ -261,5 +262,6 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
 				qp->nb_descriptors,
 				qat_qp_conf->cookie_size, 64, 0,
-				NULL, NULL, NULL, NULL, qat_qp_conf->socket_id,
+				NULL, NULL, NULL, NULL,
+				qat_dev->pci_dev->device.numa_node,
 				0);
 	if (!qp->op_cookie_pool) {
@@ -389,5 +391,5 @@ qat_queue_create(struct qat_pci_device *qat_dev, struct qat_queue *queue,
 		queue->hw_bundle_number, queue->hw_queue_number);
 	qp_mz = queue_dma_zone_reserve(queue->memz_name, queue_size_bytes,
-			qp_conf->socket_id);
+			qat_dev->pci_dev->device.numa_node);
 	if (qp_mz == NULL) {
 		QAT_LOG(ERR, "Failed to allocate ring memzone");
diff --git a/drivers/compress/qat/qat_comp_pmd.c b/drivers/compress/qat/qat_comp_pmd.c
index 9b7ae8de1..139298efe 100644
--- a/drivers/compress/qat/qat_comp_pmd.c
+++ b/drivers/compress/qat/qat_comp_pmd.c
@@ -240,5 +240,6 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
 static struct rte_mempool *
 qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
-			      uint32_t num_elements)
+			   struct rte_compressdev_config *config,
+			   uint32_t num_elements)
 {
 	char xform_pool_name[RTE_MEMPOOL_NAMESIZE];
@@ -265,5 +266,5 @@ qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
 				num_elements,
 				qat_comp_xform_size(), 0, 0,
-				NULL, NULL, NULL, NULL, rte_socket_id(),
+				NULL, NULL, NULL, NULL, config->socket_id,
 				0);
 	if (mp == NULL) {
@@ -321,5 +322,5 @@ qat_comp_dev_config(struct rte_compressdev *dev,
 	}
 
-	comp_dev->xformpool = qat_comp_create_xform_pool(comp_dev,
+	comp_dev->xformpool = qat_comp_create_xform_pool(comp_dev, config,
 					config->max_nb_priv_xforms);
 	if (comp_dev->xformpool == NULL) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.646953017 +0100
+++ 0044-drivers-qat-fix-queue-pair-NUMA-node.patch	2019-04-25 16:37:46.758294652 +0100
@@ -1 +1 @@
-From 1e796b11febb8fd3fa380f762aadadd6cc5a11e8 Mon Sep 17 00:00:00 2001
+From 43db0facdc4f211f1aee7667b73a6e921c0cd2cf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1e796b11febb8fd3fa380f762aadadd6cc5a11e8 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index febc2efc4..131215296 100644
+index 4e66c583b..935ec3fb5 100644
@@ -25 +26 @@
-@@ -213,6 +213,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
+@@ -212,6 +212,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
@@ -35 +36 @@
-@@ -220,7 +221,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
+@@ -219,7 +220,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
@@ -45 +46 @@
-@@ -262,5 +263,6 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
+@@ -261,5 +262,6 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
@@ -53 +54 @@
-@@ -391,5 +393,5 @@ qat_queue_create(struct qat_pci_device *qat_dev, struct qat_queue *queue,
+@@ -389,5 +391,5 @@ qat_queue_create(struct qat_pci_device *qat_dev, struct qat_queue *queue,
@@ -61 +62 @@
-index cf7a9e884..1d9d72e8f 100644
+index 9b7ae8de1..139298efe 100644
@@ -64 +65 @@
-@@ -277,5 +277,6 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
+@@ -240,5 +240,6 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
@@ -72 +73 @@
-@@ -302,5 +303,5 @@ qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
+@@ -265,5 +266,5 @@ qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
@@ -79 +80 @@
-@@ -358,5 +359,5 @@ qat_comp_dev_config(struct rte_compressdev *dev,
+@@ -321,5 +322,5 @@ qat_comp_dev_config(struct rte_compressdev *dev,