starlingx/integ
Code Issues Proposed changes

Merge "DPDK: mlx5 driver: fix memory region cache lookup"

Browse Source
This commit is contained in:
Zuul 2018-10-18 20:26:37 +00:00 committed by Gerrit Code Review
commit 6ec88572d1
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
networking/openvswitch/centos/meta_patches/0009-net-mlx5-fix-memory-region-cache-lookup.patch Normal file
View File

@ -0,0 +1,25 @@
From 5cabd4876e772f59a18a71a15f8fdfac0b0cf0ea Mon Sep 17 00:00:00 2001
From: Steven Webster <steven.webster@windriver.com>
Date: Wed, 17 Oct 2018 09:54:53 -0400
Subject: [PATCH] net-mlx5-fix-memory-region-cache-lookup
---
SPECS/openvswitch.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec
index f286a13..6d95f35 100644
--- a/SPECS/openvswitch.spec
+++ b/SPECS/openvswitch.spec
@@ -127,7 +127,7 @@ Patch422: 0003-vhost-extract-virtqueue-cleaning-and-freeing-functio.patch
Patch423: 0004-vhost-destroy-unused-virtqueues-when-multiqueue-not-.patch
Patch424: 0005-vhost-add-flag-for-built-in-virtio-driver.patch
Patch425: 0006-vhost-drop-virtqueues-only-with-built-in-virtio-driv.patch
-
+Patch426: net-mlx5-fix-memory-region-cache-lookup.patch
BuildRequires: gcc
BuildRequires: python2-sphinx
--
1.8.3.1

1
networking/openvswitch/centos/meta_patches/PATCH_ORDER
View File

@ -6,3 +6,4 @@
0006-rpm-check-with-condition.patch 0006-rpm-check-with-condition.patch
0007-enable-mlx-pmds.patch 0007-enable-mlx-pmds.patch
0008-iommu-width-fix.patch 0008-iommu-width-fix.patch
0009-net-mlx5-fix-memory-region-cache-lookup.patch

31
networking/openvswitch/centos/patches/net-mlx5-fix-memory-region-cache-lookup.patch Normal file
View File

@ -0,0 +1,31 @@
From de2067b4419323eb9cefdb2faed3245b28e7d4b2 Mon Sep 17 00:00:00 2001
From: Steven Webster <steven.webster@windriver.com>
Date: Wed, 17 Oct 2018 09:50:07 -0400
Subject: [PATCH] net-mlx5-fix-memory-region-cache-lookup
---
dpdk-17.11/drivers/net/mlx5/mlx5_rxtx.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dpdk-17.11/drivers/net/mlx5/mlx5_rxtx.h b/dpdk-17.11/drivers/net/mlx5/mlx5_rxtx.h
index d34f3cc..70db913 100644
--- a/dpdk-17.11/drivers/net/mlx5/mlx5_rxtx.h
+++ b/dpdk-17.11/drivers/net/mlx5/mlx5_rxtx.h
@@ -548,10 +548,12 @@ struct mlx5_mr *mlx5_txq_mp2mr_reg(struct mlx5_txq_data *, struct rte_mempool *,
struct mlx5_mr *mr;
assert(i < RTE_DIM(txq->mp2mr));
- if (likely(txq->mp2mr[i]->start <= addr && txq->mp2mr[i]->end >= addr))
+ if (likely(txq->mp2mr[i] != NULL &&
+ txq->mp2mr[i]->start <= addr && txq->mp2mr[i]->end >= addr))
return txq->mp2mr[i]->lkey;
for (i = 0; (i != RTE_DIM(txq->mp2mr)); ++i) {
- if (unlikely(txq->mp2mr[i]->mr == NULL)) {
+ if (unlikely(txq->mp2mr[i] == NULL ||
+ txq->mp2mr[i]->mr == NULL)) {
/* Unknown MP, add a new MR for it. */
break;
}
--
1.8.3.1