Re: [dpdk-dev] [PATCH v6 3/4] net/ixgbe: cleanup Tx buffers
> > > Add support to the ixgbe driver for the API rte_eth_tx_done_cleanup to
> > > force free consumed buffers on Tx ring.
> > >
> > > Signed-off-by: Chenxu Di
> > > ---
> > > drivers/net/ixgbe/ixgbe_ethdev.c | 2 +
> > > drivers/net/ixgbe/ixgbe_rxtx.c | 116 +++
> > > drivers/net/ixgbe/ixgbe_rxtx.h | 2 +
> > > 3 files changed, 120 insertions(+)
> > >
> > > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> > > b/drivers/net/ixgbe/ixgbe_ethdev.c
> > > index 2c6fd0f13..0091405db 100644
> > > --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> > > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> > > @@ -601,6 +601,7 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops
> > > = { .udp_tunnel_port_add = ixgbe_dev_udp_tunnel_port_add,
> > > .udp_tunnel_port_del = ixgbe_dev_udp_tunnel_port_del,
> > > .tm_ops_get = ixgbe_tm_ops_get,
> > > +.tx_done_cleanup = ixgbe_tx_done_cleanup,
> >
> > Don't see how we can have one tx_done_cleanup() for different tx functions?
> > Vector and scalar TX path use different format for sw_ring[] entries.
> > Also offload and simile TX paths use different method to track used/free
> > descriptors, and use different functions to free them:
> > offload uses tx_entry next_id, last_id plus txq. last_desc_cleaned, while
> > simple
> > TX paths use tx_next_dd.
> >
>
> This patches will be not include function for Vector, and I will update my
> code to
> Make it work for offload and simple .
> >
> > > };
> > >
> > > /*
> > > @@ -649,6 +650,7 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops
> > = {
> > > .reta_query = ixgbe_dev_rss_reta_query,
> > > .rss_hash_update = ixgbe_dev_rss_hash_update,
> > > .rss_hash_conf_get= ixgbe_dev_rss_hash_conf_get,
> > > +.tx_done_cleanup = ixgbe_tx_done_cleanup,
> > > };
> > >
> > > /* store statistics names and its offset in stats structure */ diff
> > > --git a/drivers/net/ixgbe/ixgbe_rxtx.c
> > > b/drivers/net/ixgbe/ixgbe_rxtx.c index fa572d184..520b9c756 100644
> > > --- a/drivers/net/ixgbe/ixgbe_rxtx.c
> > > +++ b/drivers/net/ixgbe/ixgbe_rxtx.c
> > > @@ -2306,6 +2306,122 @@ ixgbe_tx_queue_release_mbufs(struct
> > > ixgbe_tx_queue *txq) } }
> > >
> > > +int ixgbe_tx_done_cleanup(void *q, uint32_t free_cnt)
> >
> > That seems to work only for offload(full) TX path (ixgbe_xmit_pkts).
> > Simple(fast) path seems not covered by this function.
> >
>
> Same as above
>
> > > +{
> > > +struct ixgbe_tx_queue *txq = (struct ixgbe_tx_queue *)q; struct
> > > +ixgbe_tx_entry *sw_ring; volatile union ixgbe_adv_tx_desc *txr;
> > > +uint16_t tx_first; /* First segment analyzed. */
> > > +uint16_t tx_id;/* Current segment being processed. */
> > > +uint16_t tx_last; /* Last segment in the current packet. */ uint16_t
> > > +tx_next; /* First segment of the next packet. */ int count;
> > > +
> > > +if (txq == NULL)
> > > +return -ENODEV;
> > > +
> > > +count = 0;
> > > +sw_ring = txq->sw_ring;
> > > +txr = txq->tx_ring;
> > > +
> > > +/*
> > > + * tx_tail is the last sent packet on the sw_ring. Goto the end
> > > + * of that packet (the last segment in the packet chain) and
> > > + * then the next segment will be the start of the oldest segment
> > > + * in the sw_ring.
> >
> > Not sure I understand the sentence above.
> > tx_tail is the value of TDT HW register (most recently armed by SW TD).
> > last_id is the index of last descriptor for multi-seg packet.
> > next_id is just the index of next descriptor in HW TD ring.
> > How do you conclude that it will be the ' oldest segment in the sw_ring'?
> >
>
> The tx_tail is the last sent packet on the sw_ring. While the xmit_cleanup or
> Tx_free_bufs will be call when the nb_tx_free < tx_free_thresh .
> So the sw_ring[tx_tail].next_id must be the begin of mbufs which are not used
> or
> Already freed . then begin the loop until the mbuf is used and begin to free
> them.
>
>
>
> > Another question why do you need to write your own functions?
> > Why can't you reuse existing ixgbe_xmit_cleanup() for full(offload) path and
> > ixgbe_tx_free_bufs() for simple path?
> > Yes, ixgbe_xmit_cleanup() doesn't free mbufs, but at least it could be
> > used to
> > determine finished TX descriptors.
> > Based on that you can you can free appropriate sw_ring[] entries.
> >
>
> The reason why I don't reuse existing function is that they all free several
> mbufs
> While the free_cnt of the API rte_eth_tx_done_cleanup() is the number of
> packets.
> It also need to be done that check which mbuffs are from the same packet.
At first, I don't see anything bad if tx_done_cleanup() will free only some
segments from
the packet. As long as it is safe - there is no problem with that.
I think rte_eth_tx_done_cleanup() operates on mbuf, not packet quantities.
But in our case I think it doesn't matter, as ixgbe_xmit_cleanup()
mark TXDs as free only when HW is done with all TXDs for that packet.
As long as there is a way to reuse existing code and avoid
Re: [dpdk-dev] [PATCH] net/mlx5: allow install more meter actions
On Fri, Jan 3, 2020 at 11:38 AM Suanming Mou wrote:
>
> Hello Tonghao,
>
> Could you please explain much detail about your issue scenario?
>
> If I understand correctly, you are trying to create two flows with the two
> same match criteria?
>
> Example from testpmd just like that:
> add port meter profile srtcm_rfc2697 0 24 65536 32768 0
> create port meter 0 0 24 yes G Y D 0x 1 0
> flow create 0 ingress pattern eth / end actions jump group 1 / end
> flow create 0 priority 3 group 1 ingress pattern eth / end actions meter
> mtr_id 0 / queue index 0 / end
> flow create 0 priority 3 group 1 ingress pattern eth / end actions meter
> mtr_id 0 / queue index 1 / end
>
> Then the third flow will report "hardware refuses to create flow: Invalid
> argument".
>
> Please correct me if I'm wrong.
> And better to give the issue reproduce method via testpmd cmdline.
./testpmd -l 0-3 -n 4 -w :82:00.0 -w :82:00.1 -- -i
--portmask=0x3 --rxq=2 --nb-cores=2
add port meter profile srtcm_rfc2697 0 100 1024 1024 0
add port meter profile srtcm_rfc2697 0 101 2048 2048 0
create port meter 0 100 100 yes G Y D 0x 1 0
create port meter 0 101 101 yes G Y D 0x 1 0
flow create 0 ingress pattern eth / end actions jump group 1 / end
flow create 0 group 1 priority 3 ingress pattern eth / ipv4 dst is
1.1.1.100 / end actions meter mtr_id 100 / queue index 0 / end
The one of commands below will run fail:
flow create 0 group 1 priority 3 ingress pattern eth / ipv4 dst is
1.1.1.200 / end actions meter mtr_id 101 / queue index 1 / end
flow create 0 group 1 priority 3 ingress pattern eth / ipv4 dst is
1.1.1.200 / tcp dst is 80 / end actions meter mtr_id 101 / queue
index 1 / end
flow create 0 group 1 priority 3 ingress pattern eth / ipv4 / tcp dst
is 80 / end actions meter mtr_id 101 / queue index 1 / end
Caught error type 1 (cause unspecified): hardware refuses to create
flow: Invalid argument
And with this patch, it works fine.
> Thanks
> SuanmingMou
>
> > -Original Message-
> > From: Tonghao Zhang
> > Sent: Thursday, December 19, 2019 6:00 PM
> > To: Suanming Mou
> > Cc: dev@dpdk.org; sta...@dpdk.org
> > Subject: Re: [PATCH] net/mlx5: allow install more meter actions
> >
> > ping
> >
> > On Tue, Dec 17, 2019 at 3:29 PM wrote:
> > >
> > > From: Tonghao Zhang
> > >
> > > When creating the dr rule of meter, the matcher which struct is
> > > "struct mlx5dv_dr_matcher" should not be shared, if shared,
> > > mlx5dv_dr_rule_create will return NULL. We can't install more metering
> > > offload actions.
> > >
> > > The call tree (rdma-core-47mlnx1 OFED 4.7-3.2.9):
> > > * dr_rule_handle_ste_branch
> > > * dr_rule_create_rule_nic
> > > * dr_rule_create_rule_fdb
> > > * dr_rule_create_rule
> > > * mlx5dv_dr_rule_create
> > >
> > > In the dr_rule_handle_ste_branch, if ste is not used,
> > > mlx5dv_dr_rule_create will return rule, if the ste is used, and the
> > > ste is the last in the rule, mlx5dv_dr_rule_create will return NULL.
> > >
> > > dr_rule_handle_ste_branch:
> > > if dr_ste_not_used_ste
> > > dr_rule_handle_empty_entry
> > > else
> > > dr_rule_find_ste_in_miss_list
> > > dr_ste_is_last_in_rule: if so return NULL and set errno =
> > > EINVAL;
> > >
> > > Fixes: 9ea9b049a960 ("net/mlx5: split meter flow")
> > > Cc: Suanming Mou
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Tonghao Zhang
> > > ---
> > > drivers/net/mlx5/mlx5_flow.c| 20 +---
> > > drivers/net/mlx5/mlx5_flow.h| 2 ++
> > > drivers/net/mlx5/mlx5_flow_dv.c | 5 +
> > > 3 files changed, 20 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/drivers/net/mlx5/mlx5_flow.c
> > > b/drivers/net/mlx5/mlx5_flow.c index 0087163..f8cdc25 100644
> > > --- a/drivers/net/mlx5/mlx5_flow.c
> > > +++ b/drivers/net/mlx5/mlx5_flow.c
> > > @@ -3421,7 +3421,9 @@ uint32_t mlx5_flow_adjust_priority(struct
> > rte_eth_dev *dev, int32_t priority,
> > > const struct rte_flow_attr *attr,
> > > const struct rte_flow_item items[],
> > > const struct rte_flow_action actions[],
> > > - bool external, struct rte_flow_error *error)
> > > + bool external,
> > > + bool shared,
> > > + struct rte_flow_error *error)
> > > {
> > > struct mlx5_flow *dev_flow;
> > >
> > > @@ -3434,6 +3436,7 @@ uint32_t mlx5_flow_adjust_priority(struct
> > rte_eth_dev *dev, int32_t priority,
> > > LIST_INSERT_HEAD(&flow->dev_flows, dev_flow, next);
> > > if (sub_flow)
> > > *sub_flow = dev_flow;
> > > + dev_flow->matcher_shared = shared;
> > > return flow_drv_translate(dev, dev_flow, attr, items, actions,
> > > error); }
> > >
> > > @@ -3741,7 +3744,9 @@ uint32_t mlx5_flow_adjust_priority(struct
> > rte_eth_dev *dev, int32_t priority,
> > >const struct rte_flow_attr *attr,
> >
[dpdk-dev] [PATCH v1 0/1] Add Broadcom Stingray for meson cross-compilation
Add Broadcom Stingray meson config support. Qingmin Liu (1): config: add Broadcom Stingray for meson cross-compilation config/arm/arm64_stingray_linux_gcc | 17 + 1 file changed, 17 insertions(+) create mode 100644 config/arm/arm64_stingray_linux_gcc -- 2.21.0
[dpdk-dev] [PATCH v1 1/1] config: add Broadcom Stingray for meson cross-compilation
Broadcom Stingray is armv8 CPU having cortex-a72. The implementor ID is 0x41 (arm) and the primary part number is 0xd08 (cortex-a72). Signed-off-by: Qingmin Liu --- config/arm/arm64_stingray_linux_gcc | 17 + 1 file changed, 17 insertions(+) create mode 100644 config/arm/arm64_stingray_linux_gcc diff --git a/config/arm/arm64_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc new file mode 100644 index 0..86797d23c --- /dev/null +++ b/config/arm/arm64_stingray_linux_gcc @@ -0,0 +1,17 @@ +[binaries] +c = 'aarch64-linux-gnu-gcc' +cpp = 'aarch64-linux-gnu-cpp' +ar = 'aarch64-linux-gnu-gcc-ar' +strip = 'aarch64-linux-gnu-strip' +pkgconfig = 'aarch64-linux-gnu-pkg-config' +pcap-config = '' + +[host_machine] +system = 'linux' +cpu_family = 'aarch64' +cpu = 'armv8-a' +endian = 'little' + +[properties] +implementor_id = '0x41' +implementor_pn = '0xd08' -- 2.21.0
[dpdk-dev] [PATCH] net/af_xdp: fix redundant check for NEED WAKEUP
Function kick_tx() has built-in detection on NEED_WAKEUP flag, so just
call it directly, like elsewhere in the driver.
Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks")
Cc: sta...@dpdk.org
Signed-off-by: Xiao Wang
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 2b1245ee4..d903e6c28 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -480,10 +480,7 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t
nb_pkts)
tx_bytes += mbuf->pkt_len;
}
-#if defined(XDP_USE_NEED_WAKEUP)
- if (xsk_ring_prod__needs_wakeup(&txq->tx))
-#endif
- kick_tx(txq);
+ kick_tx(txq);
out:
xsk_ring_prod__submit(&txq->tx, count);
--
2.15.1
Re: [dpdk-dev] [PATCH v3] net/ice: use the copy API to do MAC assignment
> -Original Message-
> From: Wang, Haiyue
> Sent: Friday, January 3, 2020 10:59 AM
> To: dev@dpdk.org; step...@networkplumber.org; Zhang, Qi Z
> ; Yang, Qiming ; Ye,
> Xiaolong
> Cc: Wang, Haiyue
> Subject: [PATCH v3] net/ice: use the copy API to do MAC assignment
>
> Use the API rte_ether_addr_copy to do MAC assignment, instead of calling
> rte_memcpy function directly.
>
> Signed-off-by: Haiyue Wang
> ---
> v3: Update the commit message
>
> v2: Update the commit title and message, use the rte_ether_addr_copy API
> instead of just changing the length definition to make code style clean.
>
> drivers/net/ice/ice_ethdev.c | 14 +++---
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index
> 2cbd82c94..d104df26f 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -873,7 +873,7 @@ ice_add_mac_filter(struct ice_vsi *vsi, struct
> rte_ether_addr *mac_addr)
> ret = -ENOMEM;
> goto DONE;
> }
> - rte_memcpy(&f->mac_info.mac_addr, mac_addr, ETH_ADDR_LEN);
> + rte_ether_addr_copy(mac_addr, &f->mac_info.mac_addr);
> TAILQ_INSERT_TAIL(&vsi->mac_list, f, next);
> vsi->mac_num++;
>
> @@ -1660,16 +1660,16 @@ ice_setup_vsi(struct ice_pf *pf, enum
> ice_vsi_type type)
>
> if (type == ICE_VSI_PF) {
> /* MAC configuration */
> - rte_memcpy(pf->dev_addr.addr_bytes,
> -hw->port_info->mac.perm_addr,
> -ETH_ADDR_LEN);
> + rte_ether_addr_copy((struct rte_ether_addr *)
> + hw->port_info->mac.perm_addr,
> + &pf->dev_addr);
>
> - rte_memcpy(&mac_addr, &pf->dev_addr,
> RTE_ETHER_ADDR_LEN);
> + rte_ether_addr_copy(&pf->dev_addr, &mac_addr);
> ret = ice_add_mac_filter(vsi, &mac_addr);
> if (ret != ICE_SUCCESS)
> PMD_INIT_LOG(ERR, "Failed to add dflt MAC filter");
>
> - rte_memcpy(&mac_addr, &broadcast,
> RTE_ETHER_ADDR_LEN);
> + rte_ether_addr_copy(&broadcast, &mac_addr);
> ret = ice_add_mac_filter(vsi, &mac_addr);
> if (ret != ICE_SUCCESS)
> PMD_INIT_LOG(ERR, "Failed to add MAC filter"); @@
> -3267,7 +3267,7 @@ static int ice_macaddr_set(struct rte_eth_dev *dev,
> PMD_DRV_LOG(ERR, "Failed to add mac filter");
> return -EIO;
> }
> - memcpy(&pf->dev_addr, mac_addr, ETH_ADDR_LEN);
> + rte_ether_addr_copy(mac_addr, &pf->dev_addr);
>
> flags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL;
> ret = ice_aq_manage_mac_write(hw, mac_addr->addr_bytes, flags,
> NULL);
> --
> 2.17.1
Acked-by: Qiming Yang
[dpdk-dev] [PATCH v2 00/12] base code update
Main changes: 1. add support for MAC rules on specific port 2. support MAC/VLAN with TCP/UDP in switch rule 3. support 1/10G device 4. couple bug fix and code clean. v2: - rebase to next-net-intel. - remove unnecessary empty line in patch 03/12 Qi Zhang (12): net/ice/base: whitelist register for NVM access net/ice/base: support MAC/VLAN with TCP/UDP in switch net/ice/base: do not wait for PE unit to load net/ice/base: cleanup format of static const declarations net/ice/base: flexbytes should match on header data net/ice/base: enable clearing of the HW tables net/ice/base: fix loop limit net/ice/base: increase PF reset wait timeout net/ice/base: change fdir desc preparation net/ice/base: support add MAC rules on specific port net/ice: support 1/10G device IDs net/ice/base: minor code clean drivers/net/ice/base/ice_adminq_cmd.h | 1 + drivers/net/ice/base/ice_common.c | 25 +- drivers/net/ice/base/ice_devids.h | 4 + drivers/net/ice/base/ice_fdir.c | 92 +++--- drivers/net/ice/base/ice_flex_pipe.c | 63 - drivers/net/ice/base/ice_flex_pipe.h | 1 + drivers/net/ice/base/ice_flow.c | 17 +- drivers/net/ice/base/ice_flow.h | 2 +- drivers/net/ice/base/ice_nvm.c| 10 +- drivers/net/ice/base/ice_switch.c | 517 +- drivers/net/ice/base/ice_switch.h | 3 +- drivers/net/ice/base/ice_type.h | 4 - drivers/net/ice/ice_ethdev.c | 2 + 13 files changed, 533 insertions(+), 208 deletions(-) -- 2.13.6
[dpdk-dev] [PATCH v2 01/12] net/ice/base: whitelist register for NVM access
Allow tools to access register offset 0xB8188 (GLGEN_RSTAT) for
NVMUpdate operations. This is a read-only register, so risk of other
issues stemming from this change is low. Even so, update the write
command to prevent and reject any commands which attempt to write to
this register, just like we do for GL_HICR_EN.
Signed-off-by: Jeb Cramer
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_nvm.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/ice/base/ice_nvm.c
index 1dbfc2dcc..2d92524f2 100644
--- a/drivers/net/ice/base/ice_nvm.c
+++ b/drivers/net/ice/base/ice_nvm.c
@@ -504,6 +504,7 @@ ice_validate_nvm_rw_reg(struct ice_nvm_access_cmd *cmd)
case GL_FWSTS:
case GL_MNG_FWSM:
case GLGEN_CSR_DEBUG_C:
+ case GLGEN_RSTAT:
case GLPCI_LBARCTRL:
case GLNVM_GENS:
case GLNVM_FLA:
@@ -579,9 +580,14 @@ ice_nvm_access_write(struct ice_hw *hw, struct
ice_nvm_access_cmd *cmd,
if (status)
return status;
- /* The HICR_EN register is read-only */
- if (cmd->offset == GL_HICR_EN)
+ /* Reject requests to write to read-only registers */
+ switch (cmd->offset) {
+ case GL_HICR_EN:
+ case GLGEN_RSTAT:
return ICE_ERR_OUT_OF_RANGE;
+ default:
+ break;
+ }
ice_debug(hw, ICE_DBG_NVM,
"NVM access: writing register %08x with value %08x\n",
--
2.13.6
[dpdk-dev] [PATCH v2 07/12] net/ice/base: fix loop limit
In ice_prot_type_to_id routine, correct the loop limit check
to use ARRAY_SIZE instead of looking for the array element to
have a specific value.
Fixes: fed0c5ca5f19 ("net/ice/base: support programming a new switch recipe")
Cc: sta...@dpdk.org
Signed-off-by: Dan Nowlin
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_switch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ice/base/ice_switch.c
b/drivers/net/ice/base/ice_switch.c
index 3ed84ca01..b2945a9e2 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -4880,7 +4880,7 @@ static bool ice_prot_type_to_id(enum ice_protocol_type
type, u16 *id)
{
u16 i;
- for (i = 0; ice_prot_id_tbl[i].type != ICE_PROTOCOL_LAST; i++)
+ for (i = 0; i < ARRAY_SIZE(ice_prot_id_tbl); i++)
if (ice_prot_id_tbl[i].type == type) {
*id = ice_prot_id_tbl[i].protocol_id;
return true;
--
2.13.6
[dpdk-dev] [PATCH v2 02/12] net/ice/base: support MAC/VLAN with TCP/UDP in switch
Add a feature to allow user to add switch filter using input like
MAC + VLAN (C-tag only) + L4 (TCP/UDP) port. API "ice_add_adv_rule"
is extended to handle this filter type.
Signed-off-by: Kiran Patil
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_switch.c | 206 ++
1 file changed, 188 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ice/base/ice_switch.c
b/drivers/net/ice/base/ice_switch.c
index afa4fe30d..f8f5fde3c 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -251,8 +251,8 @@ u8 dummy_udp_tun_udp_packet[] = {
0x00, 0x08, 0x00, 0x00,
};
-static const
-struct ice_dummy_pkt_offsets dummy_udp_packet_offsets[] = {
+/* offset info for MAC + IPv4 + UDP dummy packet */
+static const struct ice_dummy_pkt_offsets dummy_udp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
{ ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
@@ -260,8 +260,8 @@ struct ice_dummy_pkt_offsets dummy_udp_packet_offsets[] = {
{ ICE_PROTOCOL_LAST,0 },
};
-static const u8
-dummy_udp_packet[] = {
+/* Dummy packet for MAC + IPv4 + UDP */
+static const u8 dummy_udp_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -280,8 +280,40 @@ dummy_udp_packet[] = {
0x00, 0x00, /* 2 bytes for 4 byte alignment */
};
-static const
-struct ice_dummy_pkt_offsets dummy_tcp_packet_offsets[] = {
+/* offset info for MAC + VLAN + IPv4 + UDP dummy packet */
+static const struct ice_dummy_pkt_offsets dummy_vlan_udp_packet_offsets[] = {
+ { ICE_MAC_OFOS, 0 },
+ { ICE_ETYPE_OL, 12 },
+ { ICE_VLAN_OFOS,14 },
+ { ICE_IPV4_OFOS,18 },
+ { ICE_UDP_ILOS, 38 },
+ { ICE_PROTOCOL_LAST,0 },
+};
+
+/* C-tag (801.1Q), IPv4:UDP dummy packet */
+static const u8 dummy_vlan_udp_packet[] = {
+ 0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+
+ 0x81, 0x00, /* ICE_ETYPE_OL 12 */
+
+ 0x00, 0x00, 0x08, 0x00, /* ICE_VLAN_OFOS 14 */
+
+ 0x45, 0x00, 0x00, 0x1c, /* ICE_IPV4_OFOS 18 */
+ 0x00, 0x01, 0x00, 0x00,
+ 0x00, 0x11, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+
+ 0x00, 0x00, 0x00, 0x00, /* ICE_UDP_ILOS 38 */
+ 0x00, 0x08, 0x00, 0x00,
+
+ 0x00, 0x00, /* 2 bytes for 4 byte alignment */
+};
+
+/* offset info for MAC + IPv4 + TCP dummy packet */
+static const struct ice_dummy_pkt_offsets dummy_tcp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
{ ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
@@ -289,8 +321,8 @@ struct ice_dummy_pkt_offsets dummy_tcp_packet_offsets[] = {
{ ICE_PROTOCOL_LAST,0 },
};
-static const u8
-dummy_tcp_packet[] = {
+/* Dummy packet for MAC + IPv4 + TCP */
+static const u8 dummy_tcp_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -312,8 +344,42 @@ dummy_tcp_packet[] = {
0x00, 0x00, /* 2 bytes for 4 byte alignment */
};
-static const
-struct ice_dummy_pkt_offsets dummy_tcp_ipv6_packet_offsets[] = {
+/* offset info for MAC + VLAN (C-tag, 802.1Q) + IPv4 + TCP dummy packet */
+static const struct ice_dummy_pkt_offsets dummy_vlan_tcp_packet_offsets[] = {
+ { ICE_MAC_OFOS, 0 },
+ { ICE_ETYPE_OL, 12 },
+ { ICE_VLAN_OFOS,14 },
+ { ICE_IPV4_OFOS,18 },
+ { ICE_TCP_IL, 38 },
+ { ICE_PROTOCOL_LAST,0 },
+};
+
+/* C-tag (801.1Q), IPv4:TCP dummy packet */
+static const u8 dummy_vlan_tcp_packet[] = {
+ 0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+
+ 0x81, 0x00, /* ICE_ETYPE_OL 12 */
+
+ 0x00, 0x00, 0x08, 0x00, /* ICE_VLAN_OFOS 14 */
+
+ 0x45, 0x00, 0x00, 0x28, /* ICE_IPV4_OFOS 18 */
+ 0x00, 0x01, 0x00, 0x00,
+ 0x00, 0x06, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+
+ 0x00, 0x00, 0x00, 0x00, /* ICE_TCP_IL 38 */
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x50, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+
+ 0x00, 0x00, /* 2 bytes for 4 byte alignment */
+};
+
+static const struct ice_dummy_pkt_offsets dummy_tcp_ipv6_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
{ ICE_ETYPE_OL, 12 },
{ ICE_IPV6_OFOS,14 },
@@ -349,8 +415,49 @@ dummy_tcp_ipv6_packet[] = {
0x00, 0x00, /* 2 bytes for 4 byte alignment */
};
-static const
-struct ice_dummy_pkt_offsets dummy_udp_ipv6_packet_offsets[] = {
+/* C-tag (802.1Q): IPv6 + TCP */
+static const struct ice_dummy_pkt_offsets
+d
[dpdk-dev] [PATCH v2 04/12] net/ice/base: cleanup format of static const declarations
Use a format consistent with the rest of the code.
Signed-off-by: Bruce Allan
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_switch.c | 40 ++-
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ice/base/ice_switch.c
b/drivers/net/ice/base/ice_switch.c
index f8f5fde3c..3ed84ca01 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -57,8 +57,7 @@ struct ice_dummy_pkt_offsets {
u16 offset; /* ICE_PROTOCOL_LAST indicates end of list */
};
-static const
-struct ice_dummy_pkt_offsets dummy_gre_tcp_packet_offsets[] = {
+static const struct ice_dummy_pkt_offsets dummy_gre_tcp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
{ ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
@@ -69,8 +68,7 @@ struct ice_dummy_pkt_offsets dummy_gre_tcp_packet_offsets[] =
{
{ ICE_PROTOCOL_LAST,0 },
};
-static const
-u8 dummy_gre_tcp_packet[] = {
+static const u8 dummy_gre_tcp_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -104,8 +102,7 @@ u8 dummy_gre_tcp_packet[] = {
0x00, 0x00, 0x00, 0x00
};
-static const
-struct ice_dummy_pkt_offsets dummy_gre_udp_packet_offsets[] = {
+static const struct ice_dummy_pkt_offsets dummy_gre_udp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
{ ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
@@ -116,8 +113,7 @@ struct ice_dummy_pkt_offsets dummy_gre_udp_packet_offsets[]
= {
{ ICE_PROTOCOL_LAST,0 },
};
-static const
-u8 dummy_gre_udp_packet[] = {
+static const u8 dummy_gre_udp_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -148,8 +144,7 @@ u8 dummy_gre_udp_packet[] = {
0x00, 0x08, 0x00, 0x00,
};
-static const
-struct ice_dummy_pkt_offsets dummy_udp_tun_tcp_packet_offsets[] = {
+static const struct ice_dummy_pkt_offsets dummy_udp_tun_tcp_packet_offsets[] =
{
{ ICE_MAC_OFOS, 0 },
{ ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
@@ -163,8 +158,7 @@ struct ice_dummy_pkt_offsets
dummy_udp_tun_tcp_packet_offsets[] = {
{ ICE_PROTOCOL_LAST,0 },
};
-static const
-u8 dummy_udp_tun_tcp_packet[] = {
+static const u8 dummy_udp_tun_tcp_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -201,8 +195,7 @@ u8 dummy_udp_tun_tcp_packet[] = {
0x00, 0x00, 0x00, 0x00
};
-static const
-struct ice_dummy_pkt_offsets dummy_udp_tun_udp_packet_offsets[] = {
+static const struct ice_dummy_pkt_offsets dummy_udp_tun_udp_packet_offsets[] =
{
{ ICE_MAC_OFOS, 0 },
{ ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
@@ -216,8 +209,7 @@ struct ice_dummy_pkt_offsets
dummy_udp_tun_udp_packet_offsets[] = {
{ ICE_PROTOCOL_LAST,0 },
};
-static const
-u8 dummy_udp_tun_udp_packet[] = {
+static const u8 dummy_udp_tun_udp_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -387,8 +379,7 @@ static const struct ice_dummy_pkt_offsets
dummy_tcp_ipv6_packet_offsets[] = {
{ ICE_PROTOCOL_LAST,0 },
};
-static const u8
-dummy_tcp_ipv6_packet[] = {
+static const u8 dummy_tcp_ipv6_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -465,8 +456,8 @@ static const struct ice_dummy_pkt_offsets
dummy_udp_ipv6_packet_offsets[] = {
{ ICE_PROTOCOL_LAST,0 },
};
-static const u8
-dummy_udp_ipv6_packet[] = {
+/* IPv6 + UDP dummy packet */
+static const u8 dummy_udp_ipv6_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -536,8 +527,7 @@ static const struct ice_dummy_pkt_offsets
dummy_udp_gtp_packet_offsets[] = {
{ ICE_PROTOCOL_LAST,0 },
};
-static const u8
-dummy_udp_gtp_packet[] = {
+static const u8 dummy_udp_gtp_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
@@ -560,8 +550,7 @@ dummy_udp_gtp_packet[] = {
0x00, 0x00, 0x00, 0x00,
};
-static const
-struct ice_dummy_pkt_offsets dummy_pppoe_packet_offsets[] = {
+static const struct ice_dummy_pkt_offsets dummy_pppoe_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
{ ICE_ETYPE_OL, 12 },
{ ICE_VLAN_OFOS,14},
@@ -569,8 +558,7 @@ struct ice_dummy_pkt_offsets dummy_pppoe_packet_offsets[] =
{
{ ICE_PROTOCOL_LAST,0 },
};
-static const u8
-dummy_pppoe_packet[] = {
+static const u8 dummy_pppoe_packet[] = {
0x00, 0x0
[dpdk-dev] [PATCH v2 08/12] net/ice/base: increase PF reset wait timeout
Increase the maximum time that the driver will wait for a PF reset
from 200 milliseconds to 300 milliseconds, to account for possibility
of a slightly longer than expected PF reset.
Fixes: 453d087ccaff ("net/ice/base: add common functions")
Cc: sta...@dpdk.org
Signed-off-by: Jacob Keller
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ice/base/ice_common.c
b/drivers/net/ice/base/ice_common.c
index 319b00f75..2e756f542 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -9,7 +9,7 @@
#include "ice_flow.h"
#include "ice_switch.h"
-#define ICE_PF_RESET_WAIT_COUNT200
+#define ICE_PF_RESET_WAIT_COUNT300
/**
* ice_set_mac_type - Sets MAC type
--
2.13.6
[dpdk-dev] [PATCH v2 03/12] net/ice/base: do not wait for PE unit to load
When RDMA is not enabled, when checking for completion of a CORER or GLOBR
do not wait for the PE unit to be loaded (indicated by GLNVM_ULD register's
PE_DONE bit being set) since that does not happen and will cause issues
such as failing to initialize the device.
Signed-off-by: Bruce Allan
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_common.c | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ice/base/ice_common.c
b/drivers/net/ice/base/ice_common.c
index 4ba3ab202..319b00f75 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -645,7 +645,6 @@ enum ice_status ice_init_hw(struct ice_hw *hw)
ice_clear_pxe_mode(hw);
-
status = ice_get_caps(hw);
if (status)
goto err_unroll_cqinit;
@@ -666,7 +665,6 @@ enum ice_status ice_init_hw(struct ice_hw *hw)
goto err_unroll_alloc;
hw->evb_veb = true;
-
/* Query the allocated resources for Tx scheduler */
status = ice_sched_query_res_alloc(hw);
if (status) {
@@ -785,7 +783,7 @@ void ice_deinit_hw(struct ice_hw *hw)
*/
enum ice_status ice_check_reset(struct ice_hw *hw)
{
- u32 cnt, reg = 0, grst_delay;
+ u32 cnt, reg = 0, grst_delay, uld_mask;
/* Poll for Device Active state in case a recent CORER, GLOBR,
* or EMPR has occurred. The grst delay value is in 100ms units.
@@ -807,13 +805,20 @@ enum ice_status ice_check_reset(struct ice_hw *hw)
return ICE_ERR_RESET_FAILED;
}
-#define ICE_RESET_DONE_MASK(GLNVM_ULD_CORER_DONE_M | \
-GLNVM_ULD_GLOBR_DONE_M)
+#define ICE_RESET_DONE_MASK(GLNVM_ULD_PCIER_DONE_M |\
+GLNVM_ULD_PCIER_DONE_1_M |\
+GLNVM_ULD_CORER_DONE_M |\
+GLNVM_ULD_GLOBR_DONE_M |\
+GLNVM_ULD_POR_DONE_M |\
+GLNVM_ULD_POR_DONE_1_M |\
+GLNVM_ULD_PCIER_DONE_2_M)
+
+ uld_mask = ICE_RESET_DONE_MASK;
/* Device is Active; check Global Reset processes are done */
for (cnt = 0; cnt < ICE_PF_RESET_WAIT_COUNT; cnt++) {
- reg = rd32(hw, GLNVM_ULD) & ICE_RESET_DONE_MASK;
- if (reg == ICE_RESET_DONE_MASK) {
+ reg = rd32(hw, GLNVM_ULD) & uld_mask;
+ if (reg == uld_mask) {
ice_debug(hw, ICE_DBG_INIT,
"Global reset processes done. %d\n", cnt);
break;
--
2.13.6
[dpdk-dev] [PATCH v2 05/12] net/ice/base: flexbytes should match on header data
Change the extraction sequence generated by flow director flexbytes to
use package mac protocol. Without this change data in packet headers
cannot be used for flexbyte matching. The old extraction for flex bytes
started at the beginning of the payload which is after the header.
Signed-off-by: Henry Tieman
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_flow.c | 17 -
drivers/net/ice/base/ice_flow.h | 2 +-
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index 391df1b54..eaa7a3b96 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -868,20 +868,11 @@ ice_flow_xtract_raws(struct ice_hw *hw, struct
ice_flow_prof_params *params,
raw = ¶ms->prof->segs[seg].raws[i];
- /* Only support matching raw fields in the payload */
- if (raw->off < hdrs_sz)
- return ICE_ERR_PARAM;
-
- /* Convert the segment-relative offset into payload-relative
-* offset.
-*/
- off = raw->off - hdrs_sz;
-
/* Storing extraction information */
- raw->info.xtrct.prot_id = ICE_PROT_PAY;
- raw->info.xtrct.off = (off / ICE_FLOW_FV_EXTRACT_SZ) *
+ raw->info.xtrct.prot_id = ICE_PROT_MAC_OF_OR_S;
+ raw->info.xtrct.off = (raw->off / ICE_FLOW_FV_EXTRACT_SZ) *
ICE_FLOW_FV_EXTRACT_SZ;
- raw->info.xtrct.disp = (off % ICE_FLOW_FV_EXTRACT_SZ) *
+ raw->info.xtrct.disp = (raw->off % ICE_FLOW_FV_EXTRACT_SZ) *
BITS_PER_BYTE;
raw->info.xtrct.idx = params->es_cnt;
@@ -909,7 +900,7 @@ ice_flow_xtract_raws(struct ice_hw *hw, struct
ice_flow_prof_params *params,
else
idx = params->es_cnt;
- params->es[idx].prot_id = ICE_PROT_PAY;
+ params->es[idx].prot_id = raw->info.xtrct.prot_id;
params->es[idx].off = off;
params->es_cnt++;
off += ICE_FLOW_FV_EXTRACT_SZ;
diff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/ice/base/ice_flow.h
index 4686274af..d7b10ccc3 100644
--- a/drivers/net/ice/base/ice_flow.h
+++ b/drivers/net/ice/base/ice_flow.h
@@ -282,8 +282,8 @@ struct ice_flow_fld_info {
};
struct ice_flow_seg_fld_raw {
- int off;/* Offset from the start of the segment */
struct ice_flow_fld_info info;
+ u16 off;/* Offset from the start of the segment */
};
struct ice_flow_seg_info {
--
2.13.6
[dpdk-dev] [PATCH v2 06/12] net/ice/base: enable clearing of the HW tables
Enable the code to clear the HW tables.
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_flex_pipe.c | 55
drivers/net/ice/base/ice_flex_pipe.h | 1 +
2 files changed, 56 insertions(+)
diff --git a/drivers/net/ice/base/ice_flex_pipe.c
b/drivers/net/ice/base/ice_flex_pipe.c
index e8d4bbee4..28ac3aa75 100644
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -3618,6 +3618,61 @@ static void ice_init_flow_profs(struct ice_hw *hw, u8
blk_idx)
}
/**
+ * ice_clear_hw_tbls - clear HW tables and flow profiles
+ * @hw: pointer to the hardware structure
+ */
+void ice_clear_hw_tbls(struct ice_hw *hw)
+{
+ u8 i;
+
+ for (i = 0; i < ICE_BLK_COUNT; i++) {
+ struct ice_prof_redir *prof_redir = &hw->blk[i].prof_redir;
+ struct ice_prof_tcam *prof = &hw->blk[i].prof;
+ struct ice_xlt1 *xlt1 = &hw->blk[i].xlt1;
+ struct ice_xlt2 *xlt2 = &hw->blk[i].xlt2;
+ struct ice_es *es = &hw->blk[i].es;
+
+ if (hw->blk[i].is_list_init) {
+ ice_free_prof_map(hw, i);
+ ice_free_flow_profs(hw, i);
+ }
+
+ ice_free_vsig_tbl(hw, (enum ice_block)i);
+
+ ice_memset(xlt1->ptypes, 0, xlt1->count * sizeof(*xlt1->ptypes),
+ ICE_NONDMA_MEM);
+ ice_memset(xlt1->ptg_tbl, 0,
+ ICE_MAX_PTGS * sizeof(*xlt1->ptg_tbl),
+ ICE_NONDMA_MEM);
+ ice_memset(xlt1->t, 0, xlt1->count * sizeof(*xlt1->t),
+ ICE_NONDMA_MEM);
+
+ ice_memset(xlt2->vsis, 0, xlt2->count * sizeof(*xlt2->vsis),
+ ICE_NONDMA_MEM);
+ ice_memset(xlt2->vsig_tbl, 0,
+ xlt2->count * sizeof(*xlt2->vsig_tbl),
+ ICE_NONDMA_MEM);
+ ice_memset(xlt2->t, 0, xlt2->count * sizeof(*xlt2->t),
+ ICE_NONDMA_MEM);
+
+ ice_memset(prof->t, 0, prof->count * sizeof(*prof->t),
+ ICE_NONDMA_MEM);
+ ice_memset(prof_redir->t, 0,
+ prof_redir->count * sizeof(*prof_redir->t),
+ ICE_NONDMA_MEM);
+
+ ice_memset(es->t, 0, es->count * sizeof(*es->t),
+ ICE_NONDMA_MEM);
+ ice_memset(es->ref_count, 0, es->count * sizeof(*es->ref_count),
+ ICE_NONDMA_MEM);
+ ice_memset(es->written, 0, es->count * sizeof(*es->written),
+ ICE_NONDMA_MEM);
+ ice_memset(es->mask_ena, 0, es->count * sizeof(*es->mask_ena),
+ ICE_NONDMA_MEM);
+ }
+}
+
+/**
* ice_init_hw_tbls - init hardware table memory
* @hw: pointer to the hardware structure
*/
diff --git a/drivers/net/ice/base/ice_flex_pipe.h
b/drivers/net/ice/base/ice_flex_pipe.h
index ee606af15..fa72e386d 100644
--- a/drivers/net/ice/base/ice_flex_pipe.h
+++ b/drivers/net/ice/base/ice_flex_pipe.h
@@ -71,6 +71,7 @@ ice_copy_and_init_pkg(struct ice_hw *hw, const u8 *buf, u32
len);
enum ice_status ice_init_hw_tbls(struct ice_hw *hw);
void ice_free_seg(struct ice_hw *hw);
void ice_fill_blk_tbls(struct ice_hw *hw);
+void ice_clear_hw_tbls(struct ice_hw *hw);
void ice_free_hw_tbls(struct ice_hw *hw);
enum ice_status
ice_rem_prof(struct ice_hw *hw, enum ice_block blk, u64 id);
--
2.13.6
[dpdk-dev] [PATCH v2 09/12] net/ice/base: change fdir desc preparation
Change internal implemenatation of how FD filter programming desc
is prepared. This is to minimize the amount of code needed to prep
the FD filter programming desc (avoid memcpy, etc...) and just use
predefined shifts and mask. This type of change are needed to expedite
FD setup during data path (ADQ uses this codepath during initial
flow setup) and it will also be useful when adding side-band
flow-director filter.
Signed-off-by: Kiran Patil
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_fdir.c | 92 -
1 file changed, 55 insertions(+), 37 deletions(-)
diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index 37b388169..87fa0afba 100644
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -352,35 +352,6 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
#define ICE_FDIR_NUM_PKT ARRAY_SIZE(ice_fdir_pkt)
-/* Flow Direcotr (FD) filter program descriptor Context */
-static const struct ice_ctx_ele ice_fd_fltr_desc_ctx_info[] = {
- /* Field Width LSB */
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, qindex, 11, 0),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, comp_q, 1, 11),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, comp_report,2, 12),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fd_space, 2, 14),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, cnt_index, 13, 16),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, cnt_ena,2, 29),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, evict_ena, 1, 31),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, toq,3, 32),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, toq_prio, 3, 35),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, dpu_recipe, 2, 38),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, drop, 1, 40),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, flex_prio, 3, 41),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, flex_mdid, 4, 44),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, flex_val, 16, 48),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, dtype, 4, 64),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, pcmd, 1, 68),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, desc_prof_prio, 3, 69),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, desc_prof, 6, 72),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fd_vsi, 10, 78),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, swap, 1, 88),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fdid_prio, 3, 89),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fdid_mdid, 4, 92),
- ICE_CTX_STORE(ice_fd_fltr_desc_ctx, fdid, 32, 96),
- { 0 }
-};
-
/**
* ice_set_dflt_val_fd_desc
* @fd_fltr_ctx: pointer to fd filter descriptor
@@ -455,19 +426,66 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct
ice_fdir_fltr *input,
/**
* ice_set_fd_desc_val
- * @fd_fltr_ctx: pointer to fd filter descriptor context
+ * @ctx: pointer to fd filter descriptor context
* @fdir_desc: populated with fd filter descriptor values
*/
void
-ice_set_fd_desc_val(struct ice_fd_fltr_desc_ctx *fd_fltr_ctx,
+ice_set_fd_desc_val(struct ice_fd_fltr_desc_ctx *ctx,
struct ice_fltr_desc *fdir_desc)
{
- u64 ctx_buf[2] = { 0 };
-
- ice_set_ctx((u8 *)fd_fltr_ctx, (u8 *)ctx_buf,
- ice_fd_fltr_desc_ctx_info);
- fdir_desc->qidx_compq_space_stat = CPU_TO_LE64(ctx_buf[0]);
- fdir_desc->dtype_cmd_vsi_fdid = CPU_TO_LE64(ctx_buf[1]);
+ u64 qword;
+
+ /* prep QW0 of FD filter programming desc */
+ qword = ((u64)ctx->qindex << ICE_FXD_FLTR_QW0_QINDEX_S) &
+ ICE_FXD_FLTR_QW0_QINDEX_M;
+ qword |= ((u64)ctx->comp_q << ICE_FXD_FLTR_QW0_COMP_Q_S) &
+ICE_FXD_FLTR_QW0_COMP_Q_M;
+ qword |= ((u64)ctx->comp_report << ICE_FXD_FLTR_QW0_COMP_REPORT_S) &
+ICE_FXD_FLTR_QW0_COMP_REPORT_M;
+ qword |= ((u64)ctx->fd_space << ICE_FXD_FLTR_QW0_FD_SPACE_S) &
+ICE_FXD_FLTR_QW0_FD_SPACE_M;
+ qword |= ((u64)ctx->cnt_index << ICE_FXD_FLTR_QW0_STAT_CNT_S) &
+ICE_FXD_FLTR_QW0_STAT_CNT_M;
+ qword |= ((u64)ctx->cnt_ena << ICE_FXD_FLTR_QW0_STAT_ENA_S) &
+ICE_FXD_FLTR_QW0_STAT_ENA_M;
+ qword |= ((u64)ctx->evict_ena << ICE_FXD_FLTR_QW0_EVICT_ENA_S) &
+ICE_FXD_FLTR_QW0_EVICT_ENA_M;
+ qword |= ((u64)ctx->toq << ICE_FXD_FLTR_QW0_TO_Q_S) &
+ICE_FXD_FLTR_QW0_TO_Q_M;
+ qword |= ((u64)ctx->toq_prio << ICE_FXD_FLTR_QW0_TO_Q_PRI_S) &
+ICE_FXD_FLTR_QW0_TO_Q_PRI_M;
+ qword |= ((u64)ctx->dpu_recipe << ICE_FXD_FLTR_QW0_DPU_RECIPE_S)
[dpdk-dev] [PATCH v2 12/12] net/ice/base: minor code clean
Couple minor code clean include:
1. Improve debug message format.
2. Add missing macro and comment.
3. Remove unnecessary compile options.
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_adminq_cmd.h | 1 +
drivers/net/ice/base/ice_common.c | 2 +-
drivers/net/ice/base/ice_flex_pipe.c | 8 +---
drivers/net/ice/base/ice_type.h | 4
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ice/base/ice_adminq_cmd.h
b/drivers/net/ice/base/ice_adminq_cmd.h
index e6a1350ba..9a79c7645 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -1688,6 +1688,7 @@ struct ice_aqc_nvm {
#define ICE_AQC_NVM_ACTIV_SEL_NVM BIT(3) /* Write Activate/SR Dump only */
#define ICE_AQC_NVM_ACTIV_SEL_OROM BIT(4)
#define ICE_AQC_NVM_ACTIV_SEL_NETLIST BIT(5)
+#define ICE_AQC_NVM_SPECIAL_UPDATE BIT(6)
#define ICE_AQC_NVM_ACTIV_SEL_MASK MAKEMASK(0x7, 3)
#define ICE_AQC_NVM_FLASH_ONLY BIT(7)
__le16 module_typeid;
diff --git a/drivers/net/ice/base/ice_common.c
b/drivers/net/ice/base/ice_common.c
index 22b2e316d..786e99d21 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -592,7 +592,7 @@ void ice_print_rollback_msg(struct ice_hw *hw)
SNPRINTF(nvm_str, sizeof(nvm_str), "%x.%02x 0x%x %d.%d.%d", ver_hi,
ver_lo, hw->nvm.eetrack, oem_ver, oem_build, oem_patch);
ice_warn(hw,
-"Firmware rollback mode detected. Current version is NVM: %s,
FW: %d.%d. Device may exhibit limited functionality. Refer to the Intel(R)
Ethernet Adapters and Devices User Guide for details on firmware rollback mode",
+"Firmware rollback mode detected. Current version is NVM: %s,
FW: %d.%d. Device may exhibit limited functionality. Refer to the Intel(R)
Ethernet Adapters and Devices User Guide for details on firmware rollback
mode\n",
nvm_str, hw->fw_maj_ver, hw->fw_min_ver);
}
diff --git a/drivers/net/ice/base/ice_flex_pipe.c
b/drivers/net/ice/base/ice_flex_pipe.c
index 28ac3aa75..1598efd67 100644
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -3069,7 +3069,8 @@ ice_free_prof_mask(struct ice_hw *hw, enum ice_block blk,
u16 mask_idx)
hw->blk[blk].masks.masks[mask_idx].idx = 0;
/* update mask as unused entry */
- ice_debug(hw, ICE_DBG_PKG, "Free mask, blk %d, mask %d", blk, mask_idx);
+ ice_debug(hw, ICE_DBG_PKG, "Free mask, blk %d, mask %d\n", blk,
+ mask_idx);
ice_write_prof_mask_reg(hw, blk, mask_idx, 0, 0);
exit_ice_free_prof_mask:
@@ -4173,7 +4174,7 @@ ice_upd_prof_hw(struct ice_hw *hw, enum ice_block blk,
/* update package */
status = ice_update_pkg(hw, ice_pkg_buf(b), 1);
if (status == ICE_ERR_AQ_ERROR)
- ice_debug(hw, ICE_DBG_INIT, "Unable to update HW profile.");
+ ice_debug(hw, ICE_DBG_INIT, "Unable to update HW profile\n");
error_tmp:
ice_pkg_buf_free(hw, b);
@@ -5227,7 +5228,7 @@ ice_adj_prof_priorities(struct ice_hw *hw, enum ice_block
blk, u16 vsig,
* @blk: hardware block
* @vsig: the VSIG to which this profile is to be added
* @hdl: the profile handle indicating the profile to add
- * @rev: true to reverse the additions to the list
+ * @rev: true to add entries to the end of the list
* @chg: the change list
*/
static enum ice_status
@@ -5379,6 +5380,7 @@ ice_create_prof_id_vsig(struct ice_hw *hw, enum ice_block
blk, u16 vsi, u64 hdl,
* @blk: hardware block
* @vsi: the initial VSI that will be in VSIG
* @lst: the list of profile that will be added to the VSIG
+ * @new_vsig: return of new vsig
* @chg: the change list
*/
static enum ice_status
diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h
index a8e4229a1..9773a549f 100644
--- a/drivers/net/ice/base/ice_type.h
+++ b/drivers/net/ice/base/ice_type.h
@@ -14,9 +14,7 @@
#define BITS_PER_BYTE 8
-#ifndef _FORCE_
#define _FORCE_
-#endif
#define ICE_BYTES_PER_WORD 2
#define ICE_BYTES_PER_DWORD4
@@ -130,9 +128,7 @@ static inline u32 ice_round_to_num(u32 N, u32 R)
#define ICE_DBG_USER BIT_ULL(31)
#define ICE_DBG_ALL0xULL
-#ifndef __ALWAYS_UNUSED
#define __ALWAYS_UNUSED
-#endif
#define IS_ETHER_ADDR_EQUAL(addr1, addr2) \
(((bool)u16 *)(addr1))[0] == ((u16 *)(addr2))[0]))) && \
--
2.13.6
[dpdk-dev] [PATCH v2 11/12] net/ice: support 1/10G device IDs
Add support for 1/10G devices.
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_devids.h | 4
drivers/net/ice/ice_ethdev.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/drivers/net/ice/base/ice_devids.h
b/drivers/net/ice/base/ice_devids.h
index 348d1907a..46ffdee2d 100644
--- a/drivers/net/ice/base/ice_devids.h
+++ b/drivers/net/ice/base/ice_devids.h
@@ -24,5 +24,9 @@
#define ICE_DEV_ID_C822N_QSFP 0x1891
/* Intel(R) Ethernet Connection C822N for SFP */
#define ICE_DEV_ID_C822N_SFP 0x1892
+/* Intel(R) Ethernet Connection C822N/X557-AT 10GBASE-T */
+#define ICE_DEV_ID_C822N_10G_BASE_T0x1893
+/* Intel(R) Ethernet Connection C822N 1GbE */
+#define ICE_DEV_ID_C822N_SGMII 0x1894
#endif /* _ICE_DEVIDS_H_ */
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index cf99fc358..88cd90660 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -166,6 +166,8 @@ static const struct rte_pci_id pci_id_ice_map[] = {
{ RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_C822N_BACKPLANE) },
{ RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_C822N_QSFP) },
{ RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_C822N_SFP) },
+ { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_C822N_10G_BASE_T) },
+ { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_C822N_SGMII) },
{ .vendor_id = 0, /* sentinel */ },
};
--
2.13.6
[dpdk-dev] [PATCH v2 10/12] net/ice/base: support add MAC rules on specific port
ice_add_mac_rule allow user to add rule to port based on
hw->port_info->lport number. Function in some case should
allow user to add filter rule on different port, write
another function which implemented that behaviour.
The same situation is which removing mac function.
Add new api function which allow user to choose port on which
rule going to be added. Leave add mac rule function that always
add rule on hw->port_info->lport to avoid changes in components
which don't need to choose different port. Also add function to
remove rule from specific port.
Alloc more switch_info structs to track separately rules for each
port. Choose switch_info struct basing on logic port number
because in fw added rules are connected with port.
Signed-off-by: Michal Swiatkowski
Signed-off-by: Paul M Stillwell Jr
Signed-off-by: Qi Zhang
Acked-by: Qiming Yang
---
drivers/net/ice/base/ice_common.c | 2 +-
drivers/net/ice/base/ice_switch.c | 269 +-
drivers/net/ice/base/ice_switch.h | 3 +-
3 files changed, 180 insertions(+), 94 deletions(-)
diff --git a/drivers/net/ice/base/ice_common.c
b/drivers/net/ice/base/ice_common.c
index 2e756f542..22b2e316d 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -462,7 +462,7 @@ static enum ice_status ice_init_fltr_mgmt_struct(struct
ice_hw *hw)
INIT_LIST_HEAD(&sw->vsi_list_map_head);
- return ice_init_def_sw_recp(hw);
+ return ice_init_def_sw_recp(hw, &hw->switch_info->recp_list);
}
/**
diff --git a/drivers/net/ice/base/ice_switch.c
b/drivers/net/ice/base/ice_switch.c
index b2945a9e2..085f34406 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -791,11 +791,13 @@ ice_get_recp_to_prof_map(struct ice_hw *hw)
/**
* ice_init_def_sw_recp - initialize the recipe book keeping tables
* @hw: pointer to the HW struct
+ * @recp_list: pointer to sw recipe list
*
* Allocate memory for the entire recipe table and initialize the structures/
* entries corresponding to basic recipes.
*/
-enum ice_status ice_init_def_sw_recp(struct ice_hw *hw)
+enum ice_status
+ice_init_def_sw_recp(struct ice_hw *hw, struct ice_sw_recipe **recp_list)
{
struct ice_sw_recipe *recps;
u8 i;
@@ -813,7 +815,7 @@ enum ice_status ice_init_def_sw_recp(struct ice_hw *hw)
ice_init_lock(&recps[i].filt_rule_lock);
}
- hw->switch_info->recp_list = recps;
+ *recp_list = recps;
return ICE_SUCCESS;
}
@@ -2427,6 +2429,7 @@ ice_create_vsi_list_rule(struct ice_hw *hw, u16
*vsi_handle_arr, u16 num_vsi,
/**
* ice_create_pkt_fwd_rule
* @hw: pointer to the hardware structure
+ * @recp_list: corresponding filter management list
* @f_entry: entry containing packet forwarding information
*
* Create switch rule with given filter information and add an entry
@@ -2434,13 +2437,11 @@ ice_create_vsi_list_rule(struct ice_hw *hw, u16
*vsi_handle_arr, u16 num_vsi,
* and VSI mapping
*/
static enum ice_status
-ice_create_pkt_fwd_rule(struct ice_hw *hw,
+ice_create_pkt_fwd_rule(struct ice_hw *hw, struct ice_sw_recipe *recp_list,
struct ice_fltr_list_entry *f_entry)
{
struct ice_fltr_mgmt_list_entry *fm_entry;
struct ice_aqc_sw_rules_elem *s_rule;
- enum ice_sw_lkup_type l_type;
- struct ice_sw_recipe *recp;
enum ice_status status;
s_rule = (struct ice_aqc_sw_rules_elem *)
@@ -2480,9 +2481,7 @@ ice_create_pkt_fwd_rule(struct ice_hw *hw,
/* The book keeping entries will get removed when base driver
* calls remove filter AQ command
*/
- l_type = fm_entry->fltr_info.lkup_type;
- recp = &hw->switch_info->recp_list[l_type];
- LIST_ADD(&fm_entry->list_entry, &recp->filt_rules);
+ LIST_ADD(&fm_entry->list_entry, &recp_list->filt_rules);
ice_create_pkt_fwd_rule_exit:
ice_free(hw, s_rule);
@@ -2679,21 +2678,18 @@ ice_add_update_vsi_list(struct ice_hw *hw,
/**
* ice_find_rule_entry - Search a rule entry
- * @hw: pointer to the hardware structure
- * @recp_id: lookup type for which the specified rule needs to be searched
+ * @list_head: head of rule list
* @f_info: rule information
*
* Helper function to search for a given rule entry
* Returns pointer to entry storing the rule if found
*/
static struct ice_fltr_mgmt_list_entry *
-ice_find_rule_entry(struct ice_hw *hw, u8 recp_id, struct ice_fltr_info
*f_info)
+ice_find_rule_entry(struct LIST_HEAD_TYPE *list_head,
+ struct ice_fltr_info *f_info)
{
struct ice_fltr_mgmt_list_entry *list_itr, *ret = NULL;
- struct ice_switch_info *sw = hw->switch_info;
- struct LIST_HEAD_TYPE *list_head;
- list_head = &sw->recp_list[recp_id].filt_rules;
LIST_FOR_EACH_ENTRY(list_itr, list_head, ice_fltr_mgmt_list_entry,
list_entry) {
if (!memcmp(&f_info
Re: [dpdk-dev] [PATCH v2 01/11] examples/l3fwd: add framework for event device
>-Original Message-
>From: dev On Behalf Of Ananyev,
>Konstantin
>Sent: Friday, January 3, 2020 6:19 PM
>To: Pavan Nikhilesh Bhagavatula ; Jerin
>Jacob Kollanukkaran ; Kovacevic, Marko
>; Ori Kam ;
>Richardson, Bruce ; Nicolau, Radu
>; Akhil Goyal ;
>Kantecki, Tomasz ; Sunil Kumar Kori
>
>Cc: dev@dpdk.org
>Subject: Re: [dpdk-dev] [PATCH v2 01/11] examples/l3fwd: add
>framework for event device
>
>
>> Add framework to enable event device as a producer of packets.
>> To switch between event mode and poll mode the following options
>> have been added:
>> `--mode="eventdev"` or `--mode="poll"`
>> Also, allow the user to select the schedule type to be either
>> RTE_SCHED_TYPE_ORDERED, RTE_SCHED_TYPE_ATOMIC or
>RTE_SCHED_TYPE_PARALLEL
>> through:
>> `--eventq-sched="ordered"` or `--eventq-sched="atomic"` or
>> `--eventq-sched="parallel"`
>>
>> Poll mode is still the default operation mode.
>>
>> Signed-off-by: Sunil Kumar Kori
>> ---
>> examples/l3fwd/Makefile | 2 +-
>> examples/l3fwd/l3fwd.h | 6 +++
>> examples/l3fwd/l3fwd_event.c | 75
>
>> examples/l3fwd/l3fwd_event.h | 54
>++
>> examples/l3fwd/main.c| 41 +---
>> examples/l3fwd/meson.build | 4 +-
>> 6 files changed, 174 insertions(+), 8 deletions(-)
>> create mode 100644 examples/l3fwd/l3fwd_event.c
>> create mode 100644 examples/l3fwd/l3fwd_event.h
>>
>> diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile
>> index b2dbf2607..c892b867b 100644
>> --- a/examples/l3fwd/Makefile
>> +++ b/examples/l3fwd/Makefile
>> @@ -5,7 +5,7 @@
>> APP = l3fwd
>>
>> # all source are stored in SRCS-y
>> -SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c
>> +SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c l3fwd_event.c
>>
>> # Build using pkg-config variables if possible
>> ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
>> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
>> index 293fb1fa2..cd17a41b3 100644
>> --- a/examples/l3fwd/l3fwd.h
>> +++ b/examples/l3fwd/l3fwd.h
>> @@ -5,6 +5,9 @@
>> #ifndef __L3_FWD_H__
>> #define __L3_FWD_H__
>>
>> +#include
>> +
>
>Why do we need it here?
Looks like an artifact I will remove it in next version.
>
>> +#include
>> #include
>>
>> #define DO_RFC_1812_CHECKS
>> @@ -169,6 +172,9 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt,
>uint32_t link_len)
>> }
>> #endif /* DO_RFC_1812_CHECKS */
>>
>> +void
>> +print_usage(const char *prgname);
>> +
>> /* Function pointers for LPM or EM functionality. */
>> void
>> setup_lpm(const int socketid);
>> diff --git a/examples/l3fwd/l3fwd_event.c
>b/examples/l3fwd/l3fwd_event.c
>> new file mode 100644
>> index 0..3892720be
>> --- /dev/null
>> +++ b/examples/l3fwd/l3fwd_event.c
>> @@ -0,0 +1,75 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + * Copyright(C) 2019 Marvell International Ltd.
>> + */
>> +
>> +#include
>> +#include
>> +
>> +#include "l3fwd.h"
>> +#include "l3fwd_event.h"
>> +
>> +static void
>> +parse_mode(const char *optarg)
>> +{
>> +struct l3fwd_event_resources *evt_rsrc =
>l3fwd_get_eventdev_rsrc();
>> +
>> +if (!strncmp(optarg, "poll", 4))
>
>That looks a bit clumsy and error-prone.
>Just strcmp(optarg, "poll") seems enough here.
>Same for other similar places.
Will simplify in next version.
>
>> +evt_rsrc->enabled = false;
>> +else if (!strncmp(optarg, "eventdev", 8))
>> +evt_rsrc->enabled = true;
>> +}
>> +
>> +static void
>> +parse_eventq_sync(const char *optarg)
>> +{
>> +struct l3fwd_event_resources *evt_rsrc =
>l3fwd_get_eventdev_rsrc();
>> +
>> +if (!strncmp(optarg, "ordered", 7))
>> +evt_rsrc->sched_type = RTE_SCHED_TYPE_ORDERED;
>> +if (!strncmp(optarg, "atomic", 6))
>> +evt_rsrc->sched_type = RTE_SCHED_TYPE_ATOMIC;
>> +if (!strncmp(optarg, "parallel", 8))
>> +evt_rsrc->sched_type = RTE_SCHED_TYPE_PARALLEL;
>> +}
>> +
>> +static void
>> +l3fwd_parse_eventdev_args(char **argv, int argc)
>> +{
>> +const struct option eventdev_lgopts[] = {
>> +{CMD_LINE_OPT_MODE, 1, 0,
>CMD_LINE_OPT_MODE_NUM},
>> +{CMD_LINE_OPT_EVENTQ_SYNC, 1, 0,
>CMD_LINE_OPT_EVENTQ_SYNC_NUM},
>> +{NULL, 0, 0, 0}
>> +};
>> +char *prgname = argv[0];
>> +char **argvopt = argv;
>> +int32_t option_index;
>> +int32_t opt;
>> +
>> +while ((opt = getopt_long(argc, argvopt, "", eventdev_lgopts,
>> +&option_index)) != EOF) {
>> +switch (opt) {
>> +case CMD_LINE_OPT_MODE_NUM:
>> +parse_mode(optarg);
>> +break;
>> +
>> +case CMD_LINE_OPT_EVENTQ_SYNC_NUM:
>> +parse_eventq_sync(optarg);
>> +break;
>> +
>> +default:
>> +print_usage(prgname);
>> +exit(1);
>> +}
>> +}
>> +}
>> +
>> +v
Re: [dpdk-dev] [PATCH v2 07/11] examples/l3fwd: add service core setup based on caps
>> diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
>> index 20df12748..69d212bc2 100644
>> --- a/examples/l3fwd/main.c
>> +++ b/examples/l3fwd/main.c
>> @@ -826,6 +826,93 @@ prepare_ptype_parser(uint16_t portid,
>uint16_t queueid)
>> return 0;
>> }
>>
>> +static inline int
>> +l3fwd_service_enable(uint32_t service_id)
>> +{
>> +uint8_t min_service_count = UINT8_MAX;
>> +uint32_t slcore_array[RTE_MAX_LCORE];
>> +unsigned int slcore = 0;
>> +uint8_t service_count;
>> +int32_t slcore_count;
>> +
>> +if (!rte_service_lcore_count())
>> +return -ENOENT;
>> +
>> +slcore_count = rte_service_lcore_list(slcore_array,
>RTE_MAX_LCORE);
>> +if (slcore_count < 0)
>> +return -ENOENT;
>> +/* Get the core which has least number of services running. */
>> +while (slcore_count--) {
>> +/* Reset default mapping */
>> +rte_service_map_lcore_set(service_id,
>> +slcore_array[slcore_count], 0);
>> +service_count = rte_service_lcore_count_services(
>> +slcore_array[slcore_count]);
>> +if (service_count < min_service_count) {
>> +slcore = slcore_array[slcore_count];
>> +min_service_count = service_count;
>> +}
>> +}
>> +if (rte_service_map_lcore_set(service_id, slcore, 1))
>> +return -ENOENT;
>> +rte_service_lcore_start(slcore);
>> +
>> +return 0;
>> +}
>> +
>> +static void
>> +l3fwd_event_service_setup(void)
>> +{
>> +struct l3fwd_event_resources *evt_rsrc =
>l3fwd_get_eventdev_rsrc();
>> +struct rte_event_dev_info evdev_info;
>> +uint32_t service_id, caps;
>> +int ret, i;
>> +
>> +rte_event_dev_info_get(evt_rsrc->event_d_id, &evdev_info);
>> +if (evdev_info.event_dev_cap &
>RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED) {
>> +ret = rte_event_dev_service_id_get(evt_rsrc-
>>event_d_id,
>> +&service_id);
>> +if (ret != -ESRCH && ret != 0)
>> +rte_exit(EXIT_FAILURE,
>> + "Error in starting eventdev service\n");
>> +l3fwd_service_enable(service_id);
>> +}
>> +
>> +for (i = 0; i < evt_rsrc->rx_adptr.nb_rx_adptr; i++) {
>> +ret = rte_event_eth_rx_adapter_caps_get(evt_rsrc-
>>event_d_id,
>> +evt_rsrc->rx_adptr.rx_adptr[i], &caps);
>> +if (ret < 0)
>> +rte_exit(EXIT_FAILURE,
>> + "Failed to get Rx adapter[%d] caps\n",
>> + evt_rsrc->rx_adptr.rx_adptr[i]);
>> +ret = rte_event_eth_rx_adapter_service_id_get(
>> +evt_rsrc->event_d_id,
>> +&service_id);
>> +if (ret != -ESRCH && ret != 0)
>> +rte_exit(EXIT_FAILURE,
>> + "Error in starting Rx adapter[%d]
>service\n",
>> + evt_rsrc->rx_adptr.rx_adptr[i]);
>> +l3fwd_service_enable(service_id);
>> +}
>> +
>> +for (i = 0; i < evt_rsrc->tx_adptr.nb_tx_adptr; i++) {
>> +ret = rte_event_eth_tx_adapter_caps_get(evt_rsrc-
>>event_d_id,
>> +evt_rsrc->tx_adptr.tx_adptr[i], &caps);
>> +if (ret < 0)
>> +rte_exit(EXIT_FAILURE,
>> + "Failed to get Rx adapter[%d] caps\n",
>> + evt_rsrc->tx_adptr.tx_adptr[i]);
>> +ret = rte_event_eth_tx_adapter_service_id_get(
>> +evt_rsrc->event_d_id,
>> +&service_id);
>> +if (ret != -ESRCH && ret != 0)
>> +rte_exit(EXIT_FAILURE,
>> + "Error in starting Rx adapter[%d]
>service\n",
>> + evt_rsrc->tx_adptr.tx_adptr[i]);
>> +l3fwd_service_enable(service_id);
>> +}
>> +}
>> +
>> int
>> main(int argc, char **argv)
>> {
>> @@ -869,6 +956,8 @@ main(int argc, char **argv)
>> evt_rsrc->port_mask = enabled_port_mask;
>> /* Configure eventdev parameters if user has requested */
>> l3fwd_event_resource_setup(&port_conf);
>> +if (evt_rsrc->enabled)
>> +goto skip_port_config;
>
>Please try to avoid introducing more gotos.
>If init code below is poll mode specific, let's move it int a separate
>function.
>Then we can have something like:
>If (evt_rsrc->enabled) {
> ...
> ret = l3fwd_event_resource_setup(...);
> l3fwd_event_service_setup();
> ...
>} else
> ret = l3fwd_poll_resource_setup(...);
>
>...
>
Sure, if we are ok to change/mode existing l3fwd code it makes things a lot
easier.
>>
>> if (check_lcore_params() < 0)
>> rte_exit(EXIT_FAILURE, "check_lcore_params
>failed\n");
>> @@ -1054,6 +1143,7 @@ main(int argc, char **argv)
>>
Re: [dpdk-dev] [PATCH v2 08/11] examples/l3fwd: add event lpm main loop
>> Add lpm main loop for handling events based on capabilities of the
>> event device.
>>
>> Signed-off-by: Pavan Nikhilesh
>> ---
>> examples/l3fwd/l3fwd.h | 9 ++
>> examples/l3fwd/l3fwd_event.c | 9 ++
>> examples/l3fwd/l3fwd_event.h | 5 +
>> examples/l3fwd/l3fwd_lpm.c | 231
>+++
>> examples/l3fwd/main.c| 10 +-
>> 5 files changed, 260 insertions(+), 4 deletions(-)
>>
>> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
>> index 6d16cde74..8f2e4be23 100644
>> --- a/examples/l3fwd/l3fwd.h
>> +++ b/examples/l3fwd/l3fwd.h
>> @@ -212,6 +212,15 @@ em_main_loop(__attribute__((unused)) void
>*dummy);
>> int
>> lpm_main_loop(__attribute__((unused)) void *dummy);
>>
>> +int
>> +lpm_event_main_loop_tx_d(__attribute__((unused)) void
>*dummy);
>> +int
>> +lpm_event_main_loop_tx_d_burst(__attribute__((unused)) void
>*dummy);
>> +int
>> +lpm_event_main_loop_tx_q(__attribute__((unused)) void
>*dummy);
>> +int
>> +lpm_event_main_loop_tx_q_burst(__attribute__((unused)) void
>*dummy);
>
>No need to add unused attribute in function declaration.
>BTW, if all event_loop_cb functions don't use parameter, why just not
>make them 'typedef int (*event_loop_cb)(void)'?
>
These functions are used in remote launch so, we can't modify the prototype.
rte_eal_mp_remote_launch(l3fwd_lkp.main_loop, NULL, CALL_MASTER);
I will remove the unnecessary attribute in next version.
>> +
>> /* Return ipv4/ipv6 fwd lookup struct for LPM or EM. */
>> void *
>> em_get_ipv4_l3fwd_lookup_struct(const int socketid);
>> diff --git a/examples/l3fwd/l3fwd_event.c
>b/examples/l3fwd/l3fwd_event.c
>> index 0e796f003..c7de046e3 100644
>> --- a/examples/l3fwd/l3fwd_event.c
>> +++ b/examples/l3fwd/l3fwd_event.c
>> @@ -235,6 +235,12 @@ void
>> l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
>> {
>> struct l3fwd_event_resources *evt_rsrc =
>l3fwd_get_eventdev_rsrc();
>> +const event_loop_cb lpm_event_loop[2][2] = {
>> +[0][0] = lpm_event_main_loop_tx_d,
>> +[0][1] = lpm_event_main_loop_tx_d_burst,
>> +[1][0] = lpm_event_main_loop_tx_q,
>> +[1][1] = lpm_event_main_loop_tx_q_burst,
>> +};
>> uint32_t event_queue_cfg;
>> int ret;
>>
>> @@ -268,4 +274,7 @@ l3fwd_event_resource_setup(struct
>rte_eth_conf *port_conf)
>> ret = rte_event_dev_start(evt_rsrc->event_d_id);
>> if (ret < 0)
>> rte_exit(EXIT_FAILURE, "Error in starting eventdev");
>> +
>> +evt_rsrc->ops.lpm_event_loop = lpm_event_loop[evt_rsrc-
>>tx_mode_q]
>> + [evt_rsrc-
>>has_burst];
>> }
>> diff --git a/examples/l3fwd/l3fwd_event.h
>b/examples/l3fwd/l3fwd_event.h
>> index 9d8bd5a36..fcc0ce51a 100644
>> --- a/examples/l3fwd/l3fwd_event.h
>> +++ b/examples/l3fwd/l3fwd_event.h
>> @@ -14,6 +14,11 @@
>>
>> #include "l3fwd.h"
>>
>> +#define L3FWD_EVENT_SINGLE 0x1
>> +#define L3FWD_EVENT_BURST 0x2
>> +#define L3FWD_EVENT_TX_DIRECT 0x4
>> +#define L3FWD_EVENT_TX_ENQ 0x8
>> +
>> #define CMD_LINE_OPT_MODE "mode"
>> #define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
>>
>> diff --git a/examples/l3fwd/l3fwd_lpm.c
>b/examples/l3fwd/l3fwd_lpm.c
>> index 349de2703..c4669d6d5 100644
>> --- a/examples/l3fwd/l3fwd_lpm.c
>> +++ b/examples/l3fwd/l3fwd_lpm.c
>> @@ -28,6 +28,7 @@
>> #include
>>
>> #include "l3fwd.h"
>> +#include "l3fwd_event.h"
>>
>> struct ipv4_l3fwd_lpm_route {
>> uint32_t ip;
>> @@ -254,6 +255,236 @@ lpm_main_loop(__attribute__((unused))
>void *dummy)
>> return 0;
>> }
>>
>> +static __rte_always_inline void
>> +lpm_event_loop_single(struct l3fwd_event_resources *evt_rsrc,
>> +const uint8_t flags)
>> +{
>> +const int event_p_id = l3fwd_get_free_event_port(evt_rsrc);
>> +const uint8_t tx_q_id = evt_rsrc->evq.event_q_id[
>> +evt_rsrc->evq.nb_queues - 1];
>> +const uint8_t event_d_id = evt_rsrc->event_d_id;
>> +struct lcore_conf *lconf;
>> +unsigned int lcore_id;
>> +struct rte_event ev;
>> +
>> +if (event_p_id < 0)
>> +return;
>> +
>> +lcore_id = rte_lcore_id();
>> +lconf = &lcore_conf[lcore_id];
>> +
>> +RTE_LOG(INFO, L3FWD, "entering %s on lcore %u\n", __func__,
>lcore_id);
>> +while (!force_quit) {
>> +if (!rte_event_dequeue_burst(event_d_id,
>event_p_id, &ev, 1, 0))
>> +continue;
>> +
>> +struct rte_mbuf *mbuf = ev.mbuf;
>> +mbuf->port = lpm_get_dst_port(lconf, mbuf, mbuf-
>>port);
>> +
>> +#if defined RTE_ARCH_X86 || defined
>RTE_MACHINE_CPUFLAG_NEON \
>> +|| defined RTE_ARCH_PPC_64
>> +process_packet(mbuf, &mbuf->port);
>> +#else
>> +
>> +struct rte_ether_hdr *eth_hdr =
>rte_pktmbuf_mtod(mbuf,
>> +struct
>rte_ether_hdr *);
>> +#ifdef DO_RFC_1812_CHECKS
>> +struct rte_ipv4_hdr *ipv4_hdr;
>>
Re: [dpdk-dev] [PATCH v2 09/11] examples/l3fwd: add event em main loop
>> Add em main loop for handling events based on capabilities of the >> event device. >> >> Signed-off-by: Pavan Nikhilesh >> --- >> examples/l3fwd/l3fwd.h | 10 ++ >> examples/l3fwd/l3fwd_em.c| 177 >+++ >> examples/l3fwd/l3fwd_em.h| 159 +--- >> examples/l3fwd/l3fwd_em_hlm.h| 131 > >> examples/l3fwd/l3fwd_em_sequential.h | 26 >> examples/l3fwd/l3fwd_event.c | 9 ++ >> examples/l3fwd/main.c| 5 +- >> 7 files changed, 470 insertions(+), 47 deletions(-) >> >> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h >> index 8f2e4be23..2d02fa731 100644 >> --- a/examples/l3fwd/l3fwd.h >> +++ b/examples/l3fwd/l3fwd.h >> @@ -221,6 +221,16 @@ >lpm_event_main_loop_tx_q(__attribute__((unused)) void *dummy); >> int >> lpm_event_main_loop_tx_q_burst(__attribute__((unused)) void >*dummy); >> >> +int >> +em_event_main_loop_tx_d(__attribute__((unused)) void >*dummy); >> +int >> +em_event_main_loop_tx_d_burst(__attribute__((unused)) void >*dummy); >> +int >> +em_event_main_loop_tx_q(__attribute__((unused)) void >*dummy); >> +int >> +em_event_main_loop_tx_q_burst(__attribute__((unused)) void >*dummy); > >Same question as for lpm: if your functions don't need params, >why not to define them as ones without params? Need to satisfy the prototype requirements for rte_eal_mp_remote_launch(l3fwd_lkp.main_loop, NULL, CALL_MASTER); > >> + >> + >> /* Return ipv4/ipv6 fwd lookup struct for LPM or EM. */ >> void * >> em_get_ipv4_l3fwd_lookup_struct(const int socketid);
Re: [dpdk-dev] [PATCH v2 10/11] examples/l3fwd: add graceful teardown for eventdevice
>> Add graceful teardown that addresses both event mode and poll
>mode.
>>
>> Signed-off-by: Pavan Nikhilesh
>> ---
>> examples/l3fwd/main.c | 49 ++-
>
>> 1 file changed, 34 insertions(+), 15 deletions(-)
>>
>> diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
>> index 0ae64dd41..68998f42c 100644
>> --- a/examples/l3fwd/main.c
>> +++ b/examples/l3fwd/main.c
>> @@ -920,7 +920,7 @@ main(int argc, char **argv)
>> struct lcore_conf *qconf;
>> struct rte_eth_dev_info dev_info;
>> struct rte_eth_txconf *txconf;
>> -int ret;
>> +int i, ret;
>> unsigned nb_ports;
>> uint16_t queueid, portid;
>> unsigned lcore_id;
>> @@ -1195,27 +1195,46 @@ main(int argc, char **argv)
>> }
>> }
>>
>> -
>> check_all_ports_link_status(enabled_port_mask);
>>
>> ret = 0;
>> /* launch per-lcore init on every lcore */
>> rte_eal_mp_remote_launch(l3fwd_lkp.main_loop, NULL,
>CALL_MASTER);
>> -RTE_LCORE_FOREACH_SLAVE(lcore_id) {
>> -if (rte_eal_wait_lcore(lcore_id) < 0) {
>> -ret = -1;
>> -break;
>> +if (evt_rsrc->enabled) {
>> +for (i = 0; i < evt_rsrc->rx_adptr.nb_rx_adptr; i++)
>> +rte_event_eth_rx_adapter_stop(
>> +evt_rsrc->rx_adptr.rx_adptr[i]);
>> +for (i = 0; i < evt_rsrc->tx_adptr.nb_tx_adptr; i++)
>> +rte_event_eth_tx_adapter_stop(
>> +evt_rsrc->tx_adptr.tx_adptr[i]);
>> +
>> +RTE_ETH_FOREACH_DEV(portid) {
>> +if ((enabled_port_mask & (1 << portid)) == 0)
>> +continue;
>> +rte_eth_dev_stop(portid);
>> }
>> -}
>>
>> -/* stop ports */
>> -RTE_ETH_FOREACH_DEV(portid) {
>> -if ((enabled_port_mask & (1 << portid)) == 0)
>> -continue;
>> -printf("Closing port %d...", portid);
>> -rte_eth_dev_stop(portid);
>> -rte_eth_dev_close(portid);
>> -printf(" Done\n");
>
>Why to stop ports *before* making sure all lcores are stopped?
>Shouldn't that peace of code be identical for both poll and event mode?
>Something like:
>rte_eal_mp_wait_lcore();
>
>RTE_ETH_FOREACH_DEV(portid) {
>if ((enabled_port_mask & (1 << portid)) == 0)
>continue;
>rte_eth_dev_stop(portid);
>rte_eth_dev_close(portid);
>}
>?
>
Event dev spec requires stopping producers before consumers else we might run
into
deadlock in some cases.
>> +rte_eal_mp_wait_lcore();
>> +RTE_ETH_FOREACH_DEV(portid) {
>> +if ((enabled_port_mask & (1 << portid)) == 0)
>> +continue;
>> +rte_eth_dev_close(portid);
>> +}
>> +
>> +rte_event_dev_stop(evt_rsrc->event_d_id);
>> +rte_event_dev_close(evt_rsrc->event_d_id);
>> +
>> +} else {
>> +rte_eal_mp_wait_lcore();
>> +
>> +RTE_ETH_FOREACH_DEV(portid) {
>> +if ((enabled_port_mask & (1 << portid)) == 0)
>> +continue;
>> +printf("Closing port %d...", portid);
>> +rte_eth_dev_stop(portid);
>> +rte_eth_dev_close(portid);
>> +printf(" Done\n");
>> +}
>> }
>> printf("Bye...\n");
>>
>> --
>> 2.17.1
[dpdk-dev] [PATCH 1/2] examples/l3fwd: set default schedule type as atomic
Signed-off-by: Nipun Gupta
---
These patches are based over https://patchwork.dpdk.org/patch/63553/.
Feel free to merge into the series.
examples/l3fwd/l3fwd_event.h | 4
1 file changed, 4 insertions(+)
diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index fcc0ce51a..470aedc61 100644
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -100,7 +100,11 @@ l3fwd_get_eventdev_rsrc(void)
mz = rte_memzone_reserve(name, sizeof(struct l3fwd_event_resources),
0, 0);
if (mz != NULL) {
+ struct l3fwd_event_resources *rsrc = mz->addr;
+
memset(mz->addr, 0, sizeof(struct l3fwd_event_resources));
+ rsrc->sched_type = RTE_SCHED_TYPE_ATOMIC;
+
return mz->addr;
}
--
2.17.1
[dpdk-dev] [PATCH 2/2] examples/l3fwd: support multiple queues in event mode
Signed-off-by: Nipun Gupta
---
examples/l3fwd/l3fwd_event.c | 55
examples/l3fwd/l3fwd_event.h | 4 +++
examples/l3fwd/main.c| 8 --
3 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index 9fea11bd9..61f642691 100644
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -40,12 +40,32 @@ parse_eventq_sync(const char *optarg)
evt_rsrc->sched_type = RTE_SCHED_TYPE_PARALLEL;
}
+static void
+parse_event_eth_queues(const char *eth_queues)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+ char *end = NULL;
+ uint8_t num_eth_queues;
+
+ /* parse decimal string */
+ num_eth_queues = strtoul(eth_queues, &end, 10);
+ if ((eth_queues[0] == '\0') || (end == NULL) || (*end != '\0'))
+ return;
+
+ if (num_eth_queues == 0)
+ return;
+
+ evt_rsrc->eth_queues = num_eth_queues;
+}
+
static void
l3fwd_parse_eventdev_args(char **argv, int argc)
{
const struct option eventdev_lgopts[] = {
{CMD_LINE_OPT_MODE, 1, 0, CMD_LINE_OPT_MODE_NUM},
{CMD_LINE_OPT_EVENTQ_SYNC, 1, 0, CMD_LINE_OPT_EVENTQ_SYNC_NUM},
+ {CMD_LINE_OPT_EVENT_ETH_QUEUES, 1, 0,
+ CMD_LINE_OPT_EVENT_ETH_QUEUES_NUM},
{NULL, 0, 0, 0}
};
char *prgname = argv[0];
@@ -64,6 +84,10 @@ l3fwd_parse_eventdev_args(char **argv, int argc)
parse_eventq_sync(optarg);
break;
+ case CMD_LINE_OPT_EVENT_ETH_QUEUES_NUM:
+ parse_event_eth_queues(optarg);
+ break;
+
default:
print_usage(prgname);
exit(1);
@@ -85,6 +109,7 @@ l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf)
struct rte_eth_rxconf rxconf;
unsigned int nb_mbuf;
uint16_t port_id;
+ uint8_t eth_qid;
int32_t ret;
/* initialize all ports */
@@ -118,7 +143,8 @@ l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf)
local_port_conf.rx_adv_conf.rss_conf.rss_hf);
}
- ret = rte_eth_dev_configure(port_id, 1, 1, &local_port_conf);
+ ret = rte_eth_dev_configure(port_id, evt_rsrc->eth_queues, 1,
+ &local_port_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE,
"Cannot configure device: err=%d, port=%d\n",
@@ -161,20 +187,25 @@ l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf)
8192u);
ret = init_mem(port_id, nb_mbuf);
}
- /* init one Rx queue per port */
+ /* init Rx queues per port */
rxconf = dev_info.default_rxconf;
rxconf.offloads = local_port_conf.rxmode.offloads;
- if (!evt_rsrc->per_port_pool)
- ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, 0,
- &rxconf, evt_rsrc->pkt_pool[0][0]);
- else
- ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, 0,
- &rxconf,
+
+ for (eth_qid = 0; eth_qid < evt_rsrc->eth_queues; eth_qid++) {
+ if (!evt_rsrc->per_port_pool)
+ ret = rte_eth_rx_queue_setup(port_id, eth_qid,
+ nb_rxd, 0, &rxconf,
+ evt_rsrc->pkt_pool[0][0]);
+ else
+ ret = rte_eth_rx_queue_setup(port_id, eth_qid,
+ nb_rxd, 0, &rxconf,
evt_rsrc->pkt_pool[port_id][0]);
- if (ret < 0)
- rte_exit(EXIT_FAILURE,
-"rte_eth_rx_queue_setup: err=%d, "
-"port=%d\n", ret, port_id);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE,
+"rte_eth_rx_queue_setup: err=%d, "
+"port=%d, eth queue: %d\n",
+ret, port_id, eth_qid);
+ }
/* init one Tx queue per port */
txconf = dev_info.default_txconf;
diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index 470aedc61..1fdd51e62 100644
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -21,10 +21,12 @@
#define CMD_LINE_OPT_MODE "mode"
#define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
+#define CMD_LINE_OPT_EVENT_ETH_QUEUES "even
Re: [dpdk-dev] [PATCH 0/2] drivers/net: set fixed flag for exact link speed
On 12/19, Xu, Ting wrote: > > >> -Original Message- >> From: dev On Behalf Of Guinan Sun >> Sent: Wednesday, December 4, 2019 12:59 AM >> To: dev@dpdk.org >> Cc: Lu, Wenzhuo ; Yang, Qiming >> ; Xing, Beilei ; Sun, GuinanX >> >> Subject: [dpdk-dev] [PATCH 0/2] drivers/net: set fixed flag for exact link >> speed >> >> Setting exact link speed makes sense if auto-negotiation is disabled. Fixed >> flag >> is required to disable auto-negotiation. >> >> Guinan Sun (2): >> net/i40e: set fixed flag for exact link speed >> net/ixgbe: set fixed flag for exact link speed >> >> drivers/net/i40e/i40e_ethdev.c | 17 +++-- >> drivers/net/ixgbe/ixgbe_ethdev.c | 20 +++- >> 2 files changed, 14 insertions(+), 23 deletions(-) >> >> -- >> 2.17.1 > >Reviewed-by: Ting Xu > Acked-by: Xiaolong Ye Applied to dpdk-next-net-intel, Thanks.
[dpdk-dev] [PATCH v3] net/iavf/base: change the base as driver common
Change the iavf base code as driver common library, it is used by iavf
PMD now, and it can be used by other Intel SR-IOV PMDs in the future.
Signed-off-by: Haiyue Wang
---
v3: update the commit message.
v2: update the commit message, and rename the iavf_main.c to iavf_impl.c
drivers/common/Makefile | 5 +
drivers/common/iavf/Makefile | 28 +
drivers/{net/iavf/base => common/iavf}/README | 1 +
.../iavf/base => common/iavf}/iavf_adminq.c | 0
.../iavf/base => common/iavf}/iavf_adminq.h | 0
.../base => common/iavf}/iavf_adminq_cmd.h| 0
.../iavf/base => common/iavf}/iavf_alloc.h| 0
.../iavf/base => common/iavf}/iavf_common.c | 0
.../iavf/base => common/iavf}/iavf_devids.h | 0
drivers/common/iavf/iavf_impl.c | 114 ++
.../iavf/base => common/iavf}/iavf_osdep.h| 50 ++--
.../base => common/iavf}/iavf_prototype.h | 0
.../iavf/base => common/iavf}/iavf_register.h | 0
.../iavf/base => common/iavf}/iavf_status.h | 0
.../iavf/base => common/iavf}/iavf_type.h | 0
drivers/common/iavf/meson.build | 10 ++
.../common/iavf/rte_common_iavf_version.map | 12 ++
.../{net/iavf/base => common/iavf}/virtchnl.h | 0
drivers/common/meson.build| 2 +-
drivers/net/iavf/Makefile | 23 +---
drivers/net/iavf/base/meson.build | 23
drivers/net/iavf/iavf.h | 6 +-
drivers/net/iavf/iavf_ethdev.c| 83 -
drivers/net/iavf/iavf_rxtx.c | 3 -
drivers/net/iavf/iavf_rxtx_vec_avx2.c | 1 -
drivers/net/iavf/iavf_rxtx_vec_sse.c | 2 -
drivers/net/iavf/iavf_vchnl.c | 5 -
drivers/net/iavf/meson.build | 4 +-
mk/rte.app.mk | 4 +
29 files changed, 192 insertions(+), 184 deletions(-)
create mode 100644 drivers/common/iavf/Makefile
rename drivers/{net/iavf/base => common/iavf}/README (96%)
rename drivers/{net/iavf/base => common/iavf}/iavf_adminq.c (100%)
rename drivers/{net/iavf/base => common/iavf}/iavf_adminq.h (100%)
rename drivers/{net/iavf/base => common/iavf}/iavf_adminq_cmd.h (100%)
rename drivers/{net/iavf/base => common/iavf}/iavf_alloc.h (100%)
rename drivers/{net/iavf/base => common/iavf}/iavf_common.c (100%)
rename drivers/{net/iavf/base => common/iavf}/iavf_devids.h (100%)
create mode 100644 drivers/common/iavf/iavf_impl.c
rename drivers/{net/iavf/base => common/iavf}/iavf_osdep.h (75%)
rename drivers/{net/iavf/base => common/iavf}/iavf_prototype.h (100%)
rename drivers/{net/iavf/base => common/iavf}/iavf_register.h (100%)
rename drivers/{net/iavf/base => common/iavf}/iavf_status.h (100%)
rename drivers/{net/iavf/base => common/iavf}/iavf_type.h (100%)
create mode 100644 drivers/common/iavf/meson.build
create mode 100644 drivers/common/iavf/rte_common_iavf_version.map
rename drivers/{net/iavf/base => common/iavf}/virtchnl.h (100%)
delete mode 100644 drivers/net/iavf/base/meson.build
diff --git a/drivers/common/Makefile b/drivers/common/Makefile
index 1ff033bba..3254c5274 100644
--- a/drivers/common/Makefile
+++ b/drivers/common/Makefile
@@ -30,4 +30,9 @@ ifeq ($(CONFIG_RTE_LIBRTE_COMMON_DPAAX),y)
DIRS-y += dpaax
endif
+IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD)
+ifneq (,$(findstring y,$(IAVF-y)))
+DIRS-y += iavf
+endif
+
include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/common/iavf/Makefile b/drivers/common/iavf/Makefile
new file mode 100644
index 0..43383e376
--- /dev/null
+++ b/drivers/common/iavf/Makefile
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+#
+# library name
+#
+LIB = librte_common_iavf.a
+
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+CFLAGS += -O3
+CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -Wno-pointer-arith
+CFLAGS += -Wno-cast-qual
+
+EXPORT_MAP := rte_common_iavf_version.map
+
+#
+# all source are stored in SRCS-y
+#
+SRCS-y += iavf_adminq.c
+SRCS-y += iavf_common.c
+SRCS-y += iavf_impl.c
+
+LDLIBS += -lrte_eal
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/iavf/base/README b/drivers/common/iavf/README
similarity index 96%
rename from drivers/net/iavf/base/README
rename to drivers/common/iavf/README
index e8c49c36f..b78e89bee 100644
--- a/drivers/net/iavf/base/README
+++ b/drivers/common/iavf/README
@@ -17,3 +17,4 @@ NOTE: The source code in this directory should not be
modified apart from
the following file(s):
iavf_osdep.h
+iavf_impl.c
diff --git a/drivers/net/iavf/base/iavf_adminq.c
b/drivers/common/iavf/iavf_adminq.c
similarity index 100%
rename from drivers/net/iavf/base/iavf_adminq.c
rename to drivers/common/iavf/iavf_adminq.c
diff --git a/drivers/net/iavf/base/iavf_adminq.h
b/drivers/common/iavf/iavf_adminq.h
similarity index 100%
rename from drivers/net/iavf/base/iavf_adminq.h
rename to
[dpdk-dev] Fwd: l2fwd application are not sending continuous packets .
Hello Dpdk Team,
I'm facing issue while forwarding packets in DPDK's l2fwd application.
While sending 1 Lac packets from Scapy, I could see sometimes packets are
sending from one VM to another VM.
Before explaining issue let me explain topology.
*Topology :-===*1) I am having 4 VMs(Virtual Machines) in same host.
All these VM are running on Ubuntu 16.04.1.
2) VM-1 is used as Scapy to forward packets (Scapy version 2.4.3) . While
creating packets I am giving destination mac(d-mac) address of VM-1.
3) In VM-2 am running L2 forwarding application.
In this l2fwd application, I am doing simple packet forwarding by
statically keeping mac address of VM-3.
Code :-
l2fwd_mac_updating () {
...
..
...
*((uint64_t *)tmp) = 0xddccbbaa/*VM-3 mac address*/ +
((uint64_t)dest_portid << 40);
}
4) Also in VM-3, I am doing same like VM-2, but I kept mac address of VM-4
5) In VM-4, I am using wireshark to see packets coming from VM-3.
6) In VM-2 and VM-3, I kept promiscuous mode off by commenting out
rte_eth_promiscuous_enable().
--- -
--
|VM-1 | -->| VM-2 |
> | VM-3| --> |VM-4
|
--- -
--
Scapy Simple L2 forwarding
Simple L2 forwardingWireshark
used for sending packetsSending all packets to
Sending all packets to
VM-3
VM-4
(DPDK)
(DPDK)
*Problem :- ==*==
>From scapy VM, I am sending 1 lac packets with rate of 100 packets per
second. *During problematic condition I could see packets are not getting
forward from VM-3.**Problematic state is happening anytime after sending 1k
packets.*
This issue is not consistence but I could see this issue 8 out of 10 times.
* Debugging and Observations :-=*
When I tried to debug this issue , I could see that
1) In problematic state, rx queue of VM-3 is not getting packets, but VM-2
is sending packets properly. I checked this by using pdump of rx queue.
2) Just before problematic state in VM-3, I could see that previous
packet(only one packet) instead of going to VM-4, it is coming back to
again in rx queue of VM-3 and after wards I did not get any packets in rx
queue.
3) I have changed rate of packet forward 10packets per second. but still
see the issue.
*Can anyone please help to solve this problem ? I need it urgently .*
Thanks,
Satya
Re: [dpdk-dev] [EXT] [PATCH 2/2] examples/l3fwd: support multiple queues in event mode
Regards Sunil Kumar Kori >-Original Message- >From: Nipun Gupta >Sent: Monday, January 6, 2020 10:05 AM >To: dev@dpdk.org >Cc: Pavan Nikhilesh Bhagavatula ; Jerin Jacob >Kollanukkaran ; hemant.agra...@nxp.com; >akhil.go...@nxp.com; marko.kovace...@intel.com; or...@mellanox.com; >bruce.richard...@intel.com; radu.nico...@intel.com; >tomasz.kante...@intel.com; Sunil Kumar Kori ; Nipun >Gupta >Subject: [EXT] [PATCH 2/2] examples/l3fwd: support multiple queues in event >mode > >External Email > >-- >Signed-off-by: Nipun Gupta >--- > examples/l3fwd/l3fwd_event.c | 55 > examples/l3fwd/l3fwd_event.h | 4 +++ > examples/l3fwd/main.c| 8 -- > 3 files changed, 53 insertions(+), 14 deletions(-) > >diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index >68998f42c..ecfaca435 100644 >--- a/examples/l3fwd/main.c >+++ b/examples/l3fwd/main.c >@@ -285,7 +285,8 @@ print_usage(const char *prgname) > " [--parse-ptype]" > " [--per-port-pool]" > " [--mode]" >- " [--eventq-sched]\n\n" >+ " [--eventq-sched]" >+ " [--event-eth-queues]\n\n" > > " -p PORTMASK: Hexadecimal bitmask of ports to >configure\n" > " -P : Enable promiscuous mode\n" >@@ -306,7 +307,10 @@ print_usage(const char *prgname) > " --eventq-sched: Event queue synchronization method " > " ordered, atomic or parallel.\n\t\t" > " Default: atomic\n\t\t" >- " Valid only if --mode=eventdev\n\n", >+ " Valid only if --mode=eventdev\n" >+ " --event-eth-queues: Number of ethernet queues per >device.\n\t\t" Will it be better to make it like "eth-rx-queues" simply ? So that It will clearly reflect that which queues it is referring to, Rx or Tx. Also Comment should be updated accordingly. >+ " Default: 1\n\t\t" >+ " Valid only if --mode=eventdev\n\n", > prgname); > } > >-- >2.17.1
[dpdk-dev] [PATCH] net/mlx5: fix modify actions support limitation
In the root table, there is some limitation of total number of header
modify actions, 16 or 8 for each. But in other tables, there is no
such strict limitation. In an IPv6 case, the IP fields modifying
will occupy more actions than that in IPv4, so the total support
number should be increased in order to support as many actions as
possible for an IPv6 + TCP packet.
And in the meanwhile, the memory consumption should also be taken
into consideration because sometimes only several actions are needed.
The root table checking could also be done in low layer driver and
the error code will be returned if the actions number is over the
maximal supported value.
Fixes: 0e9d00027686 ("net/mlx5: check maximum modify actions number")
Signed-off-by: Bing Zhao
---
drivers/net/mlx5/mlx5_flow.h| 15 +++---
drivers/net/mlx5/mlx5_flow_dv.c | 104 ++--
2 files changed, 66 insertions(+), 53 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 27d82ac..4b493ee 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -385,11 +385,14 @@ struct mlx5_flow_dv_tag_resource {
/*
* Number of modification commands.
- * If extensive metadata registers are supported
- * the maximal actions amount is 16 and 8 otherwise.
+ * If extensive metadata registers are supported, the maximal actions amount is
+ * 16 and 8 otherwise on root table. The validation could also be done in the
+ * lower driver layer.
+ * On non-root table, there is no limitation, but 32 is enough right now.
*/
-#define MLX5_MODIFY_NUM 16
-#define MLX5_MODIFY_NUM_NO_MREG 8
+#define MLX5_MAX_MODIFY_NUM32
+#define MLX5_ROOT_TBL_MODIFY_NUM 16
+#define MLX5_ROOT_TBL_MODIFY_NUM_NO_MREG 8
/* Modify resource structure */
struct mlx5_flow_dv_modify_hdr_resource {
@@ -400,9 +403,9 @@ struct mlx5_flow_dv_modify_hdr_resource {
/**< Verbs modify header action object. */
uint8_t ft_type; /**< Flow table type, Rx or Tx. */
uint32_t actions_num; /**< Number of modification actions. */
- struct mlx5_modification_cmd actions[MLX5_MODIFY_NUM];
- /**< Modification actions. */
uint64_t flags; /**< Flags for RDMA API. */
+ struct mlx5_modification_cmd actions[];
+ /**< Modification actions. */
};
/* Jump action resource structure. */
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 4c16281..586b56e 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -363,7 +363,7 @@ struct field_modify_info modify_tcp[] = {
uint32_t mask;
uint32_t data;
- if (i >= MLX5_MODIFY_NUM)
+ if (i >= MLX5_MAX_MODIFY_NUM)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"too many items to modify");
@@ -404,11 +404,11 @@ struct field_modify_info modify_tcp[] = {
++i;
++field;
} while (field->size);
- resource->actions_num = i;
- if (!resource->actions_num)
+ if (resource->actions_num == i)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"invalid modification flow item");
+ resource->actions_num = i;
return 0;
}
@@ -569,7 +569,7 @@ struct field_modify_info modify_tcp[] = {
struct mlx5_modification_cmd *actions = &resource->actions[i];
struct field_modify_info *field = modify_vlan_out_first_vid;
- if (i >= MLX5_MODIFY_NUM)
+ if (i >= MLX5_MAX_MODIFY_NUM)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"too many items to modify");
@@ -902,7 +902,7 @@ struct field_modify_info modify_tcp[] = {
struct mlx5_modification_cmd *actions = resource->actions;
uint32_t i = resource->actions_num;
- if (i >= MLX5_MODIFY_NUM)
+ if (i >= MLX5_MAX_MODIFY_NUM)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"too many items to modify");
@@ -914,10 +914,6 @@ struct field_modify_info modify_tcp[] = {
actions[i].data1 = rte_cpu_to_be_32(conf->data);
++i;
resource->actions_num = i;
- if (!resource->actions_num)
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION, NULL,
- "invalid modification flow item");
return 0;
}
@@ -2248,7 +2244,6 @@ struct field_modify_info modify_tcp[] = {
domain = sh->rx_domain;
else
domain = sh->tx_
[dpdk-dev] l2fwd application are not sending continuous packets .
Hello Dpdk Team,
I'm facing issue while forwarding packets in DPDK's l2fwd application.
While sending 1 Lac packets from Scapy, I could see sometimes packets are
sending from one VM to another VM.
Before explaining issue let me explain topology.
*Topology :-===*1) I am having 4 VMs(Virtual Machines) in same host.
All these VM are running on Ubuntu 16.04.1.
2) VM-1 is used as Scapy to forward packets (Scapy version 2.4.3) . While
creating packets I am giving destination mac(d-mac) address of VM-1.
3) In VM-2 am running L2 forwarding application.
In this l2fwd application, I am doing simple packet forwarding by
statically keeping mac address of VM-3.
Code :-
l2fwd_mac_updating () {
...
..
...
*((uint64_t *)tmp) = 0xddccbbaa/*VM-3 mac address*/ +
((uint64_t)dest_portid << 40);
}
4) Also in VM-3, I am doing same like VM-2, but I kept mac address of VM-4
5) In VM-4, I am using wireshark to see packets coming from VM-3.
6) In VM-2 and VM-3, I kept promiscuous mode off by commenting out
rte_eth_promiscuous_enable().
--- -
--
|VM-1 | -->| VM-2 |
> | VM-3| --> |VM-4
|
--- -
--
Scapy Simple L2 forwarding
Simple L2 forwardingWireshark
used for sending packetsSending all packets to
Sending all packets to
VM-3
VM-4
(DPDK)
(DPDK)
*Problem :- ==*==
>From scapy VM, I am sending 1 lac packets with rate of 100 packets per
second. *During problematic condition I could see packets are not getting
forward from VM-3.**Problematic state is happening anytime after sending 1k
packets.*
This issue is not consistence but I could see this issue 8 out of 10 times.
* Debugging and Observations :-=*
When I tried to debug this issue , I could see that
1) In problematic state, rx queue of VM-3 is not getting packets, but VM-2
is sending packets properly. I checked this by using pdump of rx queue.
2) Just before problematic state in VM-3, I could see that previous
packet(only one packet) instead of going to VM-4, it is coming back to
again in rx queue of VM-3 and after wards I did not get any packets in rx
queue.
3) I have changed rate of packet forward 10packets per second. but still
see the issue.
*Can anyone please help to solve this problem ? I need it urgently .*
Thanks,
Satya
[dpdk-dev] [PATCH 2/2] test/eventdev: fix octeontx2 event device name
From: Pavan Nikhilesh
Fix octeontx2 event device name used in eventdevice test.
Fixes: 62561532ac4c ("event/octeontx2: add SSO selftest")
Cc: sta...@dpdk.org
Signed-off-by: Pavan Nikhilesh
---
app/test/test_eventdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test/test_eventdev.c b/app/test/test_eventdev.c
index 56155838d..43ccb1ce9 100644
--- a/app/test/test_eventdev.c
+++ b/app/test/test_eventdev.c
@@ -1021,7 +1021,7 @@ test_eventdev_selftest_octeontx(void)
static int
test_eventdev_selftest_octeontx2(void)
{
- return test_eventdev_selftest_impl("otx2_eventdev", "");
+ return test_eventdev_selftest_impl("event_octeontx2", "");
}
static int
--
2.17.1
[dpdk-dev] [PATCH 1/2] test/eventdev: fix unintended vdev creation
From: Pavan Nikhilesh
Virtual eventdevice should only be created when there is no existing
device with the same name.
Fixes: e0f4a0ed4237 ("test: skip tests when missing requirements")
Cc: sta...@dpdk.org
Signed-off-by: Pavan Nikhilesh
---
app/test/test_eventdev.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/test/test_eventdev.c b/app/test/test_eventdev.c
index 427dbbf77..56155838d 100644
--- a/app/test/test_eventdev.c
+++ b/app/test/test_eventdev.c
@@ -996,9 +996,13 @@ test_eventdev_common(void)
static int
test_eventdev_selftest_impl(const char *pmd, const char *opts)
{
- rte_vdev_init(pmd, opts);
+ int ret = 0;
+
if (rte_event_dev_get_dev_id(pmd) == -ENODEV)
+ ret = rte_vdev_init(pmd, opts);
+ if (ret)
return TEST_SKIPPED;
+
return rte_event_dev_selftest(rte_event_dev_get_dev_id(pmd));
}
--
2.17.1
[dpdk-dev] [PATCH] event/octeontx2: fix device name in device info
From: Pavan Nikhilesh
Fix imcorrect device name being used in device info.
Fixes: bebc3dbcf4a6 ("event/octeontx2: add device capabilities function")
Cc: sta...@dpdk.org
Signed-off-by: Pavan Nikhilesh
---
drivers/event/octeontx2/otx2_evdev.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/event/octeontx2/otx2_evdev.h
b/drivers/event/octeontx2/otx2_evdev.h
index 231a12a52..ef523dc9d 100644
--- a/drivers/event/octeontx2/otx2_evdev.h
+++ b/drivers/event/octeontx2/otx2_evdev.h
@@ -16,7 +16,7 @@
#include "otx2_mempool.h"
#include "otx2_tim_evdev.h"
-#define EVENTDEV_NAME_OCTEONTX2_PMD otx2_eventdev
+#define EVENTDEV_NAME_OCTEONTX2_PMD event_octeontx2
#define sso_func_trace otx2_sso_dbg
--
2.17.1
