[v7,08/14] app/testpmd: add hairpin support
Checks
Commit Message
This commit introduce the hairpin queues to the testpmd.
the hairpin queue is configured using --hairpinq=<n>
the hairpin queue adds n queue objects for both the total number
of TX queues and RX queues.
The connection between the queues are 1 to 1, first Rx hairpin queue
will be connected to the first Tx hairpin queue
Signed-off-by: Ori Kam <orika@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
app/test-pmd/parameters.c | 28 ++++++++++++
app/test-pmd/testpmd.c | 109 +++++++++++++++++++++++++++++++++++++++++++++-
app/test-pmd/testpmd.h | 3 ++
3 files changed, 138 insertions(+), 2 deletions(-)
Comments
On 10/30/2019 11:53 PM, Ori Kam wrote:
> This commit introduce the hairpin queues to the testpmd.
> the hairpin queue is configured using --hairpinq=<n>
> the hairpin queue adds n queue objects for both the total number
> of TX queues and RX queues.
> The connection between the queues are 1 to 1, first Rx hairpin queue
> will be connected to the first Tx hairpin queue
>
> Signed-off-by: Ori Kam <orika@mellanox.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> ---
> app/test-pmd/parameters.c | 28 ++++++++++++
> app/test-pmd/testpmd.c | 109 +++++++++++++++++++++++++++++++++++++++++++++-
> app/test-pmd/testpmd.h | 3 ++
New parameter should be documented in 'doc/guides/testpmd_app_ug/run_app.rst',
can you please describe befiefly how it works, what the mapping will like by
default etc..
<...>
> @@ -2028,6 +2076,11 @@ struct extmem_param {
> queueid_t qi;
> struct rte_port *port;
> struct rte_ether_addr mac_addr;
> + struct rte_eth_hairpin_conf hairpin_conf = {
> + .peer_count = 1,
> + };
> + int i;
> + struct rte_eth_hairpin_cap cap;
>
> if (port_id_is_invalid(pid, ENABLED_WARN))
> return 0;
> @@ -2060,9 +2113,16 @@ struct extmem_param {
> configure_rxtx_dump_callbacks(0);
> printf("Configuring Port %d (socket %u)\n", pi,
> port->socket_id);
> + if (nb_hairpinq > 0 &&
> + rte_eth_dev_hairpin_capability_get(pi, &cap)) {
> + printf("Port %d doesn't support hairpin "
> + "queues\n", pi);
> + return -1;
> + }
> /* configure port */
> - diag = rte_eth_dev_configure(pi, nb_rxq, nb_txq,
> - &(port->dev_conf));
> + diag = rte_eth_dev_configure(pi, nb_rxq + nb_hairpinq,
> + nb_txq + nb_hairpinq,
> + &(port->dev_conf));
> if (diag != 0) {
> if (rte_atomic16_cmpset(&(port->port_status),
> RTE_PORT_HANDLING, RTE_PORT_STOPPED) == 0)
> @@ -2155,6 +2215,51 @@ struct extmem_param {
> port->need_reconfig_queues = 1;
> return -1;
> }
> + /* setup hairpin queues */
> + i = 0;
> + for (qi = nb_txq; qi < nb_hairpinq + nb_txq; qi++) {
> + hairpin_conf.peers[0].port = pi;
> + hairpin_conf.peers[0].queue = i + nb_rxq;
> + diag = rte_eth_tx_hairpin_queue_setup
> + (pi, qi, nb_txd, &hairpin_conf);
> + i++;
> + if (diag == 0)
> + continue;
> +
> + /* Fail to setup rx queue, return */
> + if (rte_atomic16_cmpset(&(port->port_status),
> + RTE_PORT_HANDLING,
> + RTE_PORT_STOPPED) == 0)
> + printf("Port %d can not be set back "
> + "to stopped\n", pi);
> + printf("Fail to configure port %d hairpin "
> + "queues\n", pi);
> + /* try to reconfigure queues next time */
> + port->need_reconfig_queues = 1;
> + return -1;
> + }
> + i = 0;
> + for (qi = nb_rxq; qi < nb_hairpinq + nb_rxq; qi++) {
> + hairpin_conf.peers[0].port = pi;
> + hairpin_conf.peers[0].queue = i + nb_txq;
> + diag = rte_eth_rx_hairpin_queue_setup
> + (pi, qi, nb_rxd, &hairpin_conf);
> + i++;
> + if (diag == 0)
> + continue;
> +
> + /* Fail to setup rx queue, return */
> + if (rte_atomic16_cmpset(&(port->port_status),
> + RTE_PORT_HANDLING,
> + RTE_PORT_STOPPED) == 0)
> + printf("Port %d can not be set back "
> + "to stopped\n", pi);
> + printf("Fail to configure port %d hairpin "
> + "queues\n", pi);
> + /* try to reconfigure queues next time */
> + port->need_reconfig_queues = 1;
> + return -1;
> + }
'start_port()' function is already huge, what do you think moving hairpin
related setup into a specific function and call it when "nb_hairpinq > 0" only?
This makes the hairpin related config more clear and 'start_port()' function
simpler.
I think all hairpin related operations can be extracted, like capability check,
'rte_eth_dev_configure' & hairpin queue setup.
Hi Ferruh,
Thanks, for the comments PSB,
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Thursday, October 31, 2019 7:12 PM
> To: Ori Kam <orika@mellanox.com>; Wenzhuo Lu <wenzhuo.lu@intel.com>;
> Jingjing Wu <jingjing.wu@intel.com>; Bernard Iremonger
> <bernard.iremonger@intel.com>
> Cc: dev@dpdk.org; stephen@networkplumber.org
> Subject: Re: [dpdk-dev] [PATCH v7 08/14] app/testpmd: add hairpin support
>
> On 10/30/2019 11:53 PM, Ori Kam wrote:
> > This commit introduce the hairpin queues to the testpmd.
> > the hairpin queue is configured using --hairpinq=<n>
> > the hairpin queue adds n queue objects for both the total number
> > of TX queues and RX queues.
> > The connection between the queues are 1 to 1, first Rx hairpin queue
> > will be connected to the first Tx hairpin queue
> >
> > Signed-off-by: Ori Kam <orika@mellanox.com>
> > Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> > ---
> > app/test-pmd/parameters.c | 28 ++++++++++++
> > app/test-pmd/testpmd.c | 109
> +++++++++++++++++++++++++++++++++++++++++++++-
> > app/test-pmd/testpmd.h | 3 ++
>
> New parameter should be documented in
> 'doc/guides/testpmd_app_ug/run_app.rst',
> can you please describe befiefly how it works, what the mapping will like by
> default etc..
>
The default is no hairpin queues,
If hairpinq = x is specified then we are adding x queues to the Rx queue list and x queues to the Tx, and bind them one
Rx queue to on Tx queue.
For example: test pmd parameters are:
--rxq=3 --txq=2 --hairpinq=4 the result will be:
3 normal Txq (queues 0,1,2)
2 normal Txq (queues 0,1)
4 hairpin queues (Rxq 3,4,5,6 Txq 2,3,4,5) while Rxq(3) will be connected to Txq(2), Rxq(4) will be connected to Txq(3) and so on.
> <...>
>
> > @@ -2028,6 +2076,11 @@ struct extmem_param {
> > queueid_t qi;
> > struct rte_port *port;
> > struct rte_ether_addr mac_addr;
> > + struct rte_eth_hairpin_conf hairpin_conf = {
> > + .peer_count = 1,
> > + };
> > + int i;
> > + struct rte_eth_hairpin_cap cap;
> >
> > if (port_id_is_invalid(pid, ENABLED_WARN))
> > return 0;
> > @@ -2060,9 +2113,16 @@ struct extmem_param {
> > configure_rxtx_dump_callbacks(0);
> > printf("Configuring Port %d (socket %u)\n", pi,
> > port->socket_id);
> > + if (nb_hairpinq > 0 &&
> > + rte_eth_dev_hairpin_capability_get(pi, &cap)) {
> > + printf("Port %d doesn't support hairpin "
> > + "queues\n", pi);
> > + return -1;
> > + }
> > /* configure port */
> > - diag = rte_eth_dev_configure(pi, nb_rxq, nb_txq,
> > - &(port->dev_conf));
> > + diag = rte_eth_dev_configure(pi, nb_rxq +
> nb_hairpinq,
> > + nb_txq + nb_hairpinq,
> > + &(port->dev_conf));
> > if (diag != 0) {
> > if (rte_atomic16_cmpset(&(port->port_status),
> > RTE_PORT_HANDLING, RTE_PORT_STOPPED)
> == 0)
> > @@ -2155,6 +2215,51 @@ struct extmem_param {
> > port->need_reconfig_queues = 1;
> > return -1;
> > }
> > + /* setup hairpin queues */
> > + i = 0;
> > + for (qi = nb_txq; qi < nb_hairpinq + nb_txq; qi++) {
> > + hairpin_conf.peers[0].port = pi;
> > + hairpin_conf.peers[0].queue = i + nb_rxq;
> > + diag = rte_eth_tx_hairpin_queue_setup
> > + (pi, qi, nb_txd, &hairpin_conf);
> > + i++;
> > + if (diag == 0)
> > + continue;
> > +
> > + /* Fail to setup rx queue, return */
> > + if (rte_atomic16_cmpset(&(port->port_status),
> > +
> RTE_PORT_HANDLING,
> > + RTE_PORT_STOPPED)
> == 0)
> > + printf("Port %d can not be set back "
> > + "to stopped\n", pi);
> > + printf("Fail to configure port %d hairpin "
> > + "queues\n", pi);
> > + /* try to reconfigure queues next time */
> > + port->need_reconfig_queues = 1;
> > + return -1;
> > + }
> > + i = 0;
> > + for (qi = nb_rxq; qi < nb_hairpinq + nb_rxq; qi++) {
> > + hairpin_conf.peers[0].port = pi;
> > + hairpin_conf.peers[0].queue = i + nb_txq;
> > + diag = rte_eth_rx_hairpin_queue_setup
> > + (pi, qi, nb_rxd, &hairpin_conf);
> > + i++;
> > + if (diag == 0)
> > + continue;
> > +
> > + /* Fail to setup rx queue, return */
> > + if (rte_atomic16_cmpset(&(port->port_status),
> > +
> RTE_PORT_HANDLING,
> > + RTE_PORT_STOPPED)
> == 0)
> > + printf("Port %d can not be set back "
> > + "to stopped\n", pi);
> > + printf("Fail to configure port %d hairpin "
> > + "queues\n", pi);
> > + /* try to reconfigure queues next time */
> > + port->need_reconfig_queues = 1;
> > + return -1;
> > + }
>
> 'start_port()' function is already huge, what do you think moving hairpin
> related setup into a specific function and call it when "nb_hairpinq > 0" only?
> This makes the hairpin related config more clear and 'start_port()' function
> simpler.
> I think all hairpin related operations can be extracted, like capability check,
> 'rte_eth_dev_configure' & hairpin queue setup.
I have no strong feeling, I just wanted to keep the function with the same format that all actions are done inside
the function, also it was my intention to easily show the connection between the two types of queues.
Best,
Ori
On 10/31/2019 5:36 PM, Ori Kam wrote:
> Hi Ferruh,
>
> Thanks, for the comments PSB,
>
>> -----Original Message-----
>> From: Ferruh Yigit <ferruh.yigit@intel.com>
>> Sent: Thursday, October 31, 2019 7:12 PM
>> To: Ori Kam <orika@mellanox.com>; Wenzhuo Lu <wenzhuo.lu@intel.com>;
>> Jingjing Wu <jingjing.wu@intel.com>; Bernard Iremonger
>> <bernard.iremonger@intel.com>
>> Cc: dev@dpdk.org; stephen@networkplumber.org
>> Subject: Re: [dpdk-dev] [PATCH v7 08/14] app/testpmd: add hairpin support
>>
>> On 10/30/2019 11:53 PM, Ori Kam wrote:
>>> This commit introduce the hairpin queues to the testpmd.
>>> the hairpin queue is configured using --hairpinq=<n>
>>> the hairpin queue adds n queue objects for both the total number
>>> of TX queues and RX queues.
>>> The connection between the queues are 1 to 1, first Rx hairpin queue
>>> will be connected to the first Tx hairpin queue
>>>
>>> Signed-off-by: Ori Kam <orika@mellanox.com>
>>> Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
>>> ---
>>> app/test-pmd/parameters.c | 28 ++++++++++++
>>> app/test-pmd/testpmd.c | 109
>> +++++++++++++++++++++++++++++++++++++++++++++-
>>> app/test-pmd/testpmd.h | 3 ++
>>
>> New parameter should be documented in
>> 'doc/guides/testpmd_app_ug/run_app.rst',
>> can you please describe befiefly how it works, what the mapping will like by
>> default etc..
>>
>
> The default is no hairpin queues,
> If hairpinq = x is specified then we are adding x queues to the Rx queue list and x queues to the Tx, and bind them one
> Rx queue to on Tx queue.
>
> For example: test pmd parameters are:
> --rxq=3 --txq=2 --hairpinq=4 the result will be:
>
> 3 normal Txq (queues 0,1,2)
> 2 normal Txq (queues 0,1)
> 4 hairpin queues (Rxq 3,4,5,6 Txq 2,3,4,5) while Rxq(3) will be connected to Txq(2), Rxq(4) will be connected to Txq(3) and so on.
Thanks, can you please put them into documentation in next version?
>
>> <...>
>>
>>> @@ -2028,6 +2076,11 @@ struct extmem_param {
>>> queueid_t qi;
>>> struct rte_port *port;
>>> struct rte_ether_addr mac_addr;
>>> + struct rte_eth_hairpin_conf hairpin_conf = {
>>> + .peer_count = 1,
>>> + };
>>> + int i;
>>> + struct rte_eth_hairpin_cap cap;
>>>
>>> if (port_id_is_invalid(pid, ENABLED_WARN))
>>> return 0;
>>> @@ -2060,9 +2113,16 @@ struct extmem_param {
>>> configure_rxtx_dump_callbacks(0);
>>> printf("Configuring Port %d (socket %u)\n", pi,
>>> port->socket_id);
>>> + if (nb_hairpinq > 0 &&
>>> + rte_eth_dev_hairpin_capability_get(pi, &cap)) {
>>> + printf("Port %d doesn't support hairpin "
>>> + "queues\n", pi);
>>> + return -1;
>>> + }
>>> /* configure port */
>>> - diag = rte_eth_dev_configure(pi, nb_rxq, nb_txq,
>>> - &(port->dev_conf));
>>> + diag = rte_eth_dev_configure(pi, nb_rxq +
>> nb_hairpinq,
>>> + nb_txq + nb_hairpinq,
>>> + &(port->dev_conf));
>>> if (diag != 0) {
>>> if (rte_atomic16_cmpset(&(port->port_status),
>>> RTE_PORT_HANDLING, RTE_PORT_STOPPED)
>> == 0)
>>> @@ -2155,6 +2215,51 @@ struct extmem_param {
>>> port->need_reconfig_queues = 1;
>>> return -1;
>>> }
>>> + /* setup hairpin queues */
>>> + i = 0;
>>> + for (qi = nb_txq; qi < nb_hairpinq + nb_txq; qi++) {
>>> + hairpin_conf.peers[0].port = pi;
>>> + hairpin_conf.peers[0].queue = i + nb_rxq;
>>> + diag = rte_eth_tx_hairpin_queue_setup
>>> + (pi, qi, nb_txd, &hairpin_conf);
>>> + i++;
>>> + if (diag == 0)
>>> + continue;
>>> +
>>> + /* Fail to setup rx queue, return */
>>> + if (rte_atomic16_cmpset(&(port->port_status),
>>> +
>> RTE_PORT_HANDLING,
>>> + RTE_PORT_STOPPED)
>> == 0)
>>> + printf("Port %d can not be set back "
>>> + "to stopped\n", pi);
>>> + printf("Fail to configure port %d hairpin "
>>> + "queues\n", pi);
>>> + /* try to reconfigure queues next time */
>>> + port->need_reconfig_queues = 1;
>>> + return -1;
>>> + }
>>> + i = 0;
>>> + for (qi = nb_rxq; qi < nb_hairpinq + nb_rxq; qi++) {
>>> + hairpin_conf.peers[0].port = pi;
>>> + hairpin_conf.peers[0].queue = i + nb_txq;
>>> + diag = rte_eth_rx_hairpin_queue_setup
>>> + (pi, qi, nb_rxd, &hairpin_conf);
>>> + i++;
>>> + if (diag == 0)
>>> + continue;
>>> +
>>> + /* Fail to setup rx queue, return */
>>> + if (rte_atomic16_cmpset(&(port->port_status),
>>> +
>> RTE_PORT_HANDLING,
>>> + RTE_PORT_STOPPED)
>> == 0)
>>> + printf("Port %d can not be set back "
>>> + "to stopped\n", pi);
>>> + printf("Fail to configure port %d hairpin "
>>> + "queues\n", pi);
>>> + /* try to reconfigure queues next time */
>>> + port->need_reconfig_queues = 1;
>>> + return -1;
>>> + }
>>
>> 'start_port()' function is already huge, what do you think moving hairpin
>> related setup into a specific function and call it when "nb_hairpinq > 0" only?
>> This makes the hairpin related config more clear and 'start_port()' function
>> simpler.
>> I think all hairpin related operations can be extracted, like capability check,
>> 'rte_eth_dev_configure' & hairpin queue setup.
>
> I have no strong feeling, I just wanted to keep the function with the same format that all actions are done inside
> the function, also it was my intention to easily show the connection between the two types of queues.
>
> Best,
> Ori
>
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Thursday, October 31, 2019 7:55 PM
> To: Ori Kam <orika@mellanox.com>; Wenzhuo Lu <wenzhuo.lu@intel.com>;
> Jingjing Wu <jingjing.wu@intel.com>; Bernard Iremonger
> <bernard.iremonger@intel.com>
> Cc: dev@dpdk.org; stephen@networkplumber.org
> Subject: Re: [dpdk-dev] [PATCH v7 08/14] app/testpmd: add hairpin support
>
> On 10/31/2019 5:36 PM, Ori Kam wrote:
> > Hi Ferruh,
> >
> > Thanks, for the comments PSB,
> >
> >> -----Original Message-----
> >> From: Ferruh Yigit <ferruh.yigit@intel.com>
> >> Sent: Thursday, October 31, 2019 7:12 PM
> >> To: Ori Kam <orika@mellanox.com>; Wenzhuo Lu <wenzhuo.lu@intel.com>;
> >> Jingjing Wu <jingjing.wu@intel.com>; Bernard Iremonger
> >> <bernard.iremonger@intel.com>
> >> Cc: dev@dpdk.org; stephen@networkplumber.org
> >> Subject: Re: [dpdk-dev] [PATCH v7 08/14] app/testpmd: add hairpin support
> >>
> >> On 10/30/2019 11:53 PM, Ori Kam wrote:
> >>> This commit introduce the hairpin queues to the testpmd.
> >>> the hairpin queue is configured using --hairpinq=<n>
> >>> the hairpin queue adds n queue objects for both the total number
> >>> of TX queues and RX queues.
> >>> The connection between the queues are 1 to 1, first Rx hairpin queue
> >>> will be connected to the first Tx hairpin queue
> >>>
> >>> Signed-off-by: Ori Kam <orika@mellanox.com>
> >>> Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> >>> ---
> >>> app/test-pmd/parameters.c | 28 ++++++++++++
> >>> app/test-pmd/testpmd.c | 109
> >> +++++++++++++++++++++++++++++++++++++++++++++-
> >>> app/test-pmd/testpmd.h | 3 ++
> >>
> >> New parameter should be documented in
> >> 'doc/guides/testpmd_app_ug/run_app.rst',
> >> can you please describe befiefly how it works, what the mapping will like by
> >> default etc..
> >>
> >
> > The default is no hairpin queues,
> > If hairpinq = x is specified then we are adding x queues to the Rx queue list
> and x queues to the Tx, and bind them one
> > Rx queue to on Tx queue.
> >
> > For example: test pmd parameters are:
> > --rxq=3 --txq=2 --hairpinq=4 the result will be:
> >
> > 3 normal Txq (queues 0,1,2)
> > 2 normal Txq (queues 0,1)
> > 4 hairpin queues (Rxq 3,4,5,6 Txq 2,3,4,5) while Rxq(3) will be connected to
> Txq(2), Rxq(4) will be connected to Txq(3) and so on.
>
> Thanks, can you please put them into documentation in next version?
>
Sure no problem,
> >
> >> <...>
> >>
> >>> @@ -2028,6 +2076,11 @@ struct extmem_param {
> >>> queueid_t qi;
> >>> struct rte_port *port;
> >>> struct rte_ether_addr mac_addr;
> >>> + struct rte_eth_hairpin_conf hairpin_conf = {
> >>> + .peer_count = 1,
> >>> + };
> >>> + int i;
> >>> + struct rte_eth_hairpin_cap cap;
> >>>
> >>> if (port_id_is_invalid(pid, ENABLED_WARN))
> >>> return 0;
> >>> @@ -2060,9 +2113,16 @@ struct extmem_param {
> >>> configure_rxtx_dump_callbacks(0);
> >>> printf("Configuring Port %d (socket %u)\n", pi,
> >>> port->socket_id);
> >>> + if (nb_hairpinq > 0 &&
> >>> + rte_eth_dev_hairpin_capability_get(pi, &cap)) {
> >>> + printf("Port %d doesn't support hairpin "
> >>> + "queues\n", pi);
> >>> + return -1;
> >>> + }
> >>> /* configure port */
> >>> - diag = rte_eth_dev_configure(pi, nb_rxq, nb_txq,
> >>> - &(port->dev_conf));
> >>> + diag = rte_eth_dev_configure(pi, nb_rxq +
> >> nb_hairpinq,
> >>> + nb_txq + nb_hairpinq,
> >>> + &(port->dev_conf));
> >>> if (diag != 0) {
> >>> if (rte_atomic16_cmpset(&(port->port_status),
> >>> RTE_PORT_HANDLING, RTE_PORT_STOPPED)
> >> == 0)
> >>> @@ -2155,6 +2215,51 @@ struct extmem_param {
> >>> port->need_reconfig_queues = 1;
> >>> return -1;
> >>> }
> >>> + /* setup hairpin queues */
> >>> + i = 0;
> >>> + for (qi = nb_txq; qi < nb_hairpinq + nb_txq; qi++) {
> >>> + hairpin_conf.peers[0].port = pi;
> >>> + hairpin_conf.peers[0].queue = i + nb_rxq;
> >>> + diag = rte_eth_tx_hairpin_queue_setup
> >>> + (pi, qi, nb_txd, &hairpin_conf);
> >>> + i++;
> >>> + if (diag == 0)
> >>> + continue;
> >>> +
> >>> + /* Fail to setup rx queue, return */
> >>> + if (rte_atomic16_cmpset(&(port->port_status),
> >>> +
> >> RTE_PORT_HANDLING,
> >>> + RTE_PORT_STOPPED)
> >> == 0)
> >>> + printf("Port %d can not be set back "
> >>> + "to stopped\n", pi);
> >>> + printf("Fail to configure port %d hairpin "
> >>> + "queues\n", pi);
> >>> + /* try to reconfigure queues next time */
> >>> + port->need_reconfig_queues = 1;
> >>> + return -1;
> >>> + }
> >>> + i = 0;
> >>> + for (qi = nb_rxq; qi < nb_hairpinq + nb_rxq; qi++) {
> >>> + hairpin_conf.peers[0].port = pi;
> >>> + hairpin_conf.peers[0].queue = i + nb_txq;
> >>> + diag = rte_eth_rx_hairpin_queue_setup
> >>> + (pi, qi, nb_rxd, &hairpin_conf);
> >>> + i++;
> >>> + if (diag == 0)
> >>> + continue;
> >>> +
> >>> + /* Fail to setup rx queue, return */
> >>> + if (rte_atomic16_cmpset(&(port->port_status),
> >>> +
> >> RTE_PORT_HANDLING,
> >>> + RTE_PORT_STOPPED)
> >> == 0)
> >>> + printf("Port %d can not be set back "
> >>> + "to stopped\n", pi);
> >>> + printf("Fail to configure port %d hairpin "
> >>> + "queues\n", pi);
> >>> + /* try to reconfigure queues next time */
> >>> + port->need_reconfig_queues = 1;
> >>> + return -1;
> >>> + }
> >>
> >> 'start_port()' function is already huge, what do you think moving hairpin
> >> related setup into a specific function and call it when "nb_hairpinq > 0"
> only?
> >> This makes the hairpin related config more clear and 'start_port()' function
> >> simpler.
> >> I think all hairpin related operations can be extracted, like capability check,
> >> 'rte_eth_dev_configure' & hairpin queue setup.
> >
> > I have no strong feeling, I just wanted to keep the function with the same
> format that all actions are done inside
> > the function, also it was my intention to easily show the connection between
> the two types of queues.
> >
> > Best,
> > Ori
> >
Thanks,
Ori
@@ -149,6 +149,8 @@
printf(" --rxd=N: set the number of descriptors in RX rings to N.\n");
printf(" --txq=N: set the number of TX queues per port to N.\n");
printf(" --txd=N: set the number of descriptors in TX rings to N.\n");
+ printf(" --hairpinq=N: set the number of hairpin queues per port to "
+ "N.\n");
printf(" --burst=N: set the number of packets per burst to N.\n");
printf(" --mbcache=N: set the cache of mbuf memory pool to N.\n");
printf(" --rxpt=N: set prefetch threshold register of RX rings to N.\n");
@@ -622,6 +624,7 @@
{ "txq", 1, 0, 0 },
{ "rxd", 1, 0, 0 },
{ "txd", 1, 0, 0 },
+ { "hairpinq", 1, 0, 0 },
{ "burst", 1, 0, 0 },
{ "mbcache", 1, 0, 0 },
{ "txpt", 1, 0, 0 },
@@ -1045,6 +1048,31 @@
" >= 0 && <= %u\n", n,
get_allowed_max_nb_txq(&pid));
}
+ if (!strcmp(lgopts[opt_idx].name, "hairpinq")) {
+ n = atoi(optarg);
+ if (n >= 0 &&
+ check_nb_hairpinq((queueid_t)n) == 0)
+ nb_hairpinq = (queueid_t) n;
+ else
+ rte_exit(EXIT_FAILURE, "txq %d invalid - must be"
+ " >= 0 && <= %u\n", n,
+ get_allowed_max_nb_hairpinq
+ (&pid));
+ if ((n + nb_txq) < 0 ||
+ check_nb_txq((queueid_t)(n + nb_txq)) != 0)
+ rte_exit(EXIT_FAILURE, "txq + hairpinq "
+ "%d invalid - must be"
+ " >= 0 && <= %u\n",
+ n + nb_txq,
+ get_allowed_max_nb_txq(&pid));
+ if ((n + nb_rxq) < 0 ||
+ check_nb_rxq((queueid_t)(n + nb_rxq)) != 0)
+ rte_exit(EXIT_FAILURE, "rxq + hairpinq "
+ "%d invalid - must be"
+ " >= 0 && <= %u\n",
+ n + nb_rxq,
+ get_allowed_max_nb_rxq(&pid));
+ }
if (!nb_rxq && !nb_txq) {
rte_exit(EXIT_FAILURE, "Either rx or tx queues should "
"be non-zero\n");
@@ -234,6 +234,7 @@ struct fwd_engine * fwd_engines[] = {
/*
* Configurable number of RX/TX queues.
*/
+queueid_t nb_hairpinq; /**< Number of hairpin queues per port. */
queueid_t nb_rxq = 1; /**< Number of RX queues per port. */
queueid_t nb_txq = 1; /**< Number of TX queues per port. */
@@ -1067,6 +1068,53 @@ struct extmem_param {
return 0;
}
+/*
+ * Get the allowed maximum number of hairpin queues.
+ * *pid return the port id which has minimal value of
+ * max_hairpin_queues in all ports.
+ */
+queueid_t
+get_allowed_max_nb_hairpinq(portid_t *pid)
+{
+ queueid_t allowed_max_hairpinq = MAX_QUEUE_ID;
+ portid_t pi;
+ struct rte_eth_hairpin_cap cap;
+
+ RTE_ETH_FOREACH_DEV(pi) {
+ if (rte_eth_dev_hairpin_capability_get(pi, &cap) != 0) {
+ *pid = pi;
+ return 0;
+ }
+ if (cap.max_nb_queues < allowed_max_hairpinq) {
+ allowed_max_hairpinq = cap.max_nb_queues;
+ *pid = pi;
+ }
+ }
+ return allowed_max_hairpinq;
+}
+
+/*
+ * Check input hairpin is valid or not.
+ * If input hairpin is not greater than any of maximum number
+ * of hairpin queues of all ports, it is valid.
+ * if valid, return 0, else return -1
+ */
+int
+check_nb_hairpinq(queueid_t hairpinq)
+{
+ queueid_t allowed_max_hairpinq;
+ portid_t pid = 0;
+
+ allowed_max_hairpinq = get_allowed_max_nb_hairpinq(&pid);
+ if (hairpinq > allowed_max_hairpinq) {
+ printf("Fail: input hairpin (%u) can't be greater "
+ "than max_hairpin_queues (%u) of port %u\n",
+ hairpinq, allowed_max_hairpinq, pid);
+ return -1;
+ }
+ return 0;
+}
+
static void
init_config(void)
{
@@ -2028,6 +2076,11 @@ struct extmem_param {
queueid_t qi;
struct rte_port *port;
struct rte_ether_addr mac_addr;
+ struct rte_eth_hairpin_conf hairpin_conf = {
+ .peer_count = 1,
+ };
+ int i;
+ struct rte_eth_hairpin_cap cap;
if (port_id_is_invalid(pid, ENABLED_WARN))
return 0;
@@ -2060,9 +2113,16 @@ struct extmem_param {
configure_rxtx_dump_callbacks(0);
printf("Configuring Port %d (socket %u)\n", pi,
port->socket_id);
+ if (nb_hairpinq > 0 &&
+ rte_eth_dev_hairpin_capability_get(pi, &cap)) {
+ printf("Port %d doesn't support hairpin "
+ "queues\n", pi);
+ return -1;
+ }
/* configure port */
- diag = rte_eth_dev_configure(pi, nb_rxq, nb_txq,
- &(port->dev_conf));
+ diag = rte_eth_dev_configure(pi, nb_rxq + nb_hairpinq,
+ nb_txq + nb_hairpinq,
+ &(port->dev_conf));
if (diag != 0) {
if (rte_atomic16_cmpset(&(port->port_status),
RTE_PORT_HANDLING, RTE_PORT_STOPPED) == 0)
@@ -2155,6 +2215,51 @@ struct extmem_param {
port->need_reconfig_queues = 1;
return -1;
}
+ /* setup hairpin queues */
+ i = 0;
+ for (qi = nb_txq; qi < nb_hairpinq + nb_txq; qi++) {
+ hairpin_conf.peers[0].port = pi;
+ hairpin_conf.peers[0].queue = i + nb_rxq;
+ diag = rte_eth_tx_hairpin_queue_setup
+ (pi, qi, nb_txd, &hairpin_conf);
+ i++;
+ if (diag == 0)
+ continue;
+
+ /* Fail to setup rx queue, return */
+ if (rte_atomic16_cmpset(&(port->port_status),
+ RTE_PORT_HANDLING,
+ RTE_PORT_STOPPED) == 0)
+ printf("Port %d can not be set back "
+ "to stopped\n", pi);
+ printf("Fail to configure port %d hairpin "
+ "queues\n", pi);
+ /* try to reconfigure queues next time */
+ port->need_reconfig_queues = 1;
+ return -1;
+ }
+ i = 0;
+ for (qi = nb_rxq; qi < nb_hairpinq + nb_rxq; qi++) {
+ hairpin_conf.peers[0].port = pi;
+ hairpin_conf.peers[0].queue = i + nb_txq;
+ diag = rte_eth_rx_hairpin_queue_setup
+ (pi, qi, nb_rxd, &hairpin_conf);
+ i++;
+ if (diag == 0)
+ continue;
+
+ /* Fail to setup rx queue, return */
+ if (rte_atomic16_cmpset(&(port->port_status),
+ RTE_PORT_HANDLING,
+ RTE_PORT_STOPPED) == 0)
+ printf("Port %d can not be set back "
+ "to stopped\n", pi);
+ printf("Fail to configure port %d hairpin "
+ "queues\n", pi);
+ /* try to reconfigure queues next time */
+ port->need_reconfig_queues = 1;
+ return -1;
+ }
}
configure_rxtx_dump_callbacks(verbose_level);
/* start port */
@@ -385,6 +385,7 @@ struct queue_stats_mappings {
extern uint64_t rss_hf;
+extern queueid_t nb_hairpinq;
extern queueid_t nb_rxq;
extern queueid_t nb_txq;
@@ -859,6 +860,8 @@ enum print_warning {
int check_nb_rxq(queueid_t rxq);
queueid_t get_allowed_max_nb_txq(portid_t *pid);
int check_nb_txq(queueid_t txq);
+queueid_t get_allowed_max_nb_hairpinq(portid_t *pid);
+int check_nb_hairpinq(queueid_t hairpinq);
uint16_t dump_rx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
uint16_t nb_pkts, __rte_unused uint16_t max_pkts,