[v4] net/ark: support for single function with multiple port
Checks
Commit Message
Support the creation of multiple ports from one ark device via
the use of ark pmd extension, though the assignment of queues
to port.
Add unique dev_private data for each port.
This patch repairs a latent issue uncovered during testing.
Signed-off-by: Ed Czeck <ed.czeck@atomicrules.com>
---
v3:
* Backport to LTS version is not recommended since firmware
changes are required and limited
* remove unused num_queues field from struct ark_adapter
v4:
* additional comments
* separate patch from unrelated patch in series
---
drivers/net/ark/ark_ethdev.c | 15 ++++++++++++++-
drivers/net/ark/ark_ethdev_rx.c | 6 +++---
drivers/net/ark/ark_ethdev_tx.c | 2 +-
drivers/net/ark/ark_global.h | 3 +++
4 files changed, 21 insertions(+), 5 deletions(-)
Comments
On 2/21/2023 4:30 PM, Ed Czeck wrote:
> Support the creation of multiple ports from one ark device via
> the use of ark pmd extension, though the assignment of queues
> to port.
>
> Add unique dev_private data for each port.
>
> This patch repairs a latent issue uncovered during testing.
>
> Signed-off-by: Ed Czeck <ed.czeck@atomicrules.com>
Can you please update patch title as fix commit, and add Fixes line?
It can be good to add information to commit log that backport is not
desired, for LTS maintainers see and prevent backporting by mistake.
On 2/23/2023 2:25 PM, Ferruh Yigit wrote:
> On 2/21/2023 4:30 PM, Ed Czeck wrote:
>> Support the creation of multiple ports from one ark device via
>> the use of ark pmd extension, though the assignment of queues
>> to port.
>>
>> Add unique dev_private data for each port.
>>
>> This patch repairs a latent issue uncovered during testing.
>>
>> Signed-off-by: Ed Czeck <ed.czeck@atomicrules.com>
>
> Can you please update patch title as fix commit, and add Fixes line?
>
> It can be good to add information to commit log that backport is not
> desired, for LTS maintainers see and prevent backporting by mistake.
Hi Ed,
Will there be a new version of this patch or can I drop it in the patchwork?
@@ -300,6 +300,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
int ret;
int port_count = 1;
int p;
+ uint16_t num_queues;
bool rqpacing = false;
ark->eth_dev = dev;
@@ -427,6 +428,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
ark->user_ext.dev_get_port_count(dev,
ark->user_data[dev->data->port_id]);
ark->num_ports = port_count;
+ num_queues = ark_api_num_queues_per_port(ark->mpurx.v, port_count);
for (p = 0; p < port_count; p++) {
struct rte_eth_dev *eth_dev;
@@ -452,7 +454,18 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
}
eth_dev->device = &pci_dev->device;
- eth_dev->data->dev_private = ark;
+ /* Device requires new dev_private data */
+ eth_dev->data->dev_private =
+ rte_zmalloc_socket(name,
+ sizeof(struct ark_adapter),
+ RTE_CACHE_LINE_SIZE,
+ rte_socket_id());
+
+ memcpy(eth_dev->data->dev_private, ark,
+ sizeof(struct ark_adapter));
+ ark = eth_dev->data->dev_private;
+ ark->qbase = p * num_queues;
+
eth_dev->dev_ops = ark->eth_dev->dev_ops;
eth_dev->tx_pkt_burst = ark->eth_dev->tx_pkt_burst;
eth_dev->rx_pkt_burst = ark->eth_dev->rx_pkt_burst;
@@ -68,7 +68,7 @@ struct ark_rx_queue {
static int
eth_ark_rx_hw_setup(struct rte_eth_dev *dev,
struct ark_rx_queue *queue,
- uint16_t rx_queue_id __rte_unused, uint16_t rx_queue_idx)
+ uint16_t rx_queue_idx)
{
rte_iova_t queue_base;
rte_iova_t phys_addr_q_base;
@@ -124,7 +124,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint32_t i;
int status;
- int qidx = queue_idx;
+ int qidx = ark->qbase + queue_idx;
/* We may already be setup, free memory prior to re-allocation */
if (dev->data->rx_queues[queue_idx] != NULL) {
@@ -215,7 +215,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,
}
/* MPU Setup */
if (status == 0)
- status = eth_ark_rx_hw_setup(dev, queue, qidx, queue_idx);
+ status = eth_ark_rx_hw_setup(dev, queue, queue_idx);
if (unlikely(status != 0)) {
struct rte_mbuf **mbuf;
@@ -229,7 +229,7 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,
struct ark_tx_queue *queue;
int status;
- int qidx = queue_idx;
+ int qidx = ark->qbase + queue_idx;
if (!rte_is_power_of_2(nb_desc)) {
ARK_PMD_LOG(ERR,
@@ -112,7 +112,10 @@ struct ark_adapter {
ark_pkt_chkr_t pc;
ark_pkt_dir_t pd;
+ /* For single function, multiple ports */
int num_ports;
+ uint16_t qbase;
+
bool isvf;
/* Packet generator/checker args */