[dpdk-dev] [PATCH v4 0/2] app/testpmd implement VXLAN/NVGRE Encap/Decap
This series adds an easy and maintainable configuration version support for
those two actions for 18.08 by using global variables in testpmd to store the
necessary information for the tunnel encapsulation. Those variables are used
in conjunction of RTE_FLOW_ACTION_{VXLAN,NVGRE}_ENCAP action to create easily
the action for flows.
A common way to use it:
set vxlan ipv4 4 4 4 127.0.0.1 128.0.0.1 11:11:11:11:11:11 22:22:22:22:22:22
flow create 0 ingress pattern end actions vxlan_encap / queue index 0 / end
set vxlan ipv6 4 4 4 ::1 :: 11:11:11:11:11:11 22:22:22:22:22:22
flow create 0 ingress pattern end actions vxlan_encap / queue index 0 / end
set nvgre ipv4 4 127.0.0.1 128.0.0.1 11:11:11:11:11:11 22:22:22:22:22:22
flow create 0 ingress pattern end actions nvgre_encap / queue index 0 / end
set nvgre ipv6 4 ::1 :: 11:11:11:11:11:11 22:22:22:22:22:22
flow create 0 ingress pattern end actions nvgre_encap / queue index 0 / end
This also replace the proposal done by Mohammad Abdul Awal [1] which handles
in a more complex way for the same work.
Note this API has already a modification planned for 18.11 [2] thus those
series should have a limited life for a single release.
[1] https://dpdk.org/ml/archives/dev/2018-May/101403.html
[2] https://dpdk.org/ml/archives/dev/2018-June/103485.html
Changes in v4:
- fix big endian issue on vni and tni.
- add samples to the documentation.
- set the VXLAN UDP source port to 0 by default to let the driver generate it
from the inner hash as described in the RFC 7348.
- use default rte flow mask for each item.
Changes in v3:
- support VLAN in the outer encapsulation.
- fix the documentation with missing arguments.
Changes in v2:
- add default IPv6 values for NVGRE encapsulation.
- replace VXLAN to NVGRE in comments concerning NVGRE layer.
Nelio Laranjeiro (2):
app/testpmd: add VXLAN encap/decap support
app/testpmd: add NVGRE encap/decap support
app/test-pmd/cmdline.c | 252 ++
app/test-pmd/cmdline_flow.c | 268
app/test-pmd/testpmd.c | 32 +++
app/test-pmd/testpmd.h | 32 +++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 72 ++
5 files changed, 656 insertions(+)
--
2.18.0.rc2
[dpdk-dev] [PATCH v4 2/2] app/testpmd: add NVGRE encap/decap support
Due to the complex NVGRE_ENCAP flow action and based on the fact testpmd
does not allocate memory, this patch adds a new command in testpmd to
initialise a global structure containing the necessary information to
make the outer layer of the packet. This same global structure will
then be used by the flow command line in testpmd when the action
nvgre_encap will be parsed, at this point, the conversion into such
action becomes trivial.
This global structure is only used for the encap action.
Signed-off-by: Nelio Laranjeiro
---
app/test-pmd/cmdline.c | 118 ++
app/test-pmd/cmdline_flow.c | 129
app/test-pmd/testpmd.c | 15 +++
app/test-pmd/testpmd.h | 15 +++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 37 ++
5 files changed, 314 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 048fff2bd..ad7f9eda5 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -789,6 +789,12 @@ static void cmd_help_long_parsed(void *parsed_result,
" vlan-tci eth-src eth-dst\n"
" Configure the VXLAN encapsulation for
flows.\n\n"
+ "nvgre ipv4|ipv6 tni ip-src ip-dst eth-src eth-dst\n"
+ " Configure the NVGRE encapsulation for
flows.\n\n"
+
+ "nvgre-with-vlan ipv4|ipv6 tni ip-src ip-dst vlan-tci
eth-src eth-dst\n"
+ " Configure the NVGRE encapsulation for
flows.\n\n"
+
, list_pkt_forwarding_modes()
);
}
@@ -14970,6 +14976,116 @@ cmdline_parse_inst_t cmd_set_vxlan_with_vlan = {
},
};
+/** Set NVGRE encapsulation details */
+struct cmd_set_nvgre_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t nvgre;
+ cmdline_fixed_string_t ip_version;
+ uint32_t tni;
+ cmdline_ipaddr_t ip_src;
+ cmdline_ipaddr_t ip_dst;
+ uint16_t tci;
+ struct ether_addr eth_src;
+ struct ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_nvgre_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, set, "set");
+cmdline_parse_token_string_t cmd_set_nvgre_nvgre =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, nvgre, "nvgre");
+cmdline_parse_token_string_t cmd_set_nvgre_nvgre_with_vlan =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, nvgre,
"nvgre-with-vlan");
+cmdline_parse_token_string_t cmd_set_nvgre_ip_version =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, ip_version,
+"ipv4#ipv6");
+cmdline_parse_token_num_t cmd_set_nvgre_tni =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, UINT32);
+cmdline_parse_token_num_t cmd_set_nvgre_ip_src =
+ TOKEN_IPADDR_INITIALIZER(struct cmd_set_nvgre_result, ip_src);
+cmdline_parse_token_ipaddr_t cmd_set_nvgre_ip_dst =
+ TOKEN_IPADDR_INITIALIZER(struct cmd_set_nvgre_result, ip_dst);
+cmdline_parse_token_num_t cmd_set_nvgre_vlan =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, UINT16);
+cmdline_parse_token_etheraddr_t cmd_set_nvgre_eth_src =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_nvgre_result, eth_src);
+cmdline_parse_token_etheraddr_t cmd_set_nvgre_eth_dst =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_nvgre_result, eth_dst);
+
+static void cmd_set_nvgre_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_set_nvgre_result *res = parsed_result;
+ union {
+ uint32_t nvgre_tni;
+ uint8_t tni[4];
+ } id = {
+ .nvgre_tni = rte_cpu_to_be_32(res->tni) & RTE_BE32(0x00ff),
+ };
+
+ if (strcmp(res->nvgre, "nvgre") == 0)
+ nvgre_encap_conf.select_vlan = 0;
+ else if (strcmp(res->nvgre, "nvgre-with-vlan") == 0)
+ nvgre_encap_conf.select_vlan = 1;
+ if (strcmp(res->ip_version, "ipv4") == 0)
+ nvgre_encap_conf.select_ipv4 = 1;
+ else if (strcmp(res->ip_version, "ipv6") == 0)
+ nvgre_encap_conf.select_ipv4 = 0;
+ else
+ return;
+ rte_memcpy(nvgre_encap_conf.tni, &id.tni[1], 3);
+ if (nvgre_encap_conf.select_ipv4) {
+ IPV4_ADDR_TO_UINT(res->ip_src, nvgre_encap_conf.ipv4_src);
+ IPV4_ADDR_TO_UINT(res->ip_dst, nvgre_encap_conf.ipv4_dst);
+ } else {
+ IPV6_ADDR_TO_ARRAY(res->ip_src, nvgre_encap_conf.ipv6_src);
+ IPV6_ADDR_TO_ARRAY(res->ip_dst, nvgre_encap_conf.ipv6_dst);
+ }
+ if (nvgre_encap_conf.select_vlan)
+ nvgre_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+ rte_memcpy(nvgre_encap_conf.eth_src, res->eth_src.addr_bytes,
+ ETHER_ADDR_LEN);
+ rte_
[dpdk-dev] [PATCH v4 1/2] app/testpmd: add VXLAN encap/decap support
Due to the complex VXLAN_ENCAP flow action and based on the fact testpmd
does not allocate memory, this patch adds a new command in testpmd to
initialise a global structure containing the necessary information to
make the outer layer of the packet. This same global structure will
then be used by the flow command line in testpmd when the action
vxlan_encap will be parsed, at this point, the conversion into such
action becomes trivial.
This global structure is only used for the encap action.
Signed-off-by: Nelio Laranjeiro
---
app/test-pmd/cmdline.c | 134 +++
app/test-pmd/cmdline_flow.c | 139
app/test-pmd/testpmd.c | 17 +++
app/test-pmd/testpmd.h | 17 +++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 35 +
5 files changed, 342 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 27e2aa8c8..048fff2bd 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -781,6 +781,14 @@ static void cmd_help_long_parsed(void *parsed_result,
"port tm hierarchy commit (port_id) (clean_on_fail)\n"
" Commit tm hierarchy.\n\n"
+ "vxlan ipv4|ipv6 vni udp-src udp-dst ip-src ip-dst"
+ " eth-src eth-dst\n"
+ " Configure the VXLAN encapsulation for
flows.\n\n"
+
+ "vxlan-with-vlan ipv4|ipv6 vni udp-src udp-dst ip-src
ip-dst"
+ " vlan-tci eth-src eth-dst\n"
+ " Configure the VXLAN encapsulation for
flows.\n\n"
+
, list_pkt_forwarding_modes()
);
}
@@ -14838,6 +14846,130 @@ cmdline_parse_inst_t
cmd_set_port_tm_hierarchy_default = {
};
#endif
+/** Set VXLAN encapsulation details */
+struct cmd_set_vxlan_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t vxlan;
+ cmdline_fixed_string_t ip_version;
+ uint32_t vlan_present:1;
+ uint32_t vni;
+ uint16_t udp_src;
+ uint16_t udp_dst;
+ cmdline_ipaddr_t ip_src;
+ cmdline_ipaddr_t ip_dst;
+ uint16_t tci;
+ struct ether_addr eth_src;
+ struct ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_vxlan_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, set, "set");
+cmdline_parse_token_string_t cmd_set_vxlan_vxlan =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, vxlan, "vxlan");
+cmdline_parse_token_string_t cmd_set_vxlan_vxlan_with_vlan =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, vxlan,
+"vxlan-with-vlan");
+cmdline_parse_token_string_t cmd_set_vxlan_ip_version =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, ip_version,
+"ipv4#ipv6");
+cmdline_parse_token_num_t cmd_set_vxlan_vni =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, UINT32);
+cmdline_parse_token_num_t cmd_set_vxlan_udp_src =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, UINT16);
+cmdline_parse_token_num_t cmd_set_vxlan_udp_dst =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, UINT16);
+cmdline_parse_token_ipaddr_t cmd_set_vxlan_ip_src =
+ TOKEN_IPADDR_INITIALIZER(struct cmd_set_vxlan_result, ip_src);
+cmdline_parse_token_ipaddr_t cmd_set_vxlan_ip_dst =
+ TOKEN_IPADDR_INITIALIZER(struct cmd_set_vxlan_result, ip_dst);
+cmdline_parse_token_num_t cmd_set_vxlan_vlan =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, UINT16);
+cmdline_parse_token_etheraddr_t cmd_set_vxlan_eth_src =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vxlan_result, eth_src);
+cmdline_parse_token_etheraddr_t cmd_set_vxlan_eth_dst =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vxlan_result, eth_dst);
+
+static void cmd_set_vxlan_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_set_vxlan_result *res = parsed_result;
+ union {
+ uint32_t vxlan_id;
+ uint8_t vni[4];
+ } id = {
+ .vxlan_id = rte_cpu_to_be_32(res->vni) & RTE_BE32(0x00ff),
+ };
+
+ if (strcmp(res->vxlan, "vxlan") == 0)
+ vxlan_encap_conf.select_vlan = 0;
+ else if (strcmp(res->vxlan, "vxlan-with-vlan") == 0)
+ vxlan_encap_conf.select_vlan = 1;
+ if (strcmp(res->ip_version, "ipv4") == 0)
+ vxlan_encap_conf.select_ipv4 = 1;
+ else if (strcmp(res->ip_version, "ipv6") == 0)
+ vxlan_encap_conf.select_ipv4 = 0;
+ else
+ return;
+ rte_memcpy(vxlan_encap_conf.vni, &id.vni[1], 3);
+ vxlan_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
+ vxlan_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
+
[dpdk-dev] [PATCH v3] ethdev: add flow API to expand RSS flows
Introduce an helper for PMD to expand easily flows items list with RSS
action into multiple flow items lists with priority information.
For instance a user items list being "eth / end" with rss action types
"ipv4-udp ipv6-udp end" needs to be expanded into three items lists:
- eth
- eth / ipv4 / udp
- eth / ipv6 / udp
to match the user request. Some drivers are unable to reach such
request without this expansion, this API is there to help those.
Only PMD should use such API for their internal cooking, the application
will still handle a single flow.
Signed-off-by: Nelio Laranjeiro
---
Changes in v3:
- Fix a segmentation fault due to an uninitialized pointer.
Changes in v2:
- Fix expansion for UDP/TCP layers where L3 may not be in the original
items list and thus is missing in the expansion.
- Fix size verification for some layers causing a segfault
---
lib/librte_ethdev/rte_flow.c| 408
lib/librte_ethdev/rte_flow_driver.h | 32 +++
2 files changed, 440 insertions(+)
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index b2afba089..9d86c20cb 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -526,3 +526,411 @@ rte_flow_copy(struct rte_flow_desc *desc, size_t len,
}
return 0;
}
+
+/* Copy the existing items list and expand with new items. */
+static int
+rte_flow_expand_rss_item(void *buf, size_t size,
+const struct rte_flow_item *items,
+const struct rte_flow_item *newitems)
+{
+ void *data = buf;
+ const struct rte_flow_item *item;
+ struct rte_flow_item *dst;
+ size_t data_size = 0;
+
+ dst = data;
+ /* Copy Item structure into buffer. */
+ for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) {
+ if (item->type == RTE_FLOW_ITEM_TYPE_VOID)
+ continue;
+ if (data_size + sizeof(*item) <= size) {
+ memcpy(dst, item, sizeof(*item));
+ ++dst;
+ }
+ data_size += sizeof(*item);
+ }
+ item = newitems;
+ do {
+ if (item->type == RTE_FLOW_ITEM_TYPE_VOID) {
+ ++item;
+ continue;
+ }
+ if (data_size + sizeof(*item) <= size) {
+ memcpy(dst, item, sizeof(*item));
+ ++dst;
+ }
+ data_size += sizeof(*item);
+ ++item;
+ } while ((item - 1)->type != RTE_FLOW_ITEM_TYPE_END);
+ /**
+* Copy Item spec, last, mask into buffer and set pointers
+* accordingly.
+*/
+ dst = data;
+ for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) {
+ if (item->type == RTE_FLOW_ITEM_TYPE_VOID)
+ continue;
+ if (item->spec) {
+ size_t s = flow_item_spec_copy(NULL, item, ITEM_SPEC);
+ void *addr = (data_size + s) <= size ?
+ (void *)((uintptr_t)data + data_size) :
+ NULL;
+
+ data_size += flow_item_spec_copy(addr, item, ITEM_SPEC);
+ if (addr)
+ dst->spec = addr;
+ }
+ if (item->last) {
+ size_t s = flow_item_spec_copy(NULL, item, ITEM_LAST);
+ void *addr = (data_size + s) <= size ?
+ (void *)((uintptr_t)data + data_size) :
+ NULL;
+
+ data_size += flow_item_spec_copy(addr, item, ITEM_LAST);
+ if (addr)
+ dst->last = addr;
+ }
+ if (item->mask) {
+ size_t s = flow_item_spec_copy(NULL, item, ITEM_MASK);
+ void *addr = (data_size + s) <= size ?
+ (void *)((uintptr_t)data + data_size) :
+ NULL;
+
+ data_size += flow_item_spec_copy(addr, item, ITEM_MASK);
+ if (addr)
+ dst->mask = addr;
+ }
+ if (data_size <= size)
+ ++dst;
+ }
+ return data_size;
+}
+
+/** Verify the expansion is supported by the device. */
+static int
+rte_flow_expand_rss_is_supported(const enum rte_flow_item_type **supported,
+const enum rte_flow_item_type *expand)
+{
+ unsigned int i;
+ unsigned int sidx;
+ unsigned int eidx;
+
+ for (i = 0; supported[i]; ++i) {
+ sidx = 0;
+ eidx = 0;
+ while (1) {
+ if (expand[eidx] != supported[i][sidx]) {
+ break;
+
[dpdk-dev] [PATCH v2] net/mlx5: fix RSS level validation
When setting the level in rss action it's checking for the value
stored in the parser which is set to 0 by default.
This change the check to be for the requested action instead.
Fixes: d4a40518 ("net/mlx5: support tunnel RSS level")
Cc: sta...@dpdk.org
Signed-off-by: Raslan Darawsheh
Acked-by: Shahaf Shuler
---
changes in v2:
commit massage reword.
---
---
drivers/net/mlx5/mlx5_flow.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 994be05..40df633 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -738,7 +738,7 @@ mlx5_flow_convert_actions(struct rte_eth_dev *dev,
return -rte_errno;
}
#ifndef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
- if (parser->rss_conf.level > 1) {
+ if (rss->level > 1) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION,
actions,
@@ -747,7 +747,7 @@ mlx5_flow_convert_actions(struct rte_eth_dev *dev,
return -rte_errno;
}
#endif
- if (parser->rss_conf.level > 2) {
+ if (rss->level > 2) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION,
actions,
--
2.7.4
Re: [dpdk-dev] [PATCH] ethdev: add new offload flag to keep CRC
Wednesday, June 20, 2018 7:13 PM. Ferruh Yigit:
> Subject: Re: [dpdk-dev] [PATCH] ethdev: add new offload flag to keep CRC
>
> On 6/20/2018 2:44 PM, Shahaf Shuler wrote:
> >
> > Hi Ferruh,
> >
> > Tuesday, June 19, 2018 9:03 PM, Ferruh Yigit
> >> Subject: [dpdk-dev] [PATCH] ethdev: add new offload flag to keep CRC
> >>
> >
> > [...]
> >
> >
> >> diff --git a/drivers/net/mlx5/mlx5_rxq.c
> >> b/drivers/net/mlx5/mlx5_rxq.c index de3f869ed..28cf168aa 100644
> >> --- a/drivers/net/mlx5/mlx5_rxq.c
> >> +++ b/drivers/net/mlx5/mlx5_rxq.c
> >> @@ -388,6 +388,9 @@ mlx5_get_rx_queue_offloads(struct rte_eth_dev
> >> *dev)
> >>
> >>if (config->hw_fcs_strip)
> >>offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
> >> + else
> >> + offloads |= DEV_RX_OFFLOAD_KEEP_CRC;
> >> +
> >
> > I think it should be:
> > if (config->hw_fcs_strip) {
> > offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
> > offloads |= DEV_RX_OFFLOAD_KEEP_CRC;
> > }
> >
> > The hw_fcs_strip is the capability from device which allows the PMD to
> toggle the CRC stripping.
>
> From below logic, (how "crc_present" set), hw_fcs_strip looks like capability
> from device that says keeping CRC is supported. If so it the original code was
> not clear to me, why to report CRC stripping only if HW supports keeping
> CRC?
What we report is the option to toggle the CRC stripping by the PMD, and this
is what the hw_fcs_strip capability is about.
The default behavior of HW in case this option is not supported is to remove
the CRC.
I>
> Following makes more sense to me, based on below code, report CRC
> stripping capability by default and report KEEP CRC capability if device
> supports it:
>
> offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
> if (config->hw_fcs_strip)
> offloads |= DEV_RX_OFFLOAD_KEEP_CRC;
>
> What do you think?
Yes it is better. Thanks.
>
> >
> >>if (config->hw_csum)
> >>offloads |= (DEV_RX_OFFLOAD_IPV4_CKSUM |
> >> DEV_RX_OFFLOAD_UDP_CKSUM |
> >> @@ -1419,17 +1422,17 @@ mlx5_rxq_new(struct rte_eth_dev *dev,
> >> uint16_t idx, uint16_t desc,
> >>/* Configure VLAN stripping. */
> >>tmpl->rxq.vlan_strip = !!(offloads &
> DEV_RX_OFFLOAD_VLAN_STRIP);
> >>/* By default, FCS (CRC) is stripped by hardware. */
> >> - if (offloads & DEV_RX_OFFLOAD_CRC_STRIP) {
> >> - tmpl->rxq.crc_present = 0;
> >> - } else if (config->hw_fcs_strip) {
> >> - tmpl->rxq.crc_present = 1;
> >> - } else {
> >> - DRV_LOG(WARNING,
> >> - "port %u CRC stripping has been disabled but will"
> >> - " still be performed by hardware, make sure
> >> MLNX_OFED"
> >> - " and firmware are up to date",
> >> - dev->data->port_id);
> >> - tmpl->rxq.crc_present = 0;
> >> + tmpl->rxq.crc_present = 0;
> >> + if (rte_eth_dev_is_keep_crc(offloads)) {
> >> + if (config->hw_fcs_strip) {
> >> + tmpl->rxq.crc_present = 1;
> >> + } else {
> >> + DRV_LOG(WARNING,
> >> + "port %u CRC stripping has been disabled but
> >> will"
> >> + " still be performed by hardware, make sure
> >> MLNX_OFED"
> >> + " and firmware are up to date",
> >> + dev->data->port_id);
> >> + }
> >>}
> >>DRV_LOG(DEBUG,
> >>"port %u CRC stripping is %s, %u bytes will be subtracted
> from"
Re: [dpdk-dev] [PATCH v2 22/22] examples/devmgm_mp: add simple device management sample
On 21-Jun-18 3:00 AM, Qi Zhang wrote: The sample code demonstrate device (ethdev only) management at multi-process envrionment. User can attach/detach a device on primary process and see it is synced on secondary process automatically, also user can lock a device to prevent it be detached or unlock it to go back to default behaviour. How to start? ./devmgm_mp --proc-type=auto Command Line Example: help list /* attach a af_packet vdev */ attach net_af_packet,iface=eth0 /* detach port 0 */ detach 0 /* attach a private af_packet vdev (secondary process only)*/ attachp net_af_packet,iface=eth0 /* detach a private device (secondary process only) */ detachp 0 /* lock port 0 */ lock 0 /* unlock port 0 */ unlock 0 Signed-off-by: Qi Zhang --- Hi Qi, I believe you've missed my comments for v1 of this patch. -- Thanks, Anatoly
Re: [dpdk-dev] [PATCH v2 01/22] eal: introduce one device scan
On 21-Jun-18 3:00 AM, Qi Zhang wrote:
When hot plug a new device, it is not necessary to scan everything
on the bus since the devname and devargs are already there. So new
rte_bus ops "scan_one" is introduced, bus driver can implement this
function to simplify the hotplug process.
Signed-off-by: Qi Zhang
---
+/**
* Implementation specific probe function which is responsible for linking
* devices on that bus with applicable drivers.
*
@@ -204,6 +219,7 @@ struct rte_bus {
TAILQ_ENTRY(rte_bus) next; /**< Next bus object in linked list */
const char *name;/**< Name of the bus */
rte_bus_scan_t scan; /**< Scan for devices attached to bus */
+ rte_bus_scan_one_t scan_one; /**< Scan one device using devargs */
rte_bus_probe_t probe; /**< Probe devices on bus */
rte_bus_find_device_t find_device; /**< Find a device on the bus */
rte_bus_plug_t plug; /**< Probe single device for drivers */
Does this break ABI for bus?
--
Thanks,
Anatoly
Re: [dpdk-dev] [PATCH] bus/dpaa: fix build
On Wednesday 20 June 2018 07:39 PM, Thomas Monjalon wrote:
The DPAA bus driver is defining some macros without prefix.
So it can conflict with other libraries like libbsd:
drivers/bus/dpaa/include/compat.h:53:
error: "__packed" redefined
/usr/include/bsd/sys/cdefs.h:120:
note: this is the location of the previous definition
Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros")
Cc: sta...@dpdk.org
Cc: geoff.tho...@nxp.com
Cc: hemant.agra...@nxp.com
Cc: shreyansh.j...@nxp.com
Signed-off-by: Thomas Monjalon
---
drivers/bus/dpaa/include/compat.h | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/bus/dpaa/include/compat.h
b/drivers/bus/dpaa/include/compat.h
index e4b570214..92241d231 100644
--- a/drivers/bus/dpaa/include/compat.h
+++ b/drivers/bus/dpaa/include/compat.h
@@ -48,9 +48,15 @@
*/
/* Required compiler attributes */
+#ifndef __maybe_unused
#define __maybe_unused__rte_unused
+#endif
+#ifndef __always_unused
#define __always_unused __rte_unused
+#endif
+#ifndef __packed
#define __packed __rte_packed
+#endif
#define noinline __attribute__((noinline))
#define L1_CACHE_BYTES 64
A similar patch was also issued by Jerin a few weeks back:
http://patches.dpdk.org/patch/40597/
There may be conflict while merging.
Whether you take that, or this (preferred):
Acked-by: Shreyansh Jain
Re: [dpdk-dev] [PATCH v2 03/22] ethdev: add function to release port in local process
On 21-Jun-18 3:00 AM, Qi Zhang wrote: Add driver API rte_eth_release_port_private to support the requirement that an ethdev only be released on secondary process, so only local state be set to unused , share data will not be reset so primary process can still use it. Signed-off-by: Qi Zhang --- /** * @internal + * Release the specified ethdev port in local process, only set to ethdev + * state to unused, but not reset share data since it assume other process + * is still using it, typically it is called by secondary process. + * + * @param eth_dev + * The *eth_dev* pointer is the address of the *rte_eth_dev* structure. + * @return + * - 0 on success, negative on error + */ +int rte_eth_dev_release_port_private(struct rte_eth_dev *eth_dev); + As far as i can tell, even though the function is marked as internal, it should still be exported in the .map file (see rte_eth_dev_allocate() for example). Thomas and others, does this count as new API? Should this be marked as __rte_experimental? Presumably, we guarantee ABI stability for internal functions too, so my expectation would be yes. +/** + * @internal * Release device queues and clear its configuration to force the user * application to reconfigure it. It is for internal use only. * -- Thanks, Anatoly
Re: [dpdk-dev] [PATCH v2 03/22] ethdev: add function to release port in local process
> -Original Message- > From: Burakov, Anatoly > Sent: Thursday, June 21, 2018 4:06 PM > To: Zhang, Qi Z ; tho...@monjalon.net > Cc: Ananyev, Konstantin ; dev@dpdk.org; > Richardson, Bruce ; Yigit, Ferruh > ; Shelton, Benjamin H > ; Vangati, Narender > > Subject: Re: [PATCH v2 03/22] ethdev: add function to release port in local > process > > On 21-Jun-18 3:00 AM, Qi Zhang wrote: > > Add driver API rte_eth_release_port_private to support the requirement > > that an ethdev only be released on secondary process, so only local > > state be set to unused , share data will not be reset so primary > > process can still use it. > > > > Signed-off-by: Qi Zhang > > --- > > > > > > > /** > >* @internal > > + * Release the specified ethdev port in local process, only set to > > +ethdev > > + * state to unused, but not reset share data since it assume other > > +process > > + * is still using it, typically it is called by secondary process. > > + * > > + * @param eth_dev > > + * The *eth_dev* pointer is the address of the *rte_eth_dev* structure. > > + * @return > > + * - 0 on success, negative on error > > + */ > > +int rte_eth_dev_release_port_private(struct rte_eth_dev *eth_dev); > > + > > As far as i can tell, even though the function is marked as internal, it > should still > be exported in the .map file (see rte_eth_dev_allocate() for example). > > Thomas and others, does this count as new API? Should this be marked as > __rte_experimental? Presumably, we guarantee ABI stability for internal > functions too, so my expectation would be yes. Sorry, I not intent to mark this as experimental, I must forgot to remove this It should rte_eth_dev_attach/detach_private and rte_eth_dev_lock/unlock . I guess internal API is not necessary to have this. I will remove it in v3 Thanks Qi > > > +/** > > + * @internal > >* Release device queues and clear its configuration to force the user > >* application to reconfigure it. It is for internal use only. > >* > > > > > -- > Thanks, > Anatoly
Re: [dpdk-dev] [PATCH v2 03/22] ethdev: add function to release port in local process
21/06/2018 10:06, Burakov, Anatoly: > On 21-Jun-18 3:00 AM, Qi Zhang wrote: > > Add driver API rte_eth_release_port_private to support the > > requirement that an ethdev only be released on secondary process, > > so only local state be set to unused , share data will not be > > reset so primary process can still use it. > > > > Signed-off-by: Qi Zhang > > --- > > > > > > > /** > >* @internal > > + * Release the specified ethdev port in local process, only set to ethdev > > + * state to unused, but not reset share data since it assume other process > > + * is still using it, typically it is called by secondary process. > > + * > > + * @param eth_dev > > + * The *eth_dev* pointer is the address of the *rte_eth_dev* structure. > > + * @return > > + * - 0 on success, negative on error > > + */ > > +int rte_eth_dev_release_port_private(struct rte_eth_dev *eth_dev); > > + > > As far as i can tell, even though the function is marked as internal, it > should still be exported in the .map file (see rte_eth_dev_allocate() > for example). > > Thomas and others, does this count as new API? Should this be marked as > __rte_experimental? Presumably, we guarantee ABI stability for internal > functions too, so my expectation would be yes. You know the A in ABI stands for Application :) If it is not called by application, it has no impact on ABI. However, I am not sure about having this function at all. Who is calling it?
Re: [dpdk-dev] [PATCH v2 1/3] gso: support UDP/IPv4 fragmentation
Hi,
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Jiayu Hu
> Sent: Sunday, June 17, 2018 11:13 AM
> To: dev@dpdk.org
> Cc: Ananyev, Konstantin ; Zhang, Yuwei1
> ; Iremonger, Bernard
> ; Hu, Jiayu
> Subject: [dpdk-dev] [PATCH v2 1/3] gso: support UDP/IPv4 fragmentation
>
> This patch adds GSO support for UDP/IPv4 packets. Supported packets
> may include a single VLAN tag. UDP/IPv4 GSO doesn't check if input
> packets have correct checksums, and doesn't update checksums for
> output packets (the responsibility for this lies with the application).
> Additionally, UDP/IPv4 GSO doesn't process IP fragmented packets.
>
> UDP/IPv4 GSO uses two chained MBUFs, one direct MBUF and one indrect
> MBUF, to organize an output packet. The direct MBUF stores the packet
> header, while the indirect mbuf simply points to a location within the
> original packet's payload. Consequently, use of UDP GSO requires
> multi-segment MBUF support in the TX functions of the NIC driver.
>
> If a packet is GSO'd, UDP/IPv4 GSO reduces its MBUF refcnt by 1. As a
> result, when all of its GSOed segments are freed, the packet is freed
> automatically.
>
> Signed-off-by: Jiayu Hu
> ---
> lib/librte_gso/Makefile | 1 +
> lib/librte_gso/gso_common.h | 3 ++
> lib/librte_gso/gso_udp4.c | 81
> +
> lib/librte_gso/gso_udp4.h | 42 +++
> lib/librte_gso/rte_gso.c| 24 +++---
> lib/librte_gso/rte_gso.h| 6 +++-
> 6 files changed, 151 insertions(+), 6 deletions(-)
> create mode 100644 lib/librte_gso/gso_udp4.c
> create mode 100644 lib/librte_gso/gso_udp4.h
>
> diff --git a/lib/librte_gso/Makefile b/lib/librte_gso/Makefile
> index 3648ec0..1fac53a 100644
> --- a/lib/librte_gso/Makefile
> +++ b/lib/librte_gso/Makefile
> @@ -19,6 +19,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_GSO) += rte_gso.c
> SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_common.c
> SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tcp4.c
> SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tunnel_tcp4.c
> +SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_udp4.c
>
meson should be updated accordingly.
> # install this header file
> SYMLINK-$(CONFIG_RTE_LIBRTE_GSO)-include += rte_gso.h
> diff --git a/lib/librte_gso/gso_common.h b/lib/librte_gso/gso_common.h
> index 5ca5974..6cd764f 100644
> --- a/lib/librte_gso/gso_common.h
> +++ b/lib/librte_gso/gso_common.h
> @@ -31,6 +31,9 @@
> (PKT_TX_TCP_SEG | PKT_TX_IPV4 | PKT_TX_OUTER_IPV4 | \
>PKT_TX_TUNNEL_GRE))
>
> +#define IS_IPV4_UDP(flag) (((flag) & (PKT_TX_UDP_SEG | PKT_TX_IPV4)) == \
> + (PKT_TX_UDP_SEG | PKT_TX_IPV4))
> +
> /**
> * Internal function which updates the UDP header of a packet, following
> * segmentation. This is required to update the header's datagram length
> field.
> diff --git a/lib/librte_gso/gso_udp4.c b/lib/librte_gso/gso_udp4.c
> new file mode 100644
> index 000..a3db329
> --- /dev/null
> +++ b/lib/librte_gso/gso_udp4.c
> @@ -0,0 +1,81 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2018 Intel Corporation
> + */
> +
> +#include "gso_common.h"
> +#include "gso_udp4.h"
> +
> +#define IPV4_HDR_MF_BIT (1U << 13)
> +
> +static inline void
> +update_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs,
> + uint16_t nb_segs)
> +{
> + struct ipv4_hdr *ipv4_hdr;
> + uint16_t frag_offset = 0, is_mf;
> + uint16_t l2_hdrlen = pkt->l2_len, l3_hdrlen = pkt->l3_len;
> + uint16_t tail_idx = nb_segs - 1, length, i;
> +
> + /*
> + * Update IP header fields for output segments. Specifically,
> + * keep the same IP id, update fragment offset and total
> + * length.
> + */
> + for (i = 0; i < nb_segs; i++) {
> + ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(segs[i],
> + char *) + l2_hdrlen);
You could use rte_pktmbuf_mtod_offset to simplify the code.
> + length = segs[i]->pkt_len - l2_hdrlen;
> + ipv4_hdr->total_length = rte_cpu_to_be_16(length);
> +
> + is_mf = i < tail_idx ? IPV4_HDR_MF_BIT : 0;
> + ipv4_hdr->fragment_offset =
> + rte_cpu_to_be_16(frag_offset | is_mf);
> + frag_offset += ((length - l3_hdrlen) >> 3);
> + }
> +}
> +
> +int
> +gso_udp4_segment(struct rte_mbuf *pkt,
> + uint16_t gso_size,
> + struct rte_mempool *direct_pool,
> + struct rte_mempool *indirect_pool,
> + struct rte_mbuf **pkts_out,
> + uint16_t nb_pkts_out)
> +{
> + struct ipv4_hdr *ipv4_hdr;
> + uint16_t pyld_unit_size, hdr_offset;
> + uint16_t frag_off;
> + int ret;
> +
> + /* Don't process the fragmented packet */
> + ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
> + pkt->l2_len);
Ditto.
BRs,
Xiao
Re: [dpdk-dev] [dpdk-stable] [PATCH] bus/dpaa: fix compilation issue with meson build
05/06/2018 08:20, Shreyansh Jain:
> On 6/4/2018 8:22 AM, Jerin Jacob wrote:
> > ccache gcc -Idrivers/drivers@@tmp_rte_pmd_dpaa_sec@sta -Idrivers
> > In file included from ../drivers/bus/dpaa/include/fsl_usd.h:11,
> > from ../drivers/crypto/dpaa_sec/dpaa_sec.c:27:
> > ../drivers/bus/dpaa/include/compat.h:53:
> > error: "__packed" redefined [-Werror]
> > #define __packed __rte_packed
> >
> > In file included from /usr/include/bsd/string.h:39,
> > from ../lib/librte_eal/common/include/rte_string_fns.h:71,
> > from ../drivers/crypto/dpaa_sec/dpaa_sec.c:25:
> > /usr/include/bsd/sys/cdefs.h:120: note: this is the location
> > of the previous definition
> > # define __packed __attribute__((__packed__))
> >
> > Cc: sta...@dpdk.org
> > Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros")
> >
> > Signed-off-by: Jerin Jacob
> > ---
>
> Thanks Jerin.
> Somehow, this didn't appear on my build environment (maybe because LIB
> BSD is not enabled?). But, the change looks harmless.
>
> Acked-by: Shreyansh Jain
I missed this patch and sent a more complete one recently:
https://patches.dpdk.org/patch/41314/
Re: [dpdk-dev] [PATCH v2 1/3] gso: support UDP/IPv4 fragmentation
Hi Xiao,
> -Original Message-
> From: Wang, Xiao W
> Sent: Thursday, June 21, 2018 4:25 PM
> To: Hu, Jiayu ; dev@dpdk.org
> Cc: Ananyev, Konstantin ; Zhang, Yuwei1
> ; Iremonger, Bernard
> ; Hu, Jiayu
> Subject: RE: [dpdk-dev] [PATCH v2 1/3] gso: support UDP/IPv4
> fragmentation
>
> Hi,
>
> > -Original Message-
> > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Jiayu Hu
> > Sent: Sunday, June 17, 2018 11:13 AM
> > To: dev@dpdk.org
> > Cc: Ananyev, Konstantin ; Zhang, Yuwei1
> > ; Iremonger, Bernard
> > ; Hu, Jiayu
> > Subject: [dpdk-dev] [PATCH v2 1/3] gso: support UDP/IPv4 fragmentation
> >
> > This patch adds GSO support for UDP/IPv4 packets. Supported packets
> > may include a single VLAN tag. UDP/IPv4 GSO doesn't check if input
> > packets have correct checksums, and doesn't update checksums for
> > output packets (the responsibility for this lies with the application).
> > Additionally, UDP/IPv4 GSO doesn't process IP fragmented packets.
> >
> > UDP/IPv4 GSO uses two chained MBUFs, one direct MBUF and one indrect
> > MBUF, to organize an output packet. The direct MBUF stores the packet
> > header, while the indirect mbuf simply points to a location within the
> > original packet's payload. Consequently, use of UDP GSO requires
> > multi-segment MBUF support in the TX functions of the NIC driver.
> >
> > If a packet is GSO'd, UDP/IPv4 GSO reduces its MBUF refcnt by 1. As a
> > result, when all of its GSOed segments are freed, the packet is freed
> > automatically.
> >
> > Signed-off-by: Jiayu Hu
> > ---
> > lib/librte_gso/Makefile | 1 +
> > lib/librte_gso/gso_common.h | 3 ++
> > lib/librte_gso/gso_udp4.c | 81
> > +
> > lib/librte_gso/gso_udp4.h | 42 +++
> > lib/librte_gso/rte_gso.c| 24 +++---
> > lib/librte_gso/rte_gso.h| 6 +++-
> > 6 files changed, 151 insertions(+), 6 deletions(-)
> > create mode 100644 lib/librte_gso/gso_udp4.c
> > create mode 100644 lib/librte_gso/gso_udp4.h
> >
> > diff --git a/lib/librte_gso/Makefile b/lib/librte_gso/Makefile
> > index 3648ec0..1fac53a 100644
> > --- a/lib/librte_gso/Makefile
> > +++ b/lib/librte_gso/Makefile
> > @@ -19,6 +19,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_GSO) += rte_gso.c
> > SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_common.c
> > SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tcp4.c
> > SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tunnel_tcp4.c
> > +SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_udp4.c
> >
>
> meson should be updated accordingly.
Thanks a lot. Update later.
>
> > # install this header file
> > SYMLINK-$(CONFIG_RTE_LIBRTE_GSO)-include += rte_gso.h
> > diff --git a/lib/librte_gso/gso_common.h b/lib/librte_gso/gso_common.h
> > index 5ca5974..6cd764f 100644
> > --- a/lib/librte_gso/gso_common.h
> > +++ b/lib/librte_gso/gso_common.h
> > @@ -31,6 +31,9 @@
> > (PKT_TX_TCP_SEG | PKT_TX_IPV4 | PKT_TX_OUTER_IPV4 |
> \
> > PKT_TX_TUNNEL_GRE))
> >
> > +#define IS_IPV4_UDP(flag) (((flag) & (PKT_TX_UDP_SEG | PKT_TX_IPV4))
> == \
> > + (PKT_TX_UDP_SEG | PKT_TX_IPV4))
> > +
> > /**
> > * Internal function which updates the UDP header of a packet, following
> > * segmentation. This is required to update the header's datagram length
> field.
> > diff --git a/lib/librte_gso/gso_udp4.c b/lib/librte_gso/gso_udp4.c
> > new file mode 100644
> > index 000..a3db329
> > --- /dev/null
> > +++ b/lib/librte_gso/gso_udp4.c
> > @@ -0,0 +1,81 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2018 Intel Corporation
> > + */
> > +
> > +#include "gso_common.h"
> > +#include "gso_udp4.h"
> > +
> > +#define IPV4_HDR_MF_BIT (1U << 13)
> > +
> > +static inline void
> > +update_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs,
> > + uint16_t nb_segs)
> > +{
> > + struct ipv4_hdr *ipv4_hdr;
> > + uint16_t frag_offset = 0, is_mf;
> > + uint16_t l2_hdrlen = pkt->l2_len, l3_hdrlen = pkt->l3_len;
> > + uint16_t tail_idx = nb_segs - 1, length, i;
> > +
> > + /*
> > +* Update IP header fields for output segments. Specifically,
> > +* keep the same IP id, update fragment offset and total
> > +* length.
> > +*/
> > + for (i = 0; i < nb_segs; i++) {
> > + ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(segs[i],
> > + char *) + l2_hdrlen);
>
> You could use rte_pktmbuf_mtod_offset to simplify the code.
Yes, you are right. Update later.
>
> > + length = segs[i]->pkt_len - l2_hdrlen;
> > + ipv4_hdr->total_length = rte_cpu_to_be_16(length);
> > +
> > + is_mf = i < tail_idx ? IPV4_HDR_MF_BIT : 0;
> > + ipv4_hdr->fragment_offset =
> > + rte_cpu_to_be_16(frag_offset | is_mf);
> > + frag_offset += ((length - l3_hdrlen) >> 3);
> > + }
> > +}
> > +
> > +int
> > +gso_udp4_segment(struct rte_mbuf *pkt,
> > + uint16_t gso_size,
> > + struct rte_mempool *dire
Re: [dpdk-dev] [PATCH] bus/dpaa: fix build
21/06/2018 09:58, Shreyansh Jain:
> On Wednesday 20 June 2018 07:39 PM, Thomas Monjalon wrote:
> > The DPAA bus driver is defining some macros without prefix.
> > So it can conflict with other libraries like libbsd:
> >
> > drivers/bus/dpaa/include/compat.h:53:
> > error: "__packed" redefined
> > /usr/include/bsd/sys/cdefs.h:120:
> > note: this is the location of the previous definition
> >
> > Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros")
> > Cc: sta...@dpdk.org
> > Cc: geoff.tho...@nxp.com
> > Cc: hemant.agra...@nxp.com
> > Cc: shreyansh.j...@nxp.com
> >
> > Signed-off-by: Thomas Monjalon
> > ---
> > drivers/bus/dpaa/include/compat.h | 6 ++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/drivers/bus/dpaa/include/compat.h
> > b/drivers/bus/dpaa/include/compat.h
> > index e4b570214..92241d231 100644
> > --- a/drivers/bus/dpaa/include/compat.h
> > +++ b/drivers/bus/dpaa/include/compat.h
> > @@ -48,9 +48,15 @@
> >*/
> >
> > /* Required compiler attributes */
> > +#ifndef __maybe_unused
> > #define __maybe_unused__rte_unused
> > +#endif
> > +#ifndef __always_unused
> > #define __always_unused __rte_unused
> > +#endif
> > +#ifndef __packed
> > #define __packed __rte_packed
> > +#endif
> > #define noinline __attribute__((noinline))
> >
> > #define L1_CACHE_BYTES 64
> >
>
> A similar patch was also issued by Jerin a few weeks back:
> http://patches.dpdk.org/patch/40597/
I missed it.
> There may be conflict while merging.
>
> Whether you take that, or this (preferred):
>
> Acked-by: Shreyansh Jain
This one is more complete.
Applied
Re: [dpdk-dev] [PATCH v2 04/22] ethdev: enable hotplug on multi-process
On 21-Jun-18 3:00 AM, Qi Zhang wrote:
We are going to introduce the solution to handle different hotplug
cases in multi-process situation, it include below scenario:
1. Attach a share device from primary
2. Detach a share device from primary
3. Attach a share device from secondary
4. Detach a share device from secondary
5. Attach a private device from secondary
6. Detach a private device from secondary
7. Detach a share device from secondary privately
8. Attach a share device from secondary privately
In primary-secondary process model, we assume device is shared by default.
that means attach or detach a device on any process will broadcast to
all other processes through mp channel then device information will be
synchronized on all processes.
Any failure during attaching process will cause inconsistent status
between processes, so proper rollback action should be considered.
Also it is not safe to detach a share device when other process still use
it, so a handshake mechanism is introduced.
This patch covers the implementation of case 1,2,5,6,7,8.
Case 3,4 will be implemented on separate patch as well as handshake
mechanism.
Scenario for Case 1, 2:
attach device
a) primary attach the new device if failed goto h).
b) primary send attach sync request to all secondary.
c) secondary receive request and attach device and send reply.
d) primary check the reply if all success go to i).
e) primary send attach rollback sync request to all secondary.
f) secondary receive the request and detach device and send reply.
g) primary receive the reply and detach device as rollback action.
h) attach fail
i) attach success
detach device
a) primary perform pre-detach check, if device is locked, goto i).
b) primary send pre-detach sync request to all secondary.
c) secondary perform pre-detach check and send reply.
d) primary check the reply if any fail goto i).
e) primary send detach sync request to all secondary
f) secondary detach the device and send reply (assume no fail)
g) primary detach the device.
h) detach success
i) detach failed
Case 5, 6:
Secondary process can attach private device which only visible to itself,
in this case no IPC is involved, primary process is not allowed to have
private device so far.
Case 7, 8:
Secondary process can also temporally to detach a share device "privately"
then attach it back later, this action also not impact other processes.
APIs changes:
rte_eth_dev_attach and rte_eth_dev_attach are extended to support
share device attach/detach in primary-secondary process model, it will
be called in case 1,2,3,4.
New API rte_eth_dev_attach_private and rte_eth_dev_detach_private are
introduced to cover case 5,6,7,8, this API can only be invoked in secondary
process.
Signed-off-by: Qi Zhang
---
+ memset(&da, 0, sizeof(da));
+
+ if (rte_devargs_parse(&da, "%s", devargs)) {
+ ethdev_log(ERR, "failed to parse devargs %s\n", devargs);
+ return -EINVAL;
+ }
+
+ ret = rte_eal_hotplug_add(da.bus->name, da.name, "");
+ if (ret) {
+ ethdev_log(ERR, "failed to hotplug bus:%s, device:%s\n",
+ da.bus->name, da.name);
+ free(da.args);
+ return ret;
+ }
+
+ if (rte_eth_devices[port_id].state == RTE_ETH_DEV_UNUSED) {
+ ethdev_log(ERR, "failed to attach to port %d, this is a pmd
issue\n",
+ port_id);
+ return -ENODEV;
^^^ Leaking da.args here?
+ }
+ free(da.args);
+ return 0;
+}
+
+static int handle_secondary_request(const struct rte_mp_msg *msg, const void
*peer)
+{
+ RTE_SET_USED(msg);
+ RTE_SET_USED(peer);
+ return -ENOTSUP;
+}
+
+static int handle_primary_response(const struct rte_mp_msg *msg, const void
*peer)
+{
+ ret = rte_mp_request_sync(&mp_req, &mp_reply, &ts);
+ if (ret) {
+ ethdev_log(ERR, "rte_mp_request_sync failed\n");
+ return ret;
+ }
+
+ req->result = 0;
+ for (i = 0; i < mp_reply.nb_received; i++) {
+ struct eth_dev_mp_req *resp =
+ (struct eth_dev_mp_req *)mp_reply.msgs[i].param;
+ if (resp->result) {
+ req->result = resp->result;
+ break;
+ }
+ }
Do we care if nb_sent != nb_received?
+
+ return 0;
+}
+
+int rte_eth_dev_mp_init(void)
+{
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ if (rte_mp_action_register(ETH_DEV_MP_ACTION_REQUEST,
+/**
+ * this is a synchronous wrapper for secondary process send
+ * request to primary process, this is invoked when an attach
+ * or detach request issued from primary.
+ */
+int rte_eth_dev_request_to_primary(struct eth_dev_mp_req *req);
+
+/**
+ * this is a synchronous wrapper for primary process send
+ * request to secondary process, this is invoked when an attach
+ * or detach request issu
Re: [dpdk-dev] [PATCH v2 05/22] ethdev: introduce device lock
On 21-Jun-18 3:00 AM, Qi Zhang wrote:
Introduce API rte_eth_dev_lock and rte_eth_dev_unlock to let
application lock or unlock on specific ethdev, a locked device
can't be detached, this help application to prevent unexpected
device detaching, especially in multi-process environment.
Also introduce the new API rte_eth_dev_lock_with_callback and
rte_eth_dev_unlock_with callback to let application to register
a callback function which will be invoked before a device is going
to be detached, the return value of the function will decide if
device will continue be detached or not, this support application
to do condition check at runtime.
Signed-off-by: Qi Zhang
---
+
+static int clean_lock_callback_one(uint16_t port_id)
+{
+ struct lock_entry *le;
+ int ret = 0;
+
+ rte_spinlock_lock(&lock_entry_lock);
+
+ TAILQ_FOREACH(le, &lock_entry_list, next) {
+ if (le->port_id == port_id)
+ break;
+ }
+
+ if (le != NULL) {
+ le->ref_count--;
+ if (le->ref_count == 0) {
+ TAILQ_REMOVE(&lock_entry_list, le, next);
+ free(le);
+ }
+ } else {
+ ret = -ENOENT;
+ }
+
+ rte_spinlock_unlock(&lock_entry_lock);
+ return ret;
+
+}
+
+void clean_lock_callback(uint16_t port_id)
+{
+ int ret;
+
+ for (;;) {
+ ret = clean_lock_callback_one(port_id);
+ if (ret == -ENOENT)
+ break;
+ }
+}
Why not lock/unlock the list in clean_lock_callback() and proceed to
cleaning callbacks one by one, instead of locking-and-unlocking the list
over and over again?
--
Thanks,
Anatoly
Re: [dpdk-dev] [PATCH v2 06/22] ethdev: support attach or detach share device from secondary
On 21-Jun-18 3:00 AM, Qi Zhang wrote:
This patch cover the multi-process hotplug case when a share device
attach/detach request be issued from secondary process, the implementation
references malloc_mp.c.
device attach on secondary:
a) secondary send async request to primary and wait on a condition
which will be released by matched response from primary.
b) primary receive the request and attach the new device if failed
goto i).
c) primary forward attach request to all secondary as async request
(because this in mp thread context, use sync request will deadlock)
d) secondary receive request and attach device and send reply.
e) primary check the reply if all success go to j).
f) primary send attach rollback async request to all secondary.
g) secondary receive the request and detach device and send reply.
h) primary receive the reply and detach device as rollback action.
i) send fail response to secondary, goto k).
j) send success response to secondary.
k) secondary process receive response and return.
device detach on secondary:
a) secondary send async request to primary and wait on a condition
which will be released by matched response from primary.
b) primary receive the request and perform pre-detach check, if device
is locked, goto j).
c) primary send pre-detach async request to all secondary.
d) secondary perform pre-detach check and send reply.
e) primary check the reply if any fail goto j).
f) primary send detach async request to all secondary
g) secondary detach the device and send reply
h) primary detach the device.
i) send success response to secondary, goto k).
j) send fail response to secondary.
k) secondary process receive response and return.
Signed-off-by: Qi Zhang
---
-static int handle_secondary_request(const struct rte_mp_msg *msg, const void
*peer)
+static int
+check_reply(const struct eth_dev_mp_req *req, const struct rte_mp_reply *reply)
+{
+ struct eth_dev_mp_req *resp;
+ int i;
+
+ if (reply->nb_received != reply->nb_sent)
+ return -EINVAL;
+
+ for (i = 0; i < reply->nb_received; i++) {
+ resp = (struct eth_dev_mp_req *)reply->msgs[i].param;
+
+ if (resp->t != req->t) {
+ ethdev_log(ERR, "Unexpected response to async
request\n");
+ return -EINVAL;
+ }
+
+ if (resp->id != req->id) {
+ ethdev_log(ERR, "response to wrong async request\n");
+ return -EINVAL;
+ }
+
+ if (resp->result)
+ return resp->result;
+ }
+
+ return 0;
+}
As far as i understand, return values from this will propagate all the
way up to user return value. How would a user differentiate between
-EINVAL returned from invalid parameters, and -EINVAL from failed reply?
I think this error code should be different (don't know which one though
:) ).
(as a side note, you keep returning -EINVAL all over the place, even
when problem is not in user's arguments - you should probably fix those
too. for example, if request ID not found, return code should probably
be something like -ENOENT)
--
Thanks,
Anatoly
Re: [dpdk-dev] [PATCH v2 04/22] ethdev: enable hotplug on multi-process
> -Original Message-
> From: Burakov, Anatoly
> Sent: Thursday, June 21, 2018 4:37 PM
> To: Zhang, Qi Z ; tho...@monjalon.net
> Cc: Ananyev, Konstantin ; dev@dpdk.org;
> Richardson, Bruce ; Yigit, Ferruh
> ; Shelton, Benjamin H
> ; Vangati, Narender
>
> Subject: Re: [PATCH v2 04/22] ethdev: enable hotplug on multi-process
>
> On 21-Jun-18 3:00 AM, Qi Zhang wrote:
> > We are going to introduce the solution to handle different hotplug
> > cases in multi-process situation, it include below scenario:
> >
> > 1. Attach a share device from primary
> > 2. Detach a share device from primary
> > 3. Attach a share device from secondary 4. Detach a share device from
> > secondary 5. Attach a private device from secondary 6. Detach a
> > private device from secondary 7. Detach a share device from secondary
> > privately 8. Attach a share device from secondary privately
> >
> > In primary-secondary process model, we assume device is shared by default.
> > that means attach or detach a device on any process will broadcast to
> > all other processes through mp channel then device information will be
> > synchronized on all processes.
> >
> > Any failure during attaching process will cause inconsistent status
> > between processes, so proper rollback action should be considered.
> > Also it is not safe to detach a share device when other process still
> > use it, so a handshake mechanism is introduced.
> >
> > This patch covers the implementation of case 1,2,5,6,7,8.
> > Case 3,4 will be implemented on separate patch as well as handshake
> > mechanism.
> >
> > Scenario for Case 1, 2:
> >
> > attach device
> > a) primary attach the new device if failed goto h).
> > b) primary send attach sync request to all secondary.
> > c) secondary receive request and attach device and send reply.
> > d) primary check the reply if all success go to i).
> > e) primary send attach rollback sync request to all secondary.
> > f) secondary receive the request and detach device and send reply.
> > g) primary receive the reply and detach device as rollback action.
> > h) attach fail
> > i) attach success
> >
> > detach device
> > a) primary perform pre-detach check, if device is locked, goto i).
> > b) primary send pre-detach sync request to all secondary.
> > c) secondary perform pre-detach check and send reply.
> > d) primary check the reply if any fail goto i).
> > e) primary send detach sync request to all secondary
> > f) secondary detach the device and send reply (assume no fail)
> > g) primary detach the device.
> > h) detach success
> > i) detach failed
> >
> > Case 5, 6:
> > Secondary process can attach private device which only visible to
> > itself, in this case no IPC is involved, primary process is not
> > allowed to have private device so far.
> >
> > Case 7, 8:
> > Secondary process can also temporally to detach a share device "privately"
> > then attach it back later, this action also not impact other processes.
> >
> > APIs changes:
> >
> > rte_eth_dev_attach and rte_eth_dev_attach are extended to support
> > share device attach/detach in primary-secondary process model, it will
> > be called in case 1,2,3,4.
> >
> > New API rte_eth_dev_attach_private and rte_eth_dev_detach_private are
> > introduced to cover case 5,6,7,8, this API can only be invoked in
> > secondary process.
> >
> > Signed-off-by: Qi Zhang
> > ---
>
>
>
> > + memset(&da, 0, sizeof(da));
> > +
> > + if (rte_devargs_parse(&da, "%s", devargs)) {
> > + ethdev_log(ERR, "failed to parse devargs %s\n", devargs);
> > + return -EINVAL;
> > + }
> > +
> > + ret = rte_eal_hotplug_add(da.bus->name, da.name, "");
> > + if (ret) {
> > + ethdev_log(ERR, "failed to hotplug bus:%s, device:%s\n",
> > + da.bus->name, da.name);
> > + free(da.args);
> > + return ret;
> > + }
> > +
> > + if (rte_eth_devices[port_id].state == RTE_ETH_DEV_UNUSED) {
> > + ethdev_log(ERR, "failed to attach to port %d, this is a pmd
> > issue\n",
> > + port_id);
> > + return -ENODEV;
>
> ^^^ Leaking da.args here?
>
> > + }
> > + free(da.args);
> > + return 0;
> > +}
> > +
> > +static int handle_secondary_request(const struct rte_mp_msg *msg,
> > +const void *peer) {
> > + RTE_SET_USED(msg);
> > + RTE_SET_USED(peer);
> > + return -ENOTSUP;
> > +}
> > +
> > +static int handle_primary_response(const struct rte_mp_msg *msg,
> > +const void *peer) {
>
>
>
> > + ret = rte_mp_request_sync(&mp_req, &mp_reply, &ts);
> > + if (ret) {
> > + ethdev_log(ERR, "rte_mp_request_sync failed\n");
> > + return ret;
> > + }
> > +
> > + req->result = 0;
> > + for (i = 0; i < mp_reply.nb_received; i++) {
> > + struct eth_dev_mp_req *resp =
> > + (struct eth_dev_mp_req *)mp_reply.msgs[i].param;
> > + if (resp->result) {
> > + req->result = resp->result;
> > + break;
[dpdk-dev] [PATCH 2/2] doc: fixes the limitations for dpaa2 sec
Fixes: 37f96eb01bce ("crypto/dpaa2_sec: support scatter gather")
Cc: sta...@dpdk.org
Signed-off-by: Hemant Agrawal
---
doc/guides/cryptodevs/dpaa2_sec.rst | 1 -
1 file changed, 1 deletion(-)
diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst
b/doc/guides/cryptodevs/dpaa2_sec.rst
index 3ea24c8..86d0a8d 100644
--- a/doc/guides/cryptodevs/dpaa2_sec.rst
+++ b/doc/guides/cryptodevs/dpaa2_sec.rst
@@ -148,7 +148,6 @@ Where x is the device object id as configured in resource
container.
Limitations
---
-* Chained mbufs are not supported.
* Hash followed by Cipher mode is not supported
* Only supports the session-oriented API implementation (session-less APIs are
not supported).
--
2.7.4
[dpdk-dev] [PATCH 1/2] doc: fixes the limitations for dpaa sec
Fixes: a74af788c632 ("crypto/dpaa_sec: support scatter gather")
Cc: sta...@dpdk.org
Signed-off-by: Hemant Agrawal
---
doc/guides/cryptodevs/dpaa_sec.rst | 1 -
1 file changed, 1 deletion(-)
diff --git a/doc/guides/cryptodevs/dpaa_sec.rst
b/doc/guides/cryptodevs/dpaa_sec.rst
index c14d6d7..a6283c7 100644
--- a/doc/guides/cryptodevs/dpaa_sec.rst
+++ b/doc/guides/cryptodevs/dpaa_sec.rst
@@ -94,7 +94,6 @@ For blacklisting a DPAA device, following commands can be
used.
Limitations
---
-* Chained mbufs are not supported.
* Hash followed by Cipher mode is not supported
* Only supports the session-oriented API implementation (session-less APIs are
not supported).
--
2.7.4
Re: [dpdk-dev] [PATCH v2 05/22] ethdev: introduce device lock
> -Original Message-
> From: Burakov, Anatoly
> Sent: Thursday, June 21, 2018 4:51 PM
> To: Zhang, Qi Z ; tho...@monjalon.net
> Cc: Ananyev, Konstantin ; dev@dpdk.org;
> Richardson, Bruce ; Yigit, Ferruh
> ; Shelton, Benjamin H
> ; Vangati, Narender
>
> Subject: Re: [PATCH v2 05/22] ethdev: introduce device lock
>
> On 21-Jun-18 3:00 AM, Qi Zhang wrote:
> > Introduce API rte_eth_dev_lock and rte_eth_dev_unlock to let
> > application lock or unlock on specific ethdev, a locked device can't
> > be detached, this help application to prevent unexpected device
> > detaching, especially in multi-process environment.
> >
> > Also introduce the new API rte_eth_dev_lock_with_callback and
> > rte_eth_dev_unlock_with callback to let application to register a
> > callback function which will be invoked before a device is going to be
> > detached, the return value of the function will decide if device will
> > continue be detached or not, this support application to do condition
> > check at runtime.
> >
> > Signed-off-by: Qi Zhang
> > ---
>
>
>
> > +
> > +static int clean_lock_callback_one(uint16_t port_id) {
> > + struct lock_entry *le;
> > + int ret = 0;
> > +
> > + rte_spinlock_lock(&lock_entry_lock);
> > +
> > + TAILQ_FOREACH(le, &lock_entry_list, next) {
> > + if (le->port_id == port_id)
> > + break;
> > + }
> > +
> > + if (le != NULL) {
> > + le->ref_count--;
> > + if (le->ref_count == 0) {
> > + TAILQ_REMOVE(&lock_entry_list, le, next);
> > + free(le);
> > + }
> > + } else {
> > + ret = -ENOENT;
> > + }
> > +
> > + rte_spinlock_unlock(&lock_entry_lock);
> > + return ret;
> > +
> > +}
> > +
> > +void clean_lock_callback(uint16_t port_id) {
> > + int ret;
> > +
> > + for (;;) {
> > + ret = clean_lock_callback_one(port_id);
> > + if (ret == -ENOENT)
> > + break;
> > + }
> > +}
>
> Why not lock/unlock the list in clean_lock_callback() and proceed to cleaning
> callbacks one by one, instead of locking-and-unlocking the list over and over
> again?
Definitely!
>
> --
> Thanks,
> Anatoly
[dpdk-dev] [PATCH] raw/dpaa2_qdma: fix the IOVA as VA flag for driver
Fixes: b1ee472fed58 ("raw/dpaa2_qdma: introduce the DPAA2 QDMA driver")
Cc: sta...@dpdk.org
Signed-off-by: Hemant Agrawal
---
drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
index 1d15c30..e4608a4 100644
--- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
+++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
@@ -985,6 +985,7 @@ rte_dpaa2_qdma_remove(struct rte_dpaa2_device *dpaa2_dev)
}
static struct rte_dpaa2_driver rte_dpaa2_qdma_pmd = {
+ .drv_flags = RTE_DPAA2_DRV_IOVA_AS_VA,
.drv_type = DPAA2_QDMA,
.probe = rte_dpaa2_qdma_probe,
.remove = rte_dpaa2_qdma_remove,
--
2.7.4
[dpdk-dev] [PATCH] usertools: fix build with gcc
If developer does not define DESTDIR variable, dpdk-setup.sh fails to build with lack of environment variable Build complete [x86_64-native-linuxapp-gcc] Installation cannot run with T defined and DESTDIR undefined Choonho Son (1): usertools: fix build with gcc usertools/dpdk-setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4
[dpdk-dev] [PATCH] usertools: fix build with gcc
dpdk-setup.sh fails to build with lack of environment variable
Build complete [x86_64-native-linuxapp-gcc]
Installation cannot run with T defined and DESTDIR undefined
Signed-off-by: Choonho Son
---
usertools/dpdk-setup.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/usertools/dpdk-setup.sh b/usertools/dpdk-setup.sh
index 5eebbce..5248e7a 100755
--- a/usertools/dpdk-setup.sh
+++ b/usertools/dpdk-setup.sh
@@ -65,6 +65,7 @@ setup_target()
{
option=$1
export RTE_TARGET=${TARGETS[option]}
+ export DESTDIR=${DESTDIR:-install}
compiler=${RTE_TARGET##*-}
if [ "$compiler" == "icc" ] ; then
@@ -76,7 +77,7 @@ setup_target()
fi
fi
if [ "$QUIT" == "0" ] ; then
- make install T=${RTE_TARGET}
+ make install T=${RTE_TARGET} DESTDIR=${DESTDIR}
fi
echo
"--"
echo " RTE_TARGET exported as $RTE_TARGET"
--
2.7.4
[dpdk-dev] [PATCH 01/10] bus/dpaa: fix phandle support for kernel 4.16
From: Alok Makhariya
Fixes: 2183c6f69d7e ("bus/dpaa: add OF parser for device scanning")
Cc: Shreyansh Jain
Cc: sta...@dpdk.org
Signed-off-by: Alok Makhariya
---
drivers/bus/dpaa/base/fman/of.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/drivers/bus/dpaa/base/fman/of.c b/drivers/bus/dpaa/base/fman/of.c
index 1b2dbe2..eb55cb9 100644
--- a/drivers/bus/dpaa/base/fman/of.c
+++ b/drivers/bus/dpaa/base/fman/of.c
@@ -182,6 +182,11 @@ linear_dir(struct dt_dir *d)
DPAA_BUS_LOG(DEBUG, "Duplicate lphandle in %s",
d->node.node.full_name);
d->lphandle = f;
+ } else if (!strcmp(f->node.node.name, "phandle")) {
+ if (d->lphandle)
+ DPAA_BUS_LOG(DEBUG, "Duplicate lphandle in %s",
+d->node.node.full_name);
+ d->lphandle = f;
} else if (!strcmp(f->node.node.name, "#address-cells")) {
if (d->a_cells)
DPAA_BUS_LOG(DEBUG, "Duplicate a_cells in %s",
--
2.7.4
[dpdk-dev] [PATCH 02/10] bus/dpaa: fix svr id fetch location
Otherwise the SVR may not be avilable for dpaa init.
Fixes: 3b59b73dea08 ("bus/dpaa: update platform SoC value register routines")
Cc: sta...@dpdk.org
Signed-off-by: Hemant Agrawal
---
drivers/bus/dpaa/dpaa_bus.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 2046206..7956bd0 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -539,6 +539,13 @@ rte_dpaa_bus_probe(void)
unsigned int svr_ver;
int probe_all = rte_dpaa_bus.bus.conf.scan_mode !=
RTE_BUS_SCAN_WHITELIST;
+ svr_file = fopen(DPAA_SOC_ID_FILE, "r");
+ if (svr_file) {
+ if (fscanf(svr_file, "svr:%x", &svr_ver) > 0)
+ dpaa_svr_family = svr_ver & SVR_MASK;
+ fclose(svr_file);
+ }
+
/* For each registered driver, and device, call the driver->probe */
TAILQ_FOREACH(dev, &rte_dpaa_bus.device_list, next) {
TAILQ_FOREACH(drv, &rte_dpaa_bus.driver_list, next) {
@@ -569,13 +576,6 @@ rte_dpaa_bus_probe(void)
if (!TAILQ_EMPTY(&rte_dpaa_bus.device_list))
rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME);
- svr_file = fopen(DPAA_SOC_ID_FILE, "r");
- if (svr_file) {
- if (fscanf(svr_file, "svr:%x", &svr_ver) > 0)
- dpaa_svr_family = svr_ver & SVR_MASK;
- fclose(svr_file);
- }
-
return 0;
}
--
2.7.4
[dpdk-dev] [PATCH 05/10] bus/dpaa: make vdqcr configurable
From: Nipun Gupta
This patch add support for configurable vdqcr exact flag.
This boost the performance, however this can give
side effects for some extra packet fetch. Which has been
taken care in the patch as well.
Signed-off-by: Nipun Gupta
---
drivers/bus/dpaa/base/qbman/qman.c | 4 ++--
drivers/bus/dpaa/include/fsl_qman.h | 3 ++-
drivers/crypto/dpaa_sec/dpaa_sec.c | 19 ---
drivers/net/dpaa/dpaa_rxtx.c| 18 +++---
4 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/drivers/bus/dpaa/base/qbman/qman.c
b/drivers/bus/dpaa/base/qbman/qman.c
index 13c4315..f5fe5ef 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -2002,13 +2002,13 @@ int qman_query_congestion(struct qm_mcr_querycongestion
*congestion)
return 0;
}
-int qman_set_vdq(struct qman_fq *fq, u16 num)
+int qman_set_vdq(struct qman_fq *fq, u16 num, uint32_t vdqcr_flags)
{
struct qman_portal *p = get_affine_portal();
uint32_t vdqcr;
int ret = -EBUSY;
- vdqcr = QM_VDQCR_EXACT;
+ vdqcr = vdqcr_flags;
vdqcr |= QM_VDQCR_NUMFRAMES_SET(num);
if ((fq->state != qman_fq_state_parked) &&
diff --git a/drivers/bus/dpaa/include/fsl_qman.h
b/drivers/bus/dpaa/include/fsl_qman.h
index e4ad7ae..b18cf03 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -1332,10 +1332,11 @@ unsigned int qman_portal_poll_rx(unsigned int
poll_limit,
* qman_set_vdq - Issue a volatile dequeue command
* @fq: Frame Queue on which the volatile dequeue command is issued
* @num: Number of Frames requested for volatile dequeue
+ * @vdqcr_flags: QM_VDQCR_EXACT flag to for VDQCR command
*
* This function will issue a volatile dequeue command to the QMAN.
*/
-int qman_set_vdq(struct qman_fq *fq, u16 num);
+int qman_set_vdq(struct qman_fq *fq, u16 num, uint32_t vdqcr_flags);
/**
* qman_dequeue - Get the DQRR entry after volatile dequeue command
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c
b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 06f7e43..a07869f 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -526,12 +526,25 @@ dpaa_sec_deq(struct dpaa_sec_qp *qp, struct rte_crypto_op
**ops, int nb_ops)
{
struct qman_fq *fq;
unsigned int pkts = 0;
- int ret;
+ int num_rx_bufs, ret;
struct qm_dqrr_entry *dq;
+ uint32_t vdqcr_flags = 0;
fq = &qp->outq;
- ret = qman_set_vdq(fq, (nb_ops > DPAA_MAX_DEQUEUE_NUM_FRAMES) ?
- DPAA_MAX_DEQUEUE_NUM_FRAMES : nb_ops);
+ /*
+* Until request for four buffers, we provide exact number of buffers.
+* Otherwise we do not set the QM_VDQCR_EXACT flag.
+* Not setting QM_VDQCR_EXACT flag can provide two more buffers than
+* requested, so we request two less in this case.
+*/
+ if (nb_ops < 4) {
+ vdqcr_flags = QM_VDQCR_EXACT;
+ num_rx_bufs = nb_ops;
+ } else {
+ num_rx_bufs = nb_ops > DPAA_MAX_DEQUEUE_NUM_FRAMES ?
+ (DPAA_MAX_DEQUEUE_NUM_FRAMES - 2) : (nb_ops - 2);
+ }
+ ret = qman_set_vdq(fq, num_rx_bufs, vdqcr_flags);
if (ret)
return 0;
diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 805bc30..168b77e 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -560,7 +560,8 @@ uint16_t dpaa_eth_queue_rx(void *q,
struct qman_fq *fq = q;
struct qm_dqrr_entry *dq;
uint32_t num_rx = 0, ifid = ((struct dpaa_if *)fq->dpaa_intf)->ifid;
- int ret;
+ int num_rx_bufs, ret;
+ uint32_t vdqcr_flags = 0;
if (likely(fq->is_static))
return dpaa_eth_queue_portal_rx(fq, bufs, nb_bufs);
@@ -573,8 +574,19 @@ uint16_t dpaa_eth_queue_rx(void *q,
}
}
- ret = qman_set_vdq(fq, (nb_bufs > DPAA_MAX_DEQUEUE_NUM_FRAMES) ?
- DPAA_MAX_DEQUEUE_NUM_FRAMES : nb_bufs);
+ /* Until request for four buffers, we provide exact number of buffers.
+* Otherwise we do not set the QM_VDQCR_EXACT flag.
+* Not setting QM_VDQCR_EXACT flag can provide two more buffers than
+* requested, so we request two less in this case.
+*/
+ if (nb_bufs < 4) {
+ vdqcr_flags = QM_VDQCR_EXACT;
+ num_rx_bufs = nb_bufs;
+ } else {
+ num_rx_bufs = nb_bufs > DPAA_MAX_DEQUEUE_NUM_FRAMES ?
+ (DPAA_MAX_DEQUEUE_NUM_FRAMES - 2) : (nb_bufs - 2);
+ }
+ ret = qman_set_vdq(fq, num_rx_bufs, vdqcr_flags);
if (ret)
return 0;
--
2.7.4
[dpdk-dev] [PATCH 06/10] net/dpaa: support default queue mode
In case DPAA FMAN configuration tool (FMC) is not available.
System can still work with default queue. (1 queue per port).
Signed-off-by: Hemant Agrawal
---
drivers/net/dpaa/dpaa_ethdev.c | 43 +-
1 file changed, 30 insertions(+), 13 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index d014a11..cf07d25 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -74,6 +74,7 @@ static uint64_t dev_tx_offloads_nodis =
/* Keep track of whether QMAN and BMAN have been globally initialized */
static int is_global_init;
+static int default_q; /* use default queue - FMC is not executed*/
/* At present we only allow up to 4 push mode queues as default - as each of
* this queue need dedicated portal and we are short of portals.
*/
@@ -516,7 +517,8 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
PMD_INIT_FUNC_TRACE();
- DPAA_PMD_INFO("Rx queue setup for queue index: %d", queue_idx);
+ DPAA_PMD_INFO("Rx queue setup for queue index: %d fq_id (0x%x)",
+ queue_idx, rxq->fqid);
if (!dpaa_intf->bp_info || dpaa_intf->bp_info->mp != mp) {
struct fman_if_ic_params icp;
@@ -715,7 +717,8 @@ int dpaa_eth_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
PMD_INIT_FUNC_TRACE();
- DPAA_PMD_INFO("Tx queue setup for queue index: %d", queue_idx);
+ DPAA_PMD_INFO("Tx queue setup for queue index: %d fq_id (0x%x)",
+ queue_idx, dpaa_intf->tx_queues[queue_idx].fqid);
dev->data->tx_queues[queue_idx] = &dpaa_intf->tx_queues[queue_idx];
return 0;
}
@@ -1008,12 +1011,12 @@ static int dpaa_rx_queue_init(struct qman_fq *fq,
struct qman_cgr *cgr_rx,
ret = qman_reserve_fqid(fqid);
if (ret) {
- DPAA_PMD_ERR("reserve rx fqid %d failed with ret: %d",
+ DPAA_PMD_ERR("reserve rx fqid 0x%x failed with ret: %d",
fqid, ret);
return -EINVAL;
}
- DPAA_PMD_DEBUG("creating rx fq %p, fqid %d", fq, fqid);
+ DPAA_PMD_DEBUG("creating rx fq %p, fqid 0x%x", fq, fqid);
ret = qman_create_fq(fqid, QMAN_FQ_FLAG_NO_ENQUEUE, fq);
if (ret) {
DPAA_PMD_ERR("create rx fqid %d failed with ret: %d",
@@ -1032,7 +1035,7 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct
qman_cgr *cgr_rx,
&cgr_opts);
if (ret) {
DPAA_PMD_WARN(
- "rx taildrop init fail on rx fqid %d (ret=%d)",
+ "rx taildrop init fail on rx fqid 0x%x(ret=%d)",
fqid, ret);
goto without_cgr;
}
@@ -1043,7 +1046,7 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct
qman_cgr *cgr_rx,
without_cgr:
ret = qman_init_fq(fq, flags, &opts);
if (ret)
- DPAA_PMD_ERR("init rx fqid %d failed with ret: %d", fqid, ret);
+ DPAA_PMD_ERR("init rx fqid 0x%x failed with ret:%d", fqid, ret);
return ret;
}
@@ -1071,10 +1074,10 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
/* no tx-confirmation */
opts.fqd.context_a.hi = 0x8000 | fman_dealloc_bufs_mask_hi;
opts.fqd.context_a.lo = 0 | fman_dealloc_bufs_mask_lo;
- DPAA_PMD_DEBUG("init tx fq %p, fqid %d", fq, fq->fqid);
+ DPAA_PMD_DEBUG("init tx fq %p, fqid 0x%x", fq, fq->fqid);
ret = qman_init_fq(fq, QMAN_INITFQ_FLAG_SCHED, &opts);
if (ret)
- DPAA_PMD_ERR("init tx fqid %d failed %d", fq->fqid, ret);
+ DPAA_PMD_ERR("init tx fqid 0x%x failed %d", fq->fqid, ret);
return ret;
}
@@ -1145,10 +1148,15 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
dpaa_intf->cfg = cfg;
/* Initialize Rx FQ's */
- if (getenv("DPAA_NUM_RX_QUEUES"))
- num_rx_fqs = atoi(getenv("DPAA_NUM_RX_QUEUES"));
- else
+ if (default_q) {
num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES;
+ } else {
+ if (getenv("DPAA_NUM_RX_QUEUES"))
+ num_rx_fqs = atoi(getenv("DPAA_NUM_RX_QUEUES"));
+ else
+ num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES;
+ }
+
/* if push mode queues to be enabled. Currenly we are allowing only
* one queue per thread.
@@ -1196,8 +1204,11 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
}
for (loop = 0; loop < num_rx_fqs; loop++) {
- fqid = DPAA_PCD_FQID_START + dpaa_intf->ifid *
- DPAA_PCD_FQID_MULTIPLIER + loop;
+ if (default_q)
+ fqid = cfg->rx_def;
+ else
+ fqid = DPAA_PCD_FQID_START + dpaa_intf->ifid *
+
[dpdk-dev] [PATCH 03/10] bus/dpaa: optimize the fq callback routine
Avoid array of fq as packets are dq only from a single q. Signed-off-by: Sunil Kumar Kori Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/qbman/qman.c | 15 +++ drivers/net/dpaa/dpaa_rxtx.c | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index 27d98cc..13c4315 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -1058,7 +1058,7 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit, struct qm_portal *portal = &p->p; register struct qm_dqrr *dqrr = &portal->dqrr; struct qm_dqrr_entry *dq[QM_DQRR_SIZE], *shadow[QM_DQRR_SIZE]; - struct qman_fq *fq[QM_DQRR_SIZE]; + struct qman_fq *fq; unsigned int limit = 0, rx_number = 0; uint32_t consume = 0; @@ -1092,14 +1092,13 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit, /* SDQCR: context_b points to the FQ */ #ifdef CONFIG_FSL_QMAN_FQ_LOOKUP - fq[rx_number] = qman_fq_lookup_table[be32_to_cpu( - dq[rx_number]->contextB)]; + fq = qman_fq_lookup_table[be32_to_cpu(dq[rx_number]->contextB)]; #else - fq[rx_number] = (void *)be32_to_cpu( - dq[rx_number]->contextB); + fq = (void *)be32_to_cpu(dq[rx_number]->contextB); #endif - fq[rx_number]->cb.dqrr_prepare(shadow[rx_number], -&bufs[rx_number]); + if (fq->cb.dqrr_prepare) + fq->cb.dqrr_prepare(shadow[rx_number], + &bufs[rx_number]); consume |= (1 << (31 - DQRR_PTR2IDX(shadow[rx_number]))); rx_number++; @@ -1107,7 +1106,7 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit, } while (++limit < poll_limit); if (rx_number) - fq[0]->cb.dqrr_dpdk_pull_cb(fq, shadow, bufs, rx_number); + fq->cb.dqrr_dpdk_pull_cb(&fq, shadow, bufs, rx_number); /* Consume all the DQRR enries together */ qm_out(DQRR_DCAP, (1 << 8) | consume); diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 1316d2a..805bc30 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -431,7 +431,7 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry **dqrr, } fd = &dqrr[i]->fd; - dpaa_intf = fq[i]->dpaa_intf; + dpaa_intf = fq[0]->dpaa_intf; format = (fd->opaque & DPAA_FD_FORMAT_MASK) >> DPAA_FD_FORMAT_SHIFT; -- 2.7.4
[dpdk-dev] [PATCH 04/10] bus/dpaa: implement new of API to get MAC address
From: Akhil Goyal
Signed-off-by: Akhil Goyal
---
drivers/bus/dpaa/base/fman/of.c | 39 +++
drivers/bus/dpaa/include/of.h | 2 ++
drivers/bus/dpaa/rte_bus_dpaa_version.map | 8 +++
3 files changed, 49 insertions(+)
diff --git a/drivers/bus/dpaa/base/fman/of.c b/drivers/bus/dpaa/base/fman/of.c
index eb55cb9..a7f3174 100644
--- a/drivers/bus/dpaa/base/fman/of.c
+++ b/drivers/bus/dpaa/base/fman/of.c
@@ -546,3 +546,42 @@ of_device_is_compatible(const struct device_node *dev_node,
return true;
return false;
}
+
+static const void *of_get_mac_addr(const struct device_node *np,
+ const char *name)
+{
+ return of_get_property(np, name, NULL);
+}
+
+/**
+ * Search the device tree for the best MAC address to use. 'mac-address' is
+ * checked first, because that is supposed to contain to "most recent" MAC
+ * address. If that isn't set, then 'local-mac-address' is checked next,
+ * because that is the default address. If that isn't set, then the obsolete
+ * 'address' is checked, just in case we're using an old device tree.
+ *
+ * Note that the 'address' property is supposed to contain a virtual address of
+ * the register set, but some DTS files have redefined that property to be the
+ * MAC address.
+ *
+ * All-zero MAC addresses are rejected, because those could be properties that
+ * exist in the device tree, but were not set by U-Boot. For example, the
+ * DTS could define 'mac-address' and 'local-mac-address', with zero MAC
+ * addresses. Some older U-Boots only initialized 'local-mac-address'. In
+ * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
+ * but is all zeros.
+ */
+const void *of_get_mac_address(const struct device_node *np)
+{
+ const void *addr;
+
+ addr = of_get_mac_addr(np, "mac-address");
+ if (addr)
+ return addr;
+
+ addr = of_get_mac_addr(np, "local-mac-address");
+ if (addr)
+ return addr;
+
+ return of_get_mac_addr(np, "address");
+}
diff --git a/drivers/bus/dpaa/include/of.h b/drivers/bus/dpaa/include/of.h
index 151be5a..7ea7608 100644
--- a/drivers/bus/dpaa/include/of.h
+++ b/drivers/bus/dpaa/include/of.h
@@ -109,6 +109,8 @@ const struct device_node *of_get_parent(const struct
device_node *dev_node);
const struct device_node *of_get_next_child(const struct device_node *dev_node,
const struct device_node *prev);
+const void *of_get_mac_address(const struct device_node *np);
+
#define for_each_child_node(parent, child) \
for (child = of_get_next_child(parent, NULL); child != NULL; \
child = of_get_next_child(parent, child))
diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map
b/drivers/bus/dpaa/rte_bus_dpaa_version.map
index 8d90285..e00c911 100644
--- a/drivers/bus/dpaa/rte_bus_dpaa_version.map
+++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map
@@ -92,3 +92,11 @@ DPDK_18.02 {
local: *;
} DPDK_17.11;
+
+DPDK_18.08 {
+ global:
+
+ of_get_mac_address;
+
+ local: *;
+} DPDK_18.02;
--
2.7.4
[dpdk-dev] [PATCH 09/10] bus/dpaa: cleanup unnecessary global variables
Changes originally in the patch
"drivers: cleanup unnecessary global variables" by Pavan.
Signed-off-by: Pavan Nikhilesh
Signed-off-by: Hemant Agrawal
---
drivers/bus/dpaa/base/fman/netcfg_layer.c | 5 -
drivers/bus/dpaa/base/qbman/bman_driver.c | 4 ++--
drivers/bus/dpaa/base/qbman/qman.c| 2 +-
drivers/bus/dpaa/base/qbman/qman_driver.c | 4 ++--
drivers/bus/dpaa/base/qbman/qman_priv.h | 1 -
drivers/bus/dpaa/dpaa_bus.c | 2 +-
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c
b/drivers/bus/dpaa/base/fman/netcfg_layer.c
index 3e956ce..031c6f1 100644
--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
@@ -18,11 +18,6 @@
#include
#include
-/* Structure contains information about all the interfaces given by user
- * on command line.
- */
-struct netcfg_interface *netcfg_interface;
-
/* This data structure contaings all configurations information
* related to usages of DPA devices.
*/
diff --git a/drivers/bus/dpaa/base/qbman/bman_driver.c
b/drivers/bus/dpaa/base/qbman/bman_driver.c
index 1381da3..b14b590 100644
--- a/drivers/bus/dpaa/base/qbman/bman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/bman_driver.c
@@ -15,9 +15,9 @@
/*
* Global variables of the max portal/pool number this bman version supported
*/
-u16 bman_ip_rev;
+static u16 bman_ip_rev;
u16 bman_pool_max;
-void *bman_ccsr_map;
+static void *bman_ccsr_map;
/*/
/* Portal driver */
diff --git a/drivers/bus/dpaa/base/qbman/qman.c
b/drivers/bus/dpaa/base/qbman/qman.c
index f5fe5ef..7c17027 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -625,7 +625,7 @@ struct qman_portal *qman_create_portal(
#define MAX_GLOBAL_PORTALS 8
static struct qman_portal global_portals[MAX_GLOBAL_PORTALS];
-rte_atomic16_t global_portals_used[MAX_GLOBAL_PORTALS];
+static rte_atomic16_t global_portals_used[MAX_GLOBAL_PORTALS];
static struct qman_portal *
qman_alloc_global_portal(void)
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c
b/drivers/bus/dpaa/base/qbman/qman_driver.c
index 07b29d5..f6ecd6b 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -20,9 +20,9 @@ u16 qm_channel_caam = QMAN_CHANNEL_CAAM;
u16 qm_channel_pme = QMAN_CHANNEL_PME;
/* Ccsr map address to access ccsrbased register */
-void *qman_ccsr_map;
+static void *qman_ccsr_map;
/* The qman clock frequency */
-u32 qman_clk;
+static u32 qman_clk;
static __thread int qmfd = -1;
static __thread struct qm_portal_config qpcfg;
diff --git a/drivers/bus/dpaa/base/qbman/qman_priv.h
b/drivers/bus/dpaa/base/qbman/qman_priv.h
index 9e4471e..02f6301 100644
--- a/drivers/bus/dpaa/base/qbman/qman_priv.h
+++ b/drivers/bus/dpaa/base/qbman/qman_priv.h
@@ -139,7 +139,6 @@ struct qm_portal_config {
#define QMAN_REV31 0x0301
#define QMAN_REV32 0x0302
extern u16 qman_ip_rev; /* 0 if uninitialised, otherwise QMAN_REVx */
-extern u32 qman_clk;
int qm_set_wpm(int wpm);
int qm_get_wpm(int *wpm);
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 7956bd0..5ba3d28 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -50,7 +50,7 @@ struct rte_dpaa_bus rte_dpaa_bus;
struct netcfg_info *dpaa_netcfg;
/* define a variable to hold the portal_key, once created.*/
-pthread_key_t dpaa_portal_key;
+static pthread_key_t dpaa_portal_key;
unsigned int dpaa_svr_family;
--
2.7.4
[dpdk-dev] [PATCH 08/10] net/dpaa2: fix the prefetch Rx to honor nb pkts
This patch fix the prefetch rx routine to
set the next prefetch request to the size of nb_pkts.
This will assume that next request will ideally will be
of same size.
Fixes: 4bc5ab88dbd6 ("net/dpaa2: fix Tx only mode")
Cc: sta...@dpdk.org
Signed-off-by: Hemant Agrawal
---
drivers/net/dpaa2/dpaa2_rxtx.c | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index dac086d..311861c 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -447,6 +447,12 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
return 0;
}
+/* This function assumes that you will be keeping the same value for nb_pkts
+ * across calls per queue, if that is not the case, better use non-prefetch
+ * version of rx call.
+ * It will return the packets as request in the previous call without honoring
+ * the current nb_pkts or bufs space.
+ */
uint16_t
dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
{
@@ -454,7 +460,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)queue;
struct qbman_result *dq_storage, *dq_storage1 = NULL;
uint32_t fqid = dpaa2_q->fqid;
- int ret, num_rx = 0;
+ int ret, num_rx = 0, pull_size;
uint8_t pending, status;
struct qbman_swp *swp;
const struct qbman_fd *fd, *next_fd;
@@ -470,12 +476,12 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf
**bufs, uint16_t nb_pkts)
}
}
swp = DPAA2_PER_LCORE_ETHRX_PORTAL;
-
+ pull_size = (nb_pkts > DPAA2_DQRR_RING_SIZE) ?
+ DPAA2_DQRR_RING_SIZE : nb_pkts;
if (unlikely(!q_storage->active_dqs)) {
q_storage->toggle = 0;
dq_storage = q_storage->dq_storage[q_storage->toggle];
- q_storage->last_num_pkts = (nb_pkts > DPAA2_DQRR_RING_SIZE) ?
- DPAA2_DQRR_RING_SIZE : nb_pkts;
+ q_storage->last_num_pkts = pull_size;
qbman_pull_desc_clear(&pulldesc);
qbman_pull_desc_set_numframes(&pulldesc,
q_storage->last_num_pkts);
@@ -514,7 +520,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
q_storage->toggle ^= 1;
dq_storage1 = q_storage->dq_storage[q_storage->toggle];
qbman_pull_desc_clear(&pulldesc);
- qbman_pull_desc_set_numframes(&pulldesc, DPAA2_DQRR_RING_SIZE);
+ qbman_pull_desc_set_numframes(&pulldesc, pull_size);
qbman_pull_desc_set_fq(&pulldesc, fqid);
qbman_pull_desc_set_storage(&pulldesc, dq_storage1,
(uint64_t)(DPAA2_VADDR_TO_IOVA(dq_storage1)), 1);
--
2.7.4
[dpdk-dev] [PATCH 07/10] net/dpaa: remove experimental tag from PMD APIs
Signed-off-by: Hemant Agrawal
---
drivers/net/dpaa/dpaa_ethdev.c| 6 +++---
drivers/net/dpaa/dpaa_ethdev.h| 8 +---
drivers/net/dpaa/rte_pmd_dpaa.h | 5 +
drivers/net/dpaa/rte_pmd_dpaa_version.map | 4 ++--
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index cf07d25..ba269a8 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -608,7 +608,7 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
return 0;
}
-int __rte_experimental
+int
dpaa_eth_eventq_attach(const struct rte_eth_dev *dev,
int eth_rx_queue_id,
u16 ch_id,
@@ -671,7 +671,7 @@ dpaa_eth_eventq_attach(const struct rte_eth_dev *dev,
return ret;
}
-int __rte_experimental
+int
dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,
int eth_rx_queue_id)
{
@@ -940,7 +940,7 @@ is_dpaa_supported(struct rte_eth_dev *dev)
return is_device_supported(dev, &rte_dpaa_pmd);
}
-int __rte_experimental
+int
rte_pmd_dpaa_set_tx_loopback(uint8_t port, uint8_t on)
{
struct rte_eth_dev *dev;
diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index 1897b9e..c79b9f8 100644
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -160,12 +160,14 @@ struct dpaa_if_stats {
uint64_t tund; /**
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
- *
* Enable/Disable TX loopback
*
* @param port
@@ -33,7 +30,7 @@
* - (-ENODEV) if *port* invalid.
* - (-EINVAL) if bad parameter.
*/
-int __rte_experimental
+int
rte_pmd_dpaa_set_tx_loopback(uint8_t port, uint8_t on);
#endif /* _PMD_DPAA_H_ */
diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map
b/drivers/net/dpaa/rte_pmd_dpaa_version.map
index c7ad403..8cb4500 100644
--- a/drivers/net/dpaa/rte_pmd_dpaa_version.map
+++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map
@@ -3,10 +3,10 @@ DPDK_17.11 {
local: *;
};
-EXPERIMENTAL {
+DPDK_18.08 {
global:
dpaa_eth_eventq_attach;
dpaa_eth_eventq_detach;
rte_pmd_dpaa_set_tx_loopback;
-};
+} DPDK_17.11;
--
2.7.4
[dpdk-dev] [PATCH 10/10] bus/fslmc: cleanup unnecessary global variables
Changes originally in the patch
"drivers: cleanup unnecessary global variables" by Pavan.
Signed-off-by: Pavan Nikhilesh
Signed-off-by: Hemant Agrawal
---
drivers/bus/fslmc/qbman/qbman_portal.c | 3 +--
drivers/bus/fslmc/qbman/qbman_portal.h | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c
b/drivers/bus/fslmc/qbman/qbman_portal.c
index 713ec96..0714500 100644
--- a/drivers/bus/fslmc/qbman/qbman_portal.c
+++ b/drivers/bus/fslmc/qbman/qbman_portal.c
@@ -122,8 +122,7 @@ struct qbman_swp *qbman_swp_init(const struct
qbman_swp_desc *d)
p->vdq.valid_bit = QB_VALID_BIT;
p->dqrr.next_idx = 0;
p->dqrr.valid_bit = QB_VALID_BIT;
- qman_version = p->desc.qman_version;
- if ((qman_version & 0x) < QMAN_REV_4100) {
+ if ((p->desc.qman_version & 0x) < QMAN_REV_4100) {
p->dqrr.dqrr_size = 4;
p->dqrr.reset_bug = 1;
} else {
diff --git a/drivers/bus/fslmc/qbman/qbman_portal.h
b/drivers/bus/fslmc/qbman/qbman_portal.h
index 8bff0b4..dbea22a 100644
--- a/drivers/bus/fslmc/qbman/qbman_portal.h
+++ b/drivers/bus/fslmc/qbman/qbman_portal.h
@@ -7,7 +7,6 @@
#include "qbman_sys.h"
#include
-uint32_t qman_version;
#define QMAN_REV_4000 0x0400
#define QMAN_REV_4100 0x0401
#define QMAN_REV_4101 0x04010001
--
2.7.4
Re: [dpdk-dev] [PATCH] usertools: fix build with gcc
On Thu, Jun 21, 2018 at 09:35:41AM +, Choonho Son wrote:
> dpdk-setup.sh fails to build with lack of environment variable
>
> Build complete [x86_64-native-linuxapp-gcc]
> Installation cannot run with T defined and DESTDIR undefined
>
> Signed-off-by: Choonho Son
> ---
> usertools/dpdk-setup.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/usertools/dpdk-setup.sh b/usertools/dpdk-setup.sh
> index 5eebbce..5248e7a 100755
> --- a/usertools/dpdk-setup.sh
> +++ b/usertools/dpdk-setup.sh
> @@ -65,6 +65,7 @@ setup_target()
> {
> option=$1
> export RTE_TARGET=${TARGETS[option]}
> + export DESTDIR=${DESTDIR:-install}
>
> compiler=${RTE_TARGET##*-}
> if [ "$compiler" == "icc" ] ; then
> @@ -76,7 +77,7 @@ setup_target()
> fi
> fi
> if [ "$QUIT" == "0" ] ; then
> - make install T=${RTE_TARGET}
> + make install T=${RTE_TARGET} DESTDIR=${DESTDIR}
> fi
> echo
> "--"
> echo " RTE_TARGET exported as $RTE_TARGET"
The message about no DESTDIR is not really an error, the build has
completed successfully. I don't think copying the build over to a new
directory is something we should always do as part of this script.
/Bruce
Re: [dpdk-dev] [PATCH 1/1] ena: fix SIGFPE with 0 rx queues
+ Ferruh and Michal
2018-06-20 18:32 GMT+02:00 Daria Kolistratova :
> When he number of rx queues is 0
> (what can be when application does not receive)
> failed with SIGFPE.
> Fixed adding zero check before division.
>
> Signed-off-by: Daria Kolistratova
> ---
> drivers/net/ena/ena_ethdev.c | 6 +-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
> index 9ae73e331..76c483921 100644
> --- a/drivers/net/ena/ena_ethdev.c
> +++ b/drivers/net/ena/ena_ethdev.c
> @@ -684,7 +684,11 @@ static int ena_rss_init_default(struct ena_adapter
> *adapter)
> }
>
> for (i = 0; i < ENA_RX_RSS_TABLE_SIZE; i++) {
> - val = i % nb_rx_queues;
> + if (nb_rx_queues != 0)
> + val = i % nb_rx_queues;
> + else
> + val = 0;
> +
> rc = ena_com_indirect_table_fill_entry(ena_dev, i,
>ENA_IO_RXQ_IDX(val));
> if (unlikely(rc && (rc != ENA_COM_UNSUPPORTED))) {
> --
> 2.14.4
>
Re: [dpdk-dev] [PATCH v2] net/mlx5: fix error number handling
Wednesday, June 20, 2018 10:03 AM, Nélio Laranjeiro:
> Subject: Re: [PATCH v2] net/mlx5: fix error number handling
>
> On Tue, Jun 19, 2018 at 04:13:13PM -0700, Yongseok Koh wrote:
> > rte_errno should be saved only if error has occurred because rte_errno
> > could have garbage value.
> >
> > Fixes: a6d83b6a9209 ("net/mlx5: standardize on negative errno values")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Yongseok Koh
>
> Acked-by: Nelio Laranjeiro
Applied to next-net-mlx, thanks.
Re: [dpdk-dev] [PATCH v2] net/mlx5: clean-up developer logs
Tuesday, June 5, 2018 11:45 AM, Nelio Laranjeiro: > Subject: [dpdk-dev] [PATCH v2] net/mlx5: clean-up developer logs > > Split maintainers logs from user logs. > > A lot of debug logs are present providing internal information on how the > PMD works to users. Such logs should not be available for them and thus > should remain available only when the PMD is compiled in debug mode. > > This commits removes some useless debug logs, move the Maintainers ones > under DEBUG and also move dump into debug mode only. > > Signed-off-by: Nelio Laranjeiro > > --- > > Changes in v2: > > remove even more developer logs. > --- > drivers/net/mlx5/mlx5_mr.c | 119 +++- > drivers/net/mlx5/mlx5_mr.h | 5 +- > drivers/net/mlx5/mlx5_rxq.c | 56 +-- > drivers/net/mlx5/mlx5_trigger.c | 2 - > drivers/net/mlx5/mlx5_txq.c | 18 + > 5 files changed, 62 insertions(+), 138 deletions(-) > Applied to next-net-mlx, thanks.
[dpdk-dev] [Bug 63] AWS ENA driver does not work with zero rx queues.
https://bugs.dpdk.org/show_bug.cgi?id=63 Bug ID: 63 Summary: AWS ENA driver does not work with zero rx queues. Product: DPDK Version: 18.02 Hardware: All OS: Other Status: CONFIRMED Severity: major Priority: Normal Component: other Assignee: dev@dpdk.org Reporter: daria.kolistrat...@intel.com Target Milestone: --- (Program received signal SIGFPE, Arithmetic exception.) which was caused by: 0x006f703c in ena_rss_init_default (adapter=0x7fffef399200) at /home/ec2-user/projects/src/github.com/intel-go/nff-go/dpdk/dpdk-18.02/drivers/net/ena/ena_ethdev.c:571 571 val = i % nb_rx_queues; nb_rx_queues is 0, cause our application does not receive and we do not use rx queues. After fix of SIGFPE, we cant init port cause ena_com_ind_tbl_convert_to_device function returns error at line: (if (io_sq->direction != ENA_COM_IO_QUEUE_DIRECTION_RX) return ENA_COM_INVAL;) cause place for rx queue is not initialized and 0 means tx queue. Application may have no rx queues, please look at this case. -- You are receiving this mail because: You are the assignee for the bug.
Re: [dpdk-dev] [PATCH 1/1] ena: fix SIGFPE with 0 rx queues
Hi Daria,
I couldn't find the patch in the patchwork or the mailing list, so
sorry for late response.
2018-06-21 12:14 GMT+02:00 Marcin Wojtas :
> + Ferruh and Michal
>
> 2018-06-20 18:32 GMT+02:00 Daria Kolistratova :
>> When he number of rx queues is 0
Typo (missing 't' letter)
>> (what can be when application does not receive)
To be precise, the issue appears only when the application is
requesting ETH_MQ_RX_RSS_FLAG in the
rte_dev->data->dev_conf.rxmode.mq_mode.
>> failed with SIGFPE.
>> Fixed adding zero check before division.
>>
>> Signed-off-by: Daria Kolistratova
>> ---
>> drivers/net/ena/ena_ethdev.c | 6 +-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
>> index 9ae73e331..76c483921 100644
>> --- a/drivers/net/ena/ena_ethdev.c
>> +++ b/drivers/net/ena/ena_ethdev.c
>> @@ -684,7 +684,11 @@ static int ena_rss_init_default(struct ena_adapter
>> *adapter)
>> }
>>
>> for (i = 0; i < ENA_RX_RSS_TABLE_SIZE; i++) {
>> - val = i % nb_rx_queues;
>> + if (nb_rx_queues != 0)
>> + val = i % nb_rx_queues;
>> + else
>> + val = 0;
>> +
We can skip the RSS configuration at all if the nb_rx_queues is 0. I
suggest to modify the patch like this:
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 8701328ba..5ba90f58a 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -1056,7 +1056,7 @@ static int ena_start(struct rte_eth_dev *dev)
return rc;
if (adapter->rte_dev->data->dev_conf.rxmode.mq_mode &
- ETH_MQ_RX_RSS_FLAG) {
+ ETH_MQ_RX_RSS_FLAG && adapter->rte_dev->data->nb_rx_queues > 0) {
rc = ena_rss_init_default(adapter);
if (rc)
return rc;
>> rc = ena_com_indirect_table_fill_entry(ena_dev, i,
>>ENA_IO_RXQ_IDX(val));
>> if (unlikely(rc && (rc != ENA_COM_UNSUPPORTED))) {
>> --
>> 2.14.4
>>
Re: [dpdk-dev] [PATCH] maintainers: update subtree committers
20/06/2018 12:37, Ferruh Yigit: > From: Helin Zhang > > For subtree of dpdk-next-net-intel, Qi Zhang has agreed to take > the committer role, to replace Helin Zhang. Also Beilei Xing has > agreed to be the backup committer of the subtree. > > Signed-off-by: Helin Zhang Applied, thanks all for maintaining this tree.
[dpdk-dev] [PATCH v2] ethdev: add new offload flag to keep CRC
DEV_RX_OFFLOAD_KEEP_CRC offload flag is added. PMDs that support keeping CRC should advertise this offload capability. DEV_RX_OFFLOAD_CRC_STRIP flag will remain one more release default behavior in PMDs are to keep the CRC until this flag removed Until DEV_RX_OFFLOAD_CRC_STRIP flag is removed: - Setting both KEEP_CRC & CRC_STRIP is INVALID - Setting only CRC_STRIP PMD should strip the CRC - Setting only KEEP_CRC PMD should keep the CRC - Not setting both PMD should keep the CRC A helper function rte_eth_dev_is_keep_crc() has been added to be able to change the no flag behavior with minimal changes in PMDs. The PMDs that doesn't report the DEV_RX_OFFLOAD_KEEP_CRC offload can remove rte_eth_dev_is_keep_crc() checks next release, related code commented to help the maintenance task. And DEV_RX_OFFLOAD_CRC_STRIP has been added to virtual drivers since they don't use CRC at all, when an application requires this offload virtual PMDs should not return error. Signed-off-by: Ferruh Yigit Acked-by: Allain Legacy Acked-by: Andrew Rybchenko --- v2: * mlx5 PMD updated on how to report KEEP_CRC --- doc/guides/rel_notes/deprecation.rst | 10 - drivers/net/af_packet/rte_eth_af_packet.c | 1 + drivers/net/avp/avp_ethdev.c | 1 + drivers/net/axgbe/axgbe_ethdev.c | 4 +++- drivers/net/axgbe/axgbe_rxtx.c| 6 +++-- drivers/net/bnxt/bnxt_ethdev.c| 1 + drivers/net/bnxt/bnxt_rxq.c | 3 +-- drivers/net/cxgbe/cxgbe_ethdev.c | 6 - drivers/net/e1000/em_rxtx.c | 20 ++--- drivers/net/e1000/igb_ethdev.c| 4 ++-- drivers/net/e1000/igb_rxtx.c | 27 ++- drivers/net/fm10k/fm10k_ethdev.c | 6 +++-- drivers/net/i40e/i40e_ethdev.c| 1 + drivers/net/i40e/i40e_ethdev_vf.c | 3 ++- drivers/net/i40e/i40e_rxtx.c | 6 +++-- drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++-- drivers/net/ixgbe/ixgbe_ipsec.c | 2 +- drivers/net/ixgbe/ixgbe_rxtx.c| 25 - drivers/net/kni/rte_eth_kni.c | 1 + drivers/net/mlx4/mlx4_rxq.c | 23 ++- drivers/net/mlx5/mlx5_rxq.c | 26 -- drivers/net/mvpp2/mrvl_ethdev.c | 8 --- drivers/net/nfp/nfp_net.c | 9 +--- drivers/net/null/rte_eth_null.c | 1 + drivers/net/octeontx/octeontx_ethdev.c| 5 - drivers/net/pcap/rte_eth_pcap.c | 1 + drivers/net/qede/qede_ethdev.c| 2 ++ drivers/net/ring/rte_eth_ring.c | 1 + drivers/net/sfc/sfc_rx.c | 5 - drivers/net/softnic/rte_eth_softnic.c | 1 + drivers/net/szedata2/rte_eth_szedata2.c | 3 ++- drivers/net/thunderx/nicvf_ethdev.c | 5 - drivers/net/vhost/rte_eth_vhost.c | 3 ++- drivers/net/virtio/virtio_ethdev.c| 3 ++- drivers/net/vmxnet3/vmxnet3_ethdev.c | 3 ++- lib/librte_ethdev/rte_ethdev.c| 9 lib/librte_ethdev/rte_ethdev.h| 5 + lib/librte_ethdev/rte_ethdev_driver.h | 20 + 38 files changed, 172 insertions(+), 92 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 1ce692eac..cd128ae23 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -67,16 +67,6 @@ Deprecation Notices - removal of ``txq_flags`` field from ``rte_eth_txconf`` struct. - removal of the offloads bit-field from ``rte_eth_rxmode`` struct. -* ethdev: A new offloading flag ``DEV_RX_OFFLOAD_KEEP_CRC`` will be added in v18.08, - This will replace the usage of not setting ``DEV_RX_OFFLOAD_CRC_STRIP`` flag - and will be implemented in PMDs accordingly. - In v18.08 both ``DEV_RX_OFFLOAD_KEEP_CRC`` and ``DEV_RX_OFFLOAD_CRC_STRIP`` flags - will be available, usage will be: - ``CRC_STRIP``: Strip CRC from packet - ``KEEP_CRC``: Keep CRC in packet - Both ``CRC_STRIP`` & ``KEEP_CRC``: Invalid - No flag: Keep CRC in packet - * ethdev: In v18.11 ``DEV_RX_OFFLOAD_CRC_STRIP`` offload flag will be removed, default behavior without any flag will be changed to CRC strip. To keep CRC ``DEV_RX_OFFLOAD_KEEP_CRC`` flag is required. diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index ea47abbf8..8cfb7ada4 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -305,6 +305,7 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues = (uint16_t)internals->nb_queues; dev_info->max_tx_queues = (uint16_t)internals->nb_queues; dev_info->min_rx_bufsize = 0; + dev_info->rx_offload_capa = DEV_RX_OFFLOAD_CRC_STRIP; } static int diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.
Re: [dpdk-dev] [PATCH v2 20/22] net/tap: enable port detach on secondary process
> On Jun 20, 2018, at 9:00 PM, Qi Zhang wrote:
>
> Previously, detach port on secondary process will mess primary
> process and cause same device can't be attached again, by take
> advantage of rte_eth_release_port_private, we can support this
> with minor change.
>
> Signed-off-by: Qi Zhang
> ---
> drivers/net/tap/rte_eth_tap.c | 17 +++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
> index df396bfde..bb5f20b01 100644
> --- a/drivers/net/tap/rte_eth_tap.c
> +++ b/drivers/net/tap/rte_eth_tap.c
> @@ -1759,6 +1759,7 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)
> }
> /* TODO: request info from primary to set up Rx and Tx */
> eth_dev->dev_ops = &ops;
> + eth_dev->device = &dev->device;
> rte_eth_dev_probing_finish(eth_dev);
> return 0;
> }
> @@ -1827,12 +1828,24 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
> {
> struct rte_eth_dev *eth_dev = NULL;
> struct pmd_internals *internals;
> + const char *name;
> int i;
>
> + name = rte_vdev_device_name(dev);
> /* find the ethdev entry */
> - eth_dev = rte_eth_dev_allocated(rte_vdev_device_name(dev));
> + eth_dev = rte_eth_dev_allocated(name);
> if (!eth_dev)
> - return 0;
> + return -ENODEV;
> +
> + if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
> + /* detach device on local pprocess only */
> + if (strlen(rte_vdev_device_args(dev)) == 0)
> + return rte_eth_dev_release_port_private(eth_dev);
> + /**
> + * else this is a private device for current process
> + * so continue with normal detach scenario
> + */
> + }
Acked-by: Keith Wiles for this patch of the tap PMD.
>
> internals = eth_dev->data->dev_private;
>
> --
> 2.13.6
>
Regards,
Keith
Re: [dpdk-dev] [PATCH 1/6] cryptodev: replace bus specific struct with generic dev
On 6/9/2018 3:32 AM, Pablo de Lara wrote:
Structure rte_cryptodev_info has currently PCI device
information ("struct rte_pci_device") in it.
This information is not generic to all devices,
so this gets replaced with the generic "rte_device" structure,
compatible with all crypto devices.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
Re: [dpdk-dev] [PATCH v2 06/22] ethdev: support attach or detach share device from secondary
> -Original Message-
> From: Burakov, Anatoly
> Sent: Thursday, June 21, 2018 5:06 PM
> To: Zhang, Qi Z ; tho...@monjalon.net
> Cc: Ananyev, Konstantin ; dev@dpdk.org;
> Richardson, Bruce ; Yigit, Ferruh
> ; Shelton, Benjamin H
> ; Vangati, Narender
>
> Subject: Re: [PATCH v2 06/22] ethdev: support attach or detach share device
> from secondary
>
> On 21-Jun-18 3:00 AM, Qi Zhang wrote:
> > This patch cover the multi-process hotplug case when a share device
> > attach/detach request be issued from secondary process, the
> > implementation references malloc_mp.c.
> >
> > device attach on secondary:
> > a) secondary send async request to primary and wait on a condition
> > which will be released by matched response from primary.
> > b) primary receive the request and attach the new device if failed
> > goto i).
> > c) primary forward attach request to all secondary as async request
> > (because this in mp thread context, use sync request will
> > deadlock)
> > d) secondary receive request and attach device and send reply.
> > e) primary check the reply if all success go to j).
> > f) primary send attach rollback async request to all secondary.
> > g) secondary receive the request and detach device and send reply.
> > h) primary receive the reply and detach device as rollback action.
> > i) send fail response to secondary, goto k).
> > j) send success response to secondary.
> > k) secondary process receive response and return.
> >
> > device detach on secondary:
> > a) secondary send async request to primary and wait on a condition
> > which will be released by matched response from primary.
> > b) primary receive the request and perform pre-detach check, if device
> > is locked, goto j).
> > c) primary send pre-detach async request to all secondary.
> > d) secondary perform pre-detach check and send reply.
> > e) primary check the reply if any fail goto j).
> > f) primary send detach async request to all secondary
> > g) secondary detach the device and send reply
> > h) primary detach the device.
> > i) send success response to secondary, goto k).
> > j) send fail response to secondary.
> > k) secondary process receive response and return.
> >
> > Signed-off-by: Qi Zhang
> > ---
> >
>
>
>
> > -static int handle_secondary_request(const struct rte_mp_msg *msg,
> > const void *peer)
> > +static int
> > +check_reply(const struct eth_dev_mp_req *req, const struct
> > +rte_mp_reply *reply) {
> > + struct eth_dev_mp_req *resp;
> > + int i;
> > +
> > + if (reply->nb_received != reply->nb_sent)
> > + return -EINVAL;
> > +
> > + for (i = 0; i < reply->nb_received; i++) {
> > + resp = (struct eth_dev_mp_req *)reply->msgs[i].param;
> > +
> > + if (resp->t != req->t) {
> > + ethdev_log(ERR, "Unexpected response to async
> > request\n");
> > + return -EINVAL;
> > + }
> > +
> > + if (resp->id != req->id) {
> > + ethdev_log(ERR, "response to wrong async request\n");
> > + return -EINVAL;
> > + }
> > +
> > + if (resp->result)
> > + return resp->result;
> > + }
> > +
> > + return 0;
> > +}
>
> As far as i understand, return values from this will propagate all the way up
> to
> user return value.
Yes
>How would a user differentiate between -EINVAL returned
> from invalid parameters, and -EINVAL from failed reply?
My understanding is if
(resp->t != req->t) or (resp->id != req->id) is not expected to happen at any
condition.
there should be a bug if it does happen.
So the return value is not necessary to be sensitive.
Am I right?
> I think this error code should be different (don't know which one though
> :) ).
>
> (as a side note, you keep returning -EINVAL all over the place, even when
> problem is not in user's arguments - you should probably fix those too. for
> example, if request ID not found, return code should probably be something
> like -ENOENT)
Yes, -ENOENT is better than -EINVAL for id mismatch?
>
>
> --
> Thanks,
> Anatoly
Re: [dpdk-dev] [PATCH 4/6] cryptodev: remove queue start/stop functions
On 6/9/2018 3:32 AM, Pablo de Lara wrote: Removed cryptodev queue start/stop functions, as they were marked deprecated in 18.05, since they were not implemented by any driver. Signed-off-by: Pablo de Lara Acked-by: Akhil Goyal
Re: [dpdk-dev] [PATCH v2 3/3] net/pcap: support pcap files and ifaces mix
On 6/21/2018 1:24 PM, ido goshen wrote:
> Suggested-by: Ferruh Yigit
>
> Signed-off-by: ido goshen
<...>
> +static uint16_t
> +eth_pcap_tx_mux(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
> +{
> + struct pcap_tx_queue *tx_queue = queue;
> + if (tx_queue->dumper)
> + return eth_pcap_tx_dumper(queue, bufs, nb_pkts);
> + else
> + return eth_pcap_tx(queue, bufs, nb_pkts);
> +}
> +
> /*
> * pcap_open_live wrapper function
> */
> @@ -773,6 +783,31 @@ struct pmd_devargs {
> return open_iface(key, value, extra_args);
> }
>
> +static int
> +open_pcap_rx_mux(const char *key, const char *value, void *extra_args)
> +{
> + struct pmd_devargs *pcaps = extra_args;
Do we need this assignment? Why not pass extra_args directly?
> +
> + if (strcmp(key, ETH_PCAP_RX_PCAP_ARG) == 0)
> + return open_rx_pcap(key, value, pcaps);
> + if (strcmp(key, ETH_PCAP_RX_IFACE_ARG) == 0)
> + return open_rx_iface(key, value, pcaps);
> + return 0;
> +}
> +
> +static int
> +open_pcap_tx_mux(const char *key, const char *value, void *extra_args)
> +{
> + struct pmd_devargs *dumpers = extra_args;
Do we need this assignment? Why not pass extra_args directly?
> +
> + if (strcmp(key, ETH_PCAP_TX_PCAP_ARG) == 0)
> + return open_tx_pcap(key, value, dumpers);
> + if (strcmp(key, ETH_PCAP_TX_IFACE_ARG) == 0)
> + return open_tx_iface(key, value, dumpers);
> + return 0;
> +}
> +
> +
> static struct rte_vdev_driver pmd_pcap_drv;
>
> static int
> @@ -873,8 +908,7 @@ struct pmd_devargs {
> eth_from_pcaps(struct rte_vdev_device *vdev,
> struct pmd_devargs *rx_queues, const unsigned int nb_rx_queues,
> struct pmd_devargs *tx_queues, const unsigned int nb_tx_queues,
> - struct rte_kvargs *kvlist, int single_iface,
> - unsigned int using_dumpers)
> + struct rte_kvargs *kvlist, int single_iface)
> {
> struct pmd_internals *internals = NULL;
> struct rte_eth_dev *eth_dev = NULL;
> @@ -891,10 +925,7 @@ struct pmd_devargs {
>
> eth_dev->rx_pkt_burst = eth_pcap_rx;
>
> - if (using_dumpers)
> - eth_dev->tx_pkt_burst = eth_pcap_tx_dumper;
> - else
> - eth_dev->tx_pkt_burst = eth_pcap_tx;
> + eth_dev->tx_pkt_burst = eth_pcap_tx_mux;
We shouldn't introduce an extra check in data path. Instead of checking "if
(tx_queue->dumper)" for _each_ packet, we should check it here once and assign
proper burst function.
Re: [dpdk-dev] [PATCH v2 06/22] ethdev: support attach or detach share device from secondary
On 21-Jun-18 1:50 PM, Zhang, Qi Z wrote:
-Original Message-
From: Burakov, Anatoly
Sent: Thursday, June 21, 2018 5:06 PM
To: Zhang, Qi Z ; tho...@monjalon.net
Cc: Ananyev, Konstantin ; dev@dpdk.org;
Richardson, Bruce ; Yigit, Ferruh
; Shelton, Benjamin H
; Vangati, Narender
Subject: Re: [PATCH v2 06/22] ethdev: support attach or detach share device
from secondary
On 21-Jun-18 3:00 AM, Qi Zhang wrote:
This patch cover the multi-process hotplug case when a share device
attach/detach request be issued from secondary process, the
implementation references malloc_mp.c.
device attach on secondary:
a) secondary send async request to primary and wait on a condition
which will be released by matched response from primary.
b) primary receive the request and attach the new device if failed
goto i).
c) primary forward attach request to all secondary as async request
(because this in mp thread context, use sync request will
deadlock)
d) secondary receive request and attach device and send reply.
e) primary check the reply if all success go to j).
f) primary send attach rollback async request to all secondary.
g) secondary receive the request and detach device and send reply.
h) primary receive the reply and detach device as rollback action.
i) send fail response to secondary, goto k).
j) send success response to secondary.
k) secondary process receive response and return.
device detach on secondary:
a) secondary send async request to primary and wait on a condition
which will be released by matched response from primary.
b) primary receive the request and perform pre-detach check, if device
is locked, goto j).
c) primary send pre-detach async request to all secondary.
d) secondary perform pre-detach check and send reply.
e) primary check the reply if any fail goto j).
f) primary send detach async request to all secondary
g) secondary detach the device and send reply
h) primary detach the device.
i) send success response to secondary, goto k).
j) send fail response to secondary.
k) secondary process receive response and return.
Signed-off-by: Qi Zhang
---
-static int handle_secondary_request(const struct rte_mp_msg *msg,
const void *peer)
+static int
+check_reply(const struct eth_dev_mp_req *req, const struct
+rte_mp_reply *reply) {
+ struct eth_dev_mp_req *resp;
+ int i;
+
+ if (reply->nb_received != reply->nb_sent)
+ return -EINVAL;
+
+ for (i = 0; i < reply->nb_received; i++) {
+ resp = (struct eth_dev_mp_req *)reply->msgs[i].param;
+
+ if (resp->t != req->t) {
+ ethdev_log(ERR, "Unexpected response to async
request\n");
+ return -EINVAL;
+ }
+
+ if (resp->id != req->id) {
+ ethdev_log(ERR, "response to wrong async request\n");
+ return -EINVAL;
+ }
+
+ if (resp->result)
+ return resp->result;
+ }
+
+ return 0;
+}
As far as i understand, return values from this will propagate all the way up to
user return value.
Yes
How would a user differentiate between -EINVAL returned
from invalid parameters, and -EINVAL from failed reply?
My understanding is if
(resp->t != req->t) or (resp->id != req->id) is not expected to happen at any
condition.
there should be a bug if it does happen.
So the return value is not necessary to be sensitive.
Am I right?
You're right, it won't happen under normal conditions. However, on the
off-chance that it does, the error return should still be meaningful.
Under normal conditions, malloc() doesn't fail either :)
--
Thanks,
Anatoly
Re: [dpdk-dev] [PATCH 5/6] cryptodev: remove old get session size functions
Hi Pablo,
On 6/9/2018 3:32 AM, Pablo de Lara wrote:
Removed rte_cryptodev_get_header_session_size
and rte_cryptodev_get_private_session_size functions,
as they have been substituted with functions
specific for symmetric operations, with _sym_ word
after "rte_cryptodev_".
Signed-off-by: Pablo de Lara
---
doc/guides/rel_notes/deprecation.rst | 6 --
doc/guides/rel_notes/release_18_08.rst | 8
lib/librte_cryptodev/rte_cryptodev.c | 6 --
lib/librte_cryptodev/rte_cryptodev.h | 11 ---
lib/librte_cryptodev/rte_cryptodev_version.map | 2 --
5 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 91592534e..9a73b1d8e 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -107,9 +107,3 @@ Deprecation Notices
with them.
- Some feature flags such as ``RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER`` are
ambiguous,
so some will be replaced by more explicit flags.
- - Function ``rte_cryptodev_get_header_session_size()`` will be deprecated
-in 18.05, and it gets replaced with
``rte_cryptodev_sym_get_header_session_size()``.
-It will be removed in 18.08.
- - Function ``rte_cryptodev_get_private_session_size()`` will be deprecated
-in 18.05, and it gets replaced with
``rte_cryptodev_sym_get_private_session_size()``.
-It will be removed in 18.08.
diff --git a/doc/guides/rel_notes/release_18_08.rst
b/doc/guides/rel_notes/release_18_08.rst
index 3fa9a6e68..0624f3701 100644
--- a/doc/guides/rel_notes/release_18_08.rst
+++ b/doc/guides/rel_notes/release_18_08.rst
@@ -64,6 +64,14 @@ API Changes
- ``rte_cryptodev_queue_pair_start``
- ``rte_cryptodev_queue_pair_stop``
+* cryptodev: Following functions were deprecated and are replaced by
+ other functions in 18.08:
+
+ - ``rte_cryptodev_get_header_session_size`` is replaced with
+``rte_cryptodev_sym_get_header_session_size``
+ - ``rte_cryptodev_get_private_session_size`` is replaced with
+``rte_cryptodev_sym_get_private_session_size``
+
rte_cryptodev_get_private_session_size is not removed in this patch. I
think you missed it in your patch.
-Akhil
ABI Changes
---
diff --git a/lib/librte_cryptodev/rte_cryptodev.c
b/lib/librte_cryptodev/rte_cryptodev.c
index a07904fb9..40e249e79 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -1181,12 +1181,6 @@ rte_cryptodev_sym_session_free(struct
rte_cryptodev_sym_session *sess)
return 0;
}
-unsigned int
-rte_cryptodev_get_header_session_size(void)
-{
- return rte_cryptodev_sym_get_header_session_size();
-}
-
unsigned int
rte_cryptodev_sym_get_header_session_size(void)
{
diff --git a/lib/librte_cryptodev/rte_cryptodev.h
b/lib/librte_cryptodev/rte_cryptodev.h
index 90487bffc..8e8a59522 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -925,17 +925,6 @@ int
rte_cryptodev_sym_session_clear(uint8_t dev_id,
struct rte_cryptodev_sym_session *sess);
-/**
- * @deprecated
- * Get the size of the header session, for all registered drivers.
- *
- * @return
- * Size of the header session.
- */
-__rte_deprecated
-unsigned int
-rte_cryptodev_get_header_session_size(void);
-
/**
* @deprecated
* Get the size of the private session data for a device.
diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map
b/lib/librte_cryptodev/rte_cryptodev_version.map
index 020b45754..0ab6d5195 100644
--- a/lib/librte_cryptodev/rte_cryptodev_version.map
+++ b/lib/librte_cryptodev/rte_cryptodev_version.map
@@ -63,8 +63,6 @@ DPDK_17.08 {
rte_cryptodev_driver_id_get;
rte_cryptodev_driver_name_get;
rte_cryptodev_get_aead_algo_enum;
- rte_cryptodev_get_header_session_size;
- rte_cryptodev_get_private_session_size;
rte_cryptodev_sym_capability_check_aead;
rte_cryptodev_sym_session_init;
rte_cryptodev_sym_session_clear;
Re: [dpdk-dev] [PATCH 2/6] cryptodev: remove max number of sessions per queue
On 6/9/2018 3:32 AM, Pablo de Lara wrote: The cryptodev info structure currently contains the maximum number of sessions that can be used in a queue pair. This is only set in DPAA_SEC PMD, and since it is calculated based on the maximum number of sessions (which is not used anymore), this field can be removed. Signed-off-by: Pablo de Lara --- Acked-by: Akhil Goyal
[dpdk-dev] [PATCH v2 4/8] examples/vm_power: allow greater than 64 cores
To facilitate more info per core, change the global_cpu_mask
from a uint64_t to an array. This also removes the limit on
64 cores, allocing the aray at run-time based on the number of
cores found in the system.
Signed-off-by: David Hunt
---
examples/vm_power_manager/power_manager.c | 115 +++---
1 file changed, 58 insertions(+), 57 deletions(-)
diff --git a/examples/vm_power_manager/power_manager.c
b/examples/vm_power_manager/power_manager.c
index a7849e48a..4bdde23da 100644
--- a/examples/vm_power_manager/power_manager.c
+++ b/examples/vm_power_manager/power_manager.c
@@ -19,14 +19,14 @@
#include
#include
+#include "channel_manager.h"
#include "power_manager.h"
-
-#define RTE_LOGTYPE_POWER_MANAGER RTE_LOGTYPE_USER1
+#include "oob_monitor.h"
#define POWER_SCALE_CORE(DIRECTION, core_num , ret) do { \
- if (core_num >= POWER_MGR_MAX_CPUS) \
+ if (core_num >= ci.core_count) \
return -1; \
- if (!(global_enabled_cpus & (1ULL << core_num))) \
+ if (!(ci.cd[core_num].global_enabled_cpus)) \
return -1; \
rte_spinlock_lock(&global_core_freq_info[core_num].power_sl); \
ret = rte_power_freq_##DIRECTION(core_num); \
@@ -37,7 +37,7 @@
int i; \
for (i = 0; core_mask; core_mask &= ~(1 << i++)) { \
if ((core_mask >> i) & 1) { \
- if (!(global_enabled_cpus & (1ULL << i))) \
+ if (!(ci.cd[i].global_enabled_cpus)) \
continue; \
rte_spinlock_lock(&global_core_freq_info[i].power_sl); \
if (rte_power_freq_##DIRECTION(i) != 1) \
@@ -56,28 +56,9 @@ struct freq_info {
static struct freq_info global_core_freq_info[POWER_MGR_MAX_CPUS];
struct core_info ci;
-static uint64_t global_enabled_cpus;
#define SYSFS_CPU_PATH "/sys/devices/system/cpu/cpu%u/topology/core_id"
-static unsigned
-set_host_cpus_mask(void)
-{
- char path[PATH_MAX];
- unsigned i;
- unsigned num_cpus = 0;
-
- for (i = 0; i < POWER_MGR_MAX_CPUS; i++) {
- snprintf(path, sizeof(path), SYSFS_CPU_PATH, i);
- if (access(path, F_OK) == 0) {
- global_enabled_cpus |= 1ULL << i;
- num_cpus++;
- } else
- return num_cpus;
- }
- return num_cpus;
-}
-
struct core_info *
get_core_info(void)
{
@@ -110,38 +91,45 @@ core_info_init(void)
int
power_manager_init(void)
{
- unsigned int i, num_cpus, num_freqs;
- uint64_t cpu_mask;
+ unsigned int i, num_cpus = 0, num_freqs = 0;
int ret = 0;
+ struct core_info *ci;
+
+ rte_power_set_env(PM_ENV_ACPI_CPUFREQ);
- num_cpus = set_host_cpus_mask();
- if (num_cpus == 0) {
- RTE_LOG(ERR, POWER_MANAGER, "Unable to detected host CPUs,
please "
- "ensure that sufficient privileges exist to inspect
sysfs\n");
+ ci = get_core_info();
+ if (!ci) {
+ RTE_LOG(ERR, POWER_MANAGER,
+ "Failed to get core info!\n");
return -1;
}
- rte_power_set_env(PM_ENV_ACPI_CPUFREQ);
- cpu_mask = global_enabled_cpus;
- for (i = 0; cpu_mask; cpu_mask &= ~(1 << i++)) {
- if (rte_power_init(i) < 0)
- RTE_LOG(ERR, POWER_MANAGER,
- "Unable to initialize power manager "
- "for core %u\n", i);
- num_freqs = rte_power_freqs(i, global_core_freq_info[i].freqs,
+
+ for (i = 0; i < ci->core_count; i++) {
+ if (ci->cd[i].global_enabled_cpus) {
+ if (rte_power_init(i) < 0)
+ RTE_LOG(ERR, POWER_MANAGER,
+ "Unable to initialize power
manager "
+ "for core %u\n", i);
+ num_cpus++;
+ num_freqs = rte_power_freqs(i,
+ global_core_freq_info[i].freqs,
RTE_MAX_LCORE_FREQS);
- if (num_freqs == 0) {
- RTE_LOG(ERR, POWER_MANAGER,
- "Unable to get frequency list for core %u\n",
- i);
- global_enabled_cpus &= ~(1 << i);
- num_cpus--;
- ret = -1;
+ if (num_freqs == 0) {
+ RTE_LOG(ERR, POWER_MANAGER,
+ "Unable to get frequency list for core
%u\n",
+ i);
+ ci->cd[i].oob_enabled = 0;
+ ret = -1;
+ }
+ global_core_freq_in
[dpdk-dev] [PATCH v2 6/8] examples/vm_power: add port-list to command line
add in the long form of -p, which is --port-list
Signed-off-by: David Hunt
---
examples/vm_power_manager/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index 4c6b5a990..4088861f1 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -147,6 +147,7 @@ parse_args(int argc, char **argv)
{ "mac-updating", no_argument, 0, 1},
{ "no-mac-updating", no_argument, 0, 0},
{ "core-list", optional_argument, 0, 'l'},
+ { "port-list", optional_argument, 0, 'p'},
{NULL, 0, 0, 0}
};
argvopt = argv;
--
2.17.1
[dpdk-dev] [PATCH v2 0/8] examples/vm_power: 100% Busy Polling
This patch set adds the capability to do out-of-band power monitoring on a system. It uses a thread to monitor the branch counters in the targeted cores, and calculates the branch ratio if the running code. If the branch ratop is low (0.01), then the code is most likely running in a tight poll loop and doing nothing, i.e. receiving no packets. In this case we scale down the frequency of that core. If the branch ratio is higher (>0.01), then it is likely that the code is receiving and processing packets. In this case, we scale up the frequency of that core. The cpu counters are read via /dev/cpu/x/msr, so requires the msr kernel module to be loaded. Because this method is used, the patch set is implemented with one file for x86 systems, and another for non-x86 systems, with conditional compilation in the Makefile. The non-x86 functions are stubs, and do not currently implement any functionality. The vm_power_manager app has been modified to take a new parameter --core-list or -l which takes a list of cores in a comma-separated list format, e.g. 1,3,5-7,9, which resolvest to a core list of 1,3,5,6,7,9 These cores will then be enabled for oob monitoring. When the OOB monitoring thread starts, it reads the branch hits/miss counters of each monitored core, and scales up/down accordingly. The guest_cli app has also been modified to allow sending of a policy of type BRANCH_RATIO where all of the cores included in the policy will be monitored by the vm_power_manager oob thread. v2 changes: * Add the guest_cli patch into this patch set, including the ability to set the policy to BRANCH_RATIO. http://patches.dpdk.org/patch/40742/ * When vm_power_manger receives a policy with type BRANCH_RATIO, add the relevant cores to the monitoring thread. [1/8] examples/vm_power: add check for port count [2/8] examples/vm_power: add core list parameter [3/8] examples/vm_power: add oob monitoring functions [4/8] examples/vm_power: allow greater than 64 cores [5/8] examples/vm_power: add thread for oob core monitor [6/8] examples/vm_power: add port-list to command line [7/8] examples/vm_power: add branch ratio policy type [8/8] examples/vm_power: add cli args to guest app
[dpdk-dev] [PATCH v2 3/8] examples/vm_power: add oob monitoring functions
This patch introduces the out-of-band (oob) core monitoring
functions.
The functions are similar to the channel manager functions.
There are function to add and remove cores from the
list of cores being monitored. There is a function to initialise
the monitor setup, run the monitor thread, and exit the monitor.
The monitor thread runs in it's own lcore, and is separate
functionality to the channel monitor which is epoll based.
THis thread is timer based. It loops through all monitored cores,
calculates the branch ratio, scales up or down the core, then
sleeps for an interval (~250 uS).
The method it uses to read the branch counters is a pread on the
/dev/cpu/x/msr file, so the 'msr' kernel module needs to be loaded.
Also, since the msr.h file has been made unavailable in recent
kernels, we have #defines for the relevant MSRs included in the
code.
The makefile has a switch for x86 and non-x86 platforms,
and compiles stub function for non-x86 platforms.
Signed-off-by: David Hunt
---
examples/vm_power_manager/Makefile | 5 +
examples/vm_power_manager/oob_monitor.h | 68 +
examples/vm_power_manager/oob_monitor_nop.c | 38 +++
examples/vm_power_manager/oob_monitor_x86.c | 282
4 files changed, 393 insertions(+)
create mode 100644 examples/vm_power_manager/oob_monitor.h
create mode 100644 examples/vm_power_manager/oob_monitor_nop.c
create mode 100644 examples/vm_power_manager/oob_monitor_x86.c
diff --git a/examples/vm_power_manager/Makefile
b/examples/vm_power_manager/Makefile
index 0c925967c..13a5205ba 100644
--- a/examples/vm_power_manager/Makefile
+++ b/examples/vm_power_manager/Makefile
@@ -20,6 +20,11 @@ APP = vm_power_mgr
# all source are stored in SRCS-y
SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c
SRCS-y += channel_monitor.c parse.c
+ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
+SRCS-y += oob_monitor_x86.c
+else
+SRCS-y += oob_monitor_nop.c
+endif
CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/
CFLAGS += $(WERROR_FLAGS)
diff --git a/examples/vm_power_manager/oob_monitor.h
b/examples/vm_power_manager/oob_monitor.h
new file mode 100644
index 0..b96e08df7
--- /dev/null
+++ b/examples/vm_power_manager/oob_monitor.h
@@ -0,0 +1,68 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#ifndef OOB_MONITOR_H_
+#define OOB_MONITOR_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Setup the Branch Monitor resources required to initialize epoll.
+ * Must be called first before calling other functions.
+ *
+ * @return
+ * - 0 on success.
+ * - Negative on error.
+ */
+int branch_monitor_init(void);
+
+/**
+ * Run the OOB branch monitor, loops forever on on epoll_wait.
+ *
+ *
+ * @return
+ * None
+ */
+void run_branch_monitor(void);
+
+/**
+ * Exit the OOB Branch Monitor.
+ *
+ * @return
+ * None
+ */
+void branch_monitor_exit(void);
+
+/**
+ * Add a core to the list of cores to monitor.
+ *
+ * @param core
+ * Core Number
+ *
+ * @return
+ * - 0 on success.
+ * - Negative on error.
+ */
+int add_core_to_monitor(int core);
+
+/**
+ * Remove a previously added core from core list.
+ *
+ * @param core
+ * Core Number
+ *
+ * @return
+ * - 0 on success.
+ * - Negative on error.
+ */
+int remove_core_from_monitor(int core);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* OOB_MONITOR_H_ */
diff --git a/examples/vm_power_manager/oob_monitor_nop.c
b/examples/vm_power_manager/oob_monitor_nop.c
new file mode 100644
index 0..7e7b8bc14
--- /dev/null
+++ b/examples/vm_power_manager/oob_monitor_nop.c
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include "oob_monitor.h"
+
+void branch_monitor_exit(void)
+{
+}
+
+__attribute__((unused)) static float
+apply_policy(__attribute__((unused)) int core)
+{
+ return 0.0;
+}
+
+int
+add_core_to_monitor(__attribute__((unused)) int core)
+{
+ return 0;
+}
+
+int
+remove_core_from_monitor(__attribute__((unused)) int core)
+{
+ return 0;
+}
+
+int
+branch_monitor_init(void)
+{
+ return 0;
+}
+
+void
+run_branch_monitor(void)
+{
+}
diff --git a/examples/vm_power_manager/oob_monitor_x86.c
b/examples/vm_power_manager/oob_monitor_x86.c
new file mode 100644
index 0..485ec5e3f
--- /dev/null
+++ b/examples/vm_power_manager/oob_monitor_x86.c
@@ -0,0 +1,282 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include "oob_monitor.h"
+#include "power_manager.h"
+#include "channel_manager.h"
+
+#include
+#define RTE_LOGTYPE_CHANNEL_MONITOR RTE_LOGTYPE_USER1
+
+#define MAX_EVENTS 256
+
+static volatile unsigned run_loop = 1;
+static uint64_t g_branches, g_branch_misses;
+static int g_active;
+
+void branch
[dpdk-dev] [PATCH v2 1/8] examples/vm_power: add check for port count
If we don't pass any ports to the app, we don't need to create
any mempools, and we don't need to init any ports.
Signed-off-by: David Hunt
---
examples/vm_power_manager/main.c | 81 +---
1 file changed, 43 insertions(+), 38 deletions(-)
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index c9805a461..043b374bc 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -280,51 +280,56 @@ main(int argc, char **argv)
nb_ports = rte_eth_dev_count_avail();
- mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NUM_MBUFS * nb_ports,
- MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ if (nb_ports > 0) {
+ mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL",
+ NUM_MBUFS * nb_ports, MBUF_CACHE_SIZE, 0,
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
- if (mbuf_pool == NULL)
- rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
+ if (mbuf_pool == NULL)
+ rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
- /* Initialize ports. */
- RTE_ETH_FOREACH_DEV(portid) {
- struct ether_addr eth;
- int w, j;
- int ret;
+ /* Initialize ports. */
+ RTE_ETH_FOREACH_DEV(portid) {
+ struct ether_addr eth;
+ int w, j;
+ int ret;
- if ((enabled_port_mask & (1 << portid)) == 0)
- continue;
+ if ((enabled_port_mask & (1 << portid)) == 0)
+ continue;
- eth.addr_bytes[0] = 0xe0;
- eth.addr_bytes[1] = 0xe0;
- eth.addr_bytes[2] = 0xe0;
- eth.addr_bytes[3] = 0xe0;
- eth.addr_bytes[4] = portid + 0xf0;
+ eth.addr_bytes[0] = 0xe0;
+ eth.addr_bytes[1] = 0xe0;
+ eth.addr_bytes[2] = 0xe0;
+ eth.addr_bytes[3] = 0xe0;
+ eth.addr_bytes[4] = portid + 0xf0;
- if (port_init(portid, mbuf_pool) != 0)
- rte_exit(EXIT_FAILURE, "Cannot init port %"PRIu8 "\n",
+ if (port_init(portid, mbuf_pool) != 0)
+ rte_exit(EXIT_FAILURE,
+ "Cannot init port %"PRIu8 "\n",
portid);
- for (w = 0; w < MAX_VFS; w++) {
- eth.addr_bytes[5] = w + 0xf0;
-
- ret = rte_pmd_ixgbe_set_vf_mac_addr(portid,
- w, ð);
- if (ret == -ENOTSUP)
- ret = rte_pmd_i40e_set_vf_mac_addr(portid,
- w, ð);
- if (ret == -ENOTSUP)
- ret = rte_pmd_bnxt_set_vf_mac_addr(portid,
- w, ð);
-
- switch (ret) {
- case 0:
- printf("Port %d VF %d MAC: ",
- portid, w);
- for (j = 0; j < 6; j++) {
- printf("%02x", eth.addr_bytes[j]);
- if (j < 5)
- printf(":");
+ for (w = 0; w < MAX_VFS; w++) {
+ eth.addr_bytes[5] = w + 0xf0;
+
+ ret = rte_pmd_ixgbe_set_vf_mac_addr(portid,
+ w, ð);
+ if (ret == -ENOTSUP)
+ ret = rte_pmd_i40e_set_vf_mac_addr(
+ portid, w, ð);
+ if (ret == -ENOTSUP)
+ ret = rte_pmd_bnxt_set_vf_mac_addr(
+ portid, w, ð);
+
+ switch (ret) {
+ case 0:
+ printf("Port %d VF %d MAC: ",
+ portid, w);
+ for (j = 0; j < 5; j++) {
+ printf("%02x:",
+ eth.addr_bytes[j]);
+ }
+ printf("%02x\n", eth.addr_bytes[5]);
+ break;
}
printf("\n");
[dpdk-dev] [PATCH v2 7/8] examples/vm_power: add branch ratio policy type
Add the capability for the vm_power_manager to receive
a policy of type BRANCH_RATIO. This will add any vcpus
in the policy to the oob monitoring thread.
Signed-off-by: David Hunt
---
examples/vm_power_manager/channel_monitor.c | 23 +++--
lib/librte_power/channel_commands.h | 3 ++-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/examples/vm_power_manager/channel_monitor.c
b/examples/vm_power_manager/channel_monitor.c
index 73bddd993..7fa47ba97 100644
--- a/examples/vm_power_manager/channel_monitor.c
+++ b/examples/vm_power_manager/channel_monitor.c
@@ -27,6 +27,7 @@
#include "channel_commands.h"
#include "channel_manager.h"
#include "power_manager.h"
+#include "oob_monitor.h"
#define RTE_LOGTYPE_CHANNEL_MONITOR RTE_LOGTYPE_USER1
@@ -92,6 +93,10 @@ get_pcpu_to_control(struct policy *pol)
struct vm_info info;
int pcpu, count;
uint64_t mask_u64b;
+ struct core_info *ci;
+ int ret;
+
+ ci = get_core_info();
RTE_LOG(INFO, CHANNEL_MONITOR, "Looking for pcpu for %s\n",
pol->pkt.vm_name);
@@ -100,8 +105,22 @@ get_pcpu_to_control(struct policy *pol)
for (count = 0; count < pol->pkt.num_vcpu; count++) {
mask_u64b = info.pcpu_mask[pol->pkt.vcpu_to_control[count]];
for (pcpu = 0; mask_u64b; mask_u64b &= ~(1ULL << pcpu++)) {
- if ((mask_u64b >> pcpu) & 1)
- pol->core_share[count].pcpu = pcpu;
+ if ((mask_u64b >> pcpu) & 1) {
+ if (pol->pkt.policy_to_use == BRANCH_RATIO) {
+ ci->cd[pcpu].oob_enabled = 1;
+ ret = add_core_to_monitor(pcpu);
+ if (ret == 0)
+ printf("Monitoring pcpu %d via
Branch Ratio\n",
+ pcpu);
+ else
+ printf("Failed to start OOB
Monitoring pcpu %d\n",
+ pcpu);
+
+ } else {
+ pol->core_share[count].pcpu = pcpu;
+ printf("Monitoring pcpu %d\n", pcpu);
+ }
+ }
}
}
}
diff --git a/lib/librte_power/channel_commands.h
b/lib/librte_power/channel_commands.h
index 5e8b4ab5d..ee638eefa 100644
--- a/lib/librte_power/channel_commands.h
+++ b/lib/librte_power/channel_commands.h
@@ -48,7 +48,8 @@ enum workload {HIGH, MEDIUM, LOW};
enum policy_to_use {
TRAFFIC,
TIME,
- WORKLOAD
+ WORKLOAD,
+ BRANCH_RATIO
};
struct traffic {
--
2.17.1
[dpdk-dev] [PATCH v2 2/8] examples/vm_power: add core list parameter
Add in the '-l' command line parameter (also --core-list)
So the user can now pass --corelist=4,6,8-10 and it will
expand out to 4,6,8,9,10 using the parse function provided
in parse.c (parse_set).
This list of cores is then used to enable out-of-band monitoring
to scale up and down these cores based on the ratio of branch
hits versus branch misses. The ratio will be low when a poll
loop is spinning with no packets being received, so the frequency
will be scaled down.
Also , as part of this change, we introduce a core_info struct
which keeps information on each core in the system, and whether
we're doing out of band monitoring on them.
Signed-off-by: David Hunt
---
examples/vm_power_manager/Makefile| 2 +-
examples/vm_power_manager/main.c | 34 -
examples/vm_power_manager/parse.c | 93 +++
examples/vm_power_manager/parse.h | 20 +
examples/vm_power_manager/power_manager.c | 31
examples/vm_power_manager/power_manager.h | 20 +
6 files changed, 197 insertions(+), 3 deletions(-)
create mode 100644 examples/vm_power_manager/parse.c
create mode 100644 examples/vm_power_manager/parse.h
diff --git a/examples/vm_power_manager/Makefile
b/examples/vm_power_manager/Makefile
index ef2a9f959..0c925967c 100644
--- a/examples/vm_power_manager/Makefile
+++ b/examples/vm_power_manager/Makefile
@@ -19,7 +19,7 @@ APP = vm_power_mgr
# all source are stored in SRCS-y
SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c
-SRCS-y += channel_monitor.c
+SRCS-y += channel_monitor.c parse.c
CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/
CFLAGS += $(WERROR_FLAGS)
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index 043b374bc..cc2a1289c 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -29,6 +29,7 @@
#include "channel_monitor.h"
#include "power_manager.h"
#include "vm_power_cli.h"
+#include "parse.h"
#include
#include
#include
@@ -135,18 +136,22 @@ parse_portmask(const char *portmask)
static int
parse_args(int argc, char **argv)
{
- int opt, ret;
+ int opt, ret, cnt, i;
char **argvopt;
+ uint16_t *oob_enable;
int option_index;
char *prgname = argv[0];
+ struct core_info *ci;
static struct option lgopts[] = {
{ "mac-updating", no_argument, 0, 1},
{ "no-mac-updating", no_argument, 0, 0},
+ { "core-list", optional_argument, 0, 'l'},
{NULL, 0, 0, 0}
};
argvopt = argv;
+ ci = get_core_info();
- while ((opt = getopt_long(argc, argvopt, "p:q:T:",
+ while ((opt = getopt_long(argc, argvopt, "l:p:q:T:",
lgopts, &option_index)) != EOF) {
switch (opt) {
@@ -158,6 +163,27 @@ parse_args(int argc, char **argv)
return -1;
}
break;
+ case 'l':
+ oob_enable = malloc(ci->core_count * sizeof(uint16_t));
+ if (oob_enable == NULL) {
+ printf("Error - Unable to allocate memory\n");
+ return -1;
+ }
+ cnt = parse_set(optarg, oob_enable, ci->core_count);
+ if (cnt < 0) {
+ printf("Invalid core-list - [%s]\n",
+ optarg);
+ break;
+ }
+ for (i = 0; i < ci->core_count; i++) {
+ if (oob_enable[i]) {
+ printf("***Using core %d\n", i);
+ ci->cd[i].oob_enabled = 1;
+ ci->cd[i].global_enabled_cpus = 1;
+ }
+ }
+ free(oob_enable);
+ break;
/* long options */
case 0:
break;
@@ -263,6 +289,10 @@ main(int argc, char **argv)
uint16_t portid;
+ ret = core_info_init();
+ if (ret < 0)
+ rte_panic("Cannot allocate core info\n");
+
ret = rte_eal_init(argc, argv);
if (ret < 0)
rte_panic("Cannot init EAL\n");
diff --git a/examples/vm_power_manager/parse.c
b/examples/vm_power_manager/parse.c
new file mode 100644
index 0..9de15c4a7
--- /dev/null
+++ b/examples/vm_power_manager/parse.c
@@ -0,0 +1,93 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation.
+ * Copyright(c) 2014 6WIND S.A.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "parse.h"
+
+/*
+ * Parse elem
[dpdk-dev] [PATCH v2 5/8] examples/vm_power: add thread for oob core monitor
Change the app to now require three cores, as the third core
will be used to run the oob montoring thread.
Signed-off-by: David Hunt
---
examples/vm_power_manager/main.c | 37 +---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index cc2a1289c..4c6b5a990 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -29,6 +29,7 @@
#include "channel_monitor.h"
#include "power_manager.h"
#include "vm_power_cli.h"
+#include "oob_monitor.h"
#include "parse.h"
#include
#include
@@ -269,6 +270,17 @@ run_monitor(__attribute__((unused)) void *arg)
return 0;
}
+static int
+run_core_monitor(__attribute__((unused)) void *arg)
+{
+ if (branch_monitor_init() < 0) {
+ printf("Unable to initialize core monitor\n");
+ return -1;
+ }
+ run_branch_monitor();
+ return 0;
+}
+
static void
sig_handler(int signo)
{
@@ -287,12 +299,15 @@ main(int argc, char **argv)
unsigned int nb_ports;
struct rte_mempool *mbuf_pool;
uint16_t portid;
+ struct core_info *ci;
ret = core_info_init();
if (ret < 0)
rte_panic("Cannot allocate core info\n");
+ ci = get_core_info();
+
ret = rte_eal_init(argc, argv);
if (ret < 0)
rte_panic("Cannot init EAL\n");
@@ -367,16 +382,23 @@ main(int argc, char **argv)
}
}
+ check_all_ports_link_status(enabled_port_mask);
+
lcore_id = rte_get_next_lcore(-1, 1, 0);
if (lcore_id == RTE_MAX_LCORE) {
- RTE_LOG(ERR, EAL, "A minimum of two cores are required to run "
+ RTE_LOG(ERR, EAL, "A minimum of three cores are required to run
"
"application\n");
return 0;
}
-
- check_all_ports_link_status(enabled_port_mask);
+ printf("Running channel monitor on lcore id %d\n", lcore_id);
rte_eal_remote_launch(run_monitor, NULL, lcore_id);
+ lcore_id = rte_get_next_lcore(lcore_id, 1, 0);
+ if (lcore_id == RTE_MAX_LCORE) {
+ RTE_LOG(ERR, EAL, "A minimum of three cores are required to run
"
+ "application\n");
+ return 0;
+ }
if (power_manager_init() < 0) {
printf("Unable to initialize power manager\n");
return -1;
@@ -385,8 +407,17 @@ main(int argc, char **argv)
printf("Unable to initialize channel manager\n");
return -1;
}
+
+ printf("Running core monitor on lcore id %d\n", lcore_id);
+ rte_eal_remote_launch(run_core_monitor, NULL, lcore_id);
+
run_cli(NULL);
+ branch_monitor_exit();
+
rte_eal_mp_wait_lcore();
+
+ free(ci->cd);
+
return 0;
}
--
2.17.1
[dpdk-dev] [PATCH v2 8/8] examples/vm_power: add cli args to guest app
Add new command line arguments to the guest app to make
testing and validation of the policy usage easier.
These arguments are mainly around setting up the power
management policy that is sent from the guest vm to
to the vm_power_manager in the host
New command line parameters:
-n or --vm-name
sets the name of the vm to be used by the host OS.
-b or --busy-hours
sets the list of hours that are predicted to be busy
-q or --quiet-hours
sets the list of hours that are predicted to be quiet
-l or --vcpu-list
sets the list of vcpus to monitor
-p or --port-list
sets the list of posts to monitor when using a
workload policy.
-o or --policy
sets the default policy type
TIME
WORKLOAD
TRAFFIC
BRANCH_RATIO
The format of the hours or list paramers is a comma-separated
list of integers, which can take the form of
a. xe.g. --vcpu-list=1
b. x,y e.g. --quiet-hours=3,4
c. x-y e.g. --busy-hours=9-12
d. combination of above (e.g. --busy-hours=4,5-7,9)
Signed-off-by: David Hunt
---
examples/vm_power_manager/guest_cli/Makefile | 2 +-
examples/vm_power_manager/guest_cli/main.c| 151 +-
examples/vm_power_manager/guest_cli/parse.c | 93 +++
examples/vm_power_manager/guest_cli/parse.h | 19 +++
.../guest_cli/vm_power_cli_guest.c| 113 +++--
.../guest_cli/vm_power_cli_guest.h| 6 +
6 files changed, 330 insertions(+), 54 deletions(-)
create mode 100644 examples/vm_power_manager/guest_cli/parse.c
create mode 100644 examples/vm_power_manager/guest_cli/parse.h
diff --git a/examples/vm_power_manager/guest_cli/Makefile
b/examples/vm_power_manager/guest_cli/Makefile
index d710e22d9..8b1db861e 100644
--- a/examples/vm_power_manager/guest_cli/Makefile
+++ b/examples/vm_power_manager/guest_cli/Makefile
@@ -14,7 +14,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
APP = guest_vm_power_mgr
# all source are stored in SRCS-y
-SRCS-y := main.c vm_power_cli_guest.c
+SRCS-y := main.c vm_power_cli_guest.c parse.c
CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/
CFLAGS += $(WERROR_FLAGS)
diff --git a/examples/vm_power_manager/guest_cli/main.c
b/examples/vm_power_manager/guest_cli/main.c
index b17936d6b..36365b124 100644
--- a/examples/vm_power_manager/guest_cli/main.c
+++ b/examples/vm_power_manager/guest_cli/main.c
@@ -2,23 +2,20 @@
* Copyright(c) 2010-2014 Intel Corporation
*/
-/*
#include
-#include
-#include
-#include
-#include
-#include
#include
-#include
-*/
#include
+#include
+#include
#include
#include
#include
+#include
+#include
#include "vm_power_cli_guest.h"
+#include "parse.h"
static void
sig_handler(int signo)
@@ -32,6 +29,136 @@ sig_handler(int signo)
}
+#define MAX_HOURS 24
+
+/* Parse the argument given in the command line of the application */
+static int
+parse_args(int argc, char **argv)
+{
+ int opt, ret;
+ char **argvopt;
+ int option_index;
+ char *prgname = argv[0];
+ const struct option lgopts[] = {
+ { "vm-name", required_argument, 0, 'n'},
+ { "busy-hours", required_argument, 0, 'b'},
+ { "quiet-hours", required_argument, 0, 'q'},
+ { "port-list", required_argument, 0, 'p'},
+ { "vcpu-list", required_argument, 0, 'l'},
+ { "policy", required_argument, 0, 'o'},
+ {NULL, 0, 0, 0}
+ };
+ struct channel_packet *policy;
+ unsigned short int hours[MAX_HOURS];
+ unsigned short int cores[MAX_VCPU_PER_VM];
+ unsigned short int ports[MAX_VCPU_PER_VM];
+ int i, cnt, idx;
+
+ policy = get_policy();
+ set_policy_defaults(policy);
+
+ argvopt = argv;
+
+ while ((opt = getopt_long(argc, argvopt, "n:b:q:p:",
+ lgopts, &option_index)) != EOF) {
+
+ switch (opt) {
+ /* portmask */
+ case 'n':
+ strcpy(policy->vm_name, optarg);
+ printf("Setting VM Name to [%s]\n", policy->vm_name);
+ break;
+ case 'b':
+ case 'q':
+ //printf("***Processing set using [%s]\n", optarg);
+ cnt = parse_set(optarg, hours, MAX_HOURS);
+ if (cnt < 0) {
+ printf("Invalid value passed to quiet/busy
hours - [%s]\n",
+ optarg);
+ break;
+ }
+ idx = 0;
+ for (i = 0; i < MAX_HOURS; i++) {
+ if (hours[i]) {
+ if (opt == 'b') {
+ printf("***Busy Hour %d\n", i);
+
Re: [dpdk-dev] [PATCH 1/2] examples/ipsec-secgw: fix bypass rule processing for outbound port
On 6/5/2018 7:46 PM, Konstantin Ananyev wrote:
For outbound ports BYPASS rule is erroneously treated as PROTECT one
with SA idx zero.
Fixes: 2a5106af132b ("examples/ipsec-secgw: fix corner case for SPI value")
Signed-off-by: Konstantin Ananyev
---
Acked-by: Akhil Goyal
Re: [dpdk-dev] [PATCH v3] net/ixgbe: fix crash on detach
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Pablo de Lara
> Sent: Thursday, May 31, 2018 5:53 PM
> To: Lu, Wenzhuo ; Ananyev, Konstantin
>
> Cc: dev@dpdk.org; De Lara Guarch, Pablo ;
> sta...@dpdk.org
> Subject: [dpdk-dev] [PATCH v3] net/ixgbe: fix crash on detach
>
> When detaching a port bound to ixgbe PMD, if the port does not have any VFs,
> *vfinfo is not set and there is a NULL dereference attempt, when calling
> rte_eth_switch_domain_free(), which expects VFs to be used, causing a
> segmentation fault.
>
> Steps to reproduce:
>
> ./testpmd -- -i
> testpmd> port stop all
> testpmd> port close all
> testpmd> port detach 0
>
> Bugzilla ID: 57
> Fixes: cf80ba6e2038 ("net/ixgbe: add support for representor ports")
> Cc: sta...@dpdk.org
>
> Reported-by: Anatoly Burakov
> Signed-off-by: Pablo de Lara
> Tested-by: Anatoly Burakov
> Acked-by: Remy Horton
Applied to dpdk-next-net-intel
Thanks!
Qi
Re: [dpdk-dev] [PATCH 2/2] examples/ipsec-secgw: fix portmask option parsing
Hi Konstantin,
On 6/5/2018 7:46 PM, Konstantin Ananyev wrote:
parse_portmask() returns both portmask value and possible error code
as 32-bit integer. That causes some confusion for callers.
Split error code and portmask value into two distinct variables.
Also allows to run the app with unprotected_port_mask == 0.
This would also allow cryptodev_mask == 0 to work well which should not be the
case.
Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")
Signed-off-by: Konstantin Ananyev
---
examples/ipsec-secgw/ipsec-secgw.c | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec-secgw.c
b/examples/ipsec-secgw/ipsec-secgw.c
index fafb41161..5d7071657 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -972,20 +972,19 @@ print_usage(const char *prgname)
}
static int32_t
-parse_portmask(const char *portmask)
+parse_portmask(const char *portmask, uint32_t *pmv)
{
- char *end = NULL;
+ char *end;
unsigned long pm;
/* parse hexadecimal string */
+ errno = 0;
pm = strtoul(portmask, &end, 16);
- if ((portmask[0] == '\0') || (end == NULL) || (*end != '\0'))
+ if (errno != 0 || *end != '\0' || pm > UINT32_MAX)
return -1;
- if ((pm == 0) && errno)
- return -1;
-
- return pm;
+ *pmv = pm;
+ return 0;
}
static int32_t
@@ -1063,6 +1062,7 @@ parse_args(int32_t argc, char **argv)
int32_t opt, ret;
char **argvopt;
int32_t option_index;
+ uint32_t v;
char *prgname = argv[0];
int32_t f_present = 0;
@@ -1073,8 +1073,8 @@ parse_args(int32_t argc, char **argv)
switch (opt) {
case 'p':
- enabled_port_mask = parse_portmask(optarg);
- if (enabled_port_mask == 0) {
+ ret = parse_portmask(optarg, &enabled_port_mask);
+ if (ret < 0 || enabled_port_mask == 0) {
printf("invalid portmask\n");
print_usage(prgname);
return -1;
@@ -1085,8 +1085,8 @@ parse_args(int32_t argc, char **argv)
promiscuous_on = 1;
break;
case 'u':
- unprotected_port_mask = parse_portmask(optarg);
- if (unprotected_port_mask == 0) {
+ ret = parse_portmask(optarg, &unprotected_port_mask);
+ if (ret < 0) {
printf("invalid unprotected portmask\n");
print_usage(prgname);
return -1;
@@ -1147,15 +1147,16 @@ parse_args(int32_t argc, char **argv)
single_sa_idx);
break;
case CMD_LINE_OPT_CRYPTODEV_MASK_NUM:
- ret = parse_portmask(optarg);
+ ret = parse_portmask(optarg, &v);
I think there is no need for v, enabled_cryptodev_mask can be used instead.
if (ret == -1) {
enabled_cryptodev_mask should not be 0 and should be checked here.
-Akhil
- printf("Invalid argument[portmask]\n");
+ printf("Invalid argument[%s]\n",
+ CMD_LINE_OPT_CRYPTODEV_MASK);
print_usage(prgname);
return -1;
}
/* else */
- enabled_cryptodev_mask = ret;
+ enabled_cryptodev_mask = v;
break;
default:
print_usage(prgname);
Re: [dpdk-dev] [PATCH v2] net/ixgbe: add query rule stats support for FDIR
> -Original Message- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Lu, Wenzhuo > Sent: Thursday, June 14, 2018 8:36 AM > To: Zhao1, Wei ; dev@dpdk.org > Cc: sta...@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v2] net/ixgbe: add query rule stats support for > FDIR > > Hi, > > > -Original Message- > > From: Zhao1, Wei > > Sent: Wednesday, June 13, 2018 4:09 PM > > To: dev@dpdk.org > > Cc: Lu, Wenzhuo ; sta...@dpdk.org; Zhao1, Wei > > > > Subject: [PATCH v2] net/ixgbe: add query rule stats support for FDIR > > > > There are many registeres in x550 support stats of flow director > > filters, for example the number of added or removed rules and the > > number match or miss match packet count for this for port, all these > > important information can be read form registeres in x550 and display with > command xstats. > > > > Signed-off-by: Wei Zhao > Acked-by: Wenzhuo Lu Applied to dpdk-next-net-intel Thanks! Qi
Re: [dpdk-dev] [PATCH v2 1/2] service: add mechanism for quiescing a service
> -Original Message-
> From: Thomas Monjalon [mailto:tho...@monjalon.net]
> Sent: Monday, June 18, 2018 5:14 PM
> To: Eads, Gage
> Cc: dev@dpdk.org; jerin.ja...@caviumnetworks.com; Van Haaren, Harry
> ; Richardson, Bruce
> ; Rao, Nikhil ; Carrillo,
> Erik
> G ; Gujjar, Abhinandan S
>
> Subject: Re: [dpdk-dev] [PATCH v2 1/2] service: add mechanism for quiescing a
> service
>
> 14/06/2018 15:51, Gage Eads:
> > --- a/lib/librte_eal/common/include/rte_service.h
> > +++ b/lib/librte_eal/common/include/rte_service.h
> > @@ -162,6 +162,22 @@ int32_t rte_service_runstate_set(uint32_t id,
> > uint32_t runstate); int32_t rte_service_runstate_get(uint32_t id);
> >
> > /**
> > + * This function returns whether the service may be currently
> > + executing on
> > + * at least one lcore, or definitely is not. This function can be
> > + used to
> > + * determine if, after setting the service runstate to stopped, the
> > + service
> > + * is still executing an a service lcore.
>
> Typo: "an a"
Will fix.
>
> > --- a/lib/librte_eal/rte_eal_version.map
> > +++ b/lib/librte_eal/rte_eal_version.map
> > +DPDK_18.08 {
> > + global:
> > +
> > + rte_service_may_be_active;
> > +
> > +} DPDK_18.05;
>
> Why it is not experimental?
>
It should be -- my mistake.
Thanks,
Gage
Re: [dpdk-dev] [PATCH v2] net/ixgbe: add support for VLAN in IP mode FDIR
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Lu, Wenzhuo
> Sent: Thursday, June 14, 2018 8:38 AM
> To: Zhao1, Wei ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/ixgbe: add support for VLAN in IP mode
> FDIR
>
> Hi,
>
> > -Original Message-
> > From: Zhao1, Wei
> > Sent: Wednesday, June 13, 2018 4:10 PM
> > To: dev@dpdk.org
> > Cc: Lu, Wenzhuo ; sta...@dpdk.org; Zhao1, Wei
> >
> > Subject: [PATCH v2] net/ixgbe: add support for VLAN in IP mode FDIR
> >
> > In IP mode FDIR, X550 can support not only 4 tuple parameters but also
> > vlan tci in protocol, so add this feature to flow parser.
> >
> > Fixes: 11777435c727 ("net/ixgbe: parse flow director filter")
> >
> > Signed-off-by: Wei Zhao
> Acked-by: Wenzhuo Lu
Applied to dpdk-next-net-intel
Thanks!
Qi
Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix tunnel id format error for FDIR
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Lu, Wenzhuo
> Sent: Thursday, June 14, 2018 8:39 AM
> To: Zhao1, Wei ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix tunnel id format error for
> FDIR
>
> Hi,
>
> > -Original Message-
> > From: Zhao1, Wei
> > Sent: Wednesday, June 13, 2018 4:11 PM
> > To: dev@dpdk.org
> > Cc: Lu, Wenzhuo ; sta...@dpdk.org; Zhao1, Wei
> >
> > Subject: [PATCH v2] net/ixgbe: fix tunnel id format error for FDIR
> >
> > In cloud mode for FDIR, tunnel id should be set as protocol request,
> > the lower 8 bits should be set as reserved.
> >
> > Fixes: 82fb702077f6 ("ixgbe: support new flow director modes for
> > X550")
> > Fixes: 11777435c727 ("net/ixgbe: parse flow director filter")
> >
> > Signed-off-by: Wei Zhao
> Acked-by: Wenzhuo Lu
Applied to dpdk-next-net-intel
Thanks!
Qi
Re: [dpdk-dev] [PATCH] lib/cryptodev: remove RTE_LIBRTE_CRYPTODEV_DEBUG
Hi Jananee,
On 6/12/2018 12:08 PM, Jananee Parthasarathy wrote:
For librte_cryptodev dynamic logging,
conditional compilation of debug logs would not be required anymore.
I believe this shall also be removed from config/common_base and
lib/librte_eal/common/include/rte_dev.h as nobody is using it.
-Akhil
Signed-off-by: Jananee Parthasarathy
Reviewed-by: Reshma Pattan
---
lib/librte_cryptodev/rte_cryptodev.h | 8
1 file changed, 8 deletions(-)
diff --git a/lib/librte_cryptodev/rte_cryptodev.h
b/lib/librte_cryptodev/rte_cryptodev.h
index 92ce6d49a..229712ebf 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -65,7 +65,6 @@ extern const char **rte_cyptodev_names;
RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
RTE_FMT_TAIL(__VA_ARGS__,)))
-#ifdef RTE_LIBRTE_CRYPTODEV_DEBUG
#define CDEV_LOG_DEBUG(...) \
RTE_LOG(DEBUG, CRYPTODEV, \
RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
@@ -76,13 +75,6 @@ extern const char **rte_cyptodev_names;
RTE_FMT("[%s] %s: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
dev, __func__, RTE_FMT_TAIL(__VA_ARGS__,)))
-#else
-#define CDEV_LOG_DEBUG(...) (void)0
-#define CDEV_PMD_TRACE(...) (void)0
-#endif
-
-
-
/**
* A macro that points to an offset from the start
* of the crypto operation structure (rte_crypto_op)
Re: [dpdk-dev] [PATCH v3] net/ixgbe: fix tunnel type set error for FDIR
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Lu, Wenzhuo
> Sent: Friday, June 15, 2018 8:50 AM
> To: Zhao1, Wei ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v3] net/ixgbe: fix tunnel type set error for
> FDIR
>
> Hi,
>
>
> > -Original Message-
> > From: Zhao1, Wei
> > Sent: Thursday, June 14, 2018 4:17 PM
> > To: dev@dpdk.org
> > Cc: Lu, Wenzhuo ; sta...@dpdk.org; Zhao1, Wei
> >
> > Subject: [PATCH v3] net/ixgbe: fix tunnel type set error for FDIR
> >
> > Tunnel type format should be translated to ixgbe required format
> > before register set in FDIR cloud mode, Ans also some register not
> > useful in cloud mode but only useful in IP mode should be set to zero as
> datasheet request.
> >
> > Fixes: 82fb702077f6 ("ixgbe: support new flow director modes for
> > X550")
> > Fixes: 11777435c727 ("net/ixgbe: parse flow director filter")
> >
> > Signed-off-by: Wei Zhao
> Acked-by: Wenzhuo Lu
Applied to dpdk-next-net-intel
Thanks!
Qi
Re: [dpdk-dev] [PATCH v5] net/ixgbe: fix mask bits register set error for FDIR
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Lu, Wenzhuo
> Sent: Tuesday, June 19, 2018 8:57 AM
> To: Zhao1, Wei ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v5] net/ixgbe: fix mask bits register set error
> for FDIR
>
> Hi,
>
>
> > -Original Message-
> > From: Zhao1, Wei
> > Sent: Friday, June 15, 2018 2:08 PM
> > To: dev@dpdk.org
> > Cc: Lu, Wenzhuo ; sta...@dpdk.org; Zhao1, Wei
> >
> > Subject: [PATCH v5] net/ixgbe: fix mask bits register set error for
> > FDIR
> >
> > MAC address bits in mask registers should be set to zero when the is
> > mac mask is 0xFF, otherwise if it is 0x0 these bits should be to 0x3F.
> >
> > Fixes: 82fb702077f6 ("ixgbe: support new flow director modes for
> > X550")
> >
> > Signed-off-by: Wei Zhao
> Acked-by: Wenzhuo Lu
Applied to dpdk-next-net-intel
Thanks!
Qi
Re: [dpdk-dev] [PATCH] lib/cryptodev: remove RTE_LIBRTE_CRYPTODEV_DEBUG
Please remove lib from subject also.
On 6/21/2018 7:41 PM, Akhil Goyal wrote:
Hi Jananee,
On 6/12/2018 12:08 PM, Jananee Parthasarathy wrote:
For librte_cryptodev dynamic logging,
conditional compilation of debug logs would not be required anymore.
I believe this shall also be removed from config/common_base and
lib/librte_eal/common/include/rte_dev.h as nobody is using it.
-Akhil
Signed-off-by: Jananee Parthasarathy
Reviewed-by: Reshma Pattan
---
lib/librte_cryptodev/rte_cryptodev.h | 8
1 file changed, 8 deletions(-)
diff --git a/lib/librte_cryptodev/rte_cryptodev.h
b/lib/librte_cryptodev/rte_cryptodev.h
index 92ce6d49a..229712ebf 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -65,7 +65,6 @@ extern const char **rte_cyptodev_names;
RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
RTE_FMT_TAIL(__VA_ARGS__,)))
-#ifdef RTE_LIBRTE_CRYPTODEV_DEBUG
#define CDEV_LOG_DEBUG(...) \
RTE_LOG(DEBUG, CRYPTODEV, \
RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
@@ -76,13 +75,6 @@ extern const char **rte_cyptodev_names;
RTE_FMT("[%s] %s: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
dev, __func__, RTE_FMT_TAIL(__VA_ARGS__,)))
-#else
-#define CDEV_LOG_DEBUG(...) (void)0
-#define CDEV_PMD_TRACE(...) (void)0
-#endif
-
-
-
/**
* A macro that points to an offset from the start
* of the crypto operation structure (rte_crypto_op)
Re: [dpdk-dev] [PATCH] net/i40e: fix shifts of 32-bit value
> -Original Message-
> From: Xing, Beilei
> Sent: Wednesday, May 23, 2018 3:47 PM
> To: Zhang, Qi Z
> Cc: dev@dpdk.org; Guo, Jia
> Subject: [PATCH] net/i40e: fix shifts of 32-bit value
>
> Cppcheck reports following error,
> (error) Shifting 32-bit value by 36 bits is undefined behaviour
>
> According to datasheet, there's PHY type and PHY type extension in setting PHY
> config command, should exclude PHY type extension when setting PHY type.
>
> Fixes: 1bb8f661168d ("net/i40e: fix link down and negotiation")
>
> Signed-off-by: Beilei Xing
Acked-by: Qi Zhang
Applied to dpdk-next-net-intel
Thanks!
Qi
Re: [dpdk-dev] [PATCH 2/2] doc: fixes the limitations for dpaa2 sec
On 6/21/2018 2:43 PM, Hemant Agrawal wrote:
Fixes: 37f96eb01bce ("crypto/dpaa2_sec: support scatter gather")
Cc: sta...@dpdk.org
Signed-off-by: Hemant Agrawal
---
Acked-by: Akhil Goyal
[dpdk-dev] [PATCH v3 0/2] Improve service stop support
Existing service functions allow us to stop a service, but doing so doesn't guarantee that the service has finished running on a service core. This patch set introduces a function, rte_service_may_be_active(), to check whether a stopped service is truly stopped. This is needed for flows that modify a resource that the service is using; for example when stopping an eventdev, any event adapters and/or scheduler service need to be quiesced first. This patch set also adds support for the event sw PMD's device stop flush callback, which relies on this new mechanism to ensure that the scheduler service is no longer active. v2: - Move function to DPDK_18.08 block in rte_eal_version.map - Fix signed vs. unsigned comparison compiler warning v3: - Move function to EXPERIMENTAL block and add experimental tags - Fix typo in function documentation Gage Eads (2): service: add mechanism for quiescing a service event/sw: support device stop flush callback drivers/event/sw/sw_evdev.c | 114 +++- drivers/event/sw/sw_evdev_selftest.c| 81 +++- lib/librte_eal/common/include/rte_service.h | 20 + lib/librte_eal/common/rte_service.c | 32 +++- lib/librte_eal/rte_eal_version.map | 1 + test/test/test_service_cores.c | 43 +++ 6 files changed, 284 insertions(+), 7 deletions(-) -- 2.13.6
Re: [dpdk-dev] [PATCH 1/2] doc: fixes the limitations for dpaa sec
On 6/21/2018 2:43 PM, Hemant Agrawal wrote:
Fixes: a74af788c632 ("crypto/dpaa_sec: support scatter gather")
Cc: sta...@dpdk.org
Signed-off-by: Hemant Agrawal
---
Acked-by: Akhil Goyal
[dpdk-dev] [PATCH v3 1/2] service: add mechanism for quiescing a service
Existing service functions allow us to stop a service, but doing so doesn't
guarantee that the service has finished running on a service core. This
commit introduces rte_service_may_be_active(), which returns whether the
service may be executing on one or more lcores currently, or definitely is
not.
The service core layer supports this function by setting a flag when
a service core is going to execute a service, and unsetting the flag when
the core is no longer able to run the service (its runstate becomes stopped
or the lcore is no longer mapped).
With this new function, applications can set a service's runstate to
stopped, then poll rte_service_may_be_active() until it returns false. At
that point, the service is quiesced.
Signed-off-by: Gage Eads
Acked-by: Harry van Haaren
---
lib/librte_eal/common/include/rte_service.h | 20 ++
lib/librte_eal/common/rte_service.c | 32 ++---
lib/librte_eal/rte_eal_version.map | 1 +
test/test/test_service_cores.c | 43 +
4 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/lib/librte_eal/common/include/rte_service.h
b/lib/librte_eal/common/include/rte_service.h
index aea4d91b9..20f713b19 100644
--- a/lib/librte_eal/common/include/rte_service.h
+++ b/lib/librte_eal/common/include/rte_service.h
@@ -162,6 +162,26 @@ int32_t rte_service_runstate_set(uint32_t id, uint32_t
runstate);
int32_t rte_service_runstate_get(uint32_t id);
/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * This function returns whether the service may be currently executing on
+ * at least one lcore, or definitely is not. This function can be used to
+ * determine if, after setting the service runstate to stopped, the service
+ * is still executing a service lcore.
+ *
+ * Care must be taken if calling this function when the service runstate is
+ * running, since the result of this function may be incorrect by the time the
+ * function returns due to service cores running in parallel.
+ *
+ * @retval 1 Service may be running on one or more lcores
+ * @retval 0 Service is not running on any lcore
+ * @retval -EINVAL Invalid service id
+ */
+int32_t __rte_experimental
+rte_service_may_be_active(uint32_t id);
+
+/**
* Enable or disable the check for a service-core being mapped to the service.
* An application can disable the check when takes the responsibility to run a
* service itself using *rte_service_run_iter_on_app_lcore*.
diff --git a/lib/librte_eal/common/rte_service.c
b/lib/librte_eal/common/rte_service.c
index 73507aacb..af9a660d4 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -52,6 +52,7 @@ struct rte_service_spec_impl {
rte_atomic32_t num_mapped_cores;
uint64_t calls;
uint64_t cycles_spent;
+ uint8_t active_on_lcore[RTE_MAX_LCORE];
} __rte_cache_aligned;
/* the internal values of a service core */
@@ -347,15 +348,19 @@ rte_service_runner_do_callback(struct
rte_service_spec_impl *s,
static inline int32_t
-service_run(uint32_t i, struct core_state *cs, uint64_t service_mask)
+service_run(uint32_t i, int lcore, struct core_state *cs, uint64_t
service_mask)
{
if (!service_valid(i))
return -EINVAL;
struct rte_service_spec_impl *s = &rte_services[i];
if (s->comp_runstate != RUNSTATE_RUNNING ||
s->app_runstate != RUNSTATE_RUNNING ||
- !(service_mask & (UINT64_C(1) << i)))
+ !(service_mask & (UINT64_C(1) << i))) {
+ s->active_on_lcore[lcore] = 0;
return -ENOEXEC;
+ }
+
+ s->active_on_lcore[lcore] = 1;
/* check do we need cmpset, if MT safe or <= 1 core
* mapped, atomic ops are not required.
@@ -374,6 +379,25 @@ service_run(uint32_t i, struct core_state *cs, uint64_t
service_mask)
return 0;
}
+int32_t __rte_experimental
+rte_service_may_be_active(uint32_t id)
+{
+ uint32_t ids[RTE_MAX_LCORE] = {0};
+ struct rte_service_spec_impl *s = &rte_services[id];
+ int32_t lcore_count = rte_service_lcore_list(ids, RTE_MAX_LCORE);
+ int i;
+
+ if (!service_valid(id))
+ return -EINVAL;
+
+ for (i = 0; i < lcore_count; i++) {
+ if (s->active_on_lcore[ids[i]])
+ return 1;
+ }
+
+ return 0;
+}
+
int32_t rte_service_run_iter_on_app_lcore(uint32_t id,
uint32_t serialize_mt_unsafe)
{
@@ -398,7 +422,7 @@ int32_t rte_service_run_iter_on_app_lcore(uint32_t id,
return -EBUSY;
}
- int ret = service_run(id, cs, UINT64_MAX);
+ int ret = service_run(id, rte_lcore_id(), cs, UINT64_MAX);
if (serialize_mt_unsafe)
rte_atomic32_dec(&s->num_mapped_cores);
@@ -419,7 +443,7 @@ rte_service_runner_func(void *arg)
[dpdk-dev] [PATCH v3 2/2] event/sw: support device stop flush callback
This commit also adds a flush callback test to the sw eventdev's selftest
suite.
Signed-off-by: Gage Eads
Acked-by: Harry van Haaren
---
drivers/event/sw/sw_evdev.c | 114 ++-
drivers/event/sw/sw_evdev_selftest.c | 81 -
2 files changed, 192 insertions(+), 3 deletions(-)
diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index 10f0e1ad4..331c518ff 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -361,9 +361,99 @@ sw_init_qid_iqs(struct sw_evdev *sw)
}
}
+static int
+sw_qids_empty(struct sw_evdev *sw)
+{
+ unsigned int i, j;
+
+ for (i = 0; i < sw->qid_count; i++) {
+ for (j = 0; j < SW_IQS_MAX; j++) {
+ if (iq_count(&sw->qids[i].iq[j]))
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
+static int
+sw_ports_empty(struct sw_evdev *sw)
+{
+ unsigned int i;
+
+ for (i = 0; i < sw->port_count; i++) {
+ if ((rte_event_ring_count(sw->ports[i].rx_worker_ring)) ||
+rte_event_ring_count(sw->ports[i].cq_worker_ring))
+ return 0;
+ }
+
+ return 1;
+}
+
+static void
+sw_drain_ports(struct rte_eventdev *dev)
+{
+ struct sw_evdev *sw = sw_pmd_priv(dev);
+ eventdev_stop_flush_t flush;
+ unsigned int i;
+ uint8_t dev_id;
+ void *arg;
+
+ flush = dev->dev_ops->dev_stop_flush;
+ dev_id = dev->data->dev_id;
+ arg = dev->data->dev_stop_flush_arg;
+
+ for (i = 0; i < sw->port_count; i++) {
+ struct rte_event ev;
+
+ while (rte_event_dequeue_burst(dev_id, i, &ev, 1, 0)) {
+ if (flush)
+ flush(dev_id, ev, arg);
+
+ ev.op = RTE_EVENT_OP_RELEASE;
+ rte_event_enqueue_burst(dev_id, i, &ev, 1);
+ }
+ }
+}
+
+static void
+sw_drain_queue(struct rte_eventdev *dev, struct sw_iq *iq)
+{
+ struct sw_evdev *sw = sw_pmd_priv(dev);
+ eventdev_stop_flush_t flush;
+ uint8_t dev_id;
+ void *arg;
+
+ flush = dev->dev_ops->dev_stop_flush;
+ dev_id = dev->data->dev_id;
+ arg = dev->data->dev_stop_flush_arg;
+
+ while (iq_count(iq) > 0) {
+ struct rte_event ev;
+
+ iq_dequeue_burst(sw, iq, &ev, 1);
+
+ if (flush)
+ flush(dev_id, ev, arg);
+ }
+}
+
+static void
+sw_drain_queues(struct rte_eventdev *dev)
+{
+ struct sw_evdev *sw = sw_pmd_priv(dev);
+ unsigned int i, j;
+
+ for (i = 0; i < sw->qid_count; i++) {
+ for (j = 0; j < SW_IQS_MAX; j++)
+ sw_drain_queue(dev, &sw->qids[i].iq[j]);
+ }
+}
+
static void
-sw_clean_qid_iqs(struct sw_evdev *sw)
+sw_clean_qid_iqs(struct rte_eventdev *dev)
{
+ struct sw_evdev *sw = sw_pmd_priv(dev);
int i, j;
/* Release the IQ memory of all configured qids */
@@ -729,10 +819,30 @@ static void
sw_stop(struct rte_eventdev *dev)
{
struct sw_evdev *sw = sw_pmd_priv(dev);
- sw_clean_qid_iqs(sw);
+ int32_t runstate;
+
+ /* Stop the scheduler if it's running */
+ runstate = rte_service_runstate_get(sw->service_id);
+ if (runstate == 1)
+ rte_service_runstate_set(sw->service_id, 0);
+
+ while (rte_service_may_be_active(sw->service_id))
+ rte_pause();
+
+ /* Flush all events out of the device */
+ while (!(sw_qids_empty(sw) && sw_ports_empty(sw))) {
+ sw_event_schedule(dev);
+ sw_drain_ports(dev);
+ sw_drain_queues(dev);
+ }
+
+ sw_clean_qid_iqs(dev);
sw_xstats_uninit(sw);
sw->started = 0;
rte_smp_wmb();
+
+ if (runstate == 1)
+ rte_service_runstate_set(sw->service_id, 1);
}
static int
diff --git a/drivers/event/sw/sw_evdev_selftest.c
b/drivers/event/sw/sw_evdev_selftest.c
index 78d30e07a..c40912db5 100644
--- a/drivers/event/sw/sw_evdev_selftest.c
+++ b/drivers/event/sw/sw_evdev_selftest.c
@@ -28,6 +28,7 @@
#define MAX_PORTS 16
#define MAX_QIDS 16
#define NUM_PACKETS (1<<18)
+#define DEQUEUE_DEPTH 128
static int evdev;
@@ -147,7 +148,7 @@ init(struct test *t, int nb_queues, int nb_ports)
.nb_event_ports = nb_ports,
.nb_event_queue_flows = 1024,
.nb_events_limit = 4096,
- .nb_event_port_dequeue_depth = 128,
+ .nb_event_port_dequeue_depth = DEQUEUE_DEPTH,
.nb_event_port_enqueue_depth = 128,
};
int ret;
@@ -2807,6 +2808,78 @@ holb(struct test *t) /* test to check we avoid basic
head-of-line blocking */
return -1;
}
+static void
+flush(uint8_t dev_id __rte_unused, struct rte_event
Re: [dpdk-dev] [PATCH 0/2] net/i40e: print real global changes
> -Original Message- > From: Zhang, Qi Z > Sent: Friday, June 15, 2018 9:55 PM > To: Xing, Beilei > Cc: dev@dpdk.org > Subject: RE: [PATCH 0/2] net/i40e: print real global changes > > > > > -Original Message- > > From: Xing, Beilei > > Sent: Thursday, June 7, 2018 10:40 AM > > To: Zhang, Qi Z > > Cc: dev@dpdk.org > > Subject: [PATCH 0/2] net/i40e: print real global changes > > > > Only real changes should be logged, so only the first detected change > > will be logged. Log should be like: > > i40e device xx:xx.x changed global register [xxx] original: xxx, new: > > xxx > > > > Beilei Xing (2): > > net/i40e: print real global changes > > net/i40e: remove summarized global register change info > > > > drivers/net/i40e/i40e_ethdev.c | 157 > > ++-- > > drivers/net/i40e/i40e_ethdev.h | 55 +++--- > > drivers/net/i40e/i40e_fdir.c| 1 - > > drivers/net/i40e/i40e_flow.c| 1 - > > drivers/net/i40e/rte_pmd_i40e.c | 3 - > > 5 files changed, 96 insertions(+), 121 deletions(-) > > > > -- > > 2.5.5 > > Acked-by: Qi Zhang Applied to dpdk-next-net-intel Thanks! Qi >
Re: [dpdk-dev] [PATCH 1/2] cryptodev: add min headroom and tailroom requirement
On 6/19/2018 11:56 AM, Anoob Joseph wrote:
Enabling crypto devs to specify the minimum headroom and tailroom it
expects in the mbuf. For net PMDs, standard headroom has to be honoured
by applications, which is not strictly followed for crypto devs. This
prevents crypto devs from using free space in mbuf (available as
head/tailroom) for internal requirements in crypto operations. Addition
of head/tailroom requirement will help PMDs to communicate such
requirements to the application.
The availability and use of head/tailroom is an optimization if the
hardware supports use of head/tailroom for crypto-op info. For devices
that do not support using the head/tailroom, they can continue to operate
without any performance-drop.
Signed-off-by: Anoob Joseph
---
doc/guides/rel_notes/deprecation.rst | 4
lib/librte_cryptodev/rte_cryptodev.h | 6 ++
2 files changed, 10 insertions(+)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 1ce692e..a547289 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -122,3 +122,7 @@ Deprecation Notices
- Function ``rte_cryptodev_get_private_session_size()`` will be deprecated
in 18.05, and it gets replaced with
``rte_cryptodev_sym_get_private_session_size()``.
It will be removed in 18.08.
+ - New field, ``min_headroom_req``, added in ``rte_cryptodev_info``
structure. It will be
+added in 18.11.
+ - New field, ``min_tailroom_req``, added in ``rte_cryptodev_info``
structure. It will be
+added in 18.11.
Is this targeted for 18.08 or 18.11?
diff --git a/lib/librte_cryptodev/rte_cryptodev.h
b/lib/librte_cryptodev/rte_cryptodev.h
index 92ce6d4..fa944b8 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -382,6 +382,12 @@ struct rte_cryptodev_info {
unsigned max_nb_queue_pairs;
/**< Maximum number of queues pairs supported by device. */
+ uint32_t min_headroom_req;
+ /**< Minimum mbuf headroom required by device */
+
+ uint32_t min_tailroom_req;
+ /**< Minimum mbuf tailroom required by device */
+
struct {
unsigned max_nb_sessions;
/**< Maximum number of sessions supported by device. */
Re: [dpdk-dev] [PATCH] app/testpmd: fix VLAN tci mask set error for FDIR
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Lu, Wenzhuo
> Sent: Tuesday, June 12, 2018 9:12 AM
> To: Zhao1, Wei ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] app/testpmd: fix VLAN tci mask set error for
> FDIR
>
> Hi,
>
> > -Original Message-
> > From: Zhao1, Wei
> > Sent: Tuesday, June 5, 2018 5:12 PM
> > To: dev@dpdk.org
> > Cc: Lu, Wenzhuo ; sta...@dpdk.org; Zhao1, Wei
> >
> > Subject: [PATCH] app/testpmd: fix VLAN tci mask set error for FDIR
> >
> > The vlan tci mask should be set to 0xEFFF, not 0x0, the wrong mask
> > will cause mask error for register set.
> >
> > Fixes: d9d5e6f2f0ba ("app/testpmd: set default flow director mask")
> > Signed-off-by: Wei Zhao
> Acked-by: Wenzhuo Lu
Applied to dpdk-next-net-intel
Thanks!
Qi
Re: [dpdk-dev] [PATCH v2 0/8] examples/vm_power: 100% Busy Polling
On 6/21/2018 2:24 PM, David Hunt wrote: This patch set adds the capability to do out-of-band power monitoring on a system. It uses a thread to monitor the branch counters in the targeted cores, and calculates the branch ratio if the running code. If the branch ratop is low (0.01), then the code is most likely running in a tight poll loop and doing nothing, i.e. receiving no packets. In this case we scale down the frequency of that core. If the branch ratio is higher (>0.01), then it is likely that the code is receiving and processing packets. In this case, we scale up the frequency of that core. The cpu counters are read via /dev/cpu/x/msr, so requires the msr kernel module to be loaded. Because this method is used, the patch set is implemented with one file for x86 systems, and another for non-x86 systems, with conditional compilation in the Makefile. The non-x86 functions are stubs, and do not currently implement any functionality. The vm_power_manager app has been modified to take a new parameter --core-list or -l which takes a list of cores in a comma-separated list format, e.g. 1,3,5-7,9, which resolvest to a core list of 1,3,5,6,7,9 These cores will then be enabled for oob monitoring. When the OOB monitoring thread starts, it reads the branch hits/miss counters of each monitored core, and scales up/down accordingly. The guest_cli app has also been modified to allow sending of a policy of type BRANCH_RATIO where all of the cores included in the policy will be monitored by the vm_power_manager oob thread. v2 changes: * Add the guest_cli patch into this patch set, including the ability to set the policy to BRANCH_RATIO. http://patches.dpdk.org/patch/40742/ * When vm_power_manger receives a policy with type BRANCH_RATIO, add the relevant cores to the monitoring thread. [1/8] examples/vm_power: add check for port count [2/8] examples/vm_power: add core list parameter [3/8] examples/vm_power: add oob monitoring functions [4/8] examples/vm_power: allow greater than 64 cores [5/8] examples/vm_power: add thread for oob core monitor [6/8] examples/vm_power: add port-list to command line [7/8] examples/vm_power: add branch ratio policy type [8/8] examples/vm_power: add cli args to guest app Series Acked-by: Radu Nicolau
Re: [dpdk-dev] [PATCH v3] net/i40e: workaround for Fortville performance
> -Original Message-
> From: Zhang, Qi Z
> Sent: Friday, June 15, 2018 10:07 PM
> To: Wang, Haiyue ; dev@dpdk.org
> Cc: Wu, Jingjing ; Yang, Qiming
> ; sta...@dpdk.org
> Subject: RE: [PATCH v3] net/i40e: workaround for Fortville performance
>
>
>
> > -Original Message-
> > From: Wang, Haiyue
> > Sent: Wednesday, June 13, 2018 1:53 PM
> > To: dev@dpdk.org
> > Cc: Wang, Haiyue ; Zhang, Qi Z
> > ; Wu, Jingjing ; Yang,
> > Qiming ; sta...@dpdk.org
> > Subject: [PATCH v3] net/i40e: workaround for Fortville performance
> >
> > The GL_SWR_PM_UP_THR value is not impacted from the link speed, its
> > value is set according to the total number of ports for a better
> > pipe-monitor configuration.
> >
> > All bellowing relevant device IDs are considered (NICs, LOMs, Mezz and
> > Backplane):
> >
> > Device-ID ValueComments
> > 0x1572 0x03030303 10G SFI
> > 0x1581 0x03030303 10G Backplane
> > 0x1586 0x03030303 10G BaseT
> > 0x1589 0x03030303 10G BaseT (FortPond)
> > 0x1580 0x06060606 40G Backplane
> > 0x1583 0x06060606 2x40G QSFP
> > 0x1584 0x06060606 1x40G QSFP
> > 0x1587 0x06060606 20G Backplane (HP)
> > 0x1588 0x06060606 20G KR2 (HP)
> > 0x158A 0x06060606 25G Backplane
> > 0x158B 0x06060606 25G SFP28
> >
> > Fixes: c9223a2bf53c ("i40e: workaround for XL710 performance")
> > Fixes: 75d133dd3296 ("net/i40e: enable 25G device")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Haiyue Wang
>
> Acked-by: Qi Zhang
Applied to dpdk-next-net-intel
Thanks!
Qi
Re: [dpdk-dev] [PATCH 4/7] vhost: translate iovas at vectors fill time
On 06/08/2018 12:39 PM, Maxime Coquelin wrote:
@@ -584,7 +578,8 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id,
vq->last_avail_idx + num_buffers);
if (copy_mbuf_to_desc(dev, vq, pkts[pkt_idx],
- buf_vec, num_buffers) < 0) {
+ buf_vec, num_buffers,
+ nr_vec) < 0) {
FYI,there is a bug here. num_buffers and nr_vec must be swapped:
static __rte_always_inline int
copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
struct rte_mbuf *m, struct buf_vector *buf_vec,
uint16_t num_buffers)
It can be reproduce with Kernel driver with mrg OFF and with offloads
ON.
Maxime
vq->shadow_used_idx -= num_buffers;
[dpdk-dev] patch for dpdk-devbind.py support ipv6
Hi
dpdk-devbind.py support only ipv4 interface, when run with -s parameter which
is status, it display all ipv6 interface as non Active
It set interface as Active according to "ip -o route" output
Here is a change that can support ipv6
@@ -269,6 +269,18 @@
# filter out all lines for 169.254 routes
route = "\n".join(filter(lambda ln: not ln.startswith("169.254"),
route.decode().splitlines()))
+
+routev6 = check_output(["ip", "-6", "-o", "route"])
+# filter out all lines for 169.254 routes
+routev6 = "\n".join(filter(lambda ln: not ln.startswith("unreachable") and
not ln.startswith("fe80::/64"),
+ routev6.decode().splitlines()))
+
+if len(routev6):
+if len(route):
+route = route+"\n"+routev6
+else:
+route = routev6
+
rt_info = route.split()
for i in range(len(rt_info) - 1):
if rt_info[i] == "dev":
@@ -654,3 +666,4 @@
Yaron Illouz
Re: [dpdk-dev] [PATCH 2/2] examples/ipsec-secgw: fix portmask option parsing
Hi Akhil,
> -Original Message-
> From: Akhil Goyal [mailto:akhil.go...@nxp.com]
> Sent: Thursday, June 21, 2018 2:49 PM
> To: Ananyev, Konstantin ; dev@dpdk.org
> Cc: Nicolau, Radu
> Subject: Re: [dpdk-dev] [PATCH 2/2] examples/ipsec-secgw: fix portmask option
> parsing
>
> Hi Konstantin,
>
> On 6/5/2018 7:46 PM, Konstantin Ananyev wrote:
> > parse_portmask() returns both portmask value and possible error code
> > as 32-bit integer. That causes some confusion for callers.
> > Split error code and portmask value into two distinct variables.
> > Also allows to run the app with unprotected_port_mask == 0.
>
> This would also allow cryptodev_mask == 0 to work well which should not be
> the case.
>
> >
> > Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")
> >
> > Signed-off-by: Konstantin Ananyev
> > ---
> > examples/ipsec-secgw/ipsec-secgw.c | 29 +++--
> > 1 file changed, 15 insertions(+), 14 deletions(-)
> >
> > diff --git a/examples/ipsec-secgw/ipsec-secgw.c
> > b/examples/ipsec-secgw/ipsec-secgw.c
> > index fafb41161..5d7071657 100644
> > --- a/examples/ipsec-secgw/ipsec-secgw.c
> > +++ b/examples/ipsec-secgw/ipsec-secgw.c
> > @@ -972,20 +972,19 @@ print_usage(const char *prgname)
> > }
> >
> > static int32_t
> > -parse_portmask(const char *portmask)
> > +parse_portmask(const char *portmask, uint32_t *pmv)
> > {
> > - char *end = NULL;
> > + char *end;
> > unsigned long pm;
> >
> > /* parse hexadecimal string */
> > + errno = 0;
> > pm = strtoul(portmask, &end, 16);
> > - if ((portmask[0] == '\0') || (end == NULL) || (*end != '\0'))
> > + if (errno != 0 || *end != '\0' || pm > UINT32_MAX)
> > return -1;
> >
> > - if ((pm == 0) && errno)
> > - return -1;
> > -
> > - return pm;
> > + *pmv = pm;
> > + return 0;
> > }
> >
> > static int32_t
> > @@ -1063,6 +1062,7 @@ parse_args(int32_t argc, char **argv)
> > int32_t opt, ret;
> > char **argvopt;
> > int32_t option_index;
> > + uint32_t v;
> > char *prgname = argv[0];
> > int32_t f_present = 0;
> >
> > @@ -1073,8 +1073,8 @@ parse_args(int32_t argc, char **argv)
> >
> > switch (opt) {
> > case 'p':
> > - enabled_port_mask = parse_portmask(optarg);
> > - if (enabled_port_mask == 0) {
> > + ret = parse_portmask(optarg, &enabled_port_mask);
> > + if (ret < 0 || enabled_port_mask == 0) {
> > printf("invalid portmask\n");
> > print_usage(prgname);
> > return -1;
> > @@ -1085,8 +1085,8 @@ parse_args(int32_t argc, char **argv)
> > promiscuous_on = 1;
> > break;
> > case 'u':
> > - unprotected_port_mask = parse_portmask(optarg);
> > - if (unprotected_port_mask == 0) {
> > + ret = parse_portmask(optarg, &unprotected_port_mask);
> > + if (ret < 0) {
> > printf("invalid unprotected portmask\n");
> > print_usage(prgname);
> > return -1;
> > @@ -1147,15 +1147,16 @@ parse_args(int32_t argc, char **argv)
> > single_sa_idx);
> > break;
> > case CMD_LINE_OPT_CRYPTODEV_MASK_NUM:
> > - ret = parse_portmask(optarg);
> > + ret = parse_portmask(optarg, &v);
>
> I think there is no need for v, enabled_cryptodev_mask can be used instead.
Right now - it can't as enabled_cryptodevmask is uint64_t.
To do what you suggesting we have either downgrade enabled_cryptodevmask
32-bits,
or upgrade enabled_port_mask to 64-bit and change parse_portmask() to accept
64-bit parameter.
>
> > if (ret == -1) {
>
> enabled_cryptodev_mask should not be 0 and should be checked here.
Could you explain a bit more why enabled_cryptodevmask==0 is not allowed?
Konstantin
[dpdk-dev] [PATCH] docs: add default that all fixes are backported
Set the starting point that all commits on master branch with Fixes tag are backported to relevant stable/LTS branches. Of course there will be exceptions that will crop up from time to time that need discussion, so also add a sentence for that. This is to ensure that there is consistency between what is backported to stable/LTS branches, remove some subjectivity as to what constitutes "a fix" and avoid possible conflicts for future backports. Signed-off-by: Kevin Traynor --- doc/guides/contributing/stable.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/guides/contributing/stable.rst b/doc/guides/contributing/stable.rst index 0f2f1f3..bbafc37 100644 --- a/doc/guides/contributing/stable.rst +++ b/doc/guides/contributing/stable.rst @@ -58,5 +58,7 @@ What changes should be backported - -Backporting should be limited to bug fixes. +Backporting should be limited to bug fixes. All patches accepted on the master +branch with Fixes tags will be backported to the relevant stable/LTS branches. +If there are exceptions, they will be discussed on the mailing lists. Features should not be backported to stable releases. It may be acceptable, in -- 1.8.3.1
Re: [dpdk-dev] [PATCH] docs: add default that all fixes are backported
On Thu, 2018-06-21 at 17:00 +0100, Kevin Traynor wrote: > Set the starting point that all commits on master branch > with Fixes tag are backported to relevant stable/LTS branches. > > Of course there will be exceptions that will crop up from time > to time that need discussion, so also add a sentence for that. > > This is to ensure that there is consistency between what is > backported to stable/LTS branches, remove some subjectivity > as to what constitutes "a fix" and avoid possible conflicts > for future backports. > > Signed-off-by: Kevin Traynor > --- > doc/guides/contributing/stable.rst | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/doc/guides/contributing/stable.rst > b/doc/guides/contributing/stable.rst > index 0f2f1f3..bbafc37 100644 > --- a/doc/guides/contributing/stable.rst > +++ b/doc/guides/contributing/stable.rst > @@ -58,5 +58,7 @@ What changes should be backported > - > > -Backporting should be limited to bug fixes. > +Backporting should be limited to bug fixes. All patches accepted on > the master > +branch with Fixes tags will be backported to the relevant stable/LTS > branches. > +If there are exceptions, they will be discussed on the mailing > lists. > > Features should not be backported to stable releases. It may be > acceptable, in Acked-by: Luca Boccassi -- Kind regards, Luca Boccassi
Re: [dpdk-dev] [PATCH] docs: add default that all fixes are backported
On 6/21/2018 5:00 PM, Kevin Traynor wrote:
> Set the starting point that all commits on master branch
> with Fixes tag are backported to relevant stable/LTS branches.
>
> Of course there will be exceptions that will crop up from time
> to time that need discussion, so also add a sentence for that.
>
> This is to ensure that there is consistency between what is
> backported to stable/LTS branches, remove some subjectivity
> as to what constitutes "a fix" and avoid possible conflicts
> for future backports.
>
> Signed-off-by: Kevin Traynor
> ---
> doc/guides/contributing/stable.rst | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/doc/guides/contributing/stable.rst
> b/doc/guides/contributing/stable.rst
> index 0f2f1f3..bbafc37 100644
> --- a/doc/guides/contributing/stable.rst
> +++ b/doc/guides/contributing/stable.rst
> @@ -58,5 +58,7 @@ What changes should be backported
> -
>
> -Backporting should be limited to bug fixes.
> +Backporting should be limited to bug fixes. All patches accepted on the
> master
> +branch with Fixes tags will be backported to the relevant stable/LTS
> branches.
> +If there are exceptions, they will be discussed on the mailing lists.
Just to highlight, there are some cased fix is not applicable for stable trees,
for that case "Cc: sta...@dpdk.org" tag explicitly omitted.
a) Fix with backport request:
Fixes: ("...")
Cc: sta...@dpdk.org
b) Fix but backport not applicable/requested:
Fixes: ("...")
So I agree there may be a confusion in b) if the backport is not requested or it
has been forgotten.
Is there anything we can do/change to help stable tree maintainers on this
issue?
>
> Features should not be backported to stable releases. It may be acceptable,
> in
>
Re: [dpdk-dev] [PATCH] examples: fix RSS hash function configuration
Hi Ferruh,
On Wed, Jun 20, 2018 at 04:01:22PM +0100, Ferruh Yigit wrote:
> ethdev layer introduced checks for application requested RSS hash
> functions and returns error for ones unsupported by hardware
>
> This check breaks some sample applications which blindly configures
> RSS hash functions without checking underlying hardware support.
>
> Updated examples to mask out unsupported RSS has functions during device
> configuration.
> Prints a log if configuration values updated by this check.
>
> Fixes: aa1a6d87f15d ("ethdev: force RSS offload rules again")
>
> Signed-off-by: Ferruh Yigit
> ---
> Return error added in this release, so no need to backport the fix to
> previous versions.
>
> Cc: David Hunt
> Cc: Liang Ma
> Cc: Xueming Li
> ---
> examples/bond/main.c | 12 ++
> examples/distributor/main.c | 11 ++
> examples/eventdev_pipeline/main.c | 11 ++
> examples/ip_pipeline/link.c | 8 +--
> examples/ip_reassembly/main.c | 12 ++
> examples/ipsec-secgw/ipsec-secgw.c| 12 ++
> examples/l3fwd-acl/main.c | 12 ++
> examples/l3fwd-power/main.c | 14 ++--
> examples/l3fwd-vf/main.c | 12 ++
> examples/l3fwd/main.c | 12 ++
> examples/load_balancer/init.c | 12 ++
> examples/multi_process/symmetric_mp/main.c| 12 ++
> .../performance-thread/l3fwd-thread/main.c| 12 ++
> examples/qos_meter/main.c | 22 +++
> examples/vmdq_dcb/main.c | 13 +++
> 15 files changed, 183 insertions(+), 4 deletions(-)
>
As we are fixing it for examples can we include fix for app/test-eventdev too?
diff --git a/app/test-eventdev/test_perf_common.c
b/app/test-eventdev/test_perf_common.c
index d00f91802..79d755b6f 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -706,6 +706,12 @@ perf_ethdev_setup(struct evt_test *test, struct
evt_options *opt)
}
RTE_ETH_FOREACH_DEV(i) {
+ struct rte_eth_dev_info dev_info;
+
+ memset(&dev_info, 0, sizeof(struct rte_eth_dev_info));
+ rte_eth_dev_info_get(i, &dev_info);
+ port_conf.rx_adv_conf.rss_conf.rss_hf &=
+ dev_info.flow_type_rss_offloads;
if (rte_eth_dev_configure(i, 1, 1,
&port_conf)
diff --git a/app/test-eventdev/test_pipeline_common.c
b/app/test-eventdev/test_pipeline_common.c
index 719518ff3..386ba14d1 100644
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -249,6 +249,9 @@ pipeline_ethdev_setup(struct evt_test *test, struct
evt_options *opt)
rx_conf = dev_info.default_rxconf;
rx_conf.offloads = port_conf.rxmode.offloads;
+ port_conf.rx_adv_conf.rss_conf.rss_hf &=
+ dev_info.flow_type_rss_offloads;
+
if (rte_eth_dev_configure(i, nb_queues, nb_queues,
&port_conf)
< 0) {
Thanks,
Pavan
[dpdk-dev] [PATCH] net/thunderx: fix build with gcc optimization on
build error gcc version 6.3.1 20161221 (Red Hat 6.3.1-1),
with EXTRA_CFLAGS="-O3":
.../drivers/net/thunderx/nicvf_ethdev.c:907:9:
error: ‘txq’ may be used uninitialized in this function
[-Werror=maybe-uninitialized]
if (txq->pool_free == nicvf_single_pool_free_xmited_buffers)
~~~^~~
.../drivers/net/thunderx/nicvf_ethdev.c:886:20:
note: ‘txq’ was declared here
struct nicvf_txq *txq;
^~~
Same error on function 'nicvf_eth_dev_init' and 'nicvf_dev_start', it
seems 'nicvf_set_tx_function' inlined when optimization enabled.
Initialize the txq and add NULL check before using it to fix.
Fixes: 7413feee662d ("net/thunderx: add device start/stop and close")
Cc: sta...@dpdk.org
Reported-by: Richard Walsh
Signed-off-by: Ferruh Yigit
---
Btw, no compiler optimization enabled, only nicvf_rxtx.c has -Ofast,
is this intentional?
---
drivers/net/thunderx/nicvf_ethdev.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/thunderx/nicvf_ethdev.c
b/drivers/net/thunderx/nicvf_ethdev.c
index 99fcd516b..4ab1bfbe6 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -883,7 +883,7 @@ nicvf_dev_tx_queue_release(void *sq)
static void
nicvf_set_tx_function(struct rte_eth_dev *dev)
{
- struct nicvf_txq *txq;
+ struct nicvf_txq *txq = NULL;
size_t i;
bool multiseg = false;
@@ -904,6 +904,9 @@ nicvf_set_tx_function(struct rte_eth_dev *dev)
dev->tx_pkt_burst = nicvf_xmit_pkts;
}
+ if (!txq)
+ return;
+
if (txq->pool_free == nicvf_single_pool_free_xmited_buffers)
PMD_DRV_LOG(DEBUG, "Using single-mempool tx free method");
else
--
2.17.1
Re: [dpdk-dev] [PATCH] examples: fix RSS hash function configuration
On 6/21/2018 5:54 PM, Pavan Nikhilesh wrote:
> Hi Ferruh,
>
> On Wed, Jun 20, 2018 at 04:01:22PM +0100, Ferruh Yigit wrote:
>> ethdev layer introduced checks for application requested RSS hash
>> functions and returns error for ones unsupported by hardware
>>
>> This check breaks some sample applications which blindly configures
>> RSS hash functions without checking underlying hardware support.
>>
>> Updated examples to mask out unsupported RSS has functions during device
>> configuration.
>> Prints a log if configuration values updated by this check.
>>
>> Fixes: aa1a6d87f15d ("ethdev: force RSS offload rules again")
>>
>> Signed-off-by: Ferruh Yigit
>> ---
>> Return error added in this release, so no need to backport the fix to
>> previous versions.
>>
>> Cc: David Hunt
>> Cc: Liang Ma
>> Cc: Xueming Li
>> ---
>> examples/bond/main.c | 12 ++
>> examples/distributor/main.c | 11 ++
>> examples/eventdev_pipeline/main.c | 11 ++
>> examples/ip_pipeline/link.c | 8 +--
>> examples/ip_reassembly/main.c | 12 ++
>> examples/ipsec-secgw/ipsec-secgw.c| 12 ++
>> examples/l3fwd-acl/main.c | 12 ++
>> examples/l3fwd-power/main.c | 14 ++--
>> examples/l3fwd-vf/main.c | 12 ++
>> examples/l3fwd/main.c | 12 ++
>> examples/load_balancer/init.c | 12 ++
>> examples/multi_process/symmetric_mp/main.c| 12 ++
>> .../performance-thread/l3fwd-thread/main.c| 12 ++
>> examples/qos_meter/main.c | 22 +++
>> examples/vmdq_dcb/main.c | 13 +++
>> 15 files changed, 183 insertions(+), 4 deletions(-)
>>
>
> As we are fixing it for examples can we include fix for app/test-eventdev too?
Yes we should, thanks for reminding, I will update the patch to include below.
>
> diff --git a/app/test-eventdev/test_perf_common.c
> b/app/test-eventdev/test_perf_common.c
> index d00f91802..79d755b6f 100644
> --- a/app/test-eventdev/test_perf_common.c
> +++ b/app/test-eventdev/test_perf_common.c
> @@ -706,6 +706,12 @@ perf_ethdev_setup(struct evt_test *test, struct
> evt_options *opt)
> }
>
> RTE_ETH_FOREACH_DEV(i) {
> + struct rte_eth_dev_info dev_info;
> +
> + memset(&dev_info, 0, sizeof(struct rte_eth_dev_info));
> + rte_eth_dev_info_get(i, &dev_info);
> + port_conf.rx_adv_conf.rss_conf.rss_hf &=
> + dev_info.flow_type_rss_offloads;
>
> if (rte_eth_dev_configure(i, 1, 1,
> &port_conf)
> diff --git a/app/test-eventdev/test_pipeline_common.c
> b/app/test-eventdev/test_pipeline_common.c
> index 719518ff3..386ba14d1 100644
> --- a/app/test-eventdev/test_pipeline_common.c
> +++ b/app/test-eventdev/test_pipeline_common.c
> @@ -249,6 +249,9 @@ pipeline_ethdev_setup(struct evt_test *test, struct
> evt_options *opt)
> rx_conf = dev_info.default_rxconf;
> rx_conf.offloads = port_conf.rxmode.offloads;
>
> + port_conf.rx_adv_conf.rss_conf.rss_hf &=
> + dev_info.flow_type_rss_offloads;
> +
> if (rte_eth_dev_configure(i, nb_queues, nb_queues,
> &port_conf)
> < 0) {
>
>
> Thanks,
> Pavan
>
Re: [dpdk-dev] [PATCH] docs: add default that all fixes are backported
Kevin Traynor writes: > Set the starting point that all commits on master branch > with Fixes tag are backported to relevant stable/LTS branches. > > Of course there will be exceptions that will crop up from time > to time that need discussion, so also add a sentence for that. > > This is to ensure that there is consistency between what is > backported to stable/LTS branches, remove some subjectivity > as to what constitutes "a fix" and avoid possible conflicts > for future backports. > > Signed-off-by: Kevin Traynor > --- Acked-by: Aaron Conole
[dpdk-dev] [PATCH v2 3/3] net/pcap: support pcap files and ifaces mix
Suggested-by: Ferruh Yigit
Signed-off-by: ido goshen
---
drivers/net/pcap/rte_eth_pcap.c | 82 +
1 file changed, 50 insertions(+), 32 deletions(-)
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index b21930b..33c5366 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -232,7 +232,7 @@ struct pmd_devargs {
/*
* Callback to handle writing packets to a pcap file.
*/
-static uint16_t
+static inline uint16_t
eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
{
unsigned int i;
@@ -293,7 +293,7 @@ struct pmd_devargs {
/*
* Callback to handle sending packets through a real NIC.
*/
-static uint16_t
+static inline uint16_t
eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
{
unsigned int i;
@@ -343,6 +343,16 @@ struct pmd_devargs {
return num_tx;
}
+static uint16_t
+eth_pcap_tx_mux(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+{
+ struct pcap_tx_queue *tx_queue = queue;
+ if (tx_queue->dumper)
+ return eth_pcap_tx_dumper(queue, bufs, nb_pkts);
+ else
+ return eth_pcap_tx(queue, bufs, nb_pkts);
+}
+
/*
* pcap_open_live wrapper function
*/
@@ -773,6 +783,31 @@ struct pmd_devargs {
return open_iface(key, value, extra_args);
}
+static int
+open_pcap_rx_mux(const char *key, const char *value, void *extra_args)
+{
+ struct pmd_devargs *pcaps = extra_args;
+
+ if (strcmp(key, ETH_PCAP_RX_PCAP_ARG) == 0)
+ return open_rx_pcap(key, value, pcaps);
+ if (strcmp(key, ETH_PCAP_RX_IFACE_ARG) == 0)
+ return open_rx_iface(key, value, pcaps);
+ return 0;
+}
+
+static int
+open_pcap_tx_mux(const char *key, const char *value, void *extra_args)
+{
+ struct pmd_devargs *dumpers = extra_args;
+
+ if (strcmp(key, ETH_PCAP_TX_PCAP_ARG) == 0)
+ return open_tx_pcap(key, value, dumpers);
+ if (strcmp(key, ETH_PCAP_TX_IFACE_ARG) == 0)
+ return open_tx_iface(key, value, dumpers);
+ return 0;
+}
+
+
static struct rte_vdev_driver pmd_pcap_drv;
static int
@@ -873,8 +908,7 @@ struct pmd_devargs {
eth_from_pcaps(struct rte_vdev_device *vdev,
struct pmd_devargs *rx_queues, const unsigned int nb_rx_queues,
struct pmd_devargs *tx_queues, const unsigned int nb_tx_queues,
- struct rte_kvargs *kvlist, int single_iface,
- unsigned int using_dumpers)
+ struct rte_kvargs *kvlist, int single_iface)
{
struct pmd_internals *internals = NULL;
struct rte_eth_dev *eth_dev = NULL;
@@ -891,10 +925,7 @@ struct pmd_devargs {
eth_dev->rx_pkt_burst = eth_pcap_rx;
- if (using_dumpers)
- eth_dev->tx_pkt_burst = eth_pcap_tx_dumper;
- else
- eth_dev->tx_pkt_burst = eth_pcap_tx;
+ eth_dev->tx_pkt_burst = eth_pcap_tx_mux;
rte_eth_dev_probing_finish(eth_dev);
return 0;
@@ -904,7 +935,6 @@ struct pmd_devargs {
pmd_pcap_probe(struct rte_vdev_device *dev)
{
const char *name;
- unsigned int is_rx_pcap = 0, is_tx_pcap = 0;
struct rte_kvargs *kvlist;
struct pmd_devargs pcaps = {0};
struct pmd_devargs dumpers = {0};
@@ -958,42 +988,30 @@ struct pmd_devargs {
}
/*
-* We check whether we want to open a RX stream from a real NIC or a
-* pcap file
+* Open RX streams for pcap files and real NICs
+* Need to be parsed together for the queues to maintain
+* the input args order
*/
- is_rx_pcap = rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG) ? 1 : 0;
pcaps.num_of_queue = 0;
-
- if (is_rx_pcap)
- ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_PCAP_ARG,
- &open_rx_pcap, &pcaps);
- else
- ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_IFACE_ARG,
- &open_rx_iface, &pcaps);
-
+ ret = rte_kvargs_process(kvlist, NULL,
+ &open_pcap_rx_mux, &pcaps);
if (ret < 0)
goto free_kvlist;
/*
-* We check whether we want to open a TX stream to a real NIC or a
-* pcap file
+* Open TX streams for pcap files and real NICs
+* Need to be parsed together for the queues to maintain
+* the input args order
*/
- is_tx_pcap = rte_kvargs_count(kvlist, ETH_PCAP_TX_PCAP_ARG) ? 1 : 0;
dumpers.num_of_queue = 0;
-
- if (is_tx_pcap)
- ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_PCAP_ARG,
- &open_tx_pcap, &dumpers);
- else
- ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_IFACE_ARG,
- &open_tx_iface, &dumpers);
-
+ ret = rte_kvargs_process(kvlist, NULL,
+
Re: [dpdk-dev] [PATCH v2 2/2] net/pcap: duplicate code consolidation
Although there's no functional need for them I considered keeping it for
maintainability reasons:
1. Keep the call flow more aligned with pcap (file) that has separated
open_rx_pcap()/open_tx_pcap()
2. If in future there'll rise a need for different functionality between rx and
tx then it will be a good place to hook it in.
e.g. if we'll want to force PCAP_D_IN/OUT for rx_iface/tx_iface as you
suggested then it can go in those functions
(I'd like to go back to that direction issue after this fix is done)
-Original Message-
From: Ferruh Yigit
Sent: Wednesday, June 20, 2018 8:41 PM
To: Ido Goshen
Cc: dev@dpdk.org
Subject: Re: [PATCH v2 2/2] net/pcap: duplicate code consolidation
On 6/19/2018 3:37 PM, ido goshen wrote:
> Signed-off-by: ido goshen
<...>
> /*
> + * Opens a NIC for reading packets from it */ static inline int
> +open_rx_iface(const char *key, const char *value, void *extra_args) {
> + return open_iface(key, value, extra_args); }
> +
> +/*
> * Opens a NIC for writing packets to it
> */
> static int
> open_tx_iface(const char *key, const char *value, void *extra_args)
> {
> - const char *iface = value;
> - struct pmd_devargs *tx = extra_args;
> - pcap_t *pcap;
> -
> - if (tx->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES)
> - return -1;
> - if (open_single_iface(iface, &pcap) < 0)
> - return -1;
> - tx->queue[tx->num_of_queue].pcap = pcap;
> - tx->queue[tx->num_of_queue].name = iface;
> - tx->queue[tx->num_of_queue].type = key;
> - tx->num_of_queue++;
> -
> - return 0;
> + return open_iface(key, value, extra_args);
> }
>
> static struct rte_vdev_driver pmd_pcap_drv;
>
Is there a reason to keep open_tx_iface() and open_rx_iface(), they both are
wrapper to open_iface().
Why not use open_iface() directly as callback function?
[dpdk-dev] netvsc PMD driver update plan
I have some updates to the netvsc driver that use external mbuf's and fix a couple of bugs. Would you rather: * new (V11) version consolidating those * sequence of patches against V10 * hold off until V10 is merged.
[dpdk-dev] [PATCH v2] net/i40e: remove VF interrupt handler
For i40evf, internal rx interrupt and adminq interrupt share the same
source, that cause a lot cpu cycles be wasted on interrupt handler
on rx path. This is complained by customers which require low latency
(when set I40E_ITR_INTERVAL to small value), but have to be sufferred by
tremendous interrupts handling that eat significant CPU resources.
The patch disable pci interrupt and remove the interrupt handler,
replace it with a low frequency (50ms) interrupt polling daemon
which is implemented by registering a alarm callback periodly, this
save CPU time significently: On a typical x86 server with 2.1GHz CPU,
with low latency configure (32us) we saw CPU usage from top commmand
reduced from 20% to 0% on management core in testpmd).
Also with the new method we can remove compile option: I40E_ITR_INTERVAL
which is used to balance between low latency and low CPU usage previously.
Now we don't need it since we can reach both at same time.
Suggested-by: Jingjing Wu
Signed-off-by: Qi Zhang
---
v2:
- update doc
config/common_base| 2 --
doc/guides/nics/i40e.rst | 5 -
drivers/net/i40e/i40e_ethdev.c| 3 +--
drivers/net/i40e/i40e_ethdev.h| 22 +++---
drivers/net/i40e/i40e_ethdev_vf.c | 36 ++--
5 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/config/common_base b/config/common_base
index 6b0d1cbbb..9e21c6865 100644
--- a/config/common_base
+++ b/config/common_base
@@ -264,8 +264,6 @@ CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=y
CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n
CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF=64
CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=4
-# interval up to 8160 us, aligned to 2 (or default value)
-CONFIG_RTE_LIBRTE_I40E_ITR_INTERVAL=-1
#
# Compile burst-oriented FM10K PMD
diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst
index 18549bf5a..3fc4ceac7 100644
--- a/doc/guides/nics/i40e.rst
+++ b/doc/guides/nics/i40e.rst
@@ -96,11 +96,6 @@ Please note that enabling debugging options may affect
system performance.
Number of queues reserved for each VMDQ Pool.
-- ``CONFIG_RTE_LIBRTE_I40E_ITR_INTERVAL`` (default ``-1``)
-
- Interrupt Throttling interval.
-
-
Runtime Config Options
~~
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 13c5d3296..c8f9566e0 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1829,8 +1829,7 @@ __vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t
msix_vect,
/* Write first RX queue to Link list register as the head element */
if (vsi->type != I40E_VSI_SRIOV) {
uint16_t interval =
- i40e_calc_itr_interval(RTE_LIBRTE_I40E_ITR_INTERVAL, 1,
- pf->support_multi_driver);
+ i40e_calc_itr_interval(1, pf->support_multi_driver);
if (msix_vect == I40E_MISC_VEC_ID) {
I40E_WRITE_REG(hw, I40E_PFINT_LNKLST0,
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 11c4c76bd..53dac 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -178,7 +178,7 @@ enum i40e_flxpld_layer_idx {
#define I40E_ITR_INDEX_NONE 3
#define I40E_QUEUE_ITR_INTERVAL_DEFAULT 32 /* 32 us */
#define I40E_QUEUE_ITR_INTERVAL_MAX 8160 /* 8160 us */
-#define I40E_VF_QUEUE_ITR_INTERVAL_DEFAULT 8160 /* 8160 us */
+#define I40E_VF_QUEUE_ITR_INTERVAL_DEFAULT 32 /* 32 us */
/* Special FW support this floating VEB feature */
#define FLOATING_VEB_SUPPORTED_FW_MAJ 5
#define FLOATING_VEB_SUPPORTED_FW_MIN 0
@@ -1328,17 +1328,17 @@ i40e_align_floor(int n)
}
static inline uint16_t
-i40e_calc_itr_interval(int16_t interval, bool is_pf, bool is_multi_drv)
+i40e_calc_itr_interval(bool is_pf, bool is_multi_drv)
{
- if (interval < 0 || interval > I40E_QUEUE_ITR_INTERVAL_MAX) {
- if (is_multi_drv) {
- interval = I40E_QUEUE_ITR_INTERVAL_MAX;
- } else {
- if (is_pf)
- interval = I40E_QUEUE_ITR_INTERVAL_DEFAULT;
- else
- interval = I40E_VF_QUEUE_ITR_INTERVAL_DEFAULT;
- }
+ uint16_t interval = 0;
+
+ if (is_multi_drv) {
+ interval = I40E_QUEUE_ITR_INTERVAL_MAX;
+ } else {
+ if (is_pf)
+ interval = I40E_QUEUE_ITR_INTERVAL_DEFAULT;
+ else
+ interval = I40E_VF_QUEUE_ITR_INTERVAL_DEFAULT;
}
/* Convert to hardware count, as writing each 1 represents 2 us */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
b/drivers/net/i40e/i40e_ethdev_vf.c
index 804e44530..ad5c069e8 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -44,6 +44,8 @@
#define I40EVF_BUSY_WAIT_COUNT 50
#d
[dpdk-dev] [Bug 64] Bound_promisc_opt:After the confounding mode is turned off, the port can receive data.
https://bugs.dpdk.org/show_bug.cgi?id=64
Bug ID: 64
Summary: Bound_promisc_opt:After the confounding mode is turned
off, the port can receive data.
Product: DPDK
Version: 18.05
Hardware: x86
OS: Linux
Status: CONFIRMED
Severity: normal
Priority: Normal
Component: testpmd
Assignee: dev@dpdk.org
Reporter: shuaix@intel.com
Target Milestone: ---
Environment
DPDK version: dpdk 18.05
OS: Fedora28
Kernel:4.16.5-300.fc28.x86_64
compiler:Clang version 6.0.0 (tags/RELEASE_600/final)
driver: i40e
version: 2.3.2-k
firmware-version: 6.01 0x80003205 1.1691.0
Test Setup
dut.10.240.176.151: export RTE_TARGET=x86_64-native-linuxapp-clang
dut.10.240.176.151: export RTE_SDK=`pwd`
dut.10.240.176.151: awk '/Hugepagesize/
{print $2}
' /proc/meminfo
dut.10.240.176.151: umount `awk '/hugetlbfs/
{ print $2 }' /proc/mounts`
dut.10.240.176.151: awk '/hugetlbfs/ { print $2 }
' /proc/mounts
dut.10.240.176.151: mkdir -p /mnt/huge
dut.10.240.176.151: mount -t hugetlbfs nodev /mnt/huge
dut.10.240.176.151: rmmod vfio_pci
dut.10.240.176.151: rmmod vfio_iommu_type1
dut.10.240.176.151: rmmod vfio
dut.10.240.176.151: modprobe vfio
dut.10.240.176.151: modprobe vfio-pci
dut.10.240.176.151: usertools/dpdk-devbind.py --force --bind=vfio-pci
:03:00.0 :03:00.1 :03:00.2 :03:00.3
dut.10.240.176.151: ./x86_64-native-linuxapp-clang/app/testpmd -c 0x3fffe -n 4
– -i
dut.10.240.176.151: create bonded device 3 0
dut.10.240.176.151: add bonding slave 0 4
dut.10.240.176.151: show bonding config 4
dut.10.240.176.151: add bonding slave 1 4
dut.10.240.176.151: show bonding config 4
dut.10.240.176.151: add bonding slave 2 4
dut.10.240.176.151: show bonding config 4
dut.10.240.176.151: set portlist 3,4
dut.10.240.176.151: port start 4
dut.10.240.176.151: start
dut.10.240.176.151: show port info 0
dut.10.240.176.151: show port info 1
dut.10.240.176.151: show port info 2
dut.10.240.176.151: show port info 3
dut.10.240.176.151: show port info 4
dut.10.240.176.151: show port stats 3
dut.10.240.176.151: show port stats 4
dut.10.240.176.151: show port stats 0
dut.10.240.176.151: show port stats 0
tester: echo -n '' > scapyResult.txt
tester: scapy
tester: nutmac="00:11:22:33:44:55"
tester: srcmac="52:00:00:00:00:00"
tester: destip="10.239.129.88"
tester: srcip="10.239.129.65"
tester: destport=53
tester: srcport=53
tester: sendp([Ether(dst=nutmac, src=srcmac)/IP(dst=destip, src=srcip,
len=46)/UDP(sport=srcport, dport=destport)/Raw(load="P"*26)],
iface="eno83887104", count=1)
tester: exit()
dut.10.240.176.151: show port stats
dut.10.240.176.151: show port stats 3
dut.10.240.176.151: show port stats 4
dut.10.240.176.151: show port stats 0
dut.10.240.176.151: set promisc 4 off
dut.10.240.176.151: show port info 0
dut.10.240.176.151: show port info 1
dut.10.240.176.151: show port info 2
dut.10.240.176.151: show port info 4
dut.10.240.176.151: show port stats 3
dut.10.240.176.151: show port stats 4
dut.10.240.176.151: show port stats 0
dut.10.240.176.151: show port stats 0
tester: echo -n '' > scapyResult.txt
tester: scapy
tester: nutmac="00:11:22:33:44:55"
tester: srcmac="52:00:00:00:00:00"
tester: destip="10.239.129.88"
tester: srcip="10.239.129.65"
tester: destport=53
tester: srcport=53
tester: sendp([Ether(dst=nutmac, src=srcmac)/IP(dst=destip, src=srcip,
len=46)/UDP(sport=srcport, dport=destport)/Raw(load="P"*26)],
iface="eno83887104", count=1)
tester: exit()
dut.10.240.176.151: show port stats 0
TestPmdBonded: Test Case test_bound_promisc_opt Result FAILED: 'Data received
by port, but should not.'
dut.10.240.176.151: quit
--
You are receiving this mail because:
You are the assignee for the bug.
[dpdk-dev] [PATCH] vhost: fix potential null pointer dereference
Coverity issue: 293097
Fixes: d90cf7d111ac ("vhost: support host notifier")
Signed-off-by: Tiwei Bie
---
lib/librte_vhost/vhost_user.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 26cfebec0..bea6a0428 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1830,6 +1830,8 @@ int vhost_user_host_notifier_ctrl(int vid, bool enable)
return -ENOTSUP;
vdpa_dev = rte_vdpa_get_device(did);
+ if (!vdpa_dev)
+ return -ENODEV;
RTE_FUNC_PTR_OR_ERR_RET(vdpa_dev->ops->get_vfio_device_fd, -ENOTSUP);
RTE_FUNC_PTR_OR_ERR_RET(vdpa_dev->ops->get_notify_area, -ENOTSUP);
--
2.17.0
[dpdk-dev] [PATCH v3 0/3] Support UDP/IPv4 GSO
With the support of UDP Fragmentation Offload (UFO) and TCP Segmentation Offload (TSO) in virtio, VMs can exchange large UDP and TCP packets exceeding MTU between each other, which can greatly reduce per-packet processing overheads. When the destination of the large TCP and UDP packets is crossing machines, the host application needs to call two different libraries, GSO and IP fragmentation, to split the large packets respectively. However,the GSO and IP fragmentation library have quite different APIs, which greatly complicates the host application implementation. To simplify application development, we propose to support UDP/IPv4 fragmentation in the GSO library. With supporting UDP GSO, host applicationss can use the unified APIs to split large UDP and TCP packets. This patchset is to support UDP/IPv4 GSO. The first patch is to provide UDP GSO function, the second patch is to enable UDP/IPv4 GSO in the testpmd checksum forwarding engine, and the last patch is to update the programmer guide and testpmd user guide. Change log == v3: - replace rte_pktmbuf_mtod() with rte_pktmbuf_mtod_offset(). - fix meson build. - add updates to document for better explaining how UDP GSO works. V2: - fix fragment offset calculation bug. - add UDP GSO description in testpmd user guide. - shorten the second patch name. Jiayu Hu (3): gso: support UDP/IPv4 fragmentation app/testpmd: enable UDP GSO in csum engine gso: update documents for UDP/IPv4 GSO app/test-pmd/cmdline.c | 5 +- app/test-pmd/csumonly.c| 2 + app/test-pmd/testpmd.c | 2 +- .../generic_segmentation_offload_lib.rst | 10 +++ doc/guides/testpmd_app_ug/testpmd_funcs.rst| 7 ++ lib/librte_gso/Makefile| 1 + lib/librte_gso/gso_common.h| 3 + lib/librte_gso/gso_udp4.c | 81 ++ lib/librte_gso/gso_udp4.h | 42 +++ lib/librte_gso/meson.build | 2 +- lib/librte_gso/rte_gso.c | 24 +-- lib/librte_gso/rte_gso.h | 6 +- 12 files changed, 175 insertions(+), 10 deletions(-) create mode 100644 lib/librte_gso/gso_udp4.c create mode 100644 lib/librte_gso/gso_udp4.h -- 2.7.4
