From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: Ajit Khaparde <ajit.khaparde@broadcom.com>
Cc: Randy Schacher <stuart.schacher@broadcom.com>,
dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/bnxt: fix lock release on NVM write failure' has been queued to stable release 18.05.1
Date: Tue, 14 Aug 2018 13:06:17 +0200 [thread overview]
Message-ID: <20180814110651.25277-14-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20180814110651.25277-1-christian.ehrhardt@canonical.com>
Hi,
FYI, your patch has been queued to stable release 18.05.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/16/18. So please
shout if anyone has objections.
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
>From c11bdac58e36d2af9a43c733bd1942e8fc286401 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Wed, 25 Jul 2018 18:15:46 -0700
Subject: [PATCH] net/bnxt: fix lock release on NVM write failure
[ upstream commit 4623c0d4b572e9bea28d59e6e54ae6d5dab2412e ]
In bnxt_hwrm_flash_nvram, before attempting to allocate a buffer
we are grabbing the rte_spinlock. And if the allocation fails we
are returning before releasing the spinlock. We avoid the situation
by calling HWRM_PREP which grabs the lock after the buffer is
allocated successfully.
Fixes: 19e6af01bb36 ("net/bnxt: support get/set EEPROM")
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Randy Schacher <stuart.schacher@broadcom.com>
---
drivers/net/bnxt/bnxt_hwrm.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 714871eb2..b800b1a51 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -3384,14 +3384,6 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type,
rte_iova_t dma_handle;
uint8_t *buf;
- HWRM_PREP(req, NVM_WRITE);
-
- req.dir_type = rte_cpu_to_le_16(dir_type);
- req.dir_ordinal = rte_cpu_to_le_16(dir_ordinal);
- req.dir_ext = rte_cpu_to_le_16(dir_ext);
- req.dir_attr = rte_cpu_to_le_16(dir_attr);
- req.dir_data_length = rte_cpu_to_le_32(data_len);
-
buf = rte_malloc("nvm_write", data_len, 0);
rte_mem_lock_page(buf);
if (!buf)
@@ -3404,6 +3396,14 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type,
return -ENOMEM;
}
memcpy(buf, data, data_len);
+
+ HWRM_PREP(req, NVM_WRITE);
+
+ req.dir_type = rte_cpu_to_le_16(dir_type);
+ req.dir_ordinal = rte_cpu_to_le_16(dir_ordinal);
+ req.dir_ext = rte_cpu_to_le_16(dir_ext);
+ req.dir_attr = rte_cpu_to_le_16(dir_attr);
+ req.dir_data_length = rte_cpu_to_le_32(data_len);
req.host_src_addr = rte_cpu_to_le_64(dma_handle);
rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
--
2.17.1
next prev parent reply other threads:[~2018-08-14 11:07 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-14 11:06 [dpdk-stable] patch 'test: fix result printing' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'test: fix code on report' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'test: make autotest runner python 2/3 compliant' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'test: print autotest categories' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'test: improve filtering' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'mk: update targets for classified tests' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'mk: remove unnecessary test rules' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'test: fix uninitialized port configuration' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'app/testpmd: fix DCB config' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'latency: free up the memzone' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/octeontx: fix stop clearing Rx/Tx functions' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/bnxt: fix filter freeing' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/bnxt: fix memory leaks in NVM commands' " Christian Ehrhardt
2018-08-14 11:06 ` Christian Ehrhardt [this message]
2018-08-14 11:06 ` [dpdk-stable] patch 'net/bnxt: check access denied for HWRM " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/bnxt: fix RETA size' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/qede: fix interrupt handler unregister' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/qede/base: fix to clear HW indication' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/qede/base: fix GRC attention callback' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/qede: fix MAC address removal failure message' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/bnx2x: fix FW command timeout during stop' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/bnx2x: fix poll link status' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/dpaa2: remove loop for unused pool entries' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/mlx4: check RSS queues number limitation' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/mlx4: avoid stripping the glue library' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/mlx5: " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/mlx4: advertise Rx jumbo frame support' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/mlx5: fix secondary process resource leakage' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/i40e: fix device parameter parsing' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/i40e: fix rearm check in AVX2 Rx' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/i40e: revert fix of flow director check' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/avf: fix offload capabilities' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'vhost: flush IOTLB cache on new mem table handling' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/bonding: fix race condition' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/mlx5: preserve promiscuous flag for flow isolation mode' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/mlx5: preserve allmulticast " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'event: fix ring init failure handling' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'app/crypto-perf: fix auth IV offset' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'eal: fix bitmap documentation' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'examples/flow_filtering: add flow director config for i40e' " Christian Ehrhardt
2018-08-14 12:08 ` Xu, Rosen
2018-08-14 11:06 ` [dpdk-stable] patch 'hash: fix doxygen of return values' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/tap: fix zeroed flow mask configurations' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'net/qede: fix ntuple filter configuration' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'kni: fix crash with null name' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'kni: fix build on RHEL 7.5' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'ethdev: fix a doxygen comment for port allocation' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'mk: fix permissions when using make install' " Christian Ehrhardt
2018-08-14 11:06 ` [dpdk-stable] patch 'maintainers: claim maintainership for ARM v7 and v8' " Christian Ehrhardt
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=20180814110651.25277-14-christian.ehrhardt@canonical.com \
--to=christian.ehrhardt@canonical.com \
--cc=ajit.khaparde@broadcom.com \
--cc=stable@dpdk.org \
--cc=stuart.schacher@broadcom.com \
/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).