[dpdk-stable] patch 'net/ice/base: fix memory handling' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

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/06/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/14bcbc5422fc05e1f40e7dd72fe28499a792c39d

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 14bcbc5422fc05e1f40e7dd72fe28499a792c39d Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Fri, 8 Jan 2021 12:03:52 +0800
Subject: [PATCH] net/ice/base: fix memory handling

[ upstream commit 964bafcf5e75cddfbd8bc49485922b01fc491182 ]

Fixed memory handling when memory allocated in user space was handled
as memory allocated in kernel space within QV os_dep implementation
of the ice_memdup function.

Fixes: 93e84b1bfc92 ("net/ice/base: add basic Tx scheduler")

Signed-off-by: Andrii Pypchenko <andrii.pypchenko at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/base/ice_sched.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c
index ef439c9ade..3669688bd8 100644
--- a/drivers/net/ice/base/ice_sched.c
+++ b/drivers/net/ice/base/ice_sched.c
@@ -1357,7 +1357,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw)
 			 ice_memdup(hw, buf->layer_props,
 				    (hw->num_tx_sched_layers *
 				     sizeof(*hw->layer_info)),
-				    ICE_DMA_TO_DMA);
+				    ICE_NONDMA_TO_NONDMA);
 	if (!hw->layer_info) {
 		status = ICE_ERR_NO_MEMORY;
 		goto sched_query_out;
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:29.548897288 +0100
+++ 0034-net-ice-base-fix-memory-handling.patch	2021-02-04 12:04:27.930789631 +0100
@@ -1 +1 @@
-From 964bafcf5e75cddfbd8bc49485922b01fc491182 Mon Sep 17 00:00:00 2001
+From 14bcbc5422fc05e1f40e7dd72fe28499a792c39d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 964bafcf5e75cddfbd8bc49485922b01fc491182 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index b75a44f54c..1cce8eaff1 100644
+index ef439c9ade..3669688bd8 100644
@@ -23 +24 @@
-@@ -1361,7 +1361,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw)
+@@ -1357,7 +1357,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw)