From: Kevin Traynor <ktraynor@redhat.com>
To: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Cc: Somnath Kotur <somnath.kotur@broadcom.com>,
dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/bnxt: fix check of address mapping' has been queued to LTS release 18.11.3
Date: Wed, 28 Aug 2019 14:42:13 +0100 [thread overview]
Message-ID: <20190828134234.20547-37-ktraynor@redhat.com> (raw)
In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com>
Hi,
FYI, your patch has been queued to LTS release 18.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/04/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/2221b0c1381ae0d6031f67544bff5b62cec1d9eb
Thanks.
Kevin Traynor
---
From 2221b0c1381ae0d6031f67544bff5b62cec1d9eb Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Date: Thu, 18 Jul 2019 09:05:56 +0530
Subject: [PATCH] net/bnxt: fix check of address mapping
[ upstream commit 1f3cea0044ceccbd3a0f38307cf0808c5b16d6b1 ]
rte_mem_virt2iova() function returns RTE_BAD_IOVA on failure, not zero.
Fixes: 62196f4e0941 ("mem: rename address mapping function to IOVA")
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
---
drivers/net/bnxt/bnxt_hwrm.c | 16 ++++++++--------
drivers/net/bnxt/bnxt_ring.c | 2 +-
drivers/net/bnxt/bnxt_vnic.c | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index f950440a6..79803b4d0 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -858,5 +858,5 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
bp->hwrm_cmd_resp_dma_addr =
rte_mem_virt2iova(bp->hwrm_cmd_resp_addr);
- if (bp->hwrm_cmd_resp_dma_addr == 0) {
+ if (bp->hwrm_cmd_resp_dma_addr == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
"Unable to map response buffer to physical memory.\n");
@@ -884,5 +884,5 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
bp->hwrm_short_cmd_req_dma_addr =
rte_mem_virt2iova(bp->hwrm_short_cmd_req_addr);
- if (bp->hwrm_short_cmd_req_dma_addr == 0) {
+ if (bp->hwrm_short_cmd_req_dma_addr == RTE_BAD_IOVA) {
rte_free(bp->hwrm_short_cmd_req_addr);
PMD_DRV_LOG(ERR,
@@ -2023,5 +2023,5 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp)
bp->hwrm_cmd_resp_dma_addr =
rte_mem_virt2iova(bp->hwrm_cmd_resp_addr);
- if (bp->hwrm_cmd_resp_dma_addr == 0) {
+ if (bp->hwrm_cmd_resp_dma_addr == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
"unable to map response address to physical memory\n");
@@ -2949,5 +2949,5 @@ int bnxt_hwrm_func_buf_rgtr(struct bnxt *bp)
req.req_buf_page_addr0 =
rte_cpu_to_le_64(rte_mem_virt2iova(bp->pf.vf_req_buf));
- if (req.req_buf_page_addr0 == 0) {
+ if (req.req_buf_page_addr0 == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
"unable to map buffer address to physical memory\n");
@@ -3382,5 +3382,5 @@ int bnxt_get_nvram_directory(struct bnxt *bp, uint32_t len, uint8_t *data)
return -ENOMEM;
dma_handle = rte_mem_virt2iova(buf);
- if (dma_handle == 0) {
+ if (dma_handle == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
"unable to map response address to physical memory\n");
@@ -3417,5 +3417,5 @@ int bnxt_hwrm_get_nvram_item(struct bnxt *bp, uint32_t index,
dma_handle = rte_mem_virt2iova(buf);
- if (dma_handle == 0) {
+ if (dma_handle == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
"unable to map response address to physical memory\n");
@@ -3471,5 +3471,5 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type,
dma_handle = rte_mem_virt2iova(buf);
- if (dma_handle == 0) {
+ if (dma_handle == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
"unable to map response address to physical memory\n");
@@ -3535,5 +3535,5 @@ static int bnxt_hwrm_func_vf_vnic_query(struct bnxt *bp, uint16_t vf,
req.vnic_id_tbl_addr = rte_cpu_to_le_64(rte_mem_virt2iova(vnic_ids));
- if (req.vnic_id_tbl_addr == 0) {
+ if (req.vnic_id_tbl_addr == RTE_BAD_IOVA) {
HWRM_UNLOCK();
PMD_DRV_LOG(ERR,
diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index fcbd6bc6e..0628a0b4e 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -164,5 +164,5 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
rte_mem_lock_page(((char *)mz->addr) + sz);
mz_phys_addr = rte_mem_virt2iova(mz->addr);
- if (mz_phys_addr == 0) {
+ if (mz_phys_addr == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
"unable to map ring address to physical memory\n");
diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c
index 9ebe7c963..cc0b0ae07 100644
--- a/drivers/net/bnxt/bnxt_vnic.c
+++ b/drivers/net/bnxt/bnxt_vnic.c
@@ -147,7 +147,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
"Using rte_mem_virt2iova()\n");
mz_phys_addr = rte_mem_virt2iova(mz->addr);
- if (mz_phys_addr == 0) {
+ if (mz_phys_addr == RTE_BAD_IOVA) {
PMD_DRV_LOG(ERR,
- "unable to map vnic address to physical memory\n");
+ "unable to map to physical memory\n");
return -ENOMEM;
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-08-28 14:32:34.016656545 +0100
+++ 0038-net-bnxt-fix-check-of-address-mapping.patch 2019-08-28 14:32:31.683956424 +0100
@@ -1 +1 @@
-From 1f3cea0044ceccbd3a0f38307cf0808c5b16d6b1 Mon Sep 17 00:00:00 2001
+From 2221b0c1381ae0d6031f67544bff5b62cec1d9eb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1f3cea0044ceccbd3a0f38307cf0808c5b16d6b1 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -14,5 +15,4 @@
- drivers/net/bnxt/bnxt_ethdev.c | 6 +++---
- drivers/net/bnxt/bnxt_hwrm.c | 16 ++++++++--------
- drivers/net/bnxt/bnxt_ring.c | 2 +-
- drivers/net/bnxt/bnxt_vnic.c | 4 ++--
- 4 files changed, 14 insertions(+), 14 deletions(-)
+ drivers/net/bnxt/bnxt_hwrm.c | 16 ++++++++--------
+ drivers/net/bnxt/bnxt_ring.c | 2 +-
+ drivers/net/bnxt/bnxt_vnic.c | 4 ++--
+ 3 files changed, 11 insertions(+), 11 deletions(-)
@@ -20,25 +19,0 @@
-diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index 39229f150..306d62772 100644
---- a/drivers/net/bnxt/bnxt_ethdev.c
-+++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -3473,5 +3473,5 @@ static int bnxt_alloc_ctx_mem_blk(__rte_unused struct bnxt *bp,
- "Using rte_mem_virt2iova()\n");
- mz_phys_addr = rte_mem_virt2iova(mz->addr);
-- if (mz_phys_addr == 0) {
-+ if (mz_phys_addr == RTE_BAD_IOVA) {
- PMD_DRV_LOG(ERR,
- "unable to map addr to phys memory\n");
-@@ -3699,5 +3699,5 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
- "Using rte_mem_virt2iova()\n");
- mz_phys_addr = rte_mem_virt2iova(mz->addr);
-- if (mz_phys_addr == 0) {
-+ if (mz_phys_addr == RTE_BAD_IOVA) {
- PMD_DRV_LOG(ERR,
- "Can't map address to physical memory\n");
-@@ -3737,5 +3737,5 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
- "Using rte_mem_virt2iova()\n");
- mz_phys_addr = rte_mem_virt2iova(mz->addr);
-- if (mz_phys_addr == 0) {
-+ if (mz_phys_addr == RTE_BAD_IOVA) {
- PMD_DRV_LOG(ERR,
- "Can't map address to physical memory\n");
@@ -46 +21 @@
-index 313459aaf..9c5e5ad77 100644
+index f950440a6..79803b4d0 100644
@@ -49 +24 @@
-@@ -889,5 +889,5 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
+@@ -858,5 +858,5 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
@@ -56 +31 @@
-@@ -926,5 +926,5 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
+@@ -884,5 +884,5 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
@@ -63 +38 @@
-@@ -2230,5 +2230,5 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp)
+@@ -2023,5 +2023,5 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp)
@@ -70 +45 @@
-@@ -3180,5 +3180,5 @@ int bnxt_hwrm_func_buf_rgtr(struct bnxt *bp)
+@@ -2949,5 +2949,5 @@ int bnxt_hwrm_func_buf_rgtr(struct bnxt *bp)
@@ -77 +52 @@
-@@ -3612,5 +3612,5 @@ int bnxt_get_nvram_directory(struct bnxt *bp, uint32_t len, uint8_t *data)
+@@ -3382,5 +3382,5 @@ int bnxt_get_nvram_directory(struct bnxt *bp, uint32_t len, uint8_t *data)
@@ -84 +59 @@
-@@ -3647,5 +3647,5 @@ int bnxt_hwrm_get_nvram_item(struct bnxt *bp, uint32_t index,
+@@ -3417,5 +3417,5 @@ int bnxt_hwrm_get_nvram_item(struct bnxt *bp, uint32_t index,
@@ -91 +66 @@
-@@ -3701,5 +3701,5 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type,
+@@ -3471,5 +3471,5 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type,
@@ -98 +73 @@
-@@ -3765,5 +3765,5 @@ static int bnxt_hwrm_func_vf_vnic_query(struct bnxt *bp, uint16_t vf,
+@@ -3535,5 +3535,5 @@ static int bnxt_hwrm_func_vf_vnic_query(struct bnxt *bp, uint16_t vf,
@@ -106 +81 @@
-index ada748c05..a9952e02c 100644
+index fcbd6bc6e..0628a0b4e 100644
@@ -109,2 +84,2 @@
-@@ -188,5 +188,5 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
- mz_phys_addr_base = rte_mem_virt2iova(mz->addr);
+@@ -164,5 +164,5 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
+ rte_mem_lock_page(((char *)mz->addr) + sz);
@@ -117 +92 @@
-index 20e5bf2d1..c652b8f03 100644
+index 9ebe7c963..cc0b0ae07 100644
@@ -120 +95 @@
-@@ -154,7 +154,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
+@@ -147,7 +147,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
next prev parent reply other threads:[~2019-08-28 13:43 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 13:41 [dpdk-stable] patch 'crypto/openssl: fix free of asymmetric crypto keys' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'kni: fix segmented mbuf data overflow' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'crypto/dpaa2_sec: fix handling of session init failure' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'mk: fix custom kernel directory name' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'examples/ip_frag: fix stale content of ethdev info' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/bnx2x: fix reading VF id' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/bnx2x: fix link events polling for SRIOV' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/bnx2x: fix fastpath SB allocation " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/tap: remove redundant declarations' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/af_packet: remove redundant declaration' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/vhost: " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/null: " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/pcap: " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/ring: " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/virtio_user: " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'raw/skeleton: " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'raw/dpaa2_cmdif: " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net: adjust L2 length on soft VLAN insertion' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/pcap: fix possible mbuf double freeing' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/iavf: fix driver crash when enable TSO' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'app/testpmd: fix show port info routine' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/ena: fix admin CQ polling for 32-bit' " Kevin Traynor
2019-08-28 13:41 ` [dpdk-stable] patch 'net/bnxt: fix crash on probe failure' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix Tx hang after port stop/start' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix L4 checksum error indication in Rx' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: save the number of EM flow count' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix enabling/disabling interrupts' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: check invalid VNIC in cleanup path' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix compiler warning' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix RxQ count if ntuple filtering is disabled' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: check invalid VNIC id for firmware' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/avf: fix Rx bytes stats' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/i40e: fix MAC removal check' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/i40e: fix SFP X722 with FW4.16' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'doc: fix ethernet addresses in flow API guide' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix error handling in port start' " Kevin Traynor
2019-08-28 13:42 ` Kevin Traynor [this message]
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix adding MAC address' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix unconditional wait in link update' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix setting primary MAC address' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix device init error path' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: reset filters before registering interrupts' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: retry IRQ callback deregistration' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix return values to standard error codes' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix lock release on getting NVM info' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix getting statistics' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix checking result of HWRM command' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix Rx interrupt vector' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: fix interrupt rearm logic' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/bnxt: remove unnecessary interrupt disable' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/e1000: fix buffer overrun while i219 processing DMA' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/mlx5: fix typos in comments' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/dpaa: check multi-segment external buffers' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/dpaa2: fix multi-segment Tx' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/ark: fix queue packet replacement' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/i40e: fix ethernet flow rule' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/i40e: fix flow director rule destroy' " Kevin Traynor
2019-08-28 13:42 ` [dpdk-stable] patch 'net/mlx5: remove redundant item from union' " Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190828134234.20547-37-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=kalesh-anakkur.purayil@broadcom.com \
--cc=somnath.kotur@broadcom.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).