|
 |
c7ffa4 |
From d01327d95624923003b6e984040c8c17c06b5361 Mon Sep 17 00:00:00 2001
|
|
|
c7ffa4 |
From: Shahaf Shuler <shahafs@mellanox.com>
|
|
|
c7ffa4 |
Date: Thu, 25 Jan 2018 18:18:03 +0200
|
|
|
c7ffa4 |
Subject: [PATCH] net/mlx5: fix memory region boundary checks
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
[ upstream commit 25f28d9d294d00a1c539d47a13c14ce282e31b09 ]
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
Since commit f81ec748434b ("net/mlx5: fix memory region lookup") the
|
|
|
c7ffa4 |
Memory Region (MR) are no longer overlaps.
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
Comparing the end address of the MR should be exclusive, otherwise two
|
|
|
c7ffa4 |
contiguous MRs may cause wrong matching.
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
Fixes: f81ec748434b ("net/mlx5: fix memory region lookup")
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
Signed-off-by: Xueming Li <xuemingl@mellanox.com>
|
|
|
c7ffa4 |
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
|
|
|
c7ffa4 |
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
|
|
|
c7ffa4 |
---
|
|
|
c7ffa4 |
drivers/net/mlx5/mlx5_rxtx.h | 4 ++--
|
|
|
c7ffa4 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
|
|
|
c7ffa4 |
index 604f30849..de5b769ef 100644
|
|
|
c7ffa4 |
--- a/drivers/net/mlx5/mlx5_rxtx.h
|
|
|
c7ffa4 |
+++ b/drivers/net/mlx5/mlx5_rxtx.h
|
|
|
c7ffa4 |
@@ -547,7 +547,7 @@ mlx5_tx_mb2mr(struct mlx5_txq_data *txq, struct rte_mbuf *mb)
|
|
|
c7ffa4 |
struct mlx5_mr *mr;
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
assert(i < RTE_DIM(txq->mp2mr));
|
|
|
c7ffa4 |
- if (likely(txq->mp2mr[i]->start <= addr && txq->mp2mr[i]->end >= addr))
|
|
|
c7ffa4 |
+ if (likely(txq->mp2mr[i]->start <= addr && txq->mp2mr[i]->end > addr))
|
|
|
c7ffa4 |
return txq->mp2mr[i]->lkey;
|
|
|
c7ffa4 |
for (i = 0; (i != RTE_DIM(txq->mp2mr)); ++i) {
|
|
|
c7ffa4 |
if (unlikely(txq->mp2mr[i] == NULL ||
|
|
|
c7ffa4 |
@@ -556,7 +556,7 @@ mlx5_tx_mb2mr(struct mlx5_txq_data *txq, struct rte_mbuf *mb)
|
|
|
c7ffa4 |
break;
|
|
|
c7ffa4 |
}
|
|
|
c7ffa4 |
if (txq->mp2mr[i]->start <= addr &&
|
|
|
c7ffa4 |
- txq->mp2mr[i]->end >= addr) {
|
|
|
c7ffa4 |
+ txq->mp2mr[i]->end > addr) {
|
|
|
c7ffa4 |
assert(txq->mp2mr[i]->lkey != (uint32_t)-1);
|
|
|
c7ffa4 |
assert(rte_cpu_to_be_32(txq->mp2mr[i]->mr->lkey) ==
|
|
|
c7ffa4 |
txq->mp2mr[i]->lkey);
|
|
|
c7ffa4 |
--
|
|
|
c7ffa4 |
2.14.3
|
|
|
c7ffa4 |
|