Re: [dpdk-dev] [PATCH 08/10] event/octeontx: add option to use fpavf as chunk pool
Hi Pavan,
On Saturday 17 February 2018 03:06 AM, Pavan Nikhilesh wrote:
> Add compile-time configurable option to force TIMvf to use Octeontx
> FPAvf pool manager as its chunk pool.
> When FPAvf is used as pool manager the TIMvf automatically frees the
> chunks to FPAvf through gpool-id.
>
> Signed-off-by: Pavan Nikhilesh
> ---
> config/common_base| 1 +
> drivers/event/octeontx/timvf_evdev.c | 23 +++
> drivers/event/octeontx/timvf_evdev.h | 3 +++
> drivers/event/octeontx/timvf_worker.h | 35
> +++
> 4 files changed, 62 insertions(+)
>
> diff --git a/config/common_base b/config/common_base
> index ad03cf433..00010de92 100644
> --- a/config/common_base
> +++ b/config/common_base
> @@ -562,6 +562,7 @@ CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV=y
> # Compile PMD for octeontx sso event device
> #
> CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y
> +CONFIG_RTE_PMD_OCTEONTX_TIMVF_USE_FPAVF=n
>
How about using CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL?
> #
> # Compile PMD for OPDL event device
> diff --git a/drivers/event/octeontx/timvf_evdev.c
> b/drivers/event/octeontx/timvf_evdev.c
> index ffdfbb387..386eaa08f 100644
> --- a/drivers/event/octeontx/timvf_evdev.c
> +++ b/drivers/event/octeontx/timvf_evdev.c
> @@ -162,10 +162,27 @@ timvf_ring_start(const struct rte_event_timer_adapter
> *adptr)
> 1ull << 48 |
> 1ull << 47 |
> 1ull << 44 |
> +#ifndef RTE_PMD_OCTEONTX_TIMVF_USE_FPAVF
> + 1ull << 43 |
> +#endif
> (timr->meta.nb_bkts - 1);
>
> rctrl.rctrl2 = (uint64_t)(TIM_CHUNK_SIZE / 16) << 40;
>
> +#ifdef RTE_PMD_OCTEONTX_TIMVF_USE_FPAVF
> + uintptr_t pool;
> + pool = (uintptr_t)((struct rte_mempool *)
> + timr->meta.chunk_pool)->pool_id;
> + ret = octeontx_fpa_bufpool_gpool(pool);
> + if (ret < 0) {
> + timvf_log_dbg("Unable to get gaura id");
> + ret = -ENOMEM;
> + goto error;
> + }
> + timvf_write64((uint64_t)ret,
> + (uint8_t *)timr->vbar0 + TIM_VRING_AURA);
> +#endif
> +
> timvf_write64((uint64_t)timr->meta.bkt,
> (uint8_t *)timr->vbar0 + TIM_VRING_BASE);
> if (timvf_ring_conf_set(&rctrl, timr->tim_ring_id)) {
> @@ -296,9 +313,15 @@ timvf_ring_create(struct rte_event_timer_adapter *adptr)
> return -ENOMEM;
> }
>
> +#ifdef RTE_PMD_OCTEONTX_TIMVF_USE_FPAVF
> + ret = rte_mempool_set_ops_byname(timr->meta.chunk_pool,
> + "octeontx_fpavf", NULL);
> + timvf_log_dbg("Giving back chunks to fpa gaura : %d", ret);
> +#else
> ret = rte_mempool_set_ops_byname(timr->meta.chunk_pool,
> RTE_MBUF_DEFAULT_MEMPOOL_OPS, NULL);
> timvf_log_dbg("Not giving back chunks to fpa");
> +#endif
>
May be use rte_mbuf_best_mempool_ops Or rte_mbuf_user_mempool_ops,
that way avoid above ifdef.
Also a suggestion, Try to reduce ifdef by creating a new header file
called timvf_fpa_evdev.h, abstract all possible ifdefs their,
create small static inline API and call them in timvf eventdev driver.
[...]
Thanks.
Re: [dpdk-dev] [PATCH 1/2] eal: add API to align integer to previous power of 2
> On Feb 18, 2018, at 12:11 AM, Matan Azrad wrote:
>
> Hi Pavan
>
> Please see some comments below.
>
> From: Pavan Nikhilesh, Saturday, February 17, 2018 12:50 PM
>> Add 32b and 64b API's to align the given integer to the previous power of 2.
>>
>> Signed-off-by: Pavan Nikhilesh
>> ---
>> lib/librte_eal/common/include/rte_common.h | 36
>> ++
>> 1 file changed, 36 insertions(+)
>>
>> diff --git a/lib/librte_eal/common/include/rte_common.h
>> b/lib/librte_eal/common/include/rte_common.h
>> index c7803e41c..126914f07 100644
>> --- a/lib/librte_eal/common/include/rte_common.h
>> +++ b/lib/librte_eal/common/include/rte_common.h
>> @@ -259,6 +259,24 @@ rte_align32pow2(uint32_t x)
>> return x + 1;
>> }
>>
>> +/**
>> + * Aligns input parameter to the previous power of 2
>> + *
>> + * @param x
>> + * The integer value to algin
>> + *
>> + * @return
>> + * Input parameter aligned to the previous power of 2
>
> I think the zero case(x=0) result should be documented.
>
>> + */
>> +static inline uint32_t
>> +rte_align32lowpow2(uint32_t x)
>
> What do you think about " rte_align32prevpow2"?
>
>> +{
>> +x = rte_align32pow2(x);
>
> In case of x is power of 2 number(already aligned), looks like the
> result here is x and the final result is (x >> 1)?
> Is it as you expect?
>
>> +x--;
>> +
>> +return x - (x >> 1);
>
> Why can't the implementation just be:
> return rte_align32pow2(x) >> 1;
>
> If the above is correct, Are you sure we need this API?
>
>> +}
>> +
>> /**
>> * Aligns 64b input parameter to the next power of 2
>> *
>> @@ -282,6 +300,24 @@ rte_align64pow2(uint64_t v)
>> return v + 1;
>> }
>>
>> +/**
>> + * Aligns 64b input parameter to the previous power of 2
>> + *
>> + * @param v
>> + * The 64b value to align
>> + *
>> + * @return
>> + * Input parameter aligned to the previous power of 2
>> + */
>> +static inline uint64_t
>> +rte_align64lowpow2(uint64_t v)
>> +{
>> +v = rte_align64pow2(v);
>> +v--;
>> +
>> +return v - (v >> 1);
>> +}
>> +
>
> Same comments for 64b API.
>
>> /*** Macros for calculating min and max **/
>>
>> /**
>> --
>> 2.16.1
>
>
> If it is a new API, I think it should be added to the map file and to be
> tagged as experimental. No?
>
Is this the type of API that needs to be marked experimental, we should be able
to prove these functions, correct?
> Matan
Regards,
Keith
[dpdk-dev] [PATCH] net/e1000: add mac_addr_set set to em
From: Chas Williams
Based on the equivalent code in the igb driver.
Signed-off-by: Chas Williams
---
drivers/net/e1000/em_ethdev.c | 12
1 file changed, 12 insertions(+)
diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 242375f..5bb9cc9 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -94,6 +94,8 @@ static int em_get_rx_buffer_size(struct e1000_hw *hw);
static int eth_em_rar_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
uint32_t index, uint32_t pool);
static void eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index);
+static void eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+struct ether_addr *addr);
static int eth_em_set_mc_addr_list(struct rte_eth_dev *dev,
struct ether_addr *mc_addr_set,
@@ -190,6 +192,7 @@ static const struct eth_dev_ops eth_em_ops = {
.dev_led_off = eth_em_led_off,
.flow_ctrl_get= eth_em_flow_ctrl_get,
.flow_ctrl_set= eth_em_flow_ctrl_set,
+ .mac_addr_set = eth_em_default_mac_addr_set,
.mac_addr_add = eth_em_rar_set,
.mac_addr_remove = eth_em_rar_clear,
.set_mc_addr_list = eth_em_set_mc_addr_list,
@@ -1809,6 +1812,15 @@ eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index)
e1000_rar_set(hw, addr, index);
}
+static void
+eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+ struct ether_addr *addr)
+{
+ eth_em_rar_clear(dev, 0);
+
+ eth_em_rar_set(dev, (void *)addr, 0, 0);
+}
+
static int
eth_em_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
--
2.9.5
Re: [dpdk-dev] [PATCH 1/2] eal: add API to align integer to previous power of 2
> From: Wiles, Keith, Sunday, February 18, 2018 5:39 PM
> > On Feb 18, 2018, at 12:11 AM, Matan Azrad
> wrote:
> >
> > Hi Pavan
> >
> > Please see some comments below.
> >
> > From: Pavan Nikhilesh, Saturday, February 17, 2018 12:50 PM
> >> Add 32b and 64b API's to align the given integer to the previous power of
> 2.
> >>
> >> Signed-off-by: Pavan Nikhilesh
> >> ---
> >> lib/librte_eal/common/include/rte_common.h | 36
> >> ++
> >> 1 file changed, 36 insertions(+)
> >>
> >> diff --git a/lib/librte_eal/common/include/rte_common.h
> >> b/lib/librte_eal/common/include/rte_common.h
> >> index c7803e41c..126914f07 100644
> >> --- a/lib/librte_eal/common/include/rte_common.h
> >> +++ b/lib/librte_eal/common/include/rte_common.h
> >> @@ -259,6 +259,24 @@ rte_align32pow2(uint32_t x)
> >>return x + 1;
> >> }
> >>
> >> +/**
> >> + * Aligns input parameter to the previous power of 2
> >> + *
> >> + * @param x
> >> + * The integer value to algin
> >> + *
> >> + * @return
> >> + * Input parameter aligned to the previous power of 2
> >
> > I think the zero case(x=0) result should be documented.
> >
> >> + */
> >> +static inline uint32_t
> >> +rte_align32lowpow2(uint32_t x)
> >
> > What do you think about " rte_align32prevpow2"?
> >
> >> +{
> >> + x = rte_align32pow2(x);
> >
> > In case of x is power of 2 number(already aligned), looks like the
> result here is x and the final result is (x >> 1)?
> > Is it as you expect?
> >
> >> + x--;
> >> +
> >> + return x - (x >> 1);
> >
> > Why can't the implementation just be:
> > return rte_align32pow2(x) >> 1;
> >
> > If the above is correct, Are you sure we need this API?
> >
> >> +}
> >> +
> >> /**
> >> * Aligns 64b input parameter to the next power of 2
> >> *
> >> @@ -282,6 +300,24 @@ rte_align64pow2(uint64_t v)
> >>return v + 1;
> >> }
> >>
> >> +/**
> >> + * Aligns 64b input parameter to the previous power of 2
> >> + *
> >> + * @param v
> >> + * The 64b value to align
> >> + *
> >> + * @return
> >> + * Input parameter aligned to the previous power of 2
> >> + */
> >> +static inline uint64_t
> >> +rte_align64lowpow2(uint64_t v)
> >> +{
> >> + v = rte_align64pow2(v);
> >> + v--;
> >> +
> >> + return v - (v >> 1);
> >> +}
> >> +
> >
> > Same comments for 64b API.
> >
> >> /*** Macros for calculating min and max **/
> >>
> >> /**
> >> --
> >> 2.16.1
> >
> >
> > If it is a new API, I think it should be added to the map file and to be
> > tagged
> as experimental. No?
> >
>
> Is this the type of API that needs to be marked experimental,
I think it is relevant to any exposed API(not only for internal libraries).
> we should be able to prove these functions, correct?
Don't we need to prove any function in DPDK?
What is your point?
> > Matan
>
> Regards,
> Keith
Re: [dpdk-dev] [PATCH 2/2] app/testpmd: add command to resume a TM node
On Fri, Feb 16, 2018 at 01:10:39PM +, Singh, Jasvinder wrote:
>
>
> > -Original Message-
> > From: Tomasz Duszynski [mailto:t...@semihalf.com]
> > Sent: Thursday, February 1, 2018 9:37 AM
> > To: dev@dpdk.org
> > Cc: Lu, Wenzhuo ; Wu, Jingjing
> > ; Singh, Jasvinder ;
> > Tomasz Duszynski
> > Subject: [PATCH 2/2] app/testpmd: add command to resume a TM node
> >
> > Traffic manager provides an API for resuming an arbitrary node in a
> > hierarchy.
> >
> > This commit adds support for calling this API from testpmd.
> >
> > Signed-off-by: Tomasz Duszynski
> > ---
> > app/test-pmd/cmdline.c | 4 ++
> > app/test-pmd/cmdline_tm.c | 70
> > +
> > app/test-pmd/cmdline_tm.h | 1 +
> > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 5 +++
> > 4 files changed, 80 insertions(+)
> >
> > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> > 6bbd606..f9827f6 100644
> > --- a/app/test-pmd/cmdline.c
> > +++ b/app/test-pmd/cmdline.c
> > @@ -800,6 +800,9 @@ static void cmd_help_long_parsed(void
> > *parsed_result,
> > "suspend port tm node (port_id) (node_id)"
> > " Suspend tm node.\n\n"
> >
> > + "resume port tm node (port_id) (node_id)"
> > + " Resume tm node.\n\n"
> > +
> > "port tm hierarchy commit (port_id)
> > (clean_on_fail)\n"
> > " Commit tm hierarchy.\n\n"
> >
> > @@ -16251,6 +16254,7 @@ cmdline_parse_ctx_t main_ctx[] = {
> > (cmdline_parse_inst_t *)&cmd_del_port_tm_node,
> > (cmdline_parse_inst_t *)&cmd_set_port_tm_node_parent,
> > (cmdline_parse_inst_t *)&cmd_suspend_port_tm_node,
> > + (cmdline_parse_inst_t *)&cmd_resume_port_tm_node,
> > (cmdline_parse_inst_t *)&cmd_port_tm_hierarchy_commit,
> > NULL,
> > };
> > diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c index
> > c9a18dd..807e724 100644
> > --- a/app/test-pmd/cmdline_tm.c
> > +++ b/app/test-pmd/cmdline_tm.c
> > @@ -2036,6 +2036,76 @@ cmdline_parse_inst_t
> > cmd_suspend_port_tm_node = {
> > },
> > };
> >
> > +/* *** Resume Port TM Node *** */
> > +struct cmd_resume_port_tm_node_result {
> > + cmdline_fixed_string_t resume;
> > + cmdline_fixed_string_t port;
> > + cmdline_fixed_string_t tm;
> > + cmdline_fixed_string_t node;
> > + uint16_t port_id;
> > + uint32_t node_id;
> > +};
> > +
> > +cmdline_parse_token_string_t cmd_resume_port_tm_node_resume =
> > + TOKEN_STRING_INITIALIZER(
> > + struct cmd_resume_port_tm_node_result, resume,
> > "resume");
> > +cmdline_parse_token_string_t cmd_resume_port_tm_node_port =
> > + TOKEN_STRING_INITIALIZER(
> > + struct cmd_resume_port_tm_node_result, port, "port");
> > +cmdline_parse_token_string_t cmd_resume_port_tm_node_tm =
> > + TOKEN_STRING_INITIALIZER(
> > + struct cmd_resume_port_tm_node_result, tm, "tm");
> > +cmdline_parse_token_string_t cmd_resume_port_tm_node_node =
> > + TOKEN_STRING_INITIALIZER(
> > + struct cmd_resume_port_tm_node_result, node, "node");
> > +cmdline_parse_token_num_t cmd_resume_port_tm_node_port_id =
> > + TOKEN_NUM_INITIALIZER(
> > + struct cmd_resume_port_tm_node_result, port_id, UINT16);
> > +cmdline_parse_token_num_t cmd_resume_port_tm_node_node_id =
> > + TOKEN_NUM_INITIALIZER(
> > + struct cmd_resume_port_tm_node_result, node_id, UINT32);
> > +
> > +static void cmd_resume_port_tm_node_parsed(void *parsed_result,
> > + __attribute__((unused)) struct cmdline *cl,
> > + __attribute__((unused)) void *data)
> > +{
> > + struct cmd_resume_port_tm_node_result *res = parsed_result;
> > + struct rte_tm_error error;
> > + uint32_t node_id = res->node_id;
> > + portid_t port_id = res->port_id;
> > + int ret;
> > +
> > + if (port_id_is_invalid(port_id, ENABLED_WARN))
> > + return;
> > +
> > + /* Port status */
> > + if (!port_is_started(port_id)) {
> > + printf(" Port %u not started (error)\n", port_id);
> > + return;
> > + }
>
> I suggest to remove the CLI layer restriction to check the port status for
> node suspend/resume.
> The device can check at the driver layer whether it is ok suspend/resume node
> in started/stopped state depending upon the allowed configuration.
Fair enough. Thanks for the review.
>
> Besides this,
> Reviewed-by: Jasvinder Singh
--
- Tomasz Duszyński
Re: [dpdk-dev] [PATCH 1/2] net/mlx5: add kernel version function
On Fri, Feb 16, 2018 at 10:03:04AM -0800, Stephen Hemminger wrote: > On Thu, 15 Feb 2018 09:47:27 +0100 > Nelio Laranjeiro wrote: > > > Use a function to retrieve the version of the kernel. > > > > Signed-off-by: Nelio Laranjeiro > > This type of logic will run into problems with Enterprise and vendor kernels. > What about users using older kernels with OFED? What about case where kernel > MLX drivers have been backported? > > In general, it is better to adapt to the environment the code is running > in. Try the new feature, if it fails then log a message (at info level) > and fallback to the other strategy. We have already discussed it, this new API in the kernel is buggee between v4.5 to v4.9. As there is now way in between those version to detect if the API is the buggee one or not, we don't have any other solution. It is better to not use at all this new API than using a buggee one. -- Nélio Laranjeiro 6WIND
[dpdk-dev] [PATCH v2 0/2] add suspend/resume TM node commands to testpmd
Add new testpmd commands for invoking traffic manager suspend/resume API. v2: - Remove the CLI layer restriction to check the port status. Tomasz Duszynski (2): app/testpmd: add command to suspend a TM node app/testpmd: add command to resume a TM node app/test-pmd/cmdline.c | 8 ++ app/test-pmd/cmdline_tm.c | 128 app/test-pmd/cmdline_tm.h | 2 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 10 +++ 4 files changed, 148 insertions(+) -- 2.7.4
[dpdk-dev] [PATCH v2 1/2] app/testpmd: add command to suspend a TM node
Traffic manager provides an API for suspending
an arbitrary node in a hierarchy.
This commit adds support for calling this API from testpmd.
Signed-off-by: Tomasz Duszynski
Reviewed-by: Jasvinder Singh
---
app/test-pmd/cmdline.c | 4 ++
app/test-pmd/cmdline_tm.c | 64 +
app/test-pmd/cmdline_tm.h | 1 +
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 5 +++
4 files changed, 74 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index d1dc1de..8e17f20 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -771,6 +771,9 @@ static void cmd_help_long_parsed(void *parsed_result,
" (priority) (weight)\n"
" Set port tm node parent.\n\n"
+ "suspend port tm node (port_id) (node_id)"
+ " Suspend tm node.\n\n"
+
"port tm hierarchy commit (port_id) (clean_on_fail)\n"
" Commit tm hierarchy.\n\n"
@@ -16271,6 +16274,7 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_add_port_tm_leaf_node,
(cmdline_parse_inst_t *)&cmd_del_port_tm_node,
(cmdline_parse_inst_t *)&cmd_set_port_tm_node_parent,
+ (cmdline_parse_inst_t *)&cmd_suspend_port_tm_node,
(cmdline_parse_inst_t *)&cmd_port_tm_hierarchy_commit,
NULL,
};
diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
index 35cad54..daa912a 100644
--- a/app/test-pmd/cmdline_tm.c
+++ b/app/test-pmd/cmdline_tm.c
@@ -1958,6 +1958,70 @@ cmdline_parse_inst_t cmd_set_port_tm_node_parent = {
},
};
+/* *** Suspend Port TM Node *** */
+struct cmd_suspend_port_tm_node_result {
+ cmdline_fixed_string_t suspend;
+ cmdline_fixed_string_t port;
+ cmdline_fixed_string_t tm;
+ cmdline_fixed_string_t node;
+ uint16_t port_id;
+ uint32_t node_id;
+};
+
+cmdline_parse_token_string_t cmd_suspend_port_tm_node_suspend =
+ TOKEN_STRING_INITIALIZER(
+ struct cmd_suspend_port_tm_node_result, suspend, "suspend");
+cmdline_parse_token_string_t cmd_suspend_port_tm_node_port =
+ TOKEN_STRING_INITIALIZER(
+ struct cmd_suspend_port_tm_node_result, port, "port");
+cmdline_parse_token_string_t cmd_suspend_port_tm_node_tm =
+ TOKEN_STRING_INITIALIZER(
+ struct cmd_suspend_port_tm_node_result, tm, "tm");
+cmdline_parse_token_string_t cmd_suspend_port_tm_node_node =
+ TOKEN_STRING_INITIALIZER(
+ struct cmd_suspend_port_tm_node_result, node, "node");
+cmdline_parse_token_num_t cmd_suspend_port_tm_node_port_id =
+ TOKEN_NUM_INITIALIZER(
+ struct cmd_suspend_port_tm_node_result, port_id, UINT16);
+cmdline_parse_token_num_t cmd_suspend_port_tm_node_node_id =
+ TOKEN_NUM_INITIALIZER(
+ struct cmd_suspend_port_tm_node_result, node_id, UINT32);
+
+static void cmd_suspend_port_tm_node_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_suspend_port_tm_node_result *res = parsed_result;
+ struct rte_tm_error error;
+ uint32_t node_id = res->node_id;
+ portid_t port_id = res->port_id;
+ int ret;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN))
+ return;
+
+ ret = rte_tm_node_suspend(port_id, node_id, &error);
+ if (ret != 0) {
+ print_err_msg(&error);
+ return;
+ }
+}
+
+cmdline_parse_inst_t cmd_suspend_port_tm_node = {
+ .f = cmd_suspend_port_tm_node_parsed,
+ .data = NULL,
+ .help_str = "Suspend port tm node",
+ .tokens = {
+ (void *)&cmd_suspend_port_tm_node_suspend,
+ (void *)&cmd_suspend_port_tm_node_port,
+ (void *)&cmd_suspend_port_tm_node_tm,
+ (void *)&cmd_suspend_port_tm_node_node,
+ (void *)&cmd_suspend_port_tm_node_port_id,
+ (void *)&cmd_suspend_port_tm_node_node_id,
+ NULL,
+ },
+};
+
/* *** Port TM Hierarchy Commit *** */
struct cmd_port_tm_hierarchy_commit_result {
cmdline_fixed_string_t port;
diff --git a/app/test-pmd/cmdline_tm.h b/app/test-pmd/cmdline_tm.h
index ba30360..c4d5e8c 100644
--- a/app/test-pmd/cmdline_tm.h
+++ b/app/test-pmd/cmdline_tm.h
@@ -22,6 +22,7 @@ extern cmdline_parse_inst_t cmd_add_port_tm_nonleaf_node;
extern cmdline_parse_inst_t cmd_add_port_tm_leaf_node;
extern cmdline_parse_inst_t cmd_del_port_tm_node;
extern cmdline_parse_inst_t cmd_set_port_tm_node_parent;
+extern cmdline_parse_inst_t cmd_suspend_port_tm_node;
extern cmdline_parse_inst_t cmd_port_tm_hierarchy_commit;
#endif /* _CMDLINE_TM_H_ */
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index a766ac7..38682ea 100644
--- a/doc/guide
[dpdk-dev] [PATCH v2 2/2] app/testpmd: add command to resume a TM node
Traffic manager provides an API for resuming
an arbitrary node in a hierarchy.
This commit adds support for calling this API
from testpmd.
Signed-off-by: Tomasz Duszynski
Reviewed-by: Jasvinder Singh
---
app/test-pmd/cmdline.c | 4 ++
app/test-pmd/cmdline_tm.c | 64 +
app/test-pmd/cmdline_tm.h | 1 +
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 5 +++
4 files changed, 74 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 8e17f20..052d58e 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -774,6 +774,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"suspend port tm node (port_id) (node_id)"
" Suspend tm node.\n\n"
+ "resume port tm node (port_id) (node_id)"
+ " Resume tm node.\n\n"
+
"port tm hierarchy commit (port_id) (clean_on_fail)\n"
" Commit tm hierarchy.\n\n"
@@ -16275,6 +16278,7 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_del_port_tm_node,
(cmdline_parse_inst_t *)&cmd_set_port_tm_node_parent,
(cmdline_parse_inst_t *)&cmd_suspend_port_tm_node,
+ (cmdline_parse_inst_t *)&cmd_resume_port_tm_node,
(cmdline_parse_inst_t *)&cmd_port_tm_hierarchy_commit,
NULL,
};
diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
index daa912a..7fb69de 100644
--- a/app/test-pmd/cmdline_tm.c
+++ b/app/test-pmd/cmdline_tm.c
@@ -2022,6 +2022,70 @@ cmdline_parse_inst_t cmd_suspend_port_tm_node = {
},
};
+/* *** Resume Port TM Node *** */
+struct cmd_resume_port_tm_node_result {
+ cmdline_fixed_string_t resume;
+ cmdline_fixed_string_t port;
+ cmdline_fixed_string_t tm;
+ cmdline_fixed_string_t node;
+ uint16_t port_id;
+ uint32_t node_id;
+};
+
+cmdline_parse_token_string_t cmd_resume_port_tm_node_resume =
+ TOKEN_STRING_INITIALIZER(
+ struct cmd_resume_port_tm_node_result, resume, "resume");
+cmdline_parse_token_string_t cmd_resume_port_tm_node_port =
+ TOKEN_STRING_INITIALIZER(
+ struct cmd_resume_port_tm_node_result, port, "port");
+cmdline_parse_token_string_t cmd_resume_port_tm_node_tm =
+ TOKEN_STRING_INITIALIZER(
+ struct cmd_resume_port_tm_node_result, tm, "tm");
+cmdline_parse_token_string_t cmd_resume_port_tm_node_node =
+ TOKEN_STRING_INITIALIZER(
+ struct cmd_resume_port_tm_node_result, node, "node");
+cmdline_parse_token_num_t cmd_resume_port_tm_node_port_id =
+ TOKEN_NUM_INITIALIZER(
+ struct cmd_resume_port_tm_node_result, port_id, UINT16);
+cmdline_parse_token_num_t cmd_resume_port_tm_node_node_id =
+ TOKEN_NUM_INITIALIZER(
+ struct cmd_resume_port_tm_node_result, node_id, UINT32);
+
+static void cmd_resume_port_tm_node_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_resume_port_tm_node_result *res = parsed_result;
+ struct rte_tm_error error;
+ uint32_t node_id = res->node_id;
+ portid_t port_id = res->port_id;
+ int ret;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN))
+ return;
+
+ ret = rte_tm_node_resume(port_id, node_id, &error);
+ if (ret != 0) {
+ print_err_msg(&error);
+ return;
+ }
+}
+
+cmdline_parse_inst_t cmd_resume_port_tm_node = {
+ .f = cmd_resume_port_tm_node_parsed,
+ .data = NULL,
+ .help_str = "Resume port tm node",
+ .tokens = {
+ (void *)&cmd_resume_port_tm_node_resume,
+ (void *)&cmd_resume_port_tm_node_port,
+ (void *)&cmd_resume_port_tm_node_tm,
+ (void *)&cmd_resume_port_tm_node_node,
+ (void *)&cmd_resume_port_tm_node_port_id,
+ (void *)&cmd_resume_port_tm_node_node_id,
+ NULL,
+ },
+};
+
/* *** Port TM Hierarchy Commit *** */
struct cmd_port_tm_hierarchy_commit_result {
cmdline_fixed_string_t port;
diff --git a/app/test-pmd/cmdline_tm.h b/app/test-pmd/cmdline_tm.h
index c4d5e8c..b3a14ad 100644
--- a/app/test-pmd/cmdline_tm.h
+++ b/app/test-pmd/cmdline_tm.h
@@ -23,6 +23,7 @@ extern cmdline_parse_inst_t cmd_add_port_tm_leaf_node;
extern cmdline_parse_inst_t cmd_del_port_tm_node;
extern cmdline_parse_inst_t cmd_set_port_tm_node_parent;
extern cmdline_parse_inst_t cmd_suspend_port_tm_node;
+extern cmdline_parse_inst_t cmd_resume_port_tm_node;
extern cmdline_parse_inst_t cmd_port_tm_hierarchy_commit;
#endif /* _CMDLINE_TM_H_ */
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 38682ea..f26f41a 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
