[dpdk-dev,2/4] bnxt: Fix a segfault encountered during KNI exit
Commit Message
The bnxt PMD is running into a segfault when exiting out of KNI
in the dev_uninit/close path. This patch fixes that.
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/bnxt.h | 1 +
drivers/net/bnxt/bnxt_ethdev.c | 34 ++++++++++++++++++++++------------
2 files changed, 23 insertions(+), 12 deletions(-)
Comments
On 9/29/2016 6:03 PM, Ajit Khaparde wrote:
> The bnxt PMD is running into a segfault when exiting out of KNI
KNI?
> in the dev_uninit/close path. This patch fixes that.
>
> Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
...
On Thu, Sep 29, 2016 at 12:41 PM, Ferruh Yigit <ferruh.yigit@intel.com>
wrote:
> On 9/29/2016 6:03 PM, Ajit Khaparde wrote:
> > The bnxt PMD is running into a segfault when exiting out of KNI
>
> KNI?
>
examples/kni
On closing the kni app, I am seeing a segfault. because of improper
cleanup of resources
in the dev_uninit path.
On 9/29/2016 8:06 PM, Ajit Khaparde wrote:
> On Thu, Sep 29, 2016 at 12:41 PM, Ferruh Yigit <ferruh.yigit@intel.com
> <mailto:ferruh.yigit@intel.com>>wrote:
>
> On 9/29/2016 6:03 PM, Ajit Khaparde wrote:
> > The bnxt PMD is running into a segfault when exiting out of KNI
>
> KNI?
>
> examples/kni
>
> On closing the kni app, I am seeing a segfault. because of improper
> cleanup of resources
> in the dev_uninit path.
So this is mainly related to driver exit, KNI app is just a way to
reproduce it.
Are you OK with following update in commit log:
"
net/bnxt: fix a segfault encountered during PMD exit
This patch fixes segfault encountered during dev_uninit/close routine.
KNI sample app can be used to reproduce the issue.
"
On Mon, Oct 10, 2016 at 10:24 AM, Ferruh Yigit <ferruh.yigit@intel.com>
wrote:
> On 9/29/2016 8:06 PM, Ajit Khaparde wrote:
> > On Thu, Sep 29, 2016 at 12:41 PM, Ferruh Yigit <ferruh.yigit@intel.com
> > <mailto:ferruh.yigit@intel.com>>wrote:
> >
> > On 9/29/2016 6:03 PM, Ajit Khaparde wrote:
> > > The bnxt PMD is running into a segfault when exiting out of KNI
> >
> > KNI?
> >
> > examples/kni
> >
> > On closing the kni app, I am seeing a segfault. because of improper
> > cleanup of resources
> > in the dev_uninit path.
>
> So this is mainly related to driver exit, KNI app is just a way to
> reproduce it.
>
> Are you OK with following update in commit log:
>
> "
> net/bnxt: fix a segfault encountered during PMD exit
>
> This patch fixes segfault encountered during dev_uninit/close routine.
> KNI sample app can be used to reproduce the issue.
> "
>
I am OK with this Ferruh.
Thanks
@@ -175,6 +175,7 @@ struct bnxt {
struct bnxt_pf_info pf;
struct bnxt_vf_info vf;
uint8_t port_partition_type;
+ uint8_t dev_stopped;
};
#endif
@@ -428,6 +428,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
int rc;
+ bp->dev_stopped = 0;
rc = bnxt_hwrm_func_reset(bp);
if (rc) {
RTE_LOG(ERR, PMD, "hwrm chip reset failure rc: %x\n", rc);
@@ -471,10 +472,27 @@ static int bnxt_dev_set_link_down_op(struct rte_eth_dev *eth_dev)
return 0;
}
+/* Unload the driver, release resources */
+static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
+{
+ struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+
+ if (bp->eth_dev->data->dev_started) {
+ /* TBD: STOP HW queues DMA */
+ eth_dev->data->dev_link.link_status = 0;
+ }
+ bnxt_set_hwrm_link_config(bp, false);
+ bnxt_shutdown_nic(bp);
+ bp->dev_stopped = 1;
+}
+
static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
{
struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+ if (bp->dev_stopped == 0)
+ bnxt_dev_stop_op(eth_dev);
+
bnxt_free_tx_mbufs(bp);
bnxt_free_rx_mbufs(bp);
bnxt_free_mem(bp);
@@ -488,18 +506,6 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
}
}
-/* Unload the driver, release resources */
-static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
-{
- struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
-
- if (bp->eth_dev->data->dev_started) {
- /* TBD: STOP HW queues DMA */
- eth_dev->data->dev_link.link_status = 0;
- }
- bnxt_shutdown_nic(bp);
-}
-
static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev,
uint32_t index)
{
@@ -1078,6 +1084,8 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
eth_dev->pci_dev->mem_resource[0].phys_addr,
eth_dev->pci_dev->mem_resource[0].addr);
+ bp->dev_stopped = 0;
+
return 0;
error_free:
@@ -1101,6 +1109,8 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev) {
}
rc = bnxt_hwrm_func_driver_unregister(bp, 0);
bnxt_free_hwrm_resources(bp);
+ if (bp->dev_stopped == 0)
+ bnxt_dev_close_op(eth_dev);
eth_dev->dev_ops = NULL;
eth_dev->rx_pkt_burst = NULL;
eth_dev->tx_pkt_burst = NULL;