git-lng-odp December 2019

git-lng-odp@lists.linaro.org

1 participants
4 discussions

[COMMIT] branch master updated. v1.21.0.0-389-gcbc020f35

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via cbc020f35245f21c2ea9cb3d3be55114322d3201 (commit) via 54c7061b88f8b1ecac300f31c8ea4f5e4f6752ec (commit) via 2a913b6531651d030b3e34731505846ff4e3aa6c (commit) from 6b5254d30a5cc51b213a570e106ff5d866ee9db2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cbc020f35245f21c2ea9cb3d3be55114322d3201 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Dec 13 13:28:28 2019 +0200 example: packet_dump: add VLAN support Print TPID and TCI fields of first two VLAN headers. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/packet/odp_packet_dump.c b/example/packet/odp_packet_dump.c index 69987c596..e1ef7e14d 100644 --- a/example/packet/odp_packet_dump.c +++ b/example/packet/odp_packet_dump.c @@ -502,18 +502,59 @@ static int print_packet(test_global_t *global, odp_packet_t pkt, /* L2 */ if (odp_packet_has_eth(pkt)) { + uint8_t *eth = data + l2_offset; + printf(" Ethernet offset: %u bytes\n", l2_offset); - offset = l2_offset; - if (offset + 6 <= seg_len) { + if (l2_offset + 6 <= seg_len) { printf(" dst address: "); - print_mac_addr(data + offset); + print_mac_addr(eth); } - offset = l2_offset + 6; - if (offset + 6 <= seg_len) { + if (l2_offset + 12 <= seg_len) { printf(" src address: "); - print_mac_addr(data + offset); + print_mac_addr(eth + 6); } + + /* VLAN */ + if (odp_packet_has_vlan(pkt)) { + int qinq = odp_packet_has_vlan_qinq(pkt); + uint16_t *tpid = (uint16_t *)(uintptr_t)(eth + 12); + uint16_t *tci = tpid + 1; + + if (qinq) + printf(" VLAN (outer):\n"); + else + printf(" VLAN:\n"); + + if (l2_offset + 14 <= seg_len) { + printf(" TPID: 0x%04x\n", + odp_be_to_cpu_16(*tpid)); + } + + if (l2_offset + 16 <= seg_len) { + printf(" TCI: 0x%04x (VID: %u)\n", + odp_be_to_cpu_16(*tci), + odp_be_to_cpu_16(*tci) & 0x0fff); + } + + if (qinq) { + printf(" VLAN (inner):\n"); + tpid += 2; + tci += 2; + + if (l2_offset + 18 <= seg_len) { + printf(" TPID: 0x%04x\n", + odp_be_to_cpu_16(*tpid)); + } + + if (l2_offset + 20 <= seg_len) { + printf(" TCI: 0x%04x (VID: %u)\n", + odp_be_to_cpu_16(*tci), + odp_be_to_cpu_16(*tci) & 0x0fff); + } + } + } + } else if (odp_packet_has_l2(pkt)) { printf(" L2 (%i) offset: %u bytes\n", odp_packet_l2_type(pkt), l2_offset); commit 54c7061b88f8b1ecac300f31c8ea4f5e4f6752ec Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Dec 13 12:43:23 2019 +0200 linux-gen: socket_mmap: recreate VLAN header Socket mmap interface in Linux may strip a VLAN header and copy its TPID and TCI fields into tpacket2_hdr structure. Insert VLAN header back into the packet when this happens. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reported-by: Jari Mustajärvi <jari.mustajarvi(a)nokia-bell-labs.com> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 2cceb5648..97677bfce 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -41,6 +41,9 @@ #include <protocols/eth.h> #include <protocols/ip.h> +/* VLAN flags in tpacket2_hdr status */ +#define VLAN_VALID (TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID) + /* Reserve 4MB memory for frames in a RX/TX ring */ #define FRAME_MEM_SIZE (4 * 1024 * 1024) #define BLOCK_SIZE (4 * 1024) @@ -163,12 +166,14 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, unsigned frame_num, next_frame_num; uint8_t *pkt_buf, *next_ptr; int pkt_len; + uint32_t alloc_len; struct ethhdr *eth_hdr; unsigned i; unsigned nb_rx; struct ring *ring; odp_pool_t pool = pkt_sock->pool; uint16_t frame_offset = pktio_entry->s.pktin_frame_offset; + uint16_t vlan_len = 0; if (pktio_entry->s.config.pktin.bit.ts_all || pktio_entry->s.config.pktin.bit.ts_ptp) @@ -208,7 +213,12 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, continue; } - ret = packet_alloc_multi(pool, pkt_len + frame_offset, &pkt, 1); + /* Check if packet had a VLAN header */ + if ((tp_hdr->tp_status & VLAN_VALID) == VLAN_VALID) + vlan_len = 4; + + alloc_len = pkt_len + frame_offset + vlan_len; + ret = packet_alloc_multi(pool, alloc_len, &pkt, 1); if (odp_unlikely(ret != 1)) { /* Stop receiving packets when pool is empty. Leave @@ -241,6 +251,9 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, if (frame_offset) pull_head(hdr, frame_offset); + if (vlan_len) + pull_head(hdr, vlan_len); + ret = odp_packet_copy_from_mem(pkt, 0, pkt_len, pkt_buf); if (ret != 0) { odp_packet_free(pkt); @@ -248,6 +261,24 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, frame_num = next_frame_num; continue; } + + if (vlan_len) { + /* Recreate VLAN header. Move MAC addresses and + * insert a VLAN header in between source MAC address + * and Ethernet type. */ + uint8_t *mac; + uint16_t *type, *tci; + + push_head(hdr, vlan_len); + mac = packet_data(hdr); + memmove(mac, mac + vlan_len, 2 * _ODP_ETHADDR_LEN); + type = (uint16_t *)(uintptr_t) + (mac + 2 * _ODP_ETHADDR_LEN); + *type = odp_cpu_to_be_16(tp_hdr->tp_vlan_tpid); + tci = type + 1; + *tci = odp_cpu_to_be_16(tp_hdr->tp_vlan_tci); + } + hdr->input = pktio_entry->s.handle; if (pktio_cls_enabled(pktio_entry)) commit 2a913b6531651d030b3e34731505846ff4e3aa6c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Dec 13 12:16:39 2019 +0200 linux-gen: packet: move push_head and packet_data header Moved inline functions into header, so that those can be used from socket mmap file. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 3ba76449d..ef9b3ba89 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -235,6 +235,19 @@ static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr, dst_hdr->timestamp = src_hdr->timestamp; } +static inline void *packet_data(odp_packet_hdr_t *pkt_hdr) +{ + return pkt_hdr->seg_data; +} + +static inline void push_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) +{ + pkt_hdr->headroom -= len; + pkt_hdr->frame_len += len; + pkt_hdr->seg_data -= len; + pkt_hdr->seg_len += len; +} + static inline void pull_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) { pkt_hdr->headroom += len; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index d17674f43..9e3f3a2b8 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -123,11 +123,6 @@ static inline uint32_t packet_first_seg_len(odp_packet_hdr_t *pkt_hdr) return pkt_hdr->seg_len; } -static inline void *packet_data(odp_packet_hdr_t *pkt_hdr) -{ - return pkt_hdr->seg_data; -} - static inline void *packet_tail(odp_packet_hdr_t *pkt_hdr) { odp_packet_hdr_t *last_seg = packet_last_seg(pkt_hdr); @@ -152,14 +147,6 @@ static inline uint32_t seg_tailroom(odp_packet_hdr_t *pkt_seg) return hdr->buf_end - tail; } -static inline void push_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) -{ - pkt_hdr->headroom -= len; - pkt_hdr->frame_len += len; - pkt_hdr->seg_data -= len; - pkt_hdr->seg_len += len; -} - static inline void push_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) { odp_packet_hdr_t *last_seg = packet_last_seg(pkt_hdr); ----------------------------------------------------------------------- Summary of changes: example/packet/odp_packet_dump.c | 53 +++++++++++++++++++--- .../linux-generic/include/odp_packet_internal.h | 13 ++++++ platform/linux-generic/odp_packet.c | 13 ------ platform/linux-generic/pktio/socket_mmap.c | 33 +++++++++++++- 4 files changed, 92 insertions(+), 20 deletions(-) hooks/post-receive --

4 years, 4 months

[COMMIT] branch master updated. v1.21.0.0-386-g6b5254d30

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 6b5254d30a5cc51b213a570e106ff5d866ee9db2 (commit) via 0d7f3aee5a44976e47a868e4026cbaebf354d66d (commit) via 1222d02368004285a381610bd3101a240cbf644a (commit) via c1b0347116dd0992634cc79d82831636e9ef6a4b (commit) via 427d0bcf792637cb31828c5a84fcbd3202213350 (commit) from 79bf86de3fa56ede873255e8bb34efb6035d8130 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6b5254d30a5cc51b213a570e106ff5d866ee9db2 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Dec 5 16:48:45 2019 +0200 linux-gen: dpdk: print DPDK version Print DPDK version for logging purposes. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index d603e5f7b..4308f0c99 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1274,6 +1274,8 @@ static int dpdk_pktio_init(void) if (i) ODP_ERR("Failed to reset thread affinity: %d\n", i); + ODP_PRINT("\nDPDK version: %s\n", rte_version()); + return 0; } commit 0d7f3aee5a44976e47a868e4026cbaebf354d66d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Dec 5 16:28:09 2019 +0200 linux-gen: dpdk: set MEMPOOL_F_NO_IOVA_CONTIG flag Zero-copy version crashed without this flag set, as some mbufs in a pool did not have a valid pointer to data. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 25683832c..d603e5f7b 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -74,6 +74,14 @@ #define rte_log_set_global_level rte_set_log_level #endif +/* Release notes v19.11: "Changed the mempool allocation behaviour + * so that objects no longer cross pages by default" */ +#if RTE_VERSION >= RTE_VERSION_NUM(19, 11, 0, 0) +#define MEMPOOL_FLAGS MEMPOOL_F_NO_IOVA_CONTIG +#else +#define MEMPOOL_FLAGS 0 +#endif + #if _ODP_DPDK_ZERO_COPY ODP_STATIC_ASSERT(CONFIG_PACKET_HEADROOM == RTE_PKTMBUF_HEADROOM, "ODP and DPDK headroom sizes not matching!"); @@ -331,7 +339,7 @@ static struct rte_mempool *mbuf_pool_create(const char *name, goto fail; } - total_size = rte_mempool_calc_obj_size(elt_size, 0, &sz); + total_size = rte_mempool_calc_obj_size(elt_size, MEMPOOL_FLAGS, &sz); if (total_size != pool_entry->block_size) { ODP_ERR("DPDK pool block size not matching to ODP pool: " "%" PRIu32 "/%" PRIu32 "\n", total_size, @@ -344,7 +352,7 @@ static struct rte_mempool *mbuf_pool_create(const char *name, mp = rte_mempool_create_empty(name, num + pool_entry->skipped_blocks, elt_size, cache_size(num), sizeof(struct rte_pktmbuf_pool_private), - rte_socket_id(), 0); + rte_socket_id(), MEMPOOL_FLAGS); if (mp == NULL) { ODP_ERR("Failed to create empty DPDK packet pool\n"); goto fail; @@ -518,7 +526,7 @@ uint32_t _odp_dpdk_pool_obj_size(pool_t *pool, uint32_t block_size) } block_size += sizeof(struct rte_mbuf); - total_size = rte_mempool_calc_obj_size(block_size, 0, &sz); + total_size = rte_mempool_calc_obj_size(block_size, MEMPOOL_FLAGS, &sz); pool->dpdk_elt_size = sz.elt_size; pool->block_offset = sz.header_size + sizeof(struct rte_mbuf); commit 1222d02368004285a381610bd3101a240cbf644a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 29 15:39:21 2019 +0200 linux-gen: dpdk: remove lcore role init Fix DPDK v19.11 build by removing rte_eal_get_configuration() usage. CPU roles do not need to be initialized to ROLE_RTE, as it is set as the default value for each CPU in rte_eal_cpu_init(). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index f6c63df92..25683832c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1171,7 +1171,6 @@ static int dpdk_pktio_init(void) int cmd_len; int numa_nodes; cpu_set_t original_cpuset; - struct rte_config *cfg; /** * DPDK init changes the affinity of the calling thread, so after it @@ -1267,10 +1266,6 @@ static int dpdk_pktio_init(void) if (i) ODP_ERR("Failed to reset thread affinity: %d\n", i); - cfg = rte_eal_get_configuration(); - for (i = 0; i < RTE_MAX_LCORE; i++) - cfg->lcore_role[i] = ROLE_RTE; - return 0; } commit c1b0347116dd0992634cc79d82831636e9ef6a4b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 29 14:51:26 2019 +0200 linux-gen: dpdk: improve check of promisc mode support Make check failed when using PCAP PMD device with DPDK v19.11, as rte_eth_promiscuous_enable() is supported, but rte_eth_promiscuous_disable() is not. Check both return values to determine if promiscuous mode change is supported. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index ae596b6a0..f6c63df92 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1525,6 +1525,33 @@ static void dpdk_init_capability(pktio_entry_t *pktio_entry, capa->config.pktout.bit.tcp_chksum; } +/* Some DPDK PMD virtual devices, like PCAP, do not support promisc + * mode change. Use system call for them. */ +static void promisc_mode_check(pkt_dpdk_t *pkt_dpdk) +{ +#if RTE_VERSION < RTE_VERSION_NUM(19, 11, 0, 0) + /* Enable and disable calls do not have return value */ + rte_eth_promiscuous_enable(pkt_dpdk->port_id); + + if (!rte_eth_promiscuous_get(pkt_dpdk->port_id)) + pkt_dpdk->vdev_sysc_promisc = 1; + + rte_eth_promiscuous_disable(pkt_dpdk->port_id); +#else + int ret; + + ret = rte_eth_promiscuous_enable(pkt_dpdk->port_id); + + if (!rte_eth_promiscuous_get(pkt_dpdk->port_id)) + pkt_dpdk->vdev_sysc_promisc = 1; + + ret += rte_eth_promiscuous_disable(pkt_dpdk->port_id); + + if (ret) + pkt_dpdk->vdev_sysc_promisc = 1; +#endif +} + static int dpdk_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, const char *netdev, @@ -1589,12 +1616,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, } pkt_dpdk->mtu = mtu + _ODP_ETHHDR_LEN; - /* Some DPDK PMD virtual devices, like PCAP, do not support promisc - * mode change. Use system call for them. */ - rte_eth_promiscuous_enable(pkt_dpdk->port_id); - if (!rte_eth_promiscuous_get(pkt_dpdk->port_id)) - pkt_dpdk->vdev_sysc_promisc = 1; - rte_eth_promiscuous_disable(pkt_dpdk->port_id); + promisc_mode_check(pkt_dpdk); /* Drivers requiring minimum burst size. Supports also *_vf versions * of the drivers. */ commit 427d0bcf792637cb31828c5a84fcbd3202213350 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 29 14:47:02 2019 +0200 linux-gen: dpdk: DPDK renamed protocol structs DPDK 19.08 renamed protocol structs with rte_ prefix. Use correct struct names depending on the DPDK version. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index eb662f0f7..ae596b6a0 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -55,6 +55,14 @@ #include <rte_string_fns.h> #include <rte_version.h> +#if RTE_VERSION < RTE_VERSION_NUM(19, 8, 0, 0) + #define rte_ether_addr ether_addr + #define rte_ipv4_hdr ipv4_hdr + #define rte_ipv6_hdr ipv6_hdr + #define rte_tcp_hdr tcp_hdr + #define rte_udp_hdr udp_hdr +#endif + /* NUMA is not supported on all platforms */ #ifdef _ODP_HAVE_NUMA_LIBRARY #include <numa.h> @@ -649,7 +657,7 @@ static inline int check_proto(void *l3_hdr, odp_bool_t *l3_proto_v4, uint8_t l3_proto_ver = _ODP_IPV4HDR_VER(*(uint8_t *)l3_hdr); if (l3_proto_ver == _ODP_IPV4) { - struct ipv4_hdr *ip = (struct ipv4_hdr *)l3_hdr; + struct rte_ipv4_hdr *ip = (struct rte_ipv4_hdr *)l3_hdr; *l3_proto_v4 = 1; if (!rte_ipv4_frag_pkt_is_fragmented(ip)) @@ -659,7 +667,7 @@ static inline int check_proto(void *l3_hdr, odp_bool_t *l3_proto_v4, return 0; } else if (l3_proto_ver == _ODP_IPV6) { - struct ipv6_hdr *ipv6 = (struct ipv6_hdr *)l3_hdr; + struct rte_ipv6_hdr *ipv6 = (struct rte_ipv6_hdr *)l3_hdr; *l3_proto_v4 = 0; *l4_proto = ipv6->proto; @@ -730,7 +738,7 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, if (ipv4_chksum_pkt) { mbuf->ol_flags |= PKT_TX_IP_CKSUM; - ((struct ipv4_hdr *)l3_hdr)->hdr_checksum = 0; + ((struct rte_ipv4_hdr *)l3_hdr)->hdr_checksum = 0; mbuf->l3_len = _ODP_IPV4HDR_IHL(*(uint8_t *)l3_hdr) * 4; } @@ -744,12 +752,12 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, if (udp_chksum_pkt) { mbuf->ol_flags |= PKT_TX_UDP_CKSUM; - ((struct udp_hdr *)l4_hdr)->dgram_cksum = + ((struct rte_udp_hdr *)l4_hdr)->dgram_cksum = phdr_csum(l3_proto_v4, l3_hdr, mbuf->ol_flags); } else if (tcp_chksum_pkt) { mbuf->ol_flags |= PKT_TX_TCP_CKSUM; - ((struct tcp_hdr *)l4_hdr)->cksum = + ((struct rte_tcp_hdr *)l4_hdr)->cksum = phdr_csum(l3_proto_v4, l3_hdr, mbuf->ol_flags); } } @@ -1957,7 +1965,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, static int dpdk_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { rte_eth_macaddr_get(pkt_priv(pktio_entry)->port_id, - (struct ether_addr *)mac_addr); + (struct rte_ether_addr *)mac_addr); return ETH_ALEN; } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/dpdk.c | 73 +++++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 19 deletions(-) hooks/post-receive --

4 years, 4 months

[COMMIT] branch master updated. v1.21.0.0-381-g79bf86de3

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 79bf86de3fa56ede873255e8bb34efb6035d8130 (commit) via be3fc1eb8da99c2c1a7a46d93ab572c39647c935 (commit) from d742f6e7c93b9c17e138e4dad403934aebad6e2e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 79bf86de3fa56ede873255e8bb34efb6035d8130 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Dec 5 15:09:55 2019 +0200 example: timer_acc: use shm for logs Use SHM instead of calloc for log memory. A log may be fairly large (multiple MB) depending on the test case. SHM uses huge pages (when available), which reduces the risk of having page misses during the test. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/timer/odp_timer_accuracy.c b/example/timer/odp_timer_accuracy.c index 0f06a9912..dccf70326 100644 --- a/example/timer/odp_timer_accuracy.c +++ b/example/timer/odp_timer_accuracy.c @@ -73,6 +73,7 @@ typedef struct test_global_t { uint64_t start_tick; uint64_t start_ns; uint64_t period_tick; + odp_shm_t log_shm; test_log_t *log; FILE *file; char filename[MAX_FILENAME + 1]; @@ -691,13 +692,22 @@ int main(int argc, char *argv[]) } if (test_global.opt.output) { - test_global.log = calloc(test_global.tot_timers, - sizeof(test_log_t)); + odp_shm_t shm; + void *addr; + uint64_t size = test_global.tot_timers * sizeof(test_log_t); - if (test_global.log == NULL) { - printf("Test log calloc failed.\n"); + shm = odp_shm_reserve("timer_accuracy_log", size, + sizeof(test_log_t), 0); + + if (shm == ODP_SHM_INVALID) { + printf("Test log alloc failed.\n"); goto quit; } + + addr = odp_shm_addr(shm); + memset(addr, 0, size); + test_global.log = addr; + test_global.log_shm = shm; } if (start_timers(&test_global)) @@ -718,7 +728,7 @@ quit: free(test_global.timer_ctx); if (test_global.log) - free(test_global.log); + odp_shm_free(test_global.log_shm); if (odp_term_local()) { printf("Term local failed.\n"); commit be3fc1eb8da99c2c1a7a46d93ab572c39647c935 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Dec 4 15:04:28 2019 +0200 example: timer_acc: add burst gap option Added option (-g) to control offset (gap) between timers within a burst. This way many periodic (restarted) timers can be tested with different expiration times. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/timer/odp_timer_accuracy.c b/example/timer/odp_timer_accuracy.c index 03439d172..0f06a9912 100644 --- a/example/timer/odp_timer_accuracy.c +++ b/example/timer/odp_timer_accuracy.c @@ -54,6 +54,7 @@ typedef struct test_global_t { unsigned long long int offset_ns; unsigned long long int num; unsigned long long int burst; + unsigned long long int burst_gap; int mode; int init; int output; @@ -87,8 +88,9 @@ static void print_usage(void) " -p, --period <nsec> Timeout period in nsec. Default: 200 msec\n" " -r, --resolution <nsec> Timeout resolution in nsec. Default: period / 10\n" " -f, --first <nsec> First timer offset in nsec. Default: 300 msec\n" - " -n, --num <number> Number of timeouts. Default: 50\n" - " -b, --burst <number> Number of timers per timeout. Default: 1\n" + " -n, --num <number> Number of timeout periods. Default: 50\n" + " -b, --burst <number> Number of timers per a timeout period. Default: 1\n" + " -g, --burst_gap <nsec> Gap (in nsec) between timers within a burst. Default: 0\n" " -m, --mode <number> Test mode select (default: 0):\n" " 0: Set all timers at init phase.\n" " 1: Set first burst of timers at init. Restart timers during test with absolute time.\n" @@ -109,6 +111,7 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) {"first", required_argument, NULL, 'f'}, {"num", required_argument, NULL, 'n'}, {"burst", required_argument, NULL, 'b'}, + {"burst_gap", required_argument, NULL, 'g'}, {"mode", required_argument, NULL, 'm'}, {"output", required_argument, NULL, 'o'}, {"early_retry", required_argument, NULL, 'e'}, @@ -116,7 +119,7 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+p:r:f:n:b:m:o:e:ih"; + const char *shortopts = "+p:r:f:n:b:g:m:o:e:ih"; int ret = 0; test_global->opt.period_ns = 200 * ODP_TIME_MSEC_IN_NS; @@ -124,6 +127,7 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) test_global->opt.offset_ns = 300 * ODP_TIME_MSEC_IN_NS; test_global->opt.num = 50; test_global->opt.burst = 1; + test_global->opt.burst_gap = 0; test_global->opt.mode = 0; test_global->opt.init = 0; test_global->opt.output = 0; @@ -151,6 +155,9 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) case 'b': test_global->opt.burst = strtoull(optarg, NULL, 0); break; + case 'g': + test_global->opt.burst_gap = strtoull(optarg, NULL, 0); + break; case 'm': test_global->opt.mode = atoi(optarg); break; @@ -205,7 +212,8 @@ static int start_timers(test_global_t *test_global) odp_timeout_t timeout; odp_timer_set_t ret; odp_time_t time; - uint64_t i, j, idx, num_tmo, burst, tot_timers, alloc_timers; + uint64_t i, j, idx, num_tmo, burst, burst_gap; + uint64_t tot_timers, alloc_timers; int mode; mode = test_global->opt.mode; @@ -213,6 +221,7 @@ static int start_timers(test_global_t *test_global) tot_timers = test_global->tot_timers; num_tmo = test_global->opt.num; burst = test_global->opt.burst; + burst_gap = test_global->opt.burst_gap; period_ns = test_global->opt.period_ns; test_global->period_ns = period_ns; @@ -305,6 +314,7 @@ static int start_timers(test_global_t *test_global) printf(" max timeout: %" PRIu64 " nsec\n", timer_param.max_tmo); printf(" num timeout: %" PRIu64 "\n", num_tmo); printf(" burst size: %" PRIu64 "\n", burst); + printf(" burst gap: %" PRIu64 "\n", burst_gap); printf(" total timers: %" PRIu64 "\n", tot_timers); printf(" alloc timers: %" PRIu64 "\n", alloc_timers); printf(" test run time: %.2f sec\n\n", @@ -370,10 +380,11 @@ static int start_timers(test_global_t *test_global) num_tmo = 1; for (i = 0; i < num_tmo; i++) { - nsec = offset_ns + (i * period_ns); - tick = start_tick + odp_timer_ns_to_tick(timer_pool, nsec); - for (j = 0; j < burst; j++) { + nsec = offset_ns + (i * period_ns) + (j * burst_gap); + tick = start_tick + odp_timer_ns_to_tick(timer_pool, + nsec); + timer_ctx_t *ctx = &test_global->timer_ctx[idx]; timer = ctx->timer; ----------------------------------------------------------------------- Summary of changes: example/timer/odp_timer_accuracy.c | 45 ++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 12 deletions(-) hooks/post-receive --

4 years, 4 months

[COMMIT] branch master updated. v1.21.0.0-379-gd742f6e7c

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via d742f6e7c93b9c17e138e4dad403934aebad6e2e (commit) via f6d90f60520bcb3f082fab55bc9d2140c22e5742 (commit) from b9002efa6e12fafc901794aa5f6a99ef306d944b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d742f6e7c93b9c17e138e4dad403934aebad6e2e Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Nov 28 11:00:29 2019 +0200 example: switch: disable IPv4 hashing Pure IPv4 hashing is not supported by all DPDK pktio drivers. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 616bb43b9..b73d8a50c 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -263,7 +263,6 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, } pktin_param.hash_enable = 1; - pktin_param.hash_proto.proto.ipv4 = 1; pktin_param.hash_proto.proto.ipv4_tcp = 1; pktin_param.hash_proto.proto.ipv4_udp = 1; pktin_param.num_queues = num_rx; commit f6d90f60520bcb3f082fab55bc9d2140c22e5742 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Nov 28 10:49:56 2019 +0200 example: switch: change 'unsigned' variables to 'unsigned int' Fixes checkpatch's prefer 'unsigned int' to bare use of 'unsigned' warnings. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 026af6ec8..616bb43b9 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -53,7 +53,7 @@ typedef union { */ typedef struct { unsigned int cpu_count; /**< Number of CPUs to be used */ - unsigned if_count; /**< Number of interfaces to be used */ + unsigned int if_count; /**< Number of interfaces to be used */ int num_workers; /**< Number of worker threads */ char **if_names; /**< Array of pointers to interface names */ int time; /**< Time in seconds to run */ @@ -84,7 +84,7 @@ typedef union ODP_ALIGNED_CACHE { */ typedef struct pkt_buf_t { odp_packet_t pkt[MAX_PKT_BURST]; /**< Array of packet handles */ - unsigned len; /**< Number of packets in buffer */ + unsigned int len; /**< Number of packets in buffer */ } pkt_buf_t; /** @@ -438,7 +438,7 @@ static inline void broadcast_packet(odp_packet_t pkt, thread_args_t *thr_arg, { odp_bool_t first = 1; uint8_t port_out; - unsigned buf_len; + unsigned int buf_len; for (port_out = 0; port_out < gbl_args->appl.if_count; port_out++) { if (port_out == port_in) @@ -476,13 +476,13 @@ static inline void broadcast_packet(odp_packet_t pkt, thread_args_t *thr_arg, * @param thr_arg Thread arguments * @param port_in Input port index */ -static inline void forward_packets(odp_packet_t pkt_tbl[], unsigned num, +static inline void forward_packets(odp_packet_t pkt_tbl[], unsigned int num, thread_args_t *thr_arg, uint8_t port_in) { odp_packet_t pkt; odph_ethhdr_t *eth; - unsigned i; - unsigned buf_id; + unsigned int i; + unsigned int buf_id; int ret; uint8_t port_out = 0; @@ -584,8 +584,8 @@ static int run_worker(void *arg) odp_packet_t pkt_tbl[MAX_PKT_BURST]; odp_pktin_queue_t pktin; odp_pktout_queue_t pktout; - unsigned num_pktio; - unsigned pktio = 0; + unsigned int num_pktio; + unsigned int pktio = 0; uint8_t port_in; uint8_t port_out; int pkts; @@ -598,7 +598,7 @@ static int run_worker(void *arg) while (!gbl_args->exit_threads) { int sent; - unsigned drops; + unsigned int drops; if (num_pktio > 1) { pktin = thr_args->rx_pktio[pktio].pktin; @@ -620,7 +620,7 @@ static int run_worker(void *arg) /* Empty all thread local tx buffers */ for (port_out = 0; port_out < gbl_args->appl.if_count; port_out++) { - unsigned tx_pkts; + unsigned int tx_pkts; odp_packet_t *tx_pkt_tbl; if (port_out == port_in || @@ -642,7 +642,7 @@ static int run_worker(void *arg) drops = tx_pkts - sent; if (odp_unlikely(drops)) { - unsigned i; + unsigned int i; thr_args->stats[port_out]->s.tx_drops += drops; @@ -746,7 +746,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) int long_index; char *token; size_t len; - unsigned i; + unsigned int i; static const struct option longopts[] = { {"count", required_argument, NULL, 'c'}, {"time", required_argument, NULL, 't'}, @@ -840,7 +840,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) */ static void print_info(char *progname, appl_args_t *appl_args) { - unsigned i; + unsigned int i; odp_sys_info_print(); @@ -922,7 +922,7 @@ int main(int argc, char **argv) } gbl_args_init(gbl_args); - for (i = 0; (unsigned)i < MAC_TBL_SIZE; i++) + for (i = 0; (unsigned int)i < MAC_TBL_SIZE; i++) odp_atomic_init_u64(&gbl_args->mac_tbl[i], 0); /* Parse and store the application arguments */ ----------------------------------------------------------------------- Summary of changes: example/switch/odp_switch.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) hooks/post-receive --

4 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp December 2019