On 3/12/2017 12:08 PM, Qi Zhang wrote: > Add below command line to configure ptype mapping. > ptype mapping get <port_id> <valid_only>. > ptype mapping replace <port_id> <target> <mask> <pkt_type>. > ptype mapping reset <port_id>. > ptype mapping update <port_id> <hw_ptype> <sw_ptype>. > > Signed-off-by: Qi Zhang <qi.z.zh...@intel.com> > --- > app/test-pmd/cmdline.c | 372 > +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 372 insertions(+) > > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c > index 43fc636..85f07ba 100644 > --- a/app/test-pmd/cmdline.c > +++ b/app/test-pmd/cmdline.c > @@ -575,6 +575,18 @@ static void cmd_help_long_parsed(void *parsed_result, > "E-tag set filter del e-tag-id (value) port (port_id)\n" > " Delete an E-tag forwarding filter on a port\n\n" > > + "ptype mapping get (port_id) (valid_only)\n" > + " Get ptype mapping on a port\n\n" > + > + "ptype mapping replace (port_id) (target) (mask) > (pky_type)\n" > + " Replace target with the pkt_type in ptype > mapping\n\n" > + > + "ptype mapping reset (port_id)\n" > + " Reset ptype mapping on a port\n\n" > + > + "ptype mapping update (port_id) (hw_ptype) (sw_ptype)\n" > + " Update a ptype mapping item on a port\n\n" > +
This adds new root level "ptype" command, I think it would be nice to get an Ack from testpmd maintainers for this. testpmd now supports many commands, and I don't know if it is only me, but I am having hard time to find some commands. Perhaps commands can be grouped better. > , list_pkt_forwarding_modes() > ); > } > @@ -12395,6 +12407,362 @@ cmdline_parse_inst_t cmd_set_vf_vlan_tag = { > }, > }; <...> > +static void > +cmd_ptype_mapping_get_parsed( > + void *parsed_result, > + __attribute__((unused)) struct cmdline *cl, > + __attribute__((unused)) void *data) > +{ > + struct cmd_ptype_mapping_get_result *res = parsed_result; > +#ifdef RTE_LIBRTE_I40E_PMD > + int ret = -ENOTSUP; > + int max_ptype_num = 256; > + struct rte_pmd_i40e_ptype_mapping mapping[max_ptype_num]; > + uint16_t count; > + int i; > +#endif This will cause a build error if I40E driver not enabled. Only wrapping the API with #ifdef should be enough. > + > + if (port_id_is_invalid(res->port_id, ENABLED_WARN)) > + return; > + > +#ifdef RTE_LIBRTE_I40E_PMD > + ret = rte_pmd_i40e_ptype_mapping_get(res->port_id, > + mapping, > + max_ptype_num, > + &count, > + res->valid_only); > +#endif > + > + switch (ret) { > + case 0: > + break; > + case -ENODEV: > + printf("invalid port_id %d\n", res->port_id); > + break; > + case -ENOTSUP: > + printf("function not implemented\n"); > + break; > + default: > + printf("programming error: (%s)\n", strerror(-ret)); > + } > + > +#ifdef RTE_LIBRTE_I40E_PMD > + if (!ret) { > + for (i = 0; i < count; i++) > + printf("%3d\t0x%08x\n", > + mapping[i].hw_ptype, mapping[i].sw_ptype); > + } > +#endif > +} > + <...>