* [PATCH 01/23] net/nfp: fix dereference of null pointer
[not found] <20240619095830.3479757-1-chaoyong.he@corigine.com>
@ 2024-06-19 9:58 ` Chaoyong He
2024-06-19 9:58 ` [PATCH 02/23] net/nfp: disable ctrl VNIC queues Chaoyong He
` (4 subsequent siblings)
5 siblings, 0 replies; 6+ messages in thread
From: Chaoyong He @ 2024-06-19 9:58 UTC (permalink / raw)
To: dev; +Cc: oss-drivers, Peng Zhang, chaoyong.he, stable
From: Peng Zhang <peng.zhang@corigine.com>
The original logic can call the uninitialized parameter 'process_private'
to get 'struct nfp_net_hw_priv', so the null pointer will cause a segment
fault problem.
This commit will add the "struct nfp_repr_init" as the parameter,
it includes "struct nfp_net_hw_priv", it can fix this bug.
Fixes: 149850c5b8ec ("net/nfp: support xstats for flower firmware")
Cc: chaoyong.he@corigine.com
Cc: stable@dpdk.org
Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
---
.../net/nfp/flower/nfp_flower_representor.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index e7550ce9ef..7f12a9dcaa 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -19,6 +19,11 @@ enum nfp_repr_type {
NFP_REPR_TYPE_MAX, /*<< Number of representor types */
};
+struct nfp_repr_init {
+ struct nfp_flower_representor *flower_repr;
+ struct nfp_net_hw_priv *hw_priv;
+};
+
static int
nfp_flower_repr_link_update(struct rte_eth_dev *dev,
__rte_unused int wait_to_complete)
@@ -603,6 +608,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,
int ret;
uint16_t index;
unsigned int numa_node;
+ struct nfp_repr_init *repr_init;
struct nfp_net_hw_priv *hw_priv;
char ring_name[RTE_ETH_NAME_MAX_LEN];
struct nfp_app_fw_flower *app_fw_flower;
@@ -610,12 +616,13 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,
struct nfp_flower_representor *init_repr_data;
/* Cast the input representor data to the correct struct here */
- init_repr_data = init_params;
+ repr_init = init_params;
+ init_repr_data = repr_init->flower_repr;
app_fw_flower = init_repr_data->app_fw_flower;
/* Memory has been allocated in the eth_dev_create() function */
repr = eth_dev->data->dev_private;
- hw_priv = eth_dev->process_private;
+ hw_priv = repr_init->hw_priv;
/*
* We need multiproduce rings as we can have multiple PF ports.
@@ -785,6 +792,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower,
int ret;
const char *pci_name;
struct rte_pci_device *pci_dev;
+ struct nfp_repr_init repr_init;
struct nfp_eth_table *nfp_eth_table;
struct nfp_eth_table_port *eth_port;
struct nfp_flower_representor flower_repr = {
@@ -793,6 +801,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower,
};
nfp_eth_table = hw_priv->pf_dev->nfp_eth_table;
+ repr_init.hw_priv = hw_priv;
/* Send a NFP_FLOWER_CMSG_TYPE_MAC_REPR cmsg to hardware */
ret = nfp_flower_cmsg_mac_repr(app_fw_flower, nfp_eth_table);
@@ -840,9 +849,10 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower,
* Create a eth_dev for this representor.
* This will also allocate private memory for the device.
*/
+ repr_init.flower_repr = &flower_repr;
ret = rte_eth_dev_create(&pci_dev->device, flower_repr.name,
sizeof(struct nfp_flower_representor),
- NULL, NULL, nfp_flower_repr_init, &flower_repr);
+ NULL, NULL, nfp_flower_repr_init, &repr_init);
if (ret != 0) {
PMD_INIT_LOG(ERR, "Cloud not create eth_dev for repr");
break;
@@ -868,10 +878,11 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower,
snprintf(flower_repr.name, sizeof(flower_repr.name),
"%s_repr_vf%d", pci_name, i);
+ repr_init.flower_repr = &flower_repr;
/* This will also allocate private memory for the device */
ret = rte_eth_dev_create(&pci_dev->device, flower_repr.name,
sizeof(struct nfp_flower_representor),
- NULL, NULL, nfp_flower_repr_init, &flower_repr);
+ NULL, NULL, nfp_flower_repr_init, &repr_init);
if (ret != 0) {
PMD_INIT_LOG(ERR, "Cloud not create eth_dev for repr");
break;
--
2.39.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 02/23] net/nfp: disable ctrl VNIC queues
[not found] <20240619095830.3479757-1-chaoyong.he@corigine.com>
2024-06-19 9:58 ` [PATCH 01/23] net/nfp: fix dereference of null pointer Chaoyong He
@ 2024-06-19 9:58 ` Chaoyong He
2024-06-19 9:58 ` [PATCH 03/23] net/nfp: fix dereference of null pointer Chaoyong He
` (3 subsequent siblings)
5 siblings, 0 replies; 6+ messages in thread
From: Chaoyong He @ 2024-06-19 9:58 UTC (permalink / raw)
To: dev; +Cc: oss-drivers, Peng Zhang, chaoyong.he, stable, Long Wu
From: Peng Zhang <peng.zhang@corigine.com>
The logic forgot to disable the ctrl VNIC queues when representor
port close, and this will cause DPDK application restart fail if
not force reload the flower firmware.
Fix this by adding the missing logic to disable the ctrl VNIC
queues.
Fixes: 945441ebdb9c ("net/nfp: add flower ctrl VNIC")
Cc: chaoyong.he@corigine.com
Cc: stable@dpdk.org
Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
---
drivers/net/nfp/flower/nfp_flower.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c
index 0edebd574a..5caaf9d745 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -533,6 +533,8 @@ nfp_flower_cleanup_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower,
pci_name = strchr(hw_priv->pf_dev->pci_dev->name, ':') + 1;
+ nfp_net_disable_queues(eth_dev);
+
snprintf(ctrl_txring_name, sizeof(ctrl_txring_name), "%s_cttx_ring", pci_name);
for (i = 0; i < hw->max_tx_queues; i++) {
txq = eth_dev->data->tx_queues[i];
--
2.39.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 03/23] net/nfp: fix dereference of null pointer
[not found] <20240619095830.3479757-1-chaoyong.he@corigine.com>
2024-06-19 9:58 ` [PATCH 01/23] net/nfp: fix dereference of null pointer Chaoyong He
2024-06-19 9:58 ` [PATCH 02/23] net/nfp: disable ctrl VNIC queues Chaoyong He
@ 2024-06-19 9:58 ` Chaoyong He
2024-06-19 9:58 ` [PATCH 04/23] net/nfp: fix repeat disable the port Chaoyong He
` (2 subsequent siblings)
5 siblings, 0 replies; 6+ messages in thread
From: Chaoyong He @ 2024-06-19 9:58 UTC (permalink / raw)
To: dev; +Cc: oss-drivers, Peng Zhang, james.hershaw, stable, Chaoyong He, Long Wu
From: Peng Zhang <peng.zhang@corigine.com>
The original logic can not make sure the 'repr' pointer has
valid value and the dereference of null pointer will cause
a segment fault problem.
Fixes: eae7dadbe987 ("net/nfp: update link status reporting")
Cc: james.hershaw@corigine.com
Cc: stable@dpdk.org
Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
---
drivers/net/nfp/flower/nfp_flower_ctrl.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c
index de6e419cac..8cfafe91c8 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
@@ -441,6 +441,11 @@ nfp_flower_cmsg_port_mod_rx(struct nfp_app_fw_flower *app_fw_flower,
return -EINVAL;
}
+ if (repr == NULL) {
+ PMD_DRV_LOG(ERR, "Can not get 'repr' for port %#x", port);
+ return -EINVAL;
+ }
+
repr->link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
if ((msg->info & NFP_FLOWER_CMSG_PORT_MOD_INFO_LINK) != 0)
repr->link.link_status = RTE_ETH_LINK_UP;
--
2.39.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 04/23] net/nfp: fix repeat disable the port
[not found] <20240619095830.3479757-1-chaoyong.he@corigine.com>
` (2 preceding siblings ...)
2024-06-19 9:58 ` [PATCH 03/23] net/nfp: fix dereference of null pointer Chaoyong He
@ 2024-06-19 9:58 ` Chaoyong He
2024-06-19 9:58 ` [PATCH 05/23] net/nfp: fix repeat set the speed configure Chaoyong He
2024-06-19 9:58 ` [PATCH 18/23] net/nfp: add check for numbers of VF representor port Chaoyong He
5 siblings, 0 replies; 6+ messages in thread
From: Chaoyong He @ 2024-06-19 9:58 UTC (permalink / raw)
To: dev; +Cc: oss-drivers, Peng Zhang, stable, Chaoyong He, Long Wu
From: Peng Zhang <peng.zhang@corigine.com>
For firmware with multiple PFs, all the PFs share
the same 'nfp_eth_table' data structure. So the original
logic loop the ports in 'nfp_eth_table' will make other
PFs suddently down, which will cause problem.
Fix this by adding the special logic for firmware with
multiple PFs.
Fixes: 3b00109d2b65 ("net/nfp: add PF ID used to format symbols")
Cc: stable@dpdk.org
Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
---
drivers/net/nfp/nfp_ethdev.c | 35 ++++++++++++++++++++++++++------
drivers/net/nfp/nfp_net_common.c | 10 +++++++++
drivers/net/nfp/nfp_net_common.h | 2 ++
3 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 181798e8e3..7479802a52 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -1773,6 +1773,30 @@ nfp_net_speed_capa_get(struct nfp_pf_dev *pf_dev,
return 0;
}
+/* Force the physical port down to clear the possible DMA error */
+static int
+nfp_net_force_port_down(struct nfp_pf_dev *pf_dev,
+ struct nfp_eth_table *nfp_eth_table,
+ struct nfp_cpp *cpp)
+{
+ int ret;
+ uint32_t i;
+ uint32_t id;
+ uint32_t index;
+ uint32_t count;
+
+ count = nfp_net_get_port_num(pf_dev, nfp_eth_table);
+ for (i = 0; i < count; i++) {
+ id = nfp_function_id_get(pf_dev, i);
+ index = nfp_eth_table->ports[id].index;
+ ret = nfp_eth_set_configured(cpp, index, 0);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
static int
nfp_pf_init(struct rte_pci_device *pci_dev)
{
@@ -1781,7 +1805,6 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
uint32_t id;
int ret = 0;
uint64_t addr;
- uint32_t index;
uint32_t cpp_id;
uint8_t function_id;
struct nfp_cpp *cpp;
@@ -1875,11 +1898,11 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
pf_dev->multi_pf.enabled = nfp_check_multi_pf_from_nsp(pci_dev, cpp);
pf_dev->multi_pf.function_id = function_id;
- /* Force the physical port down to clear the possible DMA error */
- for (i = 0; i < nfp_eth_table->count; i++) {
- id = nfp_function_id_get(pf_dev, i);
- index = nfp_eth_table->ports[id].index;
- nfp_eth_set_configured(cpp, index, 0);
+ ret = nfp_net_force_port_down(pf_dev, nfp_eth_table, cpp);
+ if (ret != 0) {
+ PMD_INIT_LOG(ERR, "Failed to force port down");
+ ret = -EIO;
+ goto eth_table_cleanup;
}
ret = nfp_devargs_parse(&pf_dev->devargs, pci_dev->device.devargs);
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 107306a4e3..d8b7045c3a 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -2554,3 +2554,13 @@ nfp_net_fec_set(struct rte_eth_dev *dev,
return nfp_eth_set_fec(hw_priv->pf_dev->cpp, eth_port->index, fec);
}
+
+uint32_t
+nfp_net_get_port_num(struct nfp_pf_dev *pf_dev,
+ struct nfp_eth_table *nfp_eth_table)
+{
+ if (pf_dev->multi_pf.enabled)
+ return 1;
+ else
+ return nfp_eth_table->count;
+}
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index 2feeb6f5bd..4016652cf9 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -326,6 +326,8 @@ void nfp_net_get_fw_version(struct nfp_cpp *cpp,
uint32_t *fw_version);
int nfp_net_txrwb_alloc(struct rte_eth_dev *eth_dev);
void nfp_net_txrwb_free(struct rte_eth_dev *eth_dev);
+uint32_t nfp_net_get_port_num(struct nfp_pf_dev *pf_dev,
+ struct nfp_eth_table *nfp_eth_table);
#define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\
((struct nfp_app_fw_nic *)app_fw_priv)
--
2.39.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 05/23] net/nfp: fix repeat set the speed configure
[not found] <20240619095830.3479757-1-chaoyong.he@corigine.com>
` (3 preceding siblings ...)
2024-06-19 9:58 ` [PATCH 04/23] net/nfp: fix repeat disable the port Chaoyong He
@ 2024-06-19 9:58 ` Chaoyong He
2024-06-19 9:58 ` [PATCH 18/23] net/nfp: add check for numbers of VF representor port Chaoyong He
5 siblings, 0 replies; 6+ messages in thread
From: Chaoyong He @ 2024-06-19 9:58 UTC (permalink / raw)
To: dev; +Cc: oss-drivers, Peng Zhang, zerun.fu, stable, Chaoyong He, Long Wu
From: Peng Zhang <peng.zhang@corigine.com>
For firmware with multiple PFs, all the PFs share the same
'nfp_eth_table' data structure. So the original logic loop the
ports in 'nfp_eth_table' will cause the speed capability field of
the 'struct nfp_pf_dev' be covered.
Fix this by adding the special logic for firmware with multiple PFs.
Fixes: 3110ab733862 ("net/nfp: support getting speed capability")
Cc: zerun.fu@corigine.com
Cc: stable@dpdk.org
Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
---
drivers/net/nfp/nfp_ethdev.c | 39 +++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 7479802a52..2c1300350c 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -1741,7 +1741,7 @@ nfp_net_speed_capa_get_real(struct nfp_eth_media_buf *media_buf,
}
static int
-nfp_net_speed_capa_get(struct nfp_pf_dev *pf_dev,
+nfp_net_speed_cap_get_one(struct nfp_pf_dev *pf_dev,
uint32_t port_id)
{
int ret;
@@ -1773,6 +1773,27 @@ nfp_net_speed_capa_get(struct nfp_pf_dev *pf_dev,
return 0;
}
+static int
+nfp_net_speed_cap_get(struct nfp_pf_dev *pf_dev)
+{
+ int ret;
+ uint32_t i;
+ uint32_t id;
+ uint32_t count;
+
+ count = nfp_net_get_port_num(pf_dev, pf_dev->nfp_eth_table);
+ for (i = 0; i < count; i++) {
+ id = nfp_function_id_get(pf_dev, i);
+ ret = nfp_net_speed_cap_get_one(pf_dev, id);
+ if (ret != 0) {
+ PMD_INIT_LOG(ERR, "Failed to get port %d speed capability.", id);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
/* Force the physical port down to clear the possible DMA error */
static int
nfp_net_force_port_down(struct nfp_pf_dev *pf_dev,
@@ -1801,8 +1822,6 @@ static int
nfp_pf_init(struct rte_pci_device *pci_dev)
{
void *sync;
- uint32_t i;
- uint32_t id;
int ret = 0;
uint64_t addr;
uint32_t cpp_id;
@@ -1953,15 +1972,11 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
pf_dev->nfp_eth_table = nfp_eth_table;
pf_dev->sync = sync;
- /* Get the speed capability */
- for (i = 0; i < nfp_eth_table->count; i++) {
- id = nfp_function_id_get(pf_dev, i);
- ret = nfp_net_speed_capa_get(pf_dev, id);
- if (ret != 0) {
- PMD_INIT_LOG(ERR, "Failed to get speed capability.");
- ret = -EIO;
- goto sym_tbl_cleanup;
- }
+ ret = nfp_net_speed_cap_get(pf_dev);
+ if (ret != 0) {
+ PMD_INIT_LOG(ERR, "Failed to get speed capability.");
+ ret = -EIO;
+ goto sym_tbl_cleanup;
}
/* Configure access to tx/rx vNIC BARs */
--
2.39.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 18/23] net/nfp: add check for numbers of VF representor port
[not found] <20240619095830.3479757-1-chaoyong.he@corigine.com>
` (4 preceding siblings ...)
2024-06-19 9:58 ` [PATCH 05/23] net/nfp: fix repeat set the speed configure Chaoyong He
@ 2024-06-19 9:58 ` Chaoyong He
5 siblings, 0 replies; 6+ messages in thread
From: Chaoyong He @ 2024-06-19 9:58 UTC (permalink / raw)
To: dev; +Cc: oss-drivers, Peng Zhang, chaoyong.he, stable, Long Wu
From: Peng Zhang <peng.zhang@corigine.com>
When the number of VF representor ports is bigger than
the number of VF ports, there will be segment fault.
Fix this by adding the check logic.
Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework")
Cc: chaoyong.he@corigine.com
Cc: stable@dpdk.org
Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
---
drivers/net/nfp/flower/nfp_flower_representor.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index e6fef45ddd..086dbc58e3 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -959,6 +959,11 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower,
app_fw_flower->num_phyport_reprs = pf_dev->total_phyports;
app_fw_flower->num_vf_reprs = eth_da.nb_representor_ports -
pf_dev->total_phyports - 1;
+ if (pf_dev->max_vfs != 0 && pf_dev->sriov_vf < app_fw_flower->num_vf_reprs) {
+ PMD_INIT_LOG(ERR, "The VF repr nums %d is bigger than VF nums %d",
+ app_fw_flower->num_vf_reprs, pf_dev->sriov_vf);
+ return -ERANGE;
+ }
PMD_INIT_LOG(INFO, "%d number of VF reprs", app_fw_flower->num_vf_reprs);
PMD_INIT_LOG(INFO, "%d number of phyport reprs", app_fw_flower->num_phyport_reprs);
--
2.39.1
^ permalink raw reply [flat|nested] 6+ messages in thread