[PATCH 1/2] common/iavf: fix hw mac type for 710 NIC
Fix hw mac type according to PCI ID list.
Fixes: eb385183edac ("net/iavf/base: update device IDs")
Cc: sta...@dpdk.org
Signed-off-by: Wenjing Qiao
---
drivers/common/iavf/iavf_common.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/common/iavf/iavf_common.c
b/drivers/common/iavf/iavf_common.c
index 855a0ab2f5..dc7662bc1b 100644
--- a/drivers/common/iavf/iavf_common.c
+++ b/drivers/common/iavf/iavf_common.c
@@ -27,6 +27,8 @@ enum iavf_status iavf_set_mac_type(struct iavf_hw *hw)
break;
case IAVF_DEV_ID_VF:
case IAVF_DEV_ID_VF_HV:
+ hw->mac.type = IAVF_MAC_XL710;
+ break;
case IAVF_DEV_ID_ADAPTIVE_VF:
hw->mac.type = IAVF_MAC_VF;
break;
--
2.34.1
[PATCH v2] common/iavf: fix hw mac type for 710 NIC
Fix hw mac type according to PCI ID list.
Fixes: eb385183edac ("net/iavf/base: update device IDs")
Cc: sta...@dpdk.org
Signed-off-by: Wenjing Qiao
---
drivers/common/iavf/iavf_common.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/common/iavf/iavf_common.c
b/drivers/common/iavf/iavf_common.c
index 855a0ab2f5..dc7662bc1b 100644
--- a/drivers/common/iavf/iavf_common.c
+++ b/drivers/common/iavf/iavf_common.c
@@ -27,6 +27,8 @@ enum iavf_status iavf_set_mac_type(struct iavf_hw *hw)
break;
case IAVF_DEV_ID_VF:
case IAVF_DEV_ID_VF_HV:
+ hw->mac.type = IAVF_MAC_XL710;
+ break;
case IAVF_DEV_ID_ADAPTIVE_VF:
hw->mac.type = IAVF_MAC_VF;
break;
--
2.34.1
[PATCH v2] net/iavf: fix vlan offload strip flag inconsistency
For i40e in-tree kernel driver, it will set strip on when setting
filter on. To be consistent with dpdk, disable strip again.
Fixes: cb25d4323fbf ("net/avf: enable MAC VLAN and promisc ops")
Cc: sta...@dpdk.org
Signed-off-by: Wenjing Qiao
---
Depends-on: patch-129488 ("common/iavf: fix hw mac type for 710 NIC")
---
drivers/net/iavf/iavf_ethdev.c | 12
1 file changed, 12 insertions(+)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 00b963128b..d5dfa019f7 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1361,6 +1361,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev,
uint16_t vlan_id, int on)
struct iavf_adapter *adapter =
IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+ struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
int err;
if (adapter->closed)
@@ -1379,6 +1380,17 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev,
uint16_t vlan_id, int on)
err = iavf_add_del_vlan(adapter, vlan_id, on);
if (err)
return -EIO;
+ /* for i40e in-tree kernel driver, it will set strip on when setting
+* filter on. To be consistent with dpdk, disable strip again.
+*/
+ if (adapter->hw.mac.type == IAVF_MAC_XL710 ||
+ adapter->hw.mac.type == IAVF_MAC_X722_VF) {
+ if (on && !(dev_conf->rxmode.offloads &
RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) {
+ err = iavf_disable_vlan_strip(adapter);
+ if (err)
+ return -EIO;
+ }
+ }
return 0;
}
--
2.34.1
[PATCH 0/3] fix Rx and Tx queue status get
Some Intel drivers not support queue start/stop ops, it will caused application can't get correct queue status and can't forward packets. This patchset fixed the issue by updating the queue states when the queue is disabled or enabled. Qiming Yang (3): net/ixgbevf: fix Rx and Tx queue status get net/igc: fix Rx and Tx queue status get net/e1000: fix Rx and Tx queue status drivers/net/e1000/igb_rxtx.c | 4 drivers/net/igc/igc_txrx.c | 4 drivers/net/ixgbe/ixgbe_rxtx.c | 6 ++ 3 files changed, 14 insertions(+) -- 2.25.1
[PATCH 1/3] net/ixgbevf: fix Rx and Tx queue status get
Ixgbevf driver don't enable queue start/stop functions, queue status is not
updated when the HW queue enabled or disabled. It caused application can't
get correct queue status.
This patch fixes the issue by updating the queue states when the queue is
disabled or enabled.
Fixes: 429c6d86b371 ("ixgbe: prepare for vector pmd")
Fixes: f0c50e5f56fa ("ixgbe: move PMD specific fields out of base driver")
Signed-off-by: Qiming Yang
Signed-off-by: Jie Hai
---
drivers/net/ixgbe/ixgbe_rxtx.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 61f17cd90b..954ef241a0 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -3378,6 +3378,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
if (txq != NULL) {
txq->ops->release_mbufs(txq);
txq->ops->reset(txq);
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
@@ -3387,6 +3388,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
if (rxq != NULL) {
ixgbe_rx_queue_release_mbufs(rxq);
ixgbe_reset_rx_queue(adapter, rxq);
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
/* If loopback mode was enabled, reconfigure the link accordingly */
@@ -5896,6 +5898,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)
} while (--poll_ms && !(txdctl & IXGBE_TXDCTL_ENABLE));
if (!poll_ms)
PMD_INIT_LOG(ERR, "Could not enable Tx Queue %d", i);
+ else
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STARTED;
}
for (i = 0; i < dev->data->nb_rx_queues; i++) {
@@ -5913,6 +5917,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)
} while (--poll_ms && !(rxdctl & IXGBE_RXDCTL_ENABLE));
if (!poll_ms)
PMD_INIT_LOG(ERR, "Could not enable Rx Queue %d", i);
+ else
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STARTED;
rte_wmb();
IXGBE_WRITE_REG(hw, IXGBE_VFRDT(i), rxq->nb_rx_desc - 1);
--
2.25.1
[PATCH 2/3] net/igc: fix Rx and Tx queue status get
Igc driver don't enable queue start/stop functions, queue status is not
updated when the HW queue enabled or disabled. It caused application can't
get correct queue status.
This patch fixes the issue by updating the queue states when the queue is
disabled or enabled.
Fixes: a5aeb2b9e225 ("net/igc: support Rx and Tx")
Signed-off-by: Qiming Yang
Signed-off-by: Mingjin Ye
---
drivers/net/igc/igc_txrx.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c
index c11b6f7f25..5c60e3e997 100644
--- a/drivers/net/igc/igc_txrx.c
+++ b/drivers/net/igc/igc_txrx.c
@@ -1215,6 +1215,7 @@ igc_rx_init(struct rte_eth_dev *dev)
dvmolr |= IGC_DVMOLR_STRCRC;
IGC_WRITE_REG(hw, IGC_DVMOLR(rxq->reg_idx), dvmolr);
+ dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
}
return 0;
@@ -1888,6 +1889,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
if (txq != NULL) {
igc_tx_queue_release_mbufs(txq);
igc_reset_tx_queue(txq);
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
@@ -1896,6 +1898,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
if (rxq != NULL) {
igc_rx_queue_release_mbufs(rxq);
igc_reset_rx_queue(rxq);
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
}
@@ -2143,6 +2146,7 @@ igc_tx_init(struct rte_eth_dev *dev)
IGC_TXDCTL_WTHRESH_MSK;
txdctl |= IGC_TXDCTL_QUEUE_ENABLE;
IGC_WRITE_REG(hw, IGC_TXDCTL(txq->reg_idx), txdctl);
+ dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
}
if (offloads & RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP) {
--
2.25.1
[PATCH 3/3] net/e1000: fix Rx and Tx queue status
Igb driver don't enable queue start/stop functions, queue status is not
updated when the HW queue enabled or disabled. It caused application can't
get correct queue status.
This patch fixes the issue by updating the queue states when the queue is
disabled or enabled.
Fixes: be2d648a2dd3 ("igb: add PF support")
Signed-off-by: Qiming Yang
Signed-off-by: Mingjin Ye
---
drivers/net/e1000/igb_rxtx.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 25ad9eb4e5..61c6394310 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -1854,6 +1854,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
if (txq != NULL) {
igb_tx_queue_release_mbufs(txq);
igb_reset_tx_queue(txq, dev);
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
@@ -1862,6 +1863,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
if (rxq != NULL) {
igb_rx_queue_release_mbufs(rxq);
igb_reset_rx_queue(rxq);
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
}
@@ -2442,6 +2444,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
rxdctl |= ((rxq->hthresh & 0x1F) << 8);
rxdctl |= ((rxq->wthresh & 0x1F) << 16);
E1000_WRITE_REG(hw, E1000_RXDCTL(rxq->reg_idx), rxdctl);
+ dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
}
if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_SCATTER) {
@@ -2606,6 +2609,7 @@ eth_igb_tx_init(struct rte_eth_dev *dev)
txdctl |= ((txq->wthresh & 0x1F) << 16);
txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
E1000_WRITE_REG(hw, E1000_TXDCTL(txq->reg_idx), txdctl);
+ dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
}
/* Program the Transmit Control Register. */
--
2.25.1
Re: 回复: 回复: [PATCH v3] vhost: add notify reply ops to fix message deadlock
On 7/12/23 04:17, Rma Ma wrote:
> > > Since backend and frontend message are synchronous in the same
thread,
> > > there will be a probability of message deadlock.
> > > Consider each driver to determine whether to wait for response.
> > >
> > > Fixes: d90cf7d111ac ("vhost: support host notifier")
> > > Cc: maxime.coque...@redhat.com
> > > Signed-off-by: Rma Ma
> > > ---
> > > v2 - fix format error in commit message
> > > v3 - add --in-reply-to
> > > ---
> >
> > Hi Maxime,
> >
> > This patch helps to fix vhost-user message deadlock, could you help
> > review it?
>
> The patch introduces a new device op, but it is used nowhere in vDPA
> drivers.
>
> What vDPA driver is it going to be used with?
>
> Regards,
> Maxime
Hi,
Our company's jmnd vdpa driver, which requires the
rte_vhost_host_notifier_ctrl interface,
replicates the problem with the following scenario:
QEMU start vhost-user with modern net and blk, backend use dpdk-vdpa
process,
after live migration, dest QEMU deadlock with dpdk-vdpa.
- QEMU sends VHOST_USER_SET_VRING_KICK to dpdk-vdpa net
- QEMU does not need to wait for a response to this message
- QEMU then sends VHOST_USER_SET_MEM_TABLE to dpdk-vdpa blk
- QEMU needs to wait reply in this message
- when dpdk-vdpa recv VHOST_USER_SET_VRING_KICK,
- it will send VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG to QEMU
- dpdk-vdpa needs to wait for a response to this message
- QEMU will deadlock with dpdk-vdpa
I tried to add a patch to the qemu community that uses a new thread to
loop backend channel,
But there will be some multi-threaded synchronization issues
I think this is a public issue, and other backend messages take this
into account,
so I think this message also needs a flag to fix it.
and jmnd vdpa driver will subsequently be open-sourced to the community.
Thanks forthe clarification.
Please submit this patch in the same series that introduce jmnd vDPA
driver into upstream DPDK.
Indeed, we need to have an internal driver that makes use of this new op
for it to be accepted. Otherwise, we have no way to maintain it.
Regards,
Maxime
Best wishes,
Rma
*发件人:* Maxime Coquelin
*发送时间:* 2023年7月11日 21:25
*收件人:* Rma Ma ; dpdk-dev
*抄送:* Chenbo Xia
*主题:* Re: 回复: [PATCH v3] vhost: add notify reply ops to fix message
deadlock
Hi,
On 7/11/23 11:25, Rma Ma wrote:
> Since backend and frontend message are synchronous in the same thread,
> there will be a probability of message deadlock.
> Consider each driver to determine whether to wait for response.
>
> Fixes: d90cf7d111ac ("vhost: support host notifier")
> Cc: maxime.coque...@redhat.com
> Signed-off-by: Rma Ma
> ---
> v2 - fix format error in commit message
> v3 - add --in-reply-to
> ---
Hi Maxime,
This patch helps to fix vhost-user message deadlock, could you help
review it?
The patch introduces a new device op, but it is used nowhere in vDPA
drivers.
What vDPA driver is it going to be used with?
Regards,
Maxime
Thanks.
Best wishes,
Rma
*发件人:* Rma Ma
*发送时间:* 2023年7月4日 10:52
*收件人:* dpdk-dev
*抄送:* Maxime Coquelin ; Chenbo Xia
; Rma Ma
*主题:* [PATCH v3] vhost: add notify reply ops to fix message deadlock
Since backend and frontend message are synchronous in the same thread,
there will be a probability of message deadlock.
Consider each driver to determine whether to wait for response.
Fixes: d90cf7d111ac ("vhost: support host notifier")
Cc: maxime.coque...@redhat.com
Signed-off-by: Rma Ma
---
v2 - fix format error in commit message
v3 - add --in-reply-to
---
lib/vhost/vdpa_driver.h | 3 +++
lib/vhost/vhost_user.c | 23 ++-
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/lib/vhost/vdpa_driver.h b/lib/vhost/vdpa_driver.h
index 8db4ab9f4d..3d2ea3c90e 100644
--- a/lib/vhost/vdpa_driver.h
+++ b/lib/vhost/vdpa_driver.h
@@ -81,6 +81,9 @@ struct rte_vdpa_dev_ops {
/** get device type: net device, blk device... */
int (*get_dev_type)(struct rte_vdpa_device *dev, uint32_t *type);
+
+ /** Get the notify reply flag */
+ int (*get_notify_reply_flag)(int vid, bool *need_reply);
};
/**
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 901a80bbaa..aa61992939 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -3365,13 +3365,14 @@ rte_vhost_backend_config_change(int vid, bool
need_reply)
static int vhost_user_backend_set_vring_host_notifier(struct
virtio_net *dev,
int index, int fd,
uint64_t offset,
- uint64_t size)
+ uint64_t size,
+
RE: [PATCH v2] net/iavf: fix vlan offload strip flag inconsistency
-Original Message-
From: Wenjing Qiao
Sent: Wednesday, July 12, 2023 3:49 PM
To: Wu, Jingjing ; Xing, Beilei
Cc: dev@dpdk.org; Qiao, Wenjing ; sta...@dpdk.org
Subject: [PATCH v2] net/iavf: fix vlan offload strip flag inconsistency
For i40e in-tree kernel driver, it will set strip on when setting filter on. To
be consistent with dpdk, disable strip again.
Fixes: cb25d4323fbf ("net/avf: enable MAC VLAN and promisc ops")
Cc: sta...@dpdk.org
Signed-off-by: Wenjing Qiao
---
Depends-on: patch-129488 ("common/iavf: fix hw mac type for 710 NIC")
---
Verified vf vlan filter and strip cases in i40e intree driver, tested pass.
Tested-by: Zhimin Huang
[PATCH v2 0/3] fix Rx and Tx queue status get
Some Intel drivers not support queue start/stop ops, it will caused application can't get correct queue status and can't forward packets. This patchset fixed the issue by updating the queue states when the queue is disabled or enabled. This issue related commit 141a520b35f7 app/testpmd: fix primary process not polling all queues --- v2 changes: add CC sta...@dpdk.org Qiming Yang (3): net/ixgbevf: fix Rx and Tx queue status get net/igc: fix Rx and Tx queue status get net/e1000: fix Rx and Tx queue status drivers/net/e1000/igb_rxtx.c | 4 drivers/net/igc/igc_txrx.c | 4 drivers/net/ixgbe/ixgbe_rxtx.c | 6 ++ 3 files changed, 14 insertions(+) -- 2.25.1
[PATCH v2 2/3] net/igc: fix Rx and Tx queue status get
Igc driver don't enable queue start/stop functions, queue status is not
updated when the HW queue enabled or disabled. It caused application can't
get correct queue status.
This patch fixes the issue by updating the queue states when the queue is
disabled or enabled.
Fixes: a5aeb2b9e225 ("net/igc: support Rx and Tx")
Cc: sta...@dpdk.org
Signed-off-by: Qiming Yang
Signed-off-by: Mingjin Ye
---
drivers/net/igc/igc_txrx.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c
index c11b6f7f25..5c60e3e997 100644
--- a/drivers/net/igc/igc_txrx.c
+++ b/drivers/net/igc/igc_txrx.c
@@ -1215,6 +1215,7 @@ igc_rx_init(struct rte_eth_dev *dev)
dvmolr |= IGC_DVMOLR_STRCRC;
IGC_WRITE_REG(hw, IGC_DVMOLR(rxq->reg_idx), dvmolr);
+ dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
}
return 0;
@@ -1888,6 +1889,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
if (txq != NULL) {
igc_tx_queue_release_mbufs(txq);
igc_reset_tx_queue(txq);
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
@@ -1896,6 +1898,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
if (rxq != NULL) {
igc_rx_queue_release_mbufs(rxq);
igc_reset_rx_queue(rxq);
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
}
@@ -2143,6 +2146,7 @@ igc_tx_init(struct rte_eth_dev *dev)
IGC_TXDCTL_WTHRESH_MSK;
txdctl |= IGC_TXDCTL_QUEUE_ENABLE;
IGC_WRITE_REG(hw, IGC_TXDCTL(txq->reg_idx), txdctl);
+ dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
}
if (offloads & RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP) {
--
2.25.1
[PATCH v2 1/3] net/ixgbevf: fix Rx and Tx queue status get
Ixgbevf driver don't enable queue start/stop functions, queue status is not
updated when the HW queue enabled or disabled. It caused application can't
get correct queue status.
This patch fixes the issue by updating the queue states when the queue is
disabled or enabled.
Fixes: 429c6d86b371 ("ixgbe: prepare for vector pmd")
Fixes: f0c50e5f56fa ("ixgbe: move PMD specific fields out of base driver")
Cc: sta...@dpdk.org
Signed-off-by: Qiming Yang
Signed-off-by: Jie Hai
---
drivers/net/ixgbe/ixgbe_rxtx.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 61f17cd90b..954ef241a0 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -3378,6 +3378,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
if (txq != NULL) {
txq->ops->release_mbufs(txq);
txq->ops->reset(txq);
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
@@ -3387,6 +3388,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
if (rxq != NULL) {
ixgbe_rx_queue_release_mbufs(rxq);
ixgbe_reset_rx_queue(adapter, rxq);
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
/* If loopback mode was enabled, reconfigure the link accordingly */
@@ -5896,6 +5898,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)
} while (--poll_ms && !(txdctl & IXGBE_TXDCTL_ENABLE));
if (!poll_ms)
PMD_INIT_LOG(ERR, "Could not enable Tx Queue %d", i);
+ else
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STARTED;
}
for (i = 0; i < dev->data->nb_rx_queues; i++) {
@@ -5913,6 +5917,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)
} while (--poll_ms && !(rxdctl & IXGBE_RXDCTL_ENABLE));
if (!poll_ms)
PMD_INIT_LOG(ERR, "Could not enable Rx Queue %d", i);
+ else
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STARTED;
rte_wmb();
IXGBE_WRITE_REG(hw, IXGBE_VFRDT(i), rxq->nb_rx_desc - 1);
--
2.25.1
[PATCH v2 3/3] net/e1000: fix Rx and Tx queue status
Igb driver don't enable queue start/stop functions, queue status is not
updated when the HW queue enabled or disabled. It caused application can't
get correct queue status.
This patch fixes the issue by updating the queue states when the queue is
disabled or enabled.
Fixes: be2d648a2dd3 ("igb: add PF support")
Cc: sta...@dpdk.org
Signed-off-by: Qiming Yang
Signed-off-by: Mingjin Ye
---
drivers/net/e1000/igb_rxtx.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 25ad9eb4e5..61c6394310 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -1854,6 +1854,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
if (txq != NULL) {
igb_tx_queue_release_mbufs(txq);
igb_reset_tx_queue(txq, dev);
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
@@ -1862,6 +1863,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
if (rxq != NULL) {
igb_rx_queue_release_mbufs(rxq);
igb_reset_rx_queue(rxq);
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
}
}
}
@@ -2442,6 +2444,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
rxdctl |= ((rxq->hthresh & 0x1F) << 8);
rxdctl |= ((rxq->wthresh & 0x1F) << 16);
E1000_WRITE_REG(hw, E1000_RXDCTL(rxq->reg_idx), rxdctl);
+ dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
}
if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_SCATTER) {
@@ -2606,6 +2609,7 @@ eth_igb_tx_init(struct rte_eth_dev *dev)
txdctl |= ((txq->wthresh & 0x1F) << 16);
txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
E1000_WRITE_REG(hw, E1000_TXDCTL(txq->reg_idx), txdctl);
+ dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
}
/* Program the Transmit Control Register. */
--
2.25.1
Re: [RFC v2 2/2] eal: add high-performance timer facility
On 2023-07-07 00:41, Stephen Hemminger wrote: > On Wed, 15 Mar 2023 18:03:42 +0100 > Mattias Rönnblom wrote: > >> The htimer library attempts at providing a timer facility with roughly >> the same functionality, but less overhead and better scalability than >> DPDK timer library. > > I don't understand. Why not just fix and extend existing timers. > Sure you will need to add some API's and maybe drop some of the existing > experimental ones (ie alt_timer). Even change the ABI. > > It would be better to have one high performance, scaleable timer than > spend the next 3 years telling users which one to use and why! > > So please make rte_timer work better in 23.11 release rather > than reinventing a new variant. I wanted to explore how a data plane timer API should look like. Something like a "first principles" type approach. As it happens, it seems like I will converge on something that's pretty similar to how rte_timer (and most kernel timers) API works, for example in regards to timer memory allocation. Clearly, there should not be two DPDK timer APIs that provide the same functionality. That was never the intention. Since so much DPDK code and more importantly application code depends on it wasn't obvious that the best option was make extensive changes to rte_timer API and implementation. One way that seemed like a plausible option (how much so depending on the extend of the rte_timer vs rte_htimer API differences) was to have a new API, and depreciate in the release htimer was introduced. That said, at this point, it's not clear to me which option is the best one of "making extensive changes to rte_timer" or "having rte_htimer on the side for a couple of releases". An imaginary alternative where the API/ABI can be maintained, and you get all the performance and scalability and improved API semantics of htimer, would obviously be the best option. But I don't think that is possible. Especially not if you want to end up with a nice, orthogonal API and a clean implementation. I think changes in both ABI and API are inevitable, and a good thing, considering some of the quirks for the current API. A side note: It seems to me at this point there should be two public timer APIs, but providing different functionality, at slightly different levels of abstraction. One is the lookalike, and the other what in the current patchset is represented by , but minus the callbacks, as per Morten Brørup's suggestion. The latter would be a low-level HTW only, with no MT safety, no lcore knowledge, no opinions on time source, etc.
Re: [PATCH] net/netvsc: remove unused function hn_vf_reset()
On 7/11/2023 9:32 PM, Stephen Hemminger wrote: > On Tue, 11 Jul 2023 12:12:30 -0700 > lon...@linuxonhyperv.com wrote: > >> From: Long Li >> >> hn_vf_reset() is defined but not used. Remove it. >> >> Signed-off-by: Long Li > > Acked-by: Stephen Hemminger > Applied to dpdk-next-net/main, thanks.
[PATCH] net/i40e: fix comments
The limitation of burst size in i40e vector rx has been removed, but the
comment lines have not been updated to reflect the code changes. Remove
those lines to avoid confusion. Additionally, fix a typo in
i40e_tx_queue.
Fixes: 9e27f00f3a61 ("net/i40e: fix vector Rx")
Cc: jia@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Jieqiang Wang
Reviewed-by: Ruifeng Wang
---
.mailmap | 1 +
drivers/net/i40e/i40e_rxtx.h | 2 +-
drivers/net/i40e/i40e_rxtx_vec_altivec.c | 2 --
drivers/net/i40e/i40e_rxtx_vec_neon.c| 2 --
drivers/net/i40e/i40e_rxtx_vec_sse.c | 2 --
5 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/.mailmap b/.mailmap
index 6eccf0c555..670d312f84 100644
--- a/.mailmap
+++ b/.mailmap
@@ -628,6 +628,7 @@ Jie Liu
Jie Pan
Jie Wang
Jie Zhou
+Jieqiang Wang
Jijiang Liu
Jilei Chen
Jim Harris
diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h
index 0376c219be..a8686224e5 100644
--- a/drivers/net/i40e/i40e_rxtx.h
+++ b/drivers/net/i40e/i40e_rxtx.h
@@ -169,7 +169,7 @@ struct i40e_tx_queue {
bool q_set; /**< indicate if tx queue has been configured */
bool tx_deferred_start; /**< don't start this queue in dev start */
uint8_t dcb_tc; /**< Traffic class of tx queue */
- uint64_t offloads; /**< Tx offload flags of RTE_ETH_RX_OFFLOAD_* */
+ uint64_t offloads; /**< Tx offload flags of RTE_ETH_TX_OFFLOAD_* */
const struct rte_memzone *mz;
};
diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c
b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
index 8672ad1c41..4cd78f4e58 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
@@ -449,8 +449,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
/* Notice:
* - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet
- * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST
- * numbers of DD bits
*/
uint16_t
i40e_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c
b/drivers/net/i40e/i40e_rxtx_vec_neon.c
index 49391fe4c7..d873e30972 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
@@ -574,8 +574,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq,
/*
* Notice:
* - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet
- * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST
- * numbers of DD bits
*/
uint16_t
i40e_recv_pkts_vec(void *__rte_restrict rx_queue,
diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c
b/drivers/net/i40e/i40e_rxtx_vec_sse.c
index baf83cb3df..b94c37cbb8 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_sse.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c
@@ -596,8 +596,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
/*
* Notice:
* - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet
- * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST
- * numbers of DD bits
*/
uint16_t
i40e_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
--
2.25.1
[PATCH] doc: announce deprecation of RTE_CPUFLAG_NUMFLAGS
To allow new cpu features to be added without ABI breakage, RTE_CPUFLAG_NUMFLAGS will be removed in DPDK 23.11 release. Signed-off-by: Sivaprasad Tummala --- doc/guides/rel_notes/deprecation.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 8e1cdd677a..92db59d9c2 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -28,6 +28,9 @@ Deprecation Notices the replacement API rte_thread_set_name and rte_thread_create_control being marked as stable, and planned to be removed by the 23.11 release. +* eal: RTE_CPUFLAG_NUMFLAGS will be removed in DPDK 23.11 release. This is + to allow new cpu features to be added without ABI breakage. + * rte_atomicNN_xxx: These APIs do not take memory order parameter. This does not allow for writing optimized code for all the CPU architectures supported in DPDK. DPDK has adopted the atomic operations from -- 2.34.1
Re: [PATCH] doc: announce deprecation of RTE_CPUFLAG_NUMFLAGS
On 7/12/2023 11:18 AM, Sivaprasad Tummala wrote: > To allow new cpu features to be added without ABI breakage, > RTE_CPUFLAG_NUMFLAGS will be removed in DPDK 23.11 release. > > Signed-off-by: Sivaprasad Tummala > --- > doc/guides/rel_notes/deprecation.rst | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/doc/guides/rel_notes/deprecation.rst > b/doc/guides/rel_notes/deprecation.rst > index 8e1cdd677a..92db59d9c2 100644 > --- a/doc/guides/rel_notes/deprecation.rst > +++ b/doc/guides/rel_notes/deprecation.rst > @@ -28,6 +28,9 @@ Deprecation Notices >the replacement API rte_thread_set_name and rte_thread_create_control being >marked as stable, and planned to be removed by the 23.11 release. > > +* eal: RTE_CPUFLAG_NUMFLAGS will be removed in DPDK 23.11 release. This is > + to allow new cpu features to be added without ABI breakage. > + > * rte_atomicNN_xxx: These APIs do not take memory order parameter. This does >not allow for writing optimized code for all the CPU architectures > supported >in DPDK. DPDK has adopted the atomic operations from > Acked-by: Ferruh Yigit
Re: [PATCH v1 1/2] dts: add smoke tests
On Wed, Jul 12, 2023 at 2:30 AM Juraj Linkeš
wrote:
> I think we're basically there, just one more point that needs to be
> addressed - the send_command_no_output method.
>
> >> >> > diff --git a/dts/framework/config/conf_yaml_schema.json
> b/dts/framework/config/conf_yaml_schema.json
> >> >> > index ca2d4a1e..3f7c301a 100644
> >> >> > --- a/dts/framework/config/conf_yaml_schema.json
> >> >> > +++ b/dts/framework/config/conf_yaml_schema.json
> >> >> > @@ -6,6 +6,76 @@
> >> >> >"type": "string",
> >> >> >"description": "A unique identifier for a node"
> >> >> > },
> >> >> > +"NIC": {
> >> >> > + "type": "string",
> >> >> > + "enum": [
> >> >> > +"ALL",
> >> >> > +"ConnectX3_MT4103",
> >> >> > +"ConnectX4_LX_MT4117",
> >> >> > +"ConnectX4_MT4115",
> >> >> > +"ConnectX5_MT4119",
> >> >> > +"ConnectX5_MT4121",
> >> >> > +"I40E_10G-10G_BASE_T_BC",
> >> >> > +"I40E_10G-10G_BASE_T_X722",
> >> >> > +"I40E_10G-SFP_X722",
> >> >> > +"I40E_10G-SFP_XL710",
> >> >> > +"I40E_10G-X722_A0",
> >> >> > +"I40E_1G-1G_BASE_T_X722",
> >> >> > +"I40E_25G-25G_SFP28",
> >> >> > +"I40E_40G-QSFP_A",
> >> >> > +"I40E_40G-QSFP_B",
> >> >> > +"IAVF-ADAPTIVE_VF",
> >> >> > +"IAVF-VF",
> >> >> > +"IAVF_10G-X722_VF",
> >> >> > +"ICE_100G-E810C_QSFP",
> >> >> > +"ICE_25G-E810C_SFP",
> >> >> > +"ICE_25G-E810_XXV_SFP",
> >> >> > +"IGB-I350_VF",
> >> >> > +"IGB_1G-82540EM",
> >> >> > +"IGB_1G-82545EM_COPPER",
> >> >> > +"IGB_1G-82571EB_COPPER",
> >> >> > +"IGB_1G-82574L",
> >> >> > +"IGB_1G-82576",
> >> >> > +"IGB_1G-82576_QUAD_COPPER",
> >> >> > +"IGB_1G-82576_QUAD_COPPER_ET2",
> >> >> > +"IGB_1G-82580_COPPER",
> >> >> > +"IGB_1G-I210_COPPER",
> >> >> > +"IGB_1G-I350_COPPER",
> >> >> > +"IGB_1G-I354_SGMII",
> >> >> > +"IGB_1G-PCH_LPTLP_I218_LM",
> >> >> > +"IGB_1G-PCH_LPTLP_I218_V",
> >> >> > +"IGB_1G-PCH_LPT_I217_LM",
> >> >> > +"IGB_1G-PCH_LPT_I217_V",
> >> >> > +"IGB_2.5G-I354_BACKPLANE_2_5GBPS",
> >> >> > +"IGC-I225_LM",
> >> >> > +"IGC-I226_LM",
> >> >> > +"IXGBE_10G-82599_SFP",
> >> >> > +"IXGBE_10G-82599_SFP_SF_QP",
> >> >> > +"IXGBE_10G-82599_T3_LOM",
> >> >> > +"IXGBE_10G-82599_VF",
> >> >> > +"IXGBE_10G-X540T",
> >> >> > +"IXGBE_10G-X540_VF",
> >> >> > +"IXGBE_10G-X550EM_A_SFP",
> >> >> > +"IXGBE_10G-X550EM_X_10G_T",
> >> >> > +"IXGBE_10G-X550EM_X_SFP",
> >> >> > +"IXGBE_10G-X550EM_X_VF",
> >> >> > +"IXGBE_10G-X550T",
> >> >> > +"IXGBE_10G-X550_VF",
> >> >> > +"brcm_57414",
> >> >> > +"brcm_P2100G",
> >> >> > +"cavium_0011",
> >> >> > +"cavium_a034",
> >> >> > +"cavium_a063",
> >> >> > +"cavium_a064",
> >> >> > +"fastlinq_ql41000",
> >> >> > +"fastlinq_ql41000_vf",
> >> >> > +"fastlinq_ql45000",
> >> >> > +"fastlinq_ql45000_vf",
> >> >> > +"hi1822",
> >> >> > +"virtio"
> >> >> > + ]
> >> >> > +},
> >> >> > +
> >> >>
> >> >> All these NICs may be overkill, do we want to trim them?
> >> >>
> >> >
> >> >
> >> > I think in general that the more we have the better to make it more
> universally usable. If a NIC isn't supported by DTS anymore we could pull
> it out but I don't see a problem with maintaining a list that has all
> supported NICs even if it does end up being long.
> >> >
> >>
> >> The broader question is what does it mean that a NIC is supported in
> >> DTS? That's a question we should address in the CI/DTS call and in the
> >> meantime, we could just leave the list as is.
> >>
> >
> > I think this would be a very good thing to bring up and agree that there
> should be more discussion on it. It probably is better to leave the list
> longer in the meantime like you were saying as well.
> >
>
> I'm keeping notes on everything we need to talk about - we'll do that
> after release.
>
>
> >> >
> >> >>
> >> >> >
> >> >> > """
> >> >> > The package provides modules for managing remote connections to a
> remote host (node),
> >> >> > @@ -17,7 +18,14 @@
> >> >> >
> >> >> > from .linux_session import LinuxSession
> >> >> > from .os_session import OSSession
> >> >> > -from .remote import CommandResult, RemoteSession, SSHSession
> >> >> > +from .remote import (
> >> >> > +CommandResult,
> >> >> > +InteractiveRemoteSession,
> >> >> > +InteractiveShell,
> >> >> > +RemoteSession,
> >> >> > +SSHSession,
> >> >> > +TestPmdShell,
> >> >> > +)
> >> >> >
> >> >> >
> >> >> > def create_session(
> >> >> > diff --git a/dts/framework/remote_session/os_session.py
> b/dts/framework/remote_session/os_session.py
> >> >> > index 4c48ae25..f5f53923 100644
> >> >> > --- a/dts/fra
Re: [PATCH v4 0/2] fix graph issues
10/07/2023 09:15, Zhirun Yan: > Fix graph clone issue in functional test. > Correct graph model check in graph core binding. > Update release note for mcore dispatch model. > > > Zhirun Yan (2): > graph: fix graph functional tests with valid params > graph: fix graph model check in core binding Applied with Jerin suggestions and few more minor fixes.
[PATCH v4 0/2] Add DTS smoke tests
From: Jeremy Spewock Removes the method for sending a command to an interactive shell and ignoring output. RFCs for this patch: * v3: https://mails.dpdk.org/archives/dev/2023-June/269859.html * v2: https://mails.dpdk.org/archives/dev/2023-May/267915.html * v1: https://mails.dpdk.org/archives/dev/2023-April/266580.html Previous patch: * v1: https://mails.dpdk.org/archives/dev/2023-June/271309.html * v2: https://mails.dpdk.org/archives/dev/2023-July/272833.html * v3: https://mails.dpdk.org/archives/dev/2023-July/272930.html Jeremy Spewock (2): dts: add smoke tests dts: add paramiko to dependencies dts/conf.yaml | 17 +- dts/framework/config/__init__.py | 105 +-- dts/framework/config/conf_yaml_schema.json| 142 +- dts/framework/dts.py | 87 ++--- dts/framework/exception.py| 12 ++ dts/framework/remote_session/__init__.py | 11 +- dts/framework/remote_session/os_session.py| 53 +- dts/framework/remote_session/posix_session.py | 29 ++- .../remote_session/remote/__init__.py | 10 + .../remote/interactive_remote_session.py | 82 .../remote/interactive_shell.py | 93 + .../remote_session/remote/testpmd_shell.py| 75 dts/framework/test_result.py | 37 +++- dts/framework/test_suite.py | 10 +- dts/framework/testbed_model/node.py | 2 + dts/framework/testbed_model/sut_node.py | 176 +- dts/framework/utils.py| 2 + dts/poetry.lock | 160 dts/pyproject.toml| 1 + dts/tests/TestSuite_smoke_tests.py| 113 +++ 20 files changed, 1083 insertions(+), 134 deletions(-) create mode 100644 dts/framework/remote_session/remote/interactive_remote_session.py create mode 100644 dts/framework/remote_session/remote/interactive_shell.py create mode 100644 dts/framework/remote_session/remote/testpmd_shell.py create mode 100644 dts/tests/TestSuite_smoke_tests.py -- 2.41.0
[PATCH v4 1/2] dts: add smoke tests
From: Jeremy Spewock
Adds a new test suite for running smoke tests that verify general
configuration aspects of the system under test. If any of these tests
fail, the DTS execution terminates as part of a "fail-fast" model.
Signed-off-by: Jeremy Spewock
---
dts/conf.yaml | 17 +-
dts/framework/config/__init__.py | 105 +--
dts/framework/config/conf_yaml_schema.json| 142 +-
dts/framework/dts.py | 87 ++---
dts/framework/exception.py| 12 ++
dts/framework/remote_session/__init__.py | 11 +-
dts/framework/remote_session/os_session.py| 53 +-
dts/framework/remote_session/posix_session.py | 29 ++-
.../remote_session/remote/__init__.py | 10 +
.../remote/interactive_remote_session.py | 82
.../remote/interactive_shell.py | 93 +
.../remote_session/remote/testpmd_shell.py| 75
dts/framework/test_result.py | 37 +++-
dts/framework/test_suite.py | 10 +-
dts/framework/testbed_model/node.py | 2 +
dts/framework/testbed_model/sut_node.py | 176 +-
dts/framework/utils.py| 2 +
dts/tests/TestSuite_smoke_tests.py| 113 +++
18 files changed, 959 insertions(+), 97 deletions(-)
create mode 100644
dts/framework/remote_session/remote/interactive_remote_session.py
create mode 100644 dts/framework/remote_session/remote/interactive_shell.py
create mode 100644 dts/framework/remote_session/remote/testpmd_shell.py
create mode 100644 dts/tests/TestSuite_smoke_tests.py
diff --git a/dts/conf.yaml b/dts/conf.yaml
index a9bd8a3e..c0be7848 100644
--- a/dts/conf.yaml
+++ b/dts/conf.yaml
@@ -10,9 +10,13 @@ executions:
compiler_wrapper: ccache
perf: false
func: true
+skip_smoke_tests: false # optional flag that allow you to skip smoke tests
test_suites:
- hello_world
-system_under_test: "SUT 1"
+system_under_test:
+ node_name: "SUT 1"
+ vdevs: # optional; if removed, vdevs won't be used in the execution
+- "crypto_openssl"
nodes:
- name: "SUT 1"
hostname: sut1.change.me.localhost
@@ -25,3 +29,14 @@ nodes:
hugepages: # optional; if removed, will use system hugepage configuration
amount: 256
force_first_numa: false
+ports:
+ - pci: ":00:08.0"
+os_driver_for_dpdk: vfio-pci # OS driver that DPDK will use
+os_driver: i40e
+peer_node: "TG 1"
+peer_pci: ":00:08.0"
+ - pci: ":00:08.1"
+os_driver_for_dpdk: vfio-pci
+os_driver: i40e
+peer_node: "TG 1"
+peer_pci: ":00:08.1"
diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index ebb0823f..9e144748 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -12,6 +12,7 @@
import pathlib
from dataclasses import dataclass
from enum import Enum, auto, unique
+from pathlib import PurePath
from typing import Any, TypedDict
import warlock # type: ignore
@@ -72,6 +73,20 @@ class HugepageConfiguration:
force_first_numa: bool
+@dataclass(slots=True, frozen=True)
+class PortConfig:
+node: str
+pci: str
+os_driver_for_dpdk: str
+os_driver: str
+peer_node: str
+peer_pci: str
+
+@staticmethod
+def from_dict(node: str, d: dict) -> "PortConfig":
+return PortConfig(node=node, **d)
+
+
@dataclass(slots=True, frozen=True)
class NodeConfiguration:
name: str
@@ -84,6 +99,7 @@ class NodeConfiguration:
use_first_core: bool
memory_channels: int
hugepages: HugepageConfiguration | None
+ports: list[PortConfig]
@staticmethod
def from_dict(d: dict) -> "NodeConfiguration":
@@ -92,19 +108,36 @@ def from_dict(d: dict) -> "NodeConfiguration":
if "force_first_numa" not in hugepage_config:
hugepage_config["force_first_numa"] = False
hugepage_config = HugepageConfiguration(**hugepage_config)
+common_config = {
+"name": d["name"],
+"hostname": d["hostname"],
+"user": d["user"],
+"password": d.get("password"),
+"arch": Architecture(d["arch"]),
+"os": OS(d["os"]),
+"lcores": d.get("lcores", "1"),
+"use_first_core": d.get("use_first_core", False),
+"memory_channels": d.get("memory_channels", 1),
+"hugepages": hugepage_config,
+"ports": [PortConfig.from_dict(d["name"], port) for port in
d["ports"]],
+}
+
+return NodeConfiguration(**common_config)
-return NodeConfiguration(
-name=d["name"],
-hostname=d["hostname"],
-user=d["user"],
-password=d.get("password"),
-arch=Architecture(d["arch"]),
-os=OS(d["os"]),
[PATCH v4 2/2] dts: add paramiko to dependencies
From: Jeremy Spewock added paramiko to the dependency files Signed-off-by: Jeremy Spewock --- dts/poetry.lock| 160 ++--- dts/pyproject.toml | 1 + 2 files changed, 124 insertions(+), 37 deletions(-) diff --git a/dts/poetry.lock b/dts/poetry.lock index 0b2a007d..dfd9a240 100644 --- a/dts/poetry.lock +++ b/dts/poetry.lock @@ -1,20 +1,33 @@ [[package]] name = "attrs" -version = "22.1.0" +version = "23.1.0" description = "Classes Without Boilerplate" category = "main" optional = false -python-versions = ">=3.5" +python-versions = ">=3.7" [package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] -docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] -tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] -tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"] +cov = ["attrs", "coverage[toml] (>=5.3)"] +dev = ["attrs", "pre-commit"] +docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"] +tests = ["attrs", "zope-interface"] +tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest-mypy-plugins", "pytest-xdist", "pytest (>=4.3.0)"] + +[[package]] +name = "bcrypt" +version = "4.0.1" +description = "Modern password hashing for your software and your servers" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.extras] +tests = ["pytest (>=3.2.1,!=3.3.0)"] +typecheck = ["mypy"] [[package]] name = "black" -version = "22.10.0" +version = "22.12.0" description = "The uncompromising code formatter." category = "dev" optional = false @@ -33,6 +46,17 @@ d = ["aiohttp (>=3.7.4)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] uvloop = ["uvloop (>=0.15.2)"] +[[package]] +name = "cffi" +version = "1.15.1" +description = "Foreign Function Interface for Python calling C code." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +pycparser = "*" + [[package]] name = "click" version = "8.1.3" @@ -52,18 +76,39 @@ category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +[[package]] +name = "cryptography" +version = "41.0.1" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +cffi = ">=1.12" + +[package.extras] +docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] +docstest = ["pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +nox = ["nox"] +pep8test = ["black", "ruff", "mypy", "check-sdist"] +sdist = ["build"] +ssh = ["bcrypt (>=3.1.5)"] +test = ["pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist", "pretend"] +test-randomorder = ["pytest-randomly"] + [[package]] name = "isort" -version = "5.10.1" +version = "5.12.0" description = "A Python utility / library to sort Python imports." category = "dev" optional = false -python-versions = ">=3.6.1,<4.0" +python-versions = ">=3.8.0" [package.extras] -pipfile_deprecated_finder = ["pipreqs", "requirementslib"] -requirements_deprecated_finder = ["pipreqs", "pip-api"] -colors = ["colorama (>=0.4.3,<0.5.0)"] +colors = ["colorama (>=0.4.3)"] +requirements-deprecated-finder = ["pip-api", "pipreqs"] +pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"] plugins = ["setuptools"] [[package]] @@ -87,7 +132,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "jsonschema" -version = "4.17.0" +version = "4.17.3" description = "An implementation of JSON Schema validation for Python" category = "main" optional = false @@ -129,15 +174,33 @@ reports = ["lxml"] [[package]] name = "mypy-extensions" -version = "0.4.3" -description = "Experimental type system extensions for programs checked with the mypy typechecker." +version = "1.0.0" +description = "Type system extensions for programs checked with the mypy type checker." category = "dev" optional = false -python-versions = "*" +python-versions = ">=3.5" + +[[package]] +name = "paramiko" +version = "3.2.0" +description = "SSH2 protocol library" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +bcrypt = ">=3.2" +cryptography = ">=3.3" +pynacl = ">=1.5" + +[package.extras] +all = ["pyasn1 (>=0.1.7)", "invoke (>=2.0)", "gssapi (>=1.4.1)", "pywin32 (>=2.1.8)"] +gssapi = ["pyasn1 (>=0.1.7)", "gssapi (>=1.4.1)", "pywin32 (>=2.1.8)"
Re: [PATCH v1] app/procinfo: revise display eventdev xstats
> > process_eventdev_xstats() function was iterating over eventdev_var[]
> > structure even if there is no eventdev present.
> > Revised the code to check to iterate and only look for the number of
> > eventdevs present in the system. Also, shortened function name to
> > eventdev_xstats().
> >
> > Coverity issue: 395458
> > Fixes: 674bb3906931 ("app/procinfo: display eventdev xstats")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Abdullah Sevincer
> > ---
> Tested-by: Dukai Yuan
No need Cc stable when the bug was introduced in the same release.
Applied, thanks.
Re: [PATCH v1] examples/l3fwd: fix for coverity scan
06/07/2023 20:09, Stephen Hemminger:
> On Wed, 01 Feb 2023 18:28:44 +0100
> Thomas Monjalon wrote:
>
> > 10/01/2023 15:56, Mohammad Iqbal Ahmad:
> > > This patch fixes (Logically dead code) coverity issue.
> > > This patch also fixes (Uninitialized scalar variable) coverity issue.
> > >
> > > Coverity issue: 381687
> > > Coverity issue: 381686
> > > Fixes: 6a094e328598 ("examples/l3fwd: implement FIB lookup method")
> > >
> > > Signed-off-by: Mohammad Iqbal Ahmad
> >
> > It seems you removed "if (nh != FIB_DEFAULT_HOP)"
> >
> > Please could you explain what was the issue
> > inside the commit message.
> > It could help to find a better title as well.
>
> Coverity is spotting that the same condition is evaluated first
> in the if() then in the conditional expression. So yes it is a bug.
>
> Would prefer the title of
>examples/l3fwd: fix duplicate expression for default nexthop
>
> Don't think the default nexthop was ever tested. If it was then
> hops[i] would have never been updated. Probably would just get previous
> value so it worked.
>
> Acked-by: Stephen Hemminger
Applied, thanks.
Re: [PATCH v1 1/1] maintainers: update maintainership of power lib
28/06/2023 13:56, Hunt, David: > > On 15/06/2023 10:16, Anatoly Burakov wrote: > > Add co-maintainer for power library. > > > > Signed-off-by: Anatoly Burakov > > --- > > MAINTAINERS | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 906b31f97c..21c971a273 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -1671,6 +1671,7 @@ M: Gaetan Rivet > > F: lib/pci/ > > > > Power management > > +M: Anatoly Burakov > > M: David Hunt > > F: lib/power/ > > F: doc/guides/prog_guide/power_man.rst > > > Acked-by: David Hunt Applied, thanks.
Re: [PATCH] app/test-pipeline: relax RSS hash requirement
Cristian, any comment?
26/06/2023 09:45, Feifei Wang:
> For some drivers which can not support the configured RSS hash functions,
> the thread reports 'invalid rss_hf' when doing device configure.
>
> For example, i40e driver can not support 'RTE_ETH_RSS_IPV4',
> 'RTE_ETH_RSS_IPV6' and 'RTE_ETH_RSS_NONFRAG_IPV6_OTHER', thus it can not
> run successfully in test-pipeline with XL710 NIC and reports the issue:
> -
> Ethdev port_id=0 invalid rss_hf: 0xa38c, valid value: 0x7ef8
> PANIC in app_init_ports():
> Cannot init NIC port 0 (-22)
> -
>
> To fix this, referring to l3fwd operation, adjust the 'rss_hf' based on
> device capability and just report a warning.
>
> Signed-off-by: Feifei Wang
> Reviewed-by: Ruifeng Wang
> Reviewed-by: Trevor Tao
> ---
> app/test-pipeline/init.c | 22 +-
> 1 file changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/app/test-pipeline/init.c b/app/test-pipeline/init.c
> index d146c44be0..84a1734519 100644
> --- a/app/test-pipeline/init.c
> +++ b/app/test-pipeline/init.c
> @@ -188,21 +188,41 @@ static void
> app_init_ports(void)
> {
> uint32_t i;
> + struct rte_eth_dev_info dev_info;
> +
>
> /* Init NIC ports, then start the ports */
> for (i = 0; i < app.n_ports; i++) {
> uint16_t port;
> int ret;
> + struct rte_eth_conf local_port_conf = port_conf;
>
> port = app.ports[i];
> RTE_LOG(INFO, USER1, "Initializing NIC port %u ...\n", port);
>
> + ret = rte_eth_dev_info_get(port, &dev_info);
> + if (ret != 0)
> + rte_panic("Error during getting device (port %u) info:
> %s\n",
> + port, rte_strerror(-ret));
> +
> /* Init port */
> + local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
> + dev_info.flow_type_rss_offloads;
> + if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
> + port_conf.rx_adv_conf.rss_conf.rss_hf) {
> + printf("Warning:"
> + "Port %u modified RSS hash function based on
> hardware support,"
> + "requested:%#"PRIx64" configured:%#"PRIx64"\n",
> + port,
> + port_conf.rx_adv_conf.rss_conf.rss_hf,
> + local_port_conf.rx_adv_conf.rss_conf.rss_hf);
> + }
> +
> ret = rte_eth_dev_configure(
> port,
> 1,
> 1,
> - &port_conf);
> + &local_port_conf);
> if (ret < 0)
> rte_panic("Cannot init NIC port %u (%d)\n", port, ret);
>
>
Re: [PATCH] doc: announce deprecation of RTE_CPUFLAG_NUMFLAGS
On 12-Jul-23 3:51 PM, Ferruh Yigit wrote: Caution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button On 7/12/2023 11:18 AM, Sivaprasad Tummala wrote: To allow new cpu features to be added without ABI breakage, RTE_CPUFLAG_NUMFLAGS will be removed in DPDK 23.11 release. Signed-off-by: Sivaprasad Tummala --- doc/guides/rel_notes/deprecation.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 8e1cdd677a..92db59d9c2 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -28,6 +28,9 @@ Deprecation Notices the replacement API rte_thread_set_name and rte_thread_create_control being marked as stable, and planned to be removed by the 23.11 release. +* eal: RTE_CPUFLAG_NUMFLAGS will be removed in DPDK 23.11 release. This is + to allow new cpu features to be added without ABI breakage. + * rte_atomicNN_xxx: These APIs do not take memory order parameter. This does not allow for writing optimized code for all the CPU architectures supported in DPDK. DPDK has adopted the atomic operations from Acked-by: Ferruh Yigit Acked-by: Hemant Agrawal
Re: [PATCH v5 04/11] drivers/crypto: use rte_pktmbuf_mtod_offset
Acked-by: Hemant Agrawal
Re: [PATCH v6 1/2] ip_frag: optimize key compare and hash generation
11/07/2023 18:52, pbhagavat...@marvell.com: > From: Pavan Nikhilesh > > Use optimized rte_hash_k32_cmp_eq routine for key comparison for > x86 and ARM64. > Use CRC instructions for hash generation on ARM64. > > Signed-off-by: Pavan Nikhilesh > Reviewed-by: Ruifeng Wang > Acked-by: Konstantin Ananyev Series applied, thanks.
Re: [PATCH] kni: fix build with Linux 6.5
11/07/2023 12:09, Ferruh Yigit:
> The get_user_pages_remote() API has been modified in Linux kernel v6.5
> [1], "struct vm_area_struct **vmas" parameter removed from the API.
>
> To fix KNI build with Linux kernel v6.5, version check added around the
> get_user_pages_remote() API.
>
> [1]
> ca5e863233e8 ("mm/gup: remove vmas parameter from get_user_pages_remote()")
>
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ferruh Yigit
Applied, thanks.
Re: [PATCH] devtools: fix bad substitution
11/07/2023 09:16, Raslan Darawsheh:
> When running check-git-log, it showed a Bad substitution.
>
> It is fixed by using tr to escape the open parenthesis.
>
> Fixes: 6fd14c1b58e6 ("devtools: fix mailmap check for parentheses")
> Cc: tho...@monjalon.net
>
> Suggested-by: Thomas Monjalon
> Signed-off-by: Raslan Darawsheh
> ---
> devtools/check-git-log.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
> index 89544a2cc5..5c869b7683 100755
> --- a/devtools/check-git-log.sh
> +++ b/devtools/check-git-log.sh
> @@ -264,7 +264,7 @@ names=$(git log --format='From: %an <%ae>%n%b' --reverse
> $range |
> sed -rn 's,.*: (.*<.*@.*>),\1,p' |
> sort -u)
> bad=$(for contributor in $names ; do
> - contributor=${contributor//(/\\(}
> + contributor=$(echo $contributor | tr '(' '\\(')
tr was not working here, replaced with sed
Applied, thanks.
Re: [PATCH v1] dts: create tarball from git ref
28/04/2023 21:38, Jeremy Spewock: > Acked-by: Jeremy Spweock > > On Thu, Apr 20, 2023 at 10:16 AM Juraj Linkeš > wrote: > > > Add additional convenience options for specifying what DPDK version to > > test. > > > > Signed-off-by: Juraj Linkeš Applied, thanks. Sorry for the delay.
Re: [PATCH v3] dts: replace pexpect with fabric
21/06/2023 20:33, Jeremy Spewock: > Acked-by: Jeremy Spewock > > On Fri, Jun 9, 2023 at 5:46 AM Juraj Linkeš > wrote: > > > Pexpect is not a dedicated SSH connection library while Fabric is. With > > Fabric, all SSH-related logic is provided and we can just focus on > > what's DTS specific. > > > > Signed-off-by: Juraj Linkeš Applied, thanks.
RE: [PATCH] crypto/openssl: fix segfault due to uninitialized var
> Subject: RE: [PATCH] crypto/openssl: fix segfault due to uninitialized var
>
> >
> > In some openSSL 3 libraries, uninitialized output variable cause segfault.
> > It is
> > always nice to initialize it.
> >
> > Fixes: 3b7d638fb11f ("crypto/openssl: support asymmetric SM2") Bugzilla ID:
> > 1250
> >
> > Signed-off-by: Gowrishankar Muthukrishnan
>
> Acked-by: Anoob Joseph
Applied to dpdk-next-crypto
Thanks. Will be part of RC4, as RC3 is already tagged.
RE: [PATCH] crypto/openssl: check for SM2 support in openssl 3.x lib
> Subject: RE: [PATCH] crypto/openssl: check for SM2 support in openssl 3.x lib
>
> >
> > In some version of openSSL 3 lib (for an instance, in linux distribution),
> > if SM2
> > is not supported, driver should return error.
> >
> > Fixes: 3b7d638fb11f ("crypto/openssl: support asymmetric SM2") Bugzilla ID:
> > 1250
> >
> > Signed-off-by: Gowrishankar Muthukrishnan
>
> Acked-by: Anoob Joseph
openSSL -> OpenSSL
Bugzilla ID should be before Fixes tag.
Applied to dpdk-next-crypto
Will be part of RC4.
Thanks.
Registration Reminder - DPDK Dublin Summit, Sep. 2023
Good afternoon DPDK Community, September 12-13, 2023 we will have the DPDK Summit at the Gibson Hotel in Point Square in Dublin. Registration and attendance for this event are *free!* Our call for speakers has just been finalized, and talks have been chosen - information about this, including a schedule, will be issued within the week. If you have not already registered for the event, please do so now. *You may do so here:* https://events.linuxfoundation.org/dpdk-userspace-summit/ Again: due to administrative finalizations, the Gibson Hotel isn't yet referenced on the above link, but it has been confirmed and the event will be held there. This information should be live at the link within the next few days. Any questions let us know. Thanks, Nathan Nathan C. Southern, Project Coordinator Data Plane Development Kit The Linux Foundation 248.835.4812 (mobile) nsouth...@linuxfoundation.org
[PATCH] doc: deprecation notice to add callback data to rte_event_fp_ops
Deprecation notice to add "rte_eventdev_port_data" field to ``rte_event_fp_ops`` for callback support. Signed-off-by: Sivaprasad Tummala --- doc/guides/rel_notes/deprecation.rst | 4 1 file changed, 4 insertions(+) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 8e1cdd677a..2c69338818 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -133,6 +133,10 @@ Deprecation Notices ``rte_cryptodev_get_auth_algo_string``, ``rte_cryptodev_get_aead_algo_string`` and ``rte_cryptodev_asym_get_xform_string`` respectively. +* eventdev: The struct rte_event_fp_ops will be updated with a new element + rte_eventdev_port_data to support optional callbacks in DPDK 23.11. This changes + the size of rte_event_fp_ops and result in ABI change. + * flow_classify: The flow_classify library and example have no maintainer. The library is experimental and, as such, it could be removed from DPDK. Its removal has been postponed to let potential users report interest -- 2.34.1
release candidate 23.07-rc3
A new DPDK release candidate is ready for testing: https://git.dpdk.org/dpdk/tag/?id=v23.07-rc3 There are 139 new patches in this snapshot. Release notes: https://doc.dpdk.org/guides/rel_notes/release_23_07.html Only documentation and bug fixes should be accepted at this stage. As usual, you can report any issue on https://bugs.dpdk.org Do not forget to review documentation updates and deprecation notices. DPDK 23.07-rc4 should be the last release candidate. The final release should be done end of next week. Thank you everyone
[PATCH v5 0/2] Add DTS smoke tests
From: Jeremy Spewock The previous version of this patch removed a method in the InteractiveShell class but after reading the comments over again and looking at the code, there was another method that now becomes unused and not needed. This method for emptying the stdout buffer is removed in this patch. RFCs for this patch: * v3: https://mails.dpdk.org/archives/dev/2023-June/269859.html * v2: https://mails.dpdk.org/archives/dev/2023-May/267915.html * v1: https://mails.dpdk.org/archives/dev/2023-April/266580.html Previous patch: * v1: https://mails.dpdk.org/archives/dev/2023-June/271309.html * v2: https://mails.dpdk.org/archives/dev/2023-July/272833.html * v3: https://mails.dpdk.org/archives/dev/2023-July/272930.html * v4: https://mails.dpdk.org/archives/dev/2023-July/272964.html Jeremy Spewock (2): dts: add smoke tests dts: add paramiko to dependencies dts/conf.yaml | 17 +- dts/framework/config/__init__.py | 105 +-- dts/framework/config/conf_yaml_schema.json| 142 +- dts/framework/dts.py | 87 ++--- dts/framework/exception.py| 12 ++ dts/framework/remote_session/__init__.py | 11 +- dts/framework/remote_session/os_session.py| 53 +- dts/framework/remote_session/posix_session.py | 29 ++- .../remote_session/remote/__init__.py | 10 + .../remote/interactive_remote_session.py | 82 .../remote/interactive_shell.py | 75 .../remote_session/remote/testpmd_shell.py| 75 dts/framework/test_result.py | 37 +++- dts/framework/test_suite.py | 10 +- dts/framework/testbed_model/node.py | 2 + dts/framework/testbed_model/sut_node.py | 176 +- dts/framework/utils.py| 2 + dts/poetry.lock | 160 dts/pyproject.toml| 1 + dts/tests/TestSuite_smoke_tests.py| 113 +++ 20 files changed, 1065 insertions(+), 134 deletions(-) create mode 100644 dts/framework/remote_session/remote/interactive_remote_session.py create mode 100644 dts/framework/remote_session/remote/interactive_shell.py create mode 100644 dts/framework/remote_session/remote/testpmd_shell.py create mode 100644 dts/tests/TestSuite_smoke_tests.py -- 2.41.0
[PATCH v5 1/2] dts: add smoke tests
From: Jeremy Spewock
Adds a new test suite for running smoke tests that verify general
configuration aspects of the system under test. If any of these tests
fail, the DTS execution terminates as part of a "fail-fast" model.
Signed-off-by: Jeremy Spewock
---
dts/conf.yaml | 17 +-
dts/framework/config/__init__.py | 105 +--
dts/framework/config/conf_yaml_schema.json| 142 +-
dts/framework/dts.py | 87 ++---
dts/framework/exception.py| 12 ++
dts/framework/remote_session/__init__.py | 11 +-
dts/framework/remote_session/os_session.py| 53 +-
dts/framework/remote_session/posix_session.py | 29 ++-
.../remote_session/remote/__init__.py | 10 +
.../remote/interactive_remote_session.py | 82
.../remote/interactive_shell.py | 75
.../remote_session/remote/testpmd_shell.py| 75
dts/framework/test_result.py | 37 +++-
dts/framework/test_suite.py | 10 +-
dts/framework/testbed_model/node.py | 2 +
dts/framework/testbed_model/sut_node.py | 176 +-
dts/framework/utils.py| 2 +
dts/tests/TestSuite_smoke_tests.py| 113 +++
18 files changed, 941 insertions(+), 97 deletions(-)
create mode 100644
dts/framework/remote_session/remote/interactive_remote_session.py
create mode 100644 dts/framework/remote_session/remote/interactive_shell.py
create mode 100644 dts/framework/remote_session/remote/testpmd_shell.py
create mode 100644 dts/tests/TestSuite_smoke_tests.py
diff --git a/dts/conf.yaml b/dts/conf.yaml
index a9bd8a3e..c0be7848 100644
--- a/dts/conf.yaml
+++ b/dts/conf.yaml
@@ -10,9 +10,13 @@ executions:
compiler_wrapper: ccache
perf: false
func: true
+skip_smoke_tests: false # optional flag that allow you to skip smoke tests
test_suites:
- hello_world
-system_under_test: "SUT 1"
+system_under_test:
+ node_name: "SUT 1"
+ vdevs: # optional; if removed, vdevs won't be used in the execution
+- "crypto_openssl"
nodes:
- name: "SUT 1"
hostname: sut1.change.me.localhost
@@ -25,3 +29,14 @@ nodes:
hugepages: # optional; if removed, will use system hugepage configuration
amount: 256
force_first_numa: false
+ports:
+ - pci: ":00:08.0"
+os_driver_for_dpdk: vfio-pci # OS driver that DPDK will use
+os_driver: i40e
+peer_node: "TG 1"
+peer_pci: ":00:08.0"
+ - pci: ":00:08.1"
+os_driver_for_dpdk: vfio-pci
+os_driver: i40e
+peer_node: "TG 1"
+peer_pci: ":00:08.1"
diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index ebb0823f..9e144748 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -12,6 +12,7 @@
import pathlib
from dataclasses import dataclass
from enum import Enum, auto, unique
+from pathlib import PurePath
from typing import Any, TypedDict
import warlock # type: ignore
@@ -72,6 +73,20 @@ class HugepageConfiguration:
force_first_numa: bool
+@dataclass(slots=True, frozen=True)
+class PortConfig:
+node: str
+pci: str
+os_driver_for_dpdk: str
+os_driver: str
+peer_node: str
+peer_pci: str
+
+@staticmethod
+def from_dict(node: str, d: dict) -> "PortConfig":
+return PortConfig(node=node, **d)
+
+
@dataclass(slots=True, frozen=True)
class NodeConfiguration:
name: str
@@ -84,6 +99,7 @@ class NodeConfiguration:
use_first_core: bool
memory_channels: int
hugepages: HugepageConfiguration | None
+ports: list[PortConfig]
@staticmethod
def from_dict(d: dict) -> "NodeConfiguration":
@@ -92,19 +108,36 @@ def from_dict(d: dict) -> "NodeConfiguration":
if "force_first_numa" not in hugepage_config:
hugepage_config["force_first_numa"] = False
hugepage_config = HugepageConfiguration(**hugepage_config)
+common_config = {
+"name": d["name"],
+"hostname": d["hostname"],
+"user": d["user"],
+"password": d.get("password"),
+"arch": Architecture(d["arch"]),
+"os": OS(d["os"]),
+"lcores": d.get("lcores", "1"),
+"use_first_core": d.get("use_first_core", False),
+"memory_channels": d.get("memory_channels", 1),
+"hugepages": hugepage_config,
+"ports": [PortConfig.from_dict(d["name"], port) for port in
d["ports"]],
+}
+
+return NodeConfiguration(**common_config)
-return NodeConfiguration(
-name=d["name"],
-hostname=d["hostname"],
-user=d["user"],
-password=d.get("password"),
-arch=Architecture(d["arch"]),
-os=OS(d["os"]),
[PATCH v5 2/2] dts: add paramiko to dependencies
From: Jeremy Spewock added paramiko to the dependency files Signed-off-by: Jeremy Spewock --- dts/poetry.lock| 160 ++--- dts/pyproject.toml | 1 + 2 files changed, 124 insertions(+), 37 deletions(-) diff --git a/dts/poetry.lock b/dts/poetry.lock index 0b2a007d..dfd9a240 100644 --- a/dts/poetry.lock +++ b/dts/poetry.lock @@ -1,20 +1,33 @@ [[package]] name = "attrs" -version = "22.1.0" +version = "23.1.0" description = "Classes Without Boilerplate" category = "main" optional = false -python-versions = ">=3.5" +python-versions = ">=3.7" [package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] -docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] -tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] -tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"] +cov = ["attrs", "coverage[toml] (>=5.3)"] +dev = ["attrs", "pre-commit"] +docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"] +tests = ["attrs", "zope-interface"] +tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest-mypy-plugins", "pytest-xdist", "pytest (>=4.3.0)"] + +[[package]] +name = "bcrypt" +version = "4.0.1" +description = "Modern password hashing for your software and your servers" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.extras] +tests = ["pytest (>=3.2.1,!=3.3.0)"] +typecheck = ["mypy"] [[package]] name = "black" -version = "22.10.0" +version = "22.12.0" description = "The uncompromising code formatter." category = "dev" optional = false @@ -33,6 +46,17 @@ d = ["aiohttp (>=3.7.4)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] uvloop = ["uvloop (>=0.15.2)"] +[[package]] +name = "cffi" +version = "1.15.1" +description = "Foreign Function Interface for Python calling C code." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +pycparser = "*" + [[package]] name = "click" version = "8.1.3" @@ -52,18 +76,39 @@ category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +[[package]] +name = "cryptography" +version = "41.0.1" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +cffi = ">=1.12" + +[package.extras] +docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] +docstest = ["pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +nox = ["nox"] +pep8test = ["black", "ruff", "mypy", "check-sdist"] +sdist = ["build"] +ssh = ["bcrypt (>=3.1.5)"] +test = ["pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist", "pretend"] +test-randomorder = ["pytest-randomly"] + [[package]] name = "isort" -version = "5.10.1" +version = "5.12.0" description = "A Python utility / library to sort Python imports." category = "dev" optional = false -python-versions = ">=3.6.1,<4.0" +python-versions = ">=3.8.0" [package.extras] -pipfile_deprecated_finder = ["pipreqs", "requirementslib"] -requirements_deprecated_finder = ["pipreqs", "pip-api"] -colors = ["colorama (>=0.4.3,<0.5.0)"] +colors = ["colorama (>=0.4.3)"] +requirements-deprecated-finder = ["pip-api", "pipreqs"] +pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"] plugins = ["setuptools"] [[package]] @@ -87,7 +132,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "jsonschema" -version = "4.17.0" +version = "4.17.3" description = "An implementation of JSON Schema validation for Python" category = "main" optional = false @@ -129,15 +174,33 @@ reports = ["lxml"] [[package]] name = "mypy-extensions" -version = "0.4.3" -description = "Experimental type system extensions for programs checked with the mypy typechecker." +version = "1.0.0" +description = "Type system extensions for programs checked with the mypy type checker." category = "dev" optional = false -python-versions = "*" +python-versions = ">=3.5" + +[[package]] +name = "paramiko" +version = "3.2.0" +description = "SSH2 protocol library" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +bcrypt = ">=3.2" +cryptography = ">=3.3" +pynacl = ">=1.5" + +[package.extras] +all = ["pyasn1 (>=0.1.7)", "invoke (>=2.0)", "gssapi (>=1.4.1)", "pywin32 (>=2.1.8)"] +gssapi = ["pyasn1 (>=0.1.7)", "gssapi (>=1.4.1)", "pywin32 (>=2.1.8)"
RE: [PATCH] doc: announce ethdev operation struct changes
> -Original Message- > From: Feifei Wang > Sent: Tuesday, July 4, 2023 4:17 PM > To: Feifei Wang > Cc: dev@dpdk.org; nd ; Honnappa Nagarahalli > ; Ruifeng Wang > ; Konstantin Ananyev > ; m...@smartsharesystems.com; Ferruh > Yigit ; tho...@monjalon.net; Andrew Rybchenko > ; nd > Subject: RE: [PATCH] doc: announce ethdev operation struct changes > > > > > -Original Message- > > From: Feifei Wang > > Sent: Tuesday, July 4, 2023 4:10 PM > > Cc: dev@dpdk.org; nd ; Honnappa Nagarahalli > > ; Feifei Wang ; > > Ruifeng Wang > > Subject: [PATCH] doc: announce ethdev operation struct changes > > > > To support mbufs recycle mode, announce the coming ABI changes from > > DPDK 23.11. > > > > Signed-off-by: Feifei Wang > > Reviewed-by: Ruifeng Wang > > --- > > doc/guides/rel_notes/deprecation.rst | 4 > > 1 file changed, 4 insertions(+) > > > > diff --git a/doc/guides/rel_notes/deprecation.rst > > b/doc/guides/rel_notes/deprecation.rst > > index 66431789b0..c7e1ffafb2 100644 > > --- a/doc/guides/rel_notes/deprecation.rst > > +++ b/doc/guides/rel_notes/deprecation.rst > > @@ -118,6 +118,10 @@ Deprecation Notices > >The legacy actions should be removed > >once ``MODIFY_FIELD`` alternative is implemented in drivers. > > > > +* ethdev: The Ethernet device data structure ``struct rte_eth_dev`` > > +and > > + the fast-path ethdev flat array ``struct rte_eth_fp_ops`` will be > > +updated > > + with new fields to support mbufs recycle mode from DPDK 23.11. > > + > > * cryptodev: The function ``rte_cryptodev_cb_fn`` will be updated > >to have another parameter ``qp_id`` to return the queue pair ID > >which got error interrupt to the application, > > -- > > 2.25.1 Ping~
[PATCH] net/nfp: fix invalid control message packets
From: Long Wu
If we add two cards that uses flower firmware into one dpdk-testpmd,
NFP PMD will printf error log. The reason is that the second card
uses the control VNIC Rx queue of the first card.
Because rte_eth_dma_zone_reserve() will reserve new DMA zone if
DMA zone's name is unique. But if there is already a zone with the
same name, rte_eth_dma_zone_reserve() will return the pointer of
the previously DMA zone. We try to reserve DMA zone for each card
but we use the same name to reserve.
We use the PCI address to give control VNIC a unique ring name
to avoid the above situation and let each NIC's ring have its
own DMA zone.
Fixes: 945441ebdb9c ("net/nfp: add flower ctrl VNIC")
Cc: chaoyong...@corigine.com
Cc: sta...@dpdk.org
Signed-off-by: Long Wu
---
drivers/net/nfp/flower/nfp_flower.c | 32 +
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower.c
b/drivers/net/nfp/flower/nfp_flower.c
index 77dab864f3..9a75aa5413 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -385,6 +385,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
int ret = 0;
uint16_t n_txq;
uint16_t n_rxq;
+ const char *pci_name;
unsigned int numa_node;
struct rte_mempool *mp;
struct nfp_net_rxq *rxq;
@@ -393,6 +394,8 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
struct rte_eth_dev *eth_dev;
const struct rte_memzone *tz;
struct nfp_app_fw_flower *app_fw_flower;
+ char ctrl_rxring_name[RTE_MEMZONE_NAMESIZE];
+ char ctrl_txring_name[RTE_MEMZONE_NAMESIZE];
char ctrl_pktmbuf_pool_name[RTE_MEMZONE_NAMESIZE];
/* Set up some pointers here for ease of use */
@@ -425,10 +428,12 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
goto eth_dev_cleanup;
}
+ pci_name = strchr(pf_dev->pci_dev->name, ':') + 1;
+
/* Create a mbuf pool for the ctrl vNIC */
numa_node = rte_socket_id();
snprintf(ctrl_pktmbuf_pool_name, sizeof(ctrl_pktmbuf_pool_name),
- "%s_ctrlmp", (strchr(pf_dev->pci_dev->name, ':') + 1));
+ "%s_ctrlmp", pci_name);
app_fw_flower->ctrl_pktmbuf_pool =
rte_pktmbuf_pool_create(ctrl_pktmbuf_pool_name,
4 * CTRL_VNIC_NB_DESC, 64, 0, 9216, numa_node);
@@ -467,6 +472,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
eth_dev->data->nb_rx_queues = n_txq;
eth_dev->data->dev_private = hw;
+ snprintf(ctrl_rxring_name, sizeof(ctrl_rxring_name), "%s_ctrx_ring",
pci_name);
/* Set up the Rx queues */
for (i = 0; i < n_rxq; i++) {
rxq = rte_zmalloc_socket("ethdev RX queue",
@@ -502,7 +508,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
* handle the maximum ring size is allocated in order to allow
for
* resizing in later calls to the queue setup function.
*/
- tz = rte_eth_dma_zone_reserve(eth_dev, "ctrl_rx_ring", i,
+ tz = rte_eth_dma_zone_reserve(eth_dev, ctrl_rxring_name, i,
sizeof(struct nfp_net_rx_desc) *
NFP_NET_MAX_RX_DESC,
NFP_MEMZONE_ALIGN, numa_node);
if (tz == NULL) {
@@ -521,7 +527,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
sizeof(*rxq->rxbufs) * CTRL_VNIC_NB_DESC,
RTE_CACHE_LINE_SIZE, numa_node);
if (rxq->rxbufs == NULL) {
- rte_eth_dma_zone_free(eth_dev, "ctrl_rx_ring", i);
+ rte_eth_dma_zone_free(eth_dev, ctrl_rxring_name, i);
rte_free(rxq);
ret = -ENOMEM;
goto rx_queue_setup_cleanup;
@@ -539,6 +545,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
nn_cfg_writeb(hw, NFP_NET_CFG_RXR_SZ(i),
rte_log2_u32(CTRL_VNIC_NB_DESC));
}
+ snprintf(ctrl_txring_name, sizeof(ctrl_txring_name), "%s_cttx_ring",
pci_name);
/* Set up the Tx queues */
for (i = 0; i < n_txq; i++) {
txq = rte_zmalloc_socket("ethdev TX queue",
@@ -557,7 +564,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
* handle the maximum ring size is allocated in order to allow
for
* resizing in later calls to the queue setup function.
*/
- tz = rte_eth_dma_zone_reserve(eth_dev, "ctrl_tx_ring", i,
+ tz = rte_eth_dma_zone_reserve(eth_dev, ctrl_txring_name, i,
sizeof(struct nfp_net_nfd3_tx_desc) *
NFP_NET_MAX_TX_DESC,
NFP_MEMZONE_ALIGN, numa_node);
if (tz == NULL) {
@@ -584,7 +591,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
RE: [PATCH] doc: announce inclusive naming macro name changes
> > -Original Message-
> > From: Chaoyong He
> > Sent: Wednesday, June 7, 2023 10:44 AM
> > To: dev@dpdk.org
> > Cc: oss-driv...@corigine.com; niklas.soderl...@corigine.com; Long Wu
> > ; Chaoyong He
> > Subject: [PATCH] doc: announce inclusive naming macro name changes
> >
> > From: Long Wu
> >
> > In order to support inclusive naming, some of the macro in DPDK will
> > need to be renamed. Do this through deprecation process now for 23.07.
> >
> > Signed-off-by: Long Wu
> > Reviewed-by: Chaoyong He
> > ---
> > Depends-on: patch-127084 ("doc: announce inclusive naming function
> > name")
> > ---
> > doc/guides/rel_notes/deprecation.rst | 5 +
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/doc/guides/rel_notes/deprecation.rst
> > b/doc/guides/rel_notes/deprecation.rst
> > index 267a49aa13..67353d4f2b 100644
> > --- a/doc/guides/rel_notes/deprecation.rst
> > +++ b/doc/guides/rel_notes/deprecation.rst
> > @@ -175,3 +175,8 @@ Deprecation Notices
> >``rte_eth_bond_active_members_get``,
> >``rte_eth_bond_member_add``, ``rte_eth_bond_member_remove``,
> >and ``rte_eth_bond_members_get``.
> > + References to slave will be removed and replace bonded to bonding
> > + in
> > DPDK 23.11.
> > + The following macro will be deprecated in DPDK 23.07, and removed
> > + in
> > DPDK 23.11.
> > + The old macro:
> > + ``RTE_ETH_DEV_BONDED_SLAVE`` will be replaced by:
> > + ``RTE_ETH_DEV_BONDING_MEMBER``.
> > --
> > 2.27.0
>
> Acked-by: Chenbo Xia
A gentle ping ~
Sorry for bother, we try to make a patch series about the bond PMD offload can
coming with DPDK-23.11 ...
[PATCH] app/test:add NIC parameter exception handling
Add NIC exception parameter handling to dpdk_test process,
program exits when carrying unbound vfio NIC parameters.
Fixes: 50247fe03fe0 ("test/timer: exercise new APIs in secondary process")
Cc: sta...@dpdk.org
Signed-off-by: Kaisen You
---
app/test/test.c | 18 ++
1 file changed, 18 insertions(+)
diff --git a/app/test/test.c b/app/test/test.c
index fb073ff795..c927adba81 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -20,6 +20,7 @@ extern cmdline_parse_ctx_t main_ctx[];
#endif
#include
+#include
#include
#include
#include
@@ -111,6 +112,9 @@ main(int argc, char **argv)
char *tests[argc]; /* store an array of tests to run */
int test_count = 0;
int i;
+ uint16_t count;
+ uint16_t port_id;
+ uint16_t nb_ports;
#endif
char *extra_args;
int ret;
@@ -157,6 +161,20 @@ main(int argc, char **argv)
prgname = argv[0];
+ count = 0;
+ RTE_ETH_FOREACH_DEV(port_id) {
+ count++;
+ }
+ nb_ports = count;
+ if (nb_ports == 0) {
+ if (rte_errno == EBUSY)
+ printf("Requested device cannot be used: %d\n",
rte_errno);
+ else
+ printf("No probed ethernet devices: %d\n", rte_errno);
+ ret = 0;
+ goto out;
+ }
+
#ifdef RTE_LIB_TIMER
ret = rte_timer_subsystem_init();
if (ret < 0 && ret != -EALREADY) {
--
2.25.1
Re: [PATCH v5 1/2] dts: add smoke tests
On Wed, Jul 12, 2023 at 10:00 PM Jeremy Spewock wrote: > > This fails to apply because it modifies some of the same files that the > previous DTS patches that were applied today also change. These changes only > modify things in dts/ which isn't currently being used in CI testing so there > wouldn't be any breaking changes for these builds regardless. Apologies for > my lack of knowledge on how this is handled, but are these conflicts > something that I need to fix in my patch or are instead handled by > maintainers who are applying and merging the patches on these release > candidates? > Send a new version if you have the bandwidth, it will take some work off maintainers, who are very busy. > Thanks, > Jeremy > > On Wed, Jul 12, 2023 at 3:21 PM wrote: >> >> From: Jeremy Spewock >> >> Adds a new test suite for running smoke tests that verify general >> configuration aspects of the system under test. If any of these tests >> fail, the DTS execution terminates as part of a "fail-fast" model. >> >> Signed-off-by: Jeremy Spewock >> --- >> dts/conf.yaml | 17 +- >> dts/framework/config/__init__.py | 105 +-- >> dts/framework/config/conf_yaml_schema.json| 142 +- >> dts/framework/dts.py | 87 ++--- >> dts/framework/exception.py| 12 ++ >> dts/framework/remote_session/__init__.py | 11 +- >> dts/framework/remote_session/os_session.py| 53 +- >> dts/framework/remote_session/posix_session.py | 29 ++- >> .../remote_session/remote/__init__.py | 10 + >> .../remote/interactive_remote_session.py | 82 >> .../remote/interactive_shell.py | 75 >> .../remote_session/remote/testpmd_shell.py| 75 >> dts/framework/test_result.py | 37 +++- >> dts/framework/test_suite.py | 10 +- >> dts/framework/testbed_model/node.py | 2 + >> dts/framework/testbed_model/sut_node.py | 176 +- >> dts/framework/utils.py| 2 + >> dts/tests/TestSuite_smoke_tests.py| 113 +++ >> 18 files changed, 941 insertions(+), 97 deletions(-) >> create mode 100644 >> dts/framework/remote_session/remote/interactive_remote_session.py >> create mode 100644 dts/framework/remote_session/remote/interactive_shell.py >> create mode 100644 dts/framework/remote_session/remote/testpmd_shell.py >> create mode 100644 dts/tests/TestSuite_smoke_tests.py >> >> diff --git a/dts/conf.yaml b/dts/conf.yaml >> index a9bd8a3e..c0be7848 100644 >> --- a/dts/conf.yaml >> +++ b/dts/conf.yaml >> @@ -10,9 +10,13 @@ executions: >> compiler_wrapper: ccache >> perf: false >> func: true >> +skip_smoke_tests: false # optional flag that allow you to skip smoke >> tests >> test_suites: >>- hello_world >> -system_under_test: "SUT 1" >> +system_under_test: >> + node_name: "SUT 1" >> + vdevs: # optional; if removed, vdevs won't be used in the execution >> +- "crypto_openssl" >> nodes: >>- name: "SUT 1" >> hostname: sut1.change.me.localhost >> @@ -25,3 +29,14 @@ nodes: >> hugepages: # optional; if removed, will use system hugepage >> configuration >> amount: 256 >> force_first_numa: false >> +ports: >> + - pci: ":00:08.0" >> +os_driver_for_dpdk: vfio-pci # OS driver that DPDK will use >> +os_driver: i40e >> +peer_node: "TG 1" >> +peer_pci: ":00:08.0" >> + - pci: ":00:08.1" >> +os_driver_for_dpdk: vfio-pci >> +os_driver: i40e >> +peer_node: "TG 1" >> +peer_pci: ":00:08.1" >> diff --git a/dts/framework/config/__init__.py >> b/dts/framework/config/__init__.py >> index ebb0823f..9e144748 100644 >> --- a/dts/framework/config/__init__.py >> +++ b/dts/framework/config/__init__.py >> @@ -12,6 +12,7 @@ >> import pathlib >> from dataclasses import dataclass >> from enum import Enum, auto, unique >> +from pathlib import PurePath >> from typing import Any, TypedDict >> >> import warlock # type: ignore >> @@ -72,6 +73,20 @@ class HugepageConfiguration: >> force_first_numa: bool >> >> >> +@dataclass(slots=True, frozen=True) >> +class PortConfig: >> +node: str >> +pci: str >> +os_driver_for_dpdk: str >> +os_driver: str >> +peer_node: str >> +peer_pci: str >> + >> +@staticmethod >> +def from_dict(node: str, d: dict) -> "PortConfig": >> +return PortConfig(node=node, **d) >> + >> + >> @dataclass(slots=True, frozen=True) >> class NodeConfiguration: >> name: str >> @@ -84,6 +99,7 @@ class NodeConfiguration: >> use_first_core: bool >> memory_channels: int >> hugepages: HugepageConfiguration | None >> +ports: list[PortConfig] >> >> @staticmethod >> def from_dict(d: dict) -> "NodeConfiguration": >> @@ -92,19 +108,3
