git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.21.0.0-391-g75957b745

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 75957b7458858069e3c4c765ada5d31840774dea (commit) via 89f720ec7788d1eb139def78b0aafe26bf40f047 (commit) from cbc020f35245f21c2ea9cb3d3be55114322d3201 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so … [View More]we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 75957b7458858069e3c4c765ada5d31840774dea Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jan 2 16:56:42 2020 +0200 linux-gen: dpdk: fix rx/tx checksum offload The NIC offload capabilities stored in rte_eth_dev_info.rx_offload_capa/ tx_offload_capa cannot be used per NIC queue. Fix this by doing offload configurarion using rte_eth_dev_configure(). Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index e74fb49df..18f583a65 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1115,6 +1115,8 @@ static int dpdk_setup_eth_dev(pktio_entry_t *pktio_entry, struct rte_eth_rss_conf rss_conf; struct rte_eth_conf eth_conf; uint64_t rss_hf_capa = dev_info->flow_type_rss_offloads; + uint64_t rx_offloads = 0; + uint64_t tx_offloads = 0; memset(&rss_conf, 0, sizeof(struct rte_eth_rss_conf)); @@ -1134,6 +1136,36 @@ static int dpdk_setup_eth_dev(pktio_entry_t *pktio_entry, eth_conf.txmode.mq_mode = ETH_MQ_TX_NONE; eth_conf.rx_adv_conf.rss_conf = rss_conf; + /* Setup RX checksum offloads */ + if (pktio_entry->s.config.pktin.bit.ipv4_chksum) + rx_offloads |= DEV_RX_OFFLOAD_IPV4_CKSUM; + + if (pktio_entry->s.config.pktin.bit.udp_chksum) + rx_offloads |= DEV_RX_OFFLOAD_UDP_CKSUM; + + if (pktio_entry->s.config.pktin.bit.tcp_chksum) + rx_offloads |= DEV_RX_OFFLOAD_TCP_CKSUM; + + eth_conf.rxmode.offloads = rx_offloads; + + /* Setup TX checksum offloads */ + if (pktio_entry->s.config.pktout.bit.ipv4_chksum_ena) + tx_offloads |= DEV_TX_OFFLOAD_IPV4_CKSUM; + + if (pktio_entry->s.config.pktout.bit.udp_chksum_ena) + tx_offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; + + if (pktio_entry->s.config.pktout.bit.tcp_chksum_ena) + tx_offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; + + if (pktio_entry->s.config.pktout.bit.sctp_chksum_ena) + tx_offloads |= DEV_TX_OFFLOAD_SCTP_CKSUM; + + eth_conf.txmode.offloads = tx_offloads; + + if (tx_offloads) + pktio_entry->s.chksum_insert_ena = 1; + ret = rte_eth_dev_configure(pkt_dpdk->port_id, pktio_entry->s.num_in_queue, pktio_entry->s.num_out_queue, &eth_conf); @@ -1697,38 +1729,15 @@ static int dpdk_setup_eth_tx(pktio_entry_t *pktio_entry, const pkt_dpdk_t *pkt_dpdk, const struct rte_eth_dev_info *dev_info) { - struct rte_eth_txconf txconf; - uint64_t tx_offloads; uint32_t i; int ret; uint16_t port_id = pkt_dpdk->port_id; - txconf = dev_info->default_txconf; - - tx_offloads = 0; - if (pktio_entry->s.config.pktout.bit.ipv4_chksum_ena) - tx_offloads |= DEV_TX_OFFLOAD_IPV4_CKSUM; - - if (pktio_entry->s.config.pktout.bit.udp_chksum_ena) - tx_offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; - - if (pktio_entry->s.config.pktout.bit.tcp_chksum_ena) - tx_offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; - - if (pktio_entry->s.config.pktout.bit.sctp_chksum_ena) - tx_offloads |= DEV_TX_OFFLOAD_SCTP_CKSUM; - - txconf.offloads = tx_offloads; - - if (tx_offloads) - pktio_entry->s.chksum_insert_ena = 1; - for (i = 0; i < pktio_entry->s.num_out_queue; i++) { - ret = rte_eth_tx_queue_setup(port_id, i, pkt_dpdk->opt.num_tx_desc, rte_eth_dev_socket_id(port_id), - &txconf); + &dev_info->default_txconf); if (ret < 0) { ODP_ERR("Queue setup failed: err=%d, port=%" PRIu8 "\n", ret, port_id); @@ -1744,7 +1753,6 @@ static int dpdk_setup_eth_rx(const pktio_entry_t *pktio_entry, const struct rte_eth_dev_info *dev_info) { struct rte_eth_rxconf rxconf; - uint64_t rx_offloads; uint32_t i; int ret; uint16_t port_id = pkt_dpdk->port_id; @@ -1753,18 +1761,6 @@ static int dpdk_setup_eth_rx(const pktio_entry_t *pktio_entry, rxconf.rx_drop_en = pkt_dpdk->opt.rx_drop_en; - rx_offloads = 0; - if (pktio_entry->s.config.pktin.bit.ipv4_chksum) - rx_offloads |= DEV_RX_OFFLOAD_IPV4_CKSUM; - - if (pktio_entry->s.config.pktin.bit.udp_chksum) - rx_offloads |= DEV_RX_OFFLOAD_UDP_CKSUM; - - if (pktio_entry->s.config.pktin.bit.tcp_chksum) - rx_offloads |= DEV_RX_OFFLOAD_TCP_CKSUM; - - rxconf.offloads = rx_offloads; - for (i = 0; i < pktio_entry->s.num_in_queue; i++) { ret = rte_eth_rx_queue_setup(port_id, i, pkt_dpdk->opt.num_rx_desc, commit 89f720ec7788d1eb139def78b0aafe26bf40f047 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jan 2 13:04:29 2020 +0200 linux-gen: dpdk: add support for setting interface default mac address Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 4308f0c99..e74fb49df 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1441,15 +1441,17 @@ static int dpdk_output_queues_config(pktio_entry_t *pktio_entry, return 0; } -static void dpdk_init_capability(pktio_entry_t *pktio_entry, - struct rte_eth_dev_info *dev_info) +static int dpdk_init_capability(pktio_entry_t *pktio_entry, + struct rte_eth_dev_info *dev_info) { pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); odp_pktio_capability_t *capa = &pktio_entry->s.capa; + struct rte_ether_addr mac_addr; int ptype_cnt; int ptype_l3_ipv4 = 0; int ptype_l4_tcp = 0; int ptype_l4_udp = 0; + int ret; uint32_t ptype_mask = RTE_PTYPE_L3_MASK | RTE_PTYPE_L4_MASK; memset(dev_info, 0, sizeof(struct rte_eth_dev_info)); @@ -1469,6 +1471,16 @@ static void dpdk_init_capability(pktio_entry_t *pktio_entry, PKTIO_MAX_QUEUES); capa->set_op.op.promisc_mode = 1; + /* Check if setting default MAC address is supporter */ + rte_eth_macaddr_get(pkt_dpdk->port_id, &mac_addr); + ret = rte_eth_dev_default_mac_addr_set(pkt_dpdk->port_id, &mac_addr); + if (ret == 0) { + capa->set_op.op.mac_addr = 1; + } else if (ret != -ENOTSUP && ret != -EPERM) { + ODP_ERR("Failed to set interface default MAC: %d\n", ret); + return -1; + } + ptype_cnt = rte_eth_dev_get_supported_ptypes(pkt_dpdk->port_id, ptype_mask, NULL, 0); if (ptype_cnt > 0) { @@ -1528,6 +1540,8 @@ static void dpdk_init_capability(pktio_entry_t *pktio_entry, capa->config.pktout.bit.udp_chksum; capa->config.pktout.bit.tcp_chksum_ena = capa->config.pktout.bit.tcp_chksum; + + return 0; } /* Some DPDK PMD virtual devices, like PCAP, do not support promisc @@ -1606,7 +1620,10 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, return -1; } - dpdk_init_capability(pktio_entry, &dev_info); + if (dpdk_init_capability(pktio_entry, &dev_info)) { + ODP_ERR("Failed to initialize capability\n"); + return -1; + } /* Initialize runtime options */ if (init_options(pktio_entry, &dev_info)) { @@ -1996,6 +2013,14 @@ static int dpdk_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) return ETH_ALEN; } +static int dpdk_mac_addr_set(pktio_entry_t *pktio_entry, const void *mac_addr) +{ + struct rte_ether_addr addr = *(const struct rte_ether_addr *)mac_addr; + + return rte_eth_dev_default_mac_addr_set(pkt_priv(pktio_entry)->port_id, + &addr); +} + static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { uint16_t port_id = pkt_priv(pktio_entry)->port_id; @@ -2089,7 +2114,7 @@ const pktio_if_ops_t dpdk_pktio_ops = { .promisc_mode_set = dpdk_promisc_mode_set, .promisc_mode_get = dpdk_promisc_mode_get, .mac_get = dpdk_mac_addr_get, - .mac_set = NULL, + .mac_set = dpdk_mac_addr_set, .capability = dpdk_capability, .pktin_ts_res = NULL, .pktin_ts_from_ns = NULL, ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/dpdk.c | 103 ++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 41 deletions(-) hooks/post-receive -- [View Less]

5 years, 2 months

[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 … [View More]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 -- [View Less]

5 years, 2 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 (… [View More]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 -- [View Less]

5 years, 2 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 … [View More]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 -- [View Less]

5 years, 3 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 … [View More]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 -- [View Less]

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-377-gb9002efa6

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 b9002efa6e12fafc901794aa5f6a99ef306d944b (commit) from 4a2588b84a28424ce9c9a31c971a0d8678a0c066 (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 ---------------… [View More]-------------------------------------------------- commit b9002efa6e12fafc901794aa5f6a99ef306d944b Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Nov 28 08:57:01 2019 +0200 validation: buffer: allow allocted buffer size to be larger than requested Allocated buffer may be larger than what was requested in odp_pool_param_t. Fixed a segfault in buffer_test_pool_alloc_free() if a buffer check failed. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c index 54a834dd2..07b671228 100644 --- a/test/validation/api/buffer/buffer.c +++ b/test/validation/api/buffer/buffer.c @@ -56,6 +56,7 @@ static void buffer_test_pool_alloc_free(void) odp_pool_t pool; odp_event_t ev; uint32_t i; + uint32_t num_buf = 0; void *addr; odp_event_subtype_t subtype; uint32_t num = default_param.buf.num; @@ -75,6 +76,7 @@ static void buffer_test_pool_alloc_free(void) if (buffer[i] == ODP_BUFFER_INVALID) break; + num_buf++; CU_ASSERT(odp_buffer_is_valid(buffer[i]) == 1) @@ -91,7 +93,7 @@ static void buffer_test_pool_alloc_free(void) wrong_type = true; if (subtype != ODP_EVENT_NO_SUBTYPE) wrong_subtype = true; - if (odp_buffer_size(buffer[i]) != size) + if (odp_buffer_size(buffer[i]) < size) wrong_size = true; addr = odp_buffer_addr(buffer[i]); @@ -115,7 +117,7 @@ static void buffer_test_pool_alloc_free(void) CU_ASSERT(!wrong_size); CU_ASSERT(!wrong_align); - for (i = 0; i < num; i++) + for (i = 0; i < num_buf; i++) odp_buffer_free(buffer[i]); CU_ASSERT(odp_pool_destroy(pool) == 0); @@ -171,7 +173,7 @@ static void buffer_test_pool_alloc_free_multi(void) wrong_type = true; if (subtype != ODP_EVENT_NO_SUBTYPE) wrong_subtype = true; - if (odp_buffer_size(buffer[i]) != size) + if (odp_buffer_size(buffer[i]) < size) wrong_size = true; addr = odp_buffer_addr(buffer[i]); ----------------------------------------------------------------------- Summary of changes: test/validation/api/buffer/buffer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- [View Less]

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-376-g4a2588b84

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 4a2588b84a28424ce9c9a31c971a0d8678a0c066 (commit) via 448100358c09d61f3fd8d137454b6bc45396a233 (commit) via 1b103ac26cf40df3c091c344418881c6013669da (commit) via a6241a89c18dd7a4a14214a100369f5ef46f25ef (commit) via 11bd13b261d291fd5b169e4a02c21d217fbf70ac (… [View More]commit) from 5ee1d8235638278fca00589fd577860ce88450e6 (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 4a2588b84a28424ce9c9a31c971a0d8678a0c066 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 26 10:12:01 2019 +0200 example: timer_accur: add option to retry on too early error When running test in restart timer mode with a short period, some timer set calls may return ODP_TIMER_TOOEARLY errors e.g. due to delays from operating system interruptions. This happens especially with absolute expiration time. Added -e option to specify how many times a timer restart is retried when expiration time too early error is returned. 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 94adfb20b..03439d172 100644 --- a/example/timer/odp_timer_accuracy.c +++ b/example/timer/odp_timer_accuracy.c @@ -37,6 +37,8 @@ typedef struct { uint64_t num_exact; uint64_t num_after; + uint64_t num_tooearly; + } test_stat_t; typedef struct test_log_t { @@ -55,6 +57,7 @@ typedef struct test_global_t { int mode; int init; int output; + int early_retry; } opt; test_stat_t stat; @@ -91,6 +94,8 @@ static void print_usage(void) " 1: Set first burst of timers at init. Restart timers during test with absolute time.\n" " 2: Set first burst of timers at init. Restart timers during test with relative time.\n" " -o, --output <file> Output file for measurement logs\n" + " -e, --early_retry <num> When timer restart fails due to ODP_TIMER_TOOEARLY, retry this many times\n" + " with expiration time incremented by the period. Default: 0\n" " -i, --init Set global init parameters. Default: init params not set.\n" " -h, --help Display help and exit.\n\n"); } @@ -99,18 +104,19 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) { int opt, long_index; const struct option longopts[] = { - {"period", required_argument, NULL, 'p'}, - {"resolution", required_argument, NULL, 'r'}, - {"first", required_argument, NULL, 'f'}, - {"num", required_argument, NULL, 'n'}, - {"burst", required_argument, NULL, 'b'}, - {"mode", required_argument, NULL, 'm'}, - {"output", required_argument, NULL, 'o'}, - {"init", no_argument, NULL, 'i'}, - {"help", no_argument, NULL, 'h'}, + {"period", required_argument, NULL, 'p'}, + {"resolution", required_argument, NULL, 'r'}, + {"first", required_argument, NULL, 'f'}, + {"num", required_argument, NULL, 'n'}, + {"burst", required_argument, NULL, 'b'}, + {"mode", required_argument, NULL, 'm'}, + {"output", required_argument, NULL, 'o'}, + {"early_retry", required_argument, NULL, 'e'}, + {"init", no_argument, NULL, 'i'}, + {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+p:r:f:n:b:m:o:ih"; + const char *shortopts = "+p:r:f:n:b:m:o:e:ih"; int ret = 0; test_global->opt.period_ns = 200 * ODP_TIME_MSEC_IN_NS; @@ -121,6 +127,7 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) test_global->opt.mode = 0; test_global->opt.init = 0; test_global->opt.output = 0; + test_global->opt.early_retry = 0; while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); @@ -152,6 +159,9 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) /* filename is NULL terminated in anycase */ strncpy(test_global->filename, optarg, MAX_FILENAME); break; + case 'e': + test_global->opt.early_retry = atoi(optarg); + break; case 'i': test_global->opt.init = 1; break; @@ -285,6 +295,7 @@ static int start_timers(test_global_t *test_global) printf(" resolution capa: %" PRIu64 " nsec\n", res_capa); printf(" max timers capa: %" PRIu32 "\n", timer_capa.max_timers); printf(" mode: %i\n", mode); + printf(" restart retries: %i\n", test_global->opt.early_retry); if (test_global->opt.output) printf(" log file: %s\n", test_global->filename); printf(" start offset: %" PRIu64 " nsec\n", offset_ns); @@ -465,6 +476,8 @@ static void print_stat(test_global_t *test_global) stat->num_before, 100.0 * stat->num_before / tot_timers); printf(" num exact: %12" PRIu64 " / %.2f%%\n", stat->num_exact, 100.0 * stat->num_exact / tot_timers); + printf(" num retry: %12" PRIu64 " / %.2f%%\n", + stat->num_tooearly, 100.0 * stat->num_tooearly / tot_timers); printf(" error after (nsec):\n"); printf(" min: %12" PRIu64 " / %.3fx resolution\n", stat->nsec_after_min, (double)stat->nsec_after_min / res_ns); @@ -543,29 +556,41 @@ static void run_test(test_global_t *test_global) if (mode && next_tmo < num_tmo) { /* Reset timer for next period */ - odp_timer_t timer; + odp_timer_t tim; uint64_t nsec, tick; odp_timer_set_t ret; - odp_timer_pool_t timer_pool = test_global->timer_pool; - - timer = ctx->timer; - - if (mode == 1) { - /* Absolute time */ - ctx->nsec += period_ns; - nsec = ctx->nsec - test_global->start_ns; - tick = test_global->start_tick + - odp_timer_ns_to_tick(timer_pool, nsec); - - ret = odp_timer_set_abs(timer, tick, &ev); - } else { - /* Relative time */ - tick = test_global->period_tick; - time = odp_time_local(); - time_ns = odp_time_to_ns(time); - ctx->nsec = time_ns + period_ns; - - ret = odp_timer_set_rel(timer, tick, &ev); + unsigned int j; + odp_timer_pool_t tp = test_global->timer_pool; + unsigned int retries = test_global->opt.early_retry; + uint64_t start_ns = test_global->start_ns; + + tim = ctx->timer; + + /* Depending on the option, retry when expiration + * time is too early */ + for (j = 0; j < retries + 1; j++) { + if (mode == 1) { + /* Absolute time */ + ctx->nsec += period_ns; + nsec = ctx->nsec - start_ns; + tick = test_global->start_tick + + odp_timer_ns_to_tick(tp, nsec); + + ret = odp_timer_set_abs(tim, tick, &ev); + } else { + /* Relative time */ + tick = test_global->period_tick; + time = odp_time_local(); + time_ns = odp_time_to_ns(time); + ctx->nsec = time_ns + period_ns; + + ret = odp_timer_set_rel(tim, tick, &ev); + } + + if (ret == ODP_TIMER_TOOEARLY) + stat->num_tooearly++; + else + break; } if (ret != ODP_TIMER_SUCCESS) { commit 448100358c09d61f3fd8d137454b6bc45396a233 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 22 15:33:31 2019 +0200 example: timer_accur: add output file option Added optio to output measurement samples into a log file. 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 36827ad59..94adfb20b 100644 --- a/example/timer/odp_timer_accuracy.c +++ b/example/timer/odp_timer_accuracy.c @@ -15,6 +15,8 @@ #include <odp_api.h> +#define MAX_FILENAME 128 + typedef struct timer_ctx_t { odp_timer_t timer; odp_event_t event; @@ -37,6 +39,12 @@ typedef struct { } test_stat_t; +typedef struct test_log_t { + uint64_t tmo_ns; + int64_t diff_ns; + +} test_log_t; + typedef struct test_global_t { struct { unsigned long long int period_ns; @@ -46,6 +54,7 @@ typedef struct test_global_t { unsigned long long int burst; int mode; int init; + int output; } opt; test_stat_t stat; @@ -60,6 +69,9 @@ typedef struct test_global_t { uint64_t start_tick; uint64_t start_ns; uint64_t period_tick; + test_log_t *log; + FILE *file; + char filename[MAX_FILENAME + 1]; } test_global_t; @@ -78,6 +90,7 @@ static void print_usage(void) " 0: Set all timers at init phase.\n" " 1: Set first burst of timers at init. Restart timers during test with absolute time.\n" " 2: Set first burst of timers at init. Restart timers during test with relative time.\n" + " -o, --output <file> Output file for measurement logs\n" " -i, --init Set global init parameters. Default: init params not set.\n" " -h, --help Display help and exit.\n\n"); } @@ -92,11 +105,12 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) {"num", required_argument, NULL, 'n'}, {"burst", required_argument, NULL, 'b'}, {"mode", required_argument, NULL, 'm'}, + {"output", required_argument, NULL, 'o'}, {"init", no_argument, NULL, 'i'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+p:r:f:n:b:m:ih"; + const char *shortopts = "+p:r:f:n:b:m:o:ih"; int ret = 0; test_global->opt.period_ns = 200 * ODP_TIME_MSEC_IN_NS; @@ -106,6 +120,7 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) test_global->opt.burst = 1; test_global->opt.mode = 0; test_global->opt.init = 0; + test_global->opt.output = 0; while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); @@ -132,6 +147,11 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) case 'm': test_global->opt.mode = atoi(optarg); break; + case 'o': + test_global->opt.output = 1; + /* filename is NULL terminated in anycase */ + strncpy(test_global->filename, optarg, MAX_FILENAME); + break; case 'i': test_global->opt.init = 1; break; @@ -265,6 +285,8 @@ static int start_timers(test_global_t *test_global) printf(" resolution capa: %" PRIu64 " nsec\n", res_capa); printf(" max timers capa: %" PRIu32 "\n", timer_capa.max_timers); printf(" mode: %i\n", mode); + if (test_global->opt.output) + printf(" log file: %s\n", test_global->filename); printf(" start offset: %" PRIu64 " nsec\n", offset_ns); printf(" period: %" PRIu64 " nsec\n", period_ns); printf(" resolution: %" PRIu64 " nsec\n", timer_param.res_ns); @@ -405,9 +427,11 @@ static int destroy_timers(test_global_t *test_global) static void print_stat(test_global_t *test_global) { + uint64_t i; uint64_t tot_timers = test_global->tot_timers; uint64_t res_ns = test_global->opt.res_ns; test_stat_t *stat = &test_global->stat; + test_log_t *log = test_global->log; double ave_after = 0.0; double ave_before = 0.0; @@ -421,6 +445,19 @@ static void print_stat(test_global_t *test_global) else stat->nsec_before_min = 0; + if (log) { + FILE *file = test_global->file; + + fprintf(file, " Timer tmo(ns) diff(ns)\n"); + + for (i = 0; i < tot_timers; i++) { + fprintf(file, "%8" PRIu64 " %12" PRIu64 " %10" + PRIi64 "\n", i, log[i].tmo_ns, log[i].diff_ns); + } + + fprintf(file, "\n"); + } + printf("\n Test results:\n"); printf(" num after: %12" PRIu64 " / %.2f%%\n", stat->num_after, 100.0 * stat->num_after / tot_timers); @@ -447,7 +484,8 @@ static void print_stat(test_global_t *test_global) static void run_test(test_global_t *test_global) { - uint64_t num_left, burst, num, num_tmo, next_tmo; + uint64_t burst, num, num_tmo, next_tmo; + uint64_t i, tot_timers; odp_event_t ev; odp_time_t time; uint64_t time_ns, diff_ns, period_ns; @@ -455,16 +493,17 @@ static void run_test(test_global_t *test_global) uint64_t tmo_ns; timer_ctx_t *ctx; test_stat_t *stat = &test_global->stat; + test_log_t *log = test_global->log; int mode = test_global->opt.mode; num = 0; next_tmo = 1; num_tmo = test_global->opt.num; burst = test_global->opt.burst; - num_left = test_global->tot_timers; + tot_timers = test_global->tot_timers; period_ns = test_global->period_ns; - while (num_left) { + for (i = 0; i < tot_timers; i++) { ev = odp_schedule(NULL, ODP_SCHED_WAIT); time = odp_time_local(); @@ -481,6 +520,10 @@ static void run_test(test_global_t *test_global) stat->nsec_after_min = diff_ns; if (diff_ns > stat->nsec_after_max) stat->nsec_after_max = diff_ns; + if (log) { + log[i].tmo_ns = tmo_ns; + log[i].diff_ns = diff_ns; + } } else if (time_ns < tmo_ns) { diff_ns = tmo_ns - time_ns; @@ -490,7 +533,10 @@ static void run_test(test_global_t *test_global) stat->nsec_before_min = diff_ns; if (diff_ns > stat->nsec_before_max) stat->nsec_before_max = diff_ns; - + if (log) { + log[i].tmo_ns = tmo_ns; + log[i].diff_ns = -diff_ns; + } } else { stat->num_exact++; } @@ -531,7 +577,6 @@ static void run_test(test_global_t *test_global) odp_event_free(ev); } - num_left--; num++; if (num == burst) { @@ -564,6 +609,15 @@ int main(int argc, char *argv[]) if (parse_options(argc, argv, &test_global)) return -1; + if (test_global.opt.output) { + test_global.file = fopen(test_global.filename, "w"); + if (test_global.file == NULL) { + printf("Failed to open file: %s\n", + test_global.filename); + return -1; + } + } + /* List features not to be used (may optimize performance) */ odp_init_param_init(&init); init.not_used.feat.cls = 1; @@ -600,6 +654,16 @@ int main(int argc, char *argv[]) goto quit; } + if (test_global.opt.output) { + test_global.log = calloc(test_global.tot_timers, + sizeof(test_log_t)); + + if (test_global.log == NULL) { + printf("Test log calloc failed.\n"); + goto quit; + } + } + if (start_timers(&test_global)) goto quit; @@ -608,12 +672,18 @@ int main(int argc, char *argv[]) print_stat(&test_global); quit: + if (test_global.file) + fclose(test_global.file); + if (destroy_timers(&test_global)) ret = -1; if (test_global.timer_ctx) free(test_global.timer_ctx); + if (test_global.log) + free(test_global.log); + if (odp_term_local()) { printf("Term local failed.\n"); ret = -1; commit 1b103ac26cf40df3c091c344418881c6013669da Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 22 11:08:21 2019 +0200 example: timer_accur: add mode option Added --mode option to choose if all timers are set during test init, or reset after expiration. The latter allows running the test for a long time with a low number of timers allocated. 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 24759b0e5..36827ad59 100644 --- a/example/timer/odp_timer_accuracy.c +++ b/example/timer/odp_timer_accuracy.c @@ -44,6 +44,7 @@ typedef struct test_global_t { unsigned long long int offset_ns; unsigned long long int num; unsigned long long int burst; + int mode; int init; } opt; @@ -54,8 +55,11 @@ typedef struct test_global_t { odp_pool_t timeout_pool; timer_ctx_t *timer_ctx; uint64_t period_ns; - uint64_t first_ns; uint64_t tot_timers; + uint64_t alloc_timers; + uint64_t start_tick; + uint64_t start_ns; + uint64_t period_tick; } test_global_t; @@ -70,6 +74,10 @@ static void print_usage(void) " -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" + " -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" + " 2: Set first burst of timers at init. Restart timers during test with relative time.\n" " -i, --init Set global init parameters. Default: init params not set.\n" " -h, --help Display help and exit.\n\n"); } @@ -83,11 +91,12 @@ 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'}, + {"mode", required_argument, NULL, 'm'}, {"init", no_argument, NULL, 'i'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+p:r:f:n:b:ih"; + const char *shortopts = "+p:r:f:n:b:m:ih"; int ret = 0; test_global->opt.period_ns = 200 * ODP_TIME_MSEC_IN_NS; @@ -95,6 +104,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.mode = 0; test_global->opt.init = 0; while (1) { @@ -119,6 +129,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 'm': + test_global->opt.mode = atoi(optarg); + break; case 'i': test_global->opt.init = 1; break; @@ -138,6 +151,11 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) test_global->tot_timers = test_global->opt.num * test_global->opt.burst; + if (test_global->opt.mode) + test_global->alloc_timers = test_global->opt.burst; + else + test_global->alloc_timers = test_global->tot_timers; + return ret; } @@ -157,8 +175,11 @@ 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; + uint64_t i, j, idx, num_tmo, burst, tot_timers, alloc_timers; + int mode; + mode = test_global->opt.mode; + alloc_timers = test_global->alloc_timers; tot_timers = test_global->tot_timers; num_tmo = test_global->opt.num; burst = test_global->opt.burst; @@ -170,7 +191,7 @@ static int start_timers(test_global_t *test_global) test_global->timer_pool = ODP_TIMER_POOL_INVALID; test_global->timeout_pool = ODP_POOL_INVALID; - for (i = 0; i < tot_timers; i++) { + for (i = 0; i < alloc_timers; i++) { test_global->timer_ctx[i].timer = ODP_TIMER_INVALID; test_global->timer_ctx[i].event = ODP_EVENT_INVALID; } @@ -191,7 +212,7 @@ static int start_timers(test_global_t *test_global) odp_pool_param_init(&pool_param); pool_param.type = ODP_POOL_TIMEOUT; - pool_param.tmo.num = tot_timers; + pool_param.tmo.num = alloc_timers; pool = odp_pool_create("timeout pool", &pool_param); @@ -208,9 +229,9 @@ static int start_timers(test_global_t *test_global) } if (timer_capa.max_timers && - test_global->tot_timers > timer_capa.max_timers) { + test_global->alloc_timers > timer_capa.max_timers) { printf("Error: Too many timers: %" PRIu64 ".\n" - " Max timers: %u\n", test_global->tot_timers, + " Max timers: %u\n", test_global->alloc_timers, timer_capa.max_timers); return -1; } @@ -231,14 +252,19 @@ static int start_timers(test_global_t *test_global) memset(&timer_param, 0, sizeof(odp_timer_pool_param_t)); timer_param.res_ns = res_ns; - timer_param.min_tmo = offset_ns / 2; + if (mode) + timer_param.min_tmo = period_ns / 10; + else + timer_param.min_tmo = offset_ns / 2; + timer_param.max_tmo = offset_ns + ((num_tmo + 1) * period_ns); - timer_param.num_timers = tot_timers; + timer_param.num_timers = alloc_timers; timer_param.clk_src = ODP_CLOCK_CPU; printf("\nTest parameters:\n"); printf(" resolution capa: %" PRIu64 " nsec\n", res_capa); printf(" max timers capa: %" PRIu32 "\n", timer_capa.max_timers); + printf(" mode: %i\n", mode); printf(" start offset: %" PRIu64 " nsec\n", offset_ns); printf(" period: %" PRIu64 " nsec\n", period_ns); printf(" resolution: %" PRIu64 " nsec\n", timer_param.res_ns); @@ -247,6 +273,7 @@ static int start_timers(test_global_t *test_global) printf(" num timeout: %" PRIu64 "\n", num_tmo); printf(" burst size: %" PRIu64 "\n", burst); printf(" total timers: %" PRIu64 "\n", tot_timers); + printf(" alloc timers: %" PRIu64 "\n", alloc_timers); printf(" test run time: %.2f sec\n\n", (offset_ns + (num_tmo * period_ns)) / 1000000000.0); @@ -264,7 +291,7 @@ static int start_timers(test_global_t *test_global) test_global->timer_pool = timer_pool; - for (i = 0; i < tot_timers; i++) { + for (i = 0; i < alloc_timers; i++) { timer_ctx_t *ctx = &test_global->timer_ctx[i]; timer = odp_timer_alloc(timer_pool, queue, ctx); @@ -300,7 +327,14 @@ static int start_timers(test_global_t *test_global) start_tick = odp_timer_current_tick(timer_pool); time = odp_time_local(); start_ns = odp_time_to_ns(time); - test_global->first_ns = start_ns + offset_ns; + + test_global->start_tick = start_tick; + test_global->start_ns = start_ns; + test_global->period_tick = odp_timer_ns_to_tick(timer_pool, period_ns); + + /* When mode is 1, set only one burst of timers initially */ + if (mode) + num_tmo = 1; for (i = 0; i < num_tmo; i++) { nsec = offset_ns + (i * period_ns); @@ -330,14 +364,14 @@ static int start_timers(test_global_t *test_global) static int destroy_timers(test_global_t *test_global) { - uint64_t i, tot_timers; + uint64_t i, alloc_timers; odp_timer_t timer; odp_event_t ev; int ret = 0; - tot_timers = test_global->tot_timers; + alloc_timers = test_global->alloc_timers; - for (i = 0; i < tot_timers; i++) { + for (i = 0; i < alloc_timers; i++) { timer = test_global->timer_ctx[i].timer; if (timer == ODP_TIMER_INVALID) @@ -413,25 +447,34 @@ static void print_stat(test_global_t *test_global) static void run_test(test_global_t *test_global) { - uint64_t num_left, burst, num; + uint64_t num_left, burst, num, num_tmo, next_tmo; odp_event_t ev; odp_time_t time; - uint64_t time_ns, diff_ns, next_tmo; + uint64_t time_ns, diff_ns, period_ns; + odp_timeout_t tmo; + uint64_t tmo_ns; + timer_ctx_t *ctx; test_stat_t *stat = &test_global->stat; + int mode = test_global->opt.mode; num = 0; + next_tmo = 1; + num_tmo = test_global->opt.num; burst = test_global->opt.burst; num_left = test_global->tot_timers; - next_tmo = test_global->first_ns; + period_ns = test_global->period_ns; while (num_left) { ev = odp_schedule(NULL, ODP_SCHED_WAIT); time = odp_time_local(); time_ns = odp_time_to_ns(time); + tmo = odp_timeout_from_event(ev); + ctx = odp_timeout_user_ptr(tmo); + tmo_ns = ctx->nsec; - if (time_ns > next_tmo) { - diff_ns = time_ns - next_tmo; + if (time_ns > tmo_ns) { + diff_ns = time_ns - tmo_ns; stat->num_after++; stat->nsec_after_sum += diff_ns; if (diff_ns < stat->nsec_after_min) @@ -439,8 +482,8 @@ static void run_test(test_global_t *test_global) if (diff_ns > stat->nsec_after_max) stat->nsec_after_max = diff_ns; - } else if (time_ns < next_tmo) { - diff_ns = next_tmo - time_ns; + } else if (time_ns < tmo_ns) { + diff_ns = tmo_ns - time_ns; stat->num_before++; stat->nsec_before_sum += diff_ns; if (diff_ns < stat->nsec_before_min) @@ -452,15 +495,50 @@ static void run_test(test_global_t *test_global) stat->num_exact++; } - odp_event_free(ev); + if (mode && next_tmo < num_tmo) { + /* Reset timer for next period */ + odp_timer_t timer; + uint64_t nsec, tick; + odp_timer_set_t ret; + odp_timer_pool_t timer_pool = test_global->timer_pool; + + timer = ctx->timer; + + if (mode == 1) { + /* Absolute time */ + ctx->nsec += period_ns; + nsec = ctx->nsec - test_global->start_ns; + tick = test_global->start_tick + + odp_timer_ns_to_tick(timer_pool, nsec); + + ret = odp_timer_set_abs(timer, tick, &ev); + } else { + /* Relative time */ + tick = test_global->period_tick; + time = odp_time_local(); + time_ns = odp_time_to_ns(time); + ctx->nsec = time_ns + period_ns; + + ret = odp_timer_set_rel(timer, tick, &ev); + } + + if (ret != ODP_TIMER_SUCCESS) { + printf("Timer set failed: %i. Timeout nsec " + "%" PRIu64 "\n", ret, ctx->nsec); + return; + } + } else { + odp_event_free(ev); + } num_left--; num++; if (num == burst) { - next_tmo += test_global->period_ns; + next_tmo++; num = 0; } + } /* Free current scheduler context. There should be no more events. */ @@ -514,7 +592,7 @@ int main(int argc, char *argv[]) /* Configure scheduler */ odp_schedule_config(NULL); - test_global.timer_ctx = calloc(test_global.tot_timers, + test_global.timer_ctx = calloc(test_global.alloc_timers, sizeof(timer_ctx_t)); if (test_global.timer_ctx == NULL) { commit a6241a89c18dd7a4a14214a100369f5ef46f25ef Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 22 11:07:20 2019 +0200 example: timer_accur: add timer burst option Added command line option (--burst) to set multiple timers for each timeout period. Total number of timers is number of timeout periods (--num) times the burst size. 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 4c33329cb..24759b0e5 100644 --- a/example/timer/odp_timer_accuracy.c +++ b/example/timer/odp_timer_accuracy.c @@ -15,6 +15,13 @@ #include <odp_api.h> +typedef struct timer_ctx_t { + odp_timer_t timer; + odp_event_t event; + uint64_t nsec; + +} timer_ctx_t; + typedef struct { uint64_t nsec_before_sum; uint64_t nsec_before_min; @@ -35,7 +42,8 @@ typedef struct test_global_t { unsigned long long int period_ns; unsigned long long int res_ns; unsigned long long int offset_ns; - int num; + unsigned long long int num; + unsigned long long int burst; int init; } opt; @@ -44,9 +52,10 @@ typedef struct test_global_t { odp_queue_t queue; odp_timer_pool_t timer_pool; odp_pool_t timeout_pool; - odp_timer_t *timer; + timer_ctx_t *timer_ctx; uint64_t period_ns; uint64_t first_ns; + uint64_t tot_timers; } test_global_t; @@ -60,6 +69,7 @@ static void print_usage(void) " -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" " -i, --init Set global init parameters. Default: init params not set.\n" " -h, --help Display help and exit.\n\n"); } @@ -72,17 +82,19 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) {"resolution", required_argument, NULL, 'r'}, {"first", required_argument, NULL, 'f'}, {"num", required_argument, NULL, 'n'}, + {"burst", required_argument, NULL, 'b'}, {"init", no_argument, NULL, 'i'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+p:r:f:n:ih"; + const char *shortopts = "+p:r:f:n:b:ih"; int ret = 0; test_global->opt.period_ns = 200 * ODP_TIME_MSEC_IN_NS; test_global->opt.res_ns = 0; test_global->opt.offset_ns = 300 * ODP_TIME_MSEC_IN_NS; test_global->opt.num = 50; + test_global->opt.burst = 1; test_global->opt.init = 0; while (1) { @@ -102,7 +114,10 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) test_global->opt.offset_ns = strtoull(optarg, NULL, 0); break; case 'n': - test_global->opt.num = atoi(optarg); + test_global->opt.num = strtoull(optarg, NULL, 0); + break; + case 'b': + test_global->opt.burst = strtoull(optarg, NULL, 0); break; case 'i': test_global->opt.init = 1; @@ -121,6 +136,8 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) if (test_global->opt.res_ns == 0) test_global->opt.res_ns = test_global->opt.period_ns / 10; + test_global->tot_timers = test_global->opt.num * test_global->opt.burst; + return ret; } @@ -140,9 +157,11 @@ static int start_timers(test_global_t *test_global) odp_timeout_t timeout; odp_timer_set_t ret; odp_time_t time; - int i, num; + uint64_t i, j, idx, num_tmo, burst, tot_timers; - num = test_global->opt.num; + tot_timers = test_global->tot_timers; + num_tmo = test_global->opt.num; + burst = test_global->opt.burst; period_ns = test_global->opt.period_ns; test_global->period_ns = period_ns; @@ -151,8 +170,10 @@ static int start_timers(test_global_t *test_global) test_global->timer_pool = ODP_TIMER_POOL_INVALID; test_global->timeout_pool = ODP_POOL_INVALID; - for (i = 0; i < num; i++) - test_global->timer[i] = ODP_TIMER_INVALID; + for (i = 0; i < tot_timers; i++) { + test_global->timer_ctx[i].timer = ODP_TIMER_INVALID; + test_global->timer_ctx[i].event = ODP_EVENT_INVALID; + } odp_queue_param_init(&queue_param); queue_param.type = ODP_QUEUE_TYPE_SCHED; @@ -170,7 +191,7 @@ static int start_timers(test_global_t *test_global) odp_pool_param_init(&pool_param); pool_param.type = ODP_POOL_TIMEOUT; - pool_param.tmo.num = num; + pool_param.tmo.num = tot_timers; pool = odp_pool_create("timeout pool", &pool_param); @@ -186,6 +207,14 @@ static int start_timers(test_global_t *test_global) return -1; } + if (timer_capa.max_timers && + test_global->tot_timers > timer_capa.max_timers) { + printf("Error: Too many timers: %" PRIu64 ".\n" + " Max timers: %u\n", test_global->tot_timers, + timer_capa.max_timers); + return -1; + } + res_capa = timer_capa.highest_res_ns; offset_ns = test_global->opt.offset_ns; @@ -203,20 +232,23 @@ static int start_timers(test_global_t *test_global) timer_param.res_ns = res_ns; timer_param.min_tmo = offset_ns / 2; - timer_param.max_tmo = offset_ns + ((num + 1) * period_ns); - timer_param.num_timers = num; + timer_param.max_tmo = offset_ns + ((num_tmo + 1) * period_ns); + timer_param.num_timers = tot_timers; timer_param.clk_src = ODP_CLOCK_CPU; printf("\nTest parameters:\n"); printf(" resolution capa: %" PRIu64 " nsec\n", res_capa); + printf(" max timers capa: %" PRIu32 "\n", timer_capa.max_timers); printf(" start offset: %" PRIu64 " nsec\n", offset_ns); printf(" period: %" PRIu64 " nsec\n", period_ns); printf(" resolution: %" PRIu64 " nsec\n", timer_param.res_ns); printf(" min timeout: %" PRIu64 " nsec\n", timer_param.min_tmo); printf(" max timeout: %" PRIu64 " nsec\n", timer_param.max_tmo); - printf(" num timers: %u\n", timer_param.num_timers); - printf(" test run time: %.1f sec\n\n", - timer_param.max_tmo / 1000000000.0); + printf(" num timeout: %" PRIu64 "\n", num_tmo); + printf(" burst size: %" PRIu64 "\n", burst); + printf(" total timers: %" PRIu64 "\n", tot_timers); + printf(" test run time: %.2f sec\n\n", + (offset_ns + (num_tmo * period_ns)) / 1000000000.0); timer_pool = odp_timer_pool_create("timer_accuracy", &timer_param); @@ -232,15 +264,25 @@ static int start_timers(test_global_t *test_global) test_global->timer_pool = timer_pool; - for (i = 0; i < num; i++) { - timer = odp_timer_alloc(timer_pool, queue, NULL); + for (i = 0; i < tot_timers; i++) { + timer_ctx_t *ctx = &test_global->timer_ctx[i]; + + timer = odp_timer_alloc(timer_pool, queue, ctx); if (timer == ODP_TIMER_INVALID) { printf("Timer alloc failed.\n"); return -1; } - test_global->timer[i] = timer; + ctx->timer = timer; + + timeout = odp_timeout_alloc(pool); + if (timeout == ODP_TIMEOUT_INVALID) { + printf("Timeout alloc failed\n"); + return -1; + } + + ctx->event = odp_timeout_to_event(timeout); } /* Run scheduler few times to ensure that (software) timer is active */ @@ -254,30 +296,32 @@ static int start_timers(test_global_t *test_global) } } + idx = 0; start_tick = odp_timer_current_tick(timer_pool); time = odp_time_local(); start_ns = odp_time_to_ns(time); test_global->first_ns = start_ns + offset_ns; - for (i = 0; i < num; i++) { - timer = test_global->timer[i]; + for (i = 0; i < num_tmo; i++) { + nsec = offset_ns + (i * period_ns); + tick = start_tick + odp_timer_ns_to_tick(timer_pool, nsec); - timeout = odp_timeout_alloc(pool); - if (timeout == ODP_TIMEOUT_INVALID) { - printf("Timeout alloc failed\n"); - return -1; - } + for (j = 0; j < burst; j++) { + timer_ctx_t *ctx = &test_global->timer_ctx[idx]; - event = odp_timeout_to_event(timeout); + timer = ctx->timer; + event = ctx->event; + ctx->nsec = start_ns + nsec; - nsec = offset_ns + (i * period_ns); - tick = start_tick + odp_timer_ns_to_tick(timer_pool, nsec); + ret = odp_timer_set_abs(timer, tick, &event); - ret = odp_timer_set_abs(timer, tick, &event); + if (ret != ODP_TIMER_SUCCESS) { + printf("Timer[%" PRIu64 "] set failed: %i\n", + idx, ret); + return -1; + } - if (ret != ODP_TIMER_SUCCESS) { - printf("Timer[%i] set failed: ret %i\n", i, ret); - return -1; + idx++; } } @@ -286,15 +330,15 @@ static int start_timers(test_global_t *test_global) static int destroy_timers(test_global_t *test_global) { - int i, num; + uint64_t i, tot_timers; odp_timer_t timer; odp_event_t ev; int ret = 0; - num = test_global->opt.num; + tot_timers = test_global->tot_timers; - for (i = 0; i < num; i++) { - timer = test_global->timer[i]; + for (i = 0; i < tot_timers; i++) { + timer = test_global->timer_ctx[i].timer; if (timer == ODP_TIMER_INVALID) break; @@ -327,7 +371,7 @@ static int destroy_timers(test_global_t *test_global) static void print_stat(test_global_t *test_global) { - uint64_t num = test_global->opt.num; + uint64_t tot_timers = test_global->tot_timers; uint64_t res_ns = test_global->opt.res_ns; test_stat_t *stat = &test_global->stat; double ave_after = 0.0; @@ -345,11 +389,11 @@ static void print_stat(test_global_t *test_global) printf("\n Test results:\n"); printf(" num after: %12" PRIu64 " / %.2f%%\n", - stat->num_after, 100.0 * stat->num_after / num); + stat->num_after, 100.0 * stat->num_after / tot_timers); printf(" num before: %12" PRIu64 " / %.2f%%\n", - stat->num_before, 100.0 * stat->num_before / num); + stat->num_before, 100.0 * stat->num_before / tot_timers); printf(" num exact: %12" PRIu64 " / %.2f%%\n", - stat->num_exact, 100.0 * stat->num_exact / num); + stat->num_exact, 100.0 * stat->num_exact / tot_timers); printf(" error after (nsec):\n"); printf(" min: %12" PRIu64 " / %.3fx resolution\n", stat->nsec_after_min, (double)stat->nsec_after_min / res_ns); @@ -369,14 +413,15 @@ static void print_stat(test_global_t *test_global) static void run_test(test_global_t *test_global) { - int num, num_left; + uint64_t num_left, burst, num; odp_event_t ev; odp_time_t time; uint64_t time_ns, diff_ns, next_tmo; test_stat_t *stat = &test_global->stat; - num = test_global->opt.num; - num_left = num; + num = 0; + burst = test_global->opt.burst; + num_left = test_global->tot_timers; next_tmo = test_global->first_ns; while (num_left) { @@ -409,8 +454,13 @@ static void run_test(test_global_t *test_global) odp_event_free(ev); - next_tmo += test_global->period_ns; num_left--; + num++; + + if (num == burst) { + next_tmo += test_global->period_ns; + num = 0; + } } /* Free current scheduler context. There should be no more events. */ @@ -425,7 +475,6 @@ int main(int argc, char *argv[]) { odp_instance_t instance; odp_init_t init; - int num; test_global_t test_global; odp_init_t *init_ptr = NULL; int ret = 0; @@ -465,12 +514,11 @@ int main(int argc, char *argv[]) /* Configure scheduler */ odp_schedule_config(NULL); - num = test_global.opt.num; - - test_global.timer = calloc(num, sizeof(odp_timer_t)); + test_global.timer_ctx = calloc(test_global.tot_timers, + sizeof(timer_ctx_t)); - if (test_global.timer == NULL) { - printf("Malloc failed.\n"); + if (test_global.timer_ctx == NULL) { + printf("Timer context table calloc failed.\n"); goto quit; } @@ -485,8 +533,8 @@ quit: if (destroy_timers(&test_global)) ret = -1; - if (test_global.timer) - free(test_global.timer); + if (test_global.timer_ctx) + free(test_global.timer_ctx); if (odp_term_local()) { printf("Term local failed.\n"); commit 11bd13b261d291fd5b169e4a02c21d217fbf70ac Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 21 13:04:33 2019 +0200 example: timer_accur: statistics print function Move statistics print into a function, so that it can be reused by a new test case. 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 35c8c612d..4c33329cb 100644 --- a/example/timer/odp_timer_accuracy.c +++ b/example/timer/odp_timer_accuracy.c @@ -1,4 +1,5 @@ /* Copyright (c) 2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -14,6 +15,21 @@ #include <odp_api.h> +typedef struct { + uint64_t nsec_before_sum; + uint64_t nsec_before_min; + uint64_t nsec_before_max; + + uint64_t nsec_after_sum; + uint64_t nsec_after_min; + uint64_t nsec_after_max; + + uint64_t num_before; + uint64_t num_exact; + uint64_t num_after; + +} test_stat_t; + typedef struct test_global_t { struct { unsigned long long int period_ns; @@ -23,6 +39,8 @@ typedef struct test_global_t { int init; } opt; + test_stat_t stat; + odp_queue_t queue; odp_timer_pool_t timer_pool; odp_pool_t timeout_pool; @@ -307,25 +325,56 @@ static int destroy_timers(test_global_t *test_global) return ret; } +static void print_stat(test_global_t *test_global) +{ + uint64_t num = test_global->opt.num; + uint64_t res_ns = test_global->opt.res_ns; + test_stat_t *stat = &test_global->stat; + double ave_after = 0.0; + double ave_before = 0.0; + + if (stat->num_after) + ave_after = (double)stat->nsec_after_sum / stat->num_after; + else + stat->nsec_after_min = 0; + + if (stat->num_before) + ave_before = (double)stat->nsec_before_sum / stat->num_before; + else + stat->nsec_before_min = 0; + + printf("\n Test results:\n"); + printf(" num after: %12" PRIu64 " / %.2f%%\n", + stat->num_after, 100.0 * stat->num_after / num); + printf(" num before: %12" PRIu64 " / %.2f%%\n", + stat->num_before, 100.0 * stat->num_before / num); + printf(" num exact: %12" PRIu64 " / %.2f%%\n", + stat->num_exact, 100.0 * stat->num_exact / num); + printf(" error after (nsec):\n"); + printf(" min: %12" PRIu64 " / %.3fx resolution\n", + stat->nsec_after_min, (double)stat->nsec_after_min / res_ns); + printf(" max: %12" PRIu64 " / %.3fx resolution\n", + stat->nsec_after_max, (double)stat->nsec_after_max / res_ns); + printf(" ave: %12.0f / %.3fx resolution\n", + ave_after, ave_after / res_ns); + printf(" error before (nsec):\n"); + printf(" min: %12" PRIu64 " / %.3fx resolution\n", + stat->nsec_before_min, (double)stat->nsec_before_min / res_ns); + printf(" max: %12" PRIu64 " / %.3fx resolution\n", + stat->nsec_before_max, (double)stat->nsec_before_max / res_ns); + printf(" ave: %12.0f / %.3fx resolution\n", + ave_before, ave_before / res_ns); + printf("\n"); +} + static void run_test(test_global_t *test_global) { int num, num_left; odp_event_t ev; odp_time_t time; - uint64_t time_ns, diff_ns, next_tmo, res_ns; - uint64_t after = 0; - uint64_t min_after = UINT64_MAX; - uint64_t max_after = 0; - uint64_t before = 0; - uint64_t min_before = UINT64_MAX; - uint64_t max_before = 0; - double ave_after = 0.0; - double ave_before = 0.0; - int num_after = 0; - int num_exact = 0; - int num_before = 0; + uint64_t time_ns, diff_ns, next_tmo; + test_stat_t *stat = &test_global->stat; - res_ns = test_global->opt.res_ns; num = test_global->opt.num; num_left = num; next_tmo = test_global->first_ns; @@ -338,24 +387,24 @@ static void run_test(test_global_t *test_global) if (time_ns > next_tmo) { diff_ns = time_ns - next_tmo; - num_after++; - after += diff_ns; - if (diff_ns < min_after) - min_after = diff_ns; - if (diff_ns > max_after) - max_after = diff_ns; + stat->num_after++; + stat->nsec_after_sum += diff_ns; + if (diff_ns < stat->nsec_after_min) + stat->nsec_after_min = diff_ns; + if (diff_ns > stat->nsec_after_max) + stat->nsec_after_max = diff_ns; } else if (time_ns < next_tmo) { diff_ns = next_tmo - time_ns; - num_before++; - before += diff_ns; - if (diff_ns < min_before) - min_before = diff_ns; - if (diff_ns > max_before) - max_before = diff_ns; + stat->num_before++; + stat->nsec_before_sum += diff_ns; + if (diff_ns < stat->nsec_before_min) + stat->nsec_before_min = diff_ns; + if (diff_ns > stat->nsec_before_max) + stat->nsec_before_max = diff_ns; } else { - num_exact++; + stat->num_exact++; } odp_event_free(ev); @@ -370,39 +419,6 @@ static void run_test(test_global_t *test_global) printf("Dropping extra event\n"); odp_event_free(ev); } - - if (num_after) - ave_after = (double)after / num_after; - else - min_after = 0; - - if (num_before) - ave_before = (double)before / num_before; - else - min_before = 0; - - printf("\n Test results:\n"); - printf(" num after: %12i / %.2f%%\n", - num_after, 100.0 * num_after / num); - printf(" num before: %12i / %.2f%%\n", - num_before, 100.0 * num_before / num); - printf(" num exact: %12i / %.2f%%\n", - num_exact, 100.0 * num_exact / num); - printf(" error after (nsec):\n"); - printf(" min: %12" PRIu64 " / %.3fx resolution\n", - min_after, (double)min_after / res_ns); - printf(" max: %12" PRIu64 " / %.3fx resolution\n", - max_after, (double)max_after / res_ns); - printf(" ave: %12.0f / %.3fx resolution\n", - ave_after, ave_after / res_ns); - printf(" error before (nsec):\n"); - printf(" min: %12" PRIu64 " / %.3fx resolution\n", - min_before, (double)min_before / res_ns); - printf(" max: %12" PRIu64 " / %.3fx resolution\n", - max_before, (double)max_before / res_ns); - printf(" ave: %12.0f / %.3fx resolution\n", - ave_before, ave_before / res_ns); - printf("\n"); } int main(int argc, char *argv[]) @@ -415,6 +431,8 @@ int main(int argc, char *argv[]) int ret = 0; memset(&test_global, 0, sizeof(test_global_t)); + test_global.stat.nsec_before_min = UINT64_MAX; + test_global.stat.nsec_after_min = UINT64_MAX; if (parse_options(argc, argv, &test_global)) return -1; @@ -461,6 +479,8 @@ int main(int argc, char *argv[]) run_test(&test_global); + print_stat(&test_global); + quit: if (destroy_timers(&test_global)) ret = -1; ----------------------------------------------------------------------- Summary of changes: example/timer/odp_timer_accuracy.c | 489 +++++++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 124 deletions(-) hooks/post-receive -- [View Less]

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-371-g5ee1d8235

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 5ee1d8235638278fca00589fd577860ce88450e6 (commit) via cce800d191f57e4236deaaee739ba647459ed5d1 (commit) from ce93696c8c016fadb4d1b6cd6a7e203f135b1194 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so … [View More]we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5ee1d8235638278fca00589fd577860ce88450e6 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Nov 22 10:28:47 2019 +0200 linux-gen: pktio: change unsigned variables to unsigned int Checkpatch complains about bare use of unsigned. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 220259672..94f4d620e 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -602,8 +602,8 @@ int odp_pktio_start(odp_pktio_t hdl) mode = entry->s.param.in_mode; if (mode == ODP_PKTIN_MODE_SCHED) { - unsigned i; - unsigned num = entry->s.num_in_queue; + unsigned int i; + unsigned int num = entry->s.num_in_queue; int index[num]; odp_queue_t odpq[num]; @@ -928,7 +928,7 @@ int sched_cb_pktin_poll_one(int pktio_index, return 0; } - ODP_ASSERT((unsigned)rx_queue < entry->s.num_in_queue); + ODP_ASSERT((unsigned int)rx_queue < entry->s.num_in_queue); num_pkts = entry->s.ops->recv(entry, rx_queue, packets, QUEUE_MULTI_MAX); @@ -1433,7 +1433,7 @@ int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa) return ret; } -unsigned odp_pktio_max_index(void) +unsigned int odp_pktio_max_index(void) { return ODP_CONFIG_PKTIO_ENTRIES - 1; } @@ -1497,8 +1497,8 @@ int odp_pktin_queue_config(odp_pktio_t pktio, pktio_entry_t *entry; odp_pktin_mode_t mode; odp_pktio_capability_t capa; - unsigned num_queues; - unsigned i; + unsigned int num_queues; + unsigned int i; int rc; odp_queue_t queue; odp_pktin_queue_param_t default_param; @@ -1621,8 +1621,8 @@ int odp_pktout_queue_config(odp_pktio_t pktio, pktio_entry_t *entry; odp_pktout_mode_t mode; odp_pktio_capability_t capa; - unsigned num_queues; - unsigned i; + unsigned int num_queues; + unsigned int i; int rc; odp_pktout_queue_param_t default_param; @@ -1966,11 +1966,11 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num, } } -int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, - unsigned *from, odp_packet_t packets[], int num, +int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned int num_q, + unsigned int *from, odp_packet_t packets[], int num, uint64_t wait) { - unsigned i; + unsigned int i; int ret; odp_time_t t1, t2; struct timespec ts; diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index 747b1cc33..af2d6e397 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -10,13 +10,13 @@ static int sock_recv_mq_tmo_select(pktio_entry_t * const *entry, const int index[], - unsigned num_q, unsigned *from, + unsigned int num_q, unsigned int *from, odp_packet_t packets[], int num, uint64_t usecs, fd_set *readfds, int maxfd) { struct timeval timeout; - unsigned i; + unsigned int i; int ret; for (i = 0; i < num_q; i++) { @@ -49,17 +49,17 @@ static int sock_recv_mq_tmo_select(pktio_entry_t * const *entry, } int sock_recv_mq_tmo_try_int_driven(const struct odp_pktin_queue_t queues[], - unsigned num_q, unsigned *from, + unsigned int num_q, unsigned int *from, odp_packet_t packets[], int num, uint64_t usecs, int *trial_successful) { - unsigned i; + unsigned int i; pktio_entry_t *entry[num_q]; int index[num_q]; fd_set readfds; int maxfd = -1; int (*impl)(pktio_entry_t *entry[], int index[], int num_q, - odp_packet_t packets[], int num, unsigned *from, + odp_packet_t packets[], int num, unsigned int *from, uint64_t wait_usecs) = NULL; int impl_set = 0; commit cce800d191f57e4236deaaee739ba647459ed5d1 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Nov 22 10:18:40 2019 +0200 linux-gen: pktio: always check pktio state before recv/send Previously some pktio types could recv/send packets even though the pktio was not in started state. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reported-by: Carl Wallen <carl.wallen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 7c4b72a61..220259672 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1890,6 +1890,9 @@ int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num) return -1; } + if (odp_unlikely(entry->s.state != PKTIO_STATE_STARTED)) + return 0; + ret = entry->s.ops->recv(entry, queue.index, packets, num); if (_ODP_PCAPNG) _odp_dump_pcapng_pkts(entry, queue.index, packets, ret); @@ -1916,6 +1919,9 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num, return -1; } + if (odp_unlikely(entry->s.state != PKTIO_STATE_STARTED)) + return 0; + if (entry->s.ops->recv_tmo && wait != ODP_PKTIN_NO_WAIT) { ret = entry->s.ops->recv_tmo(entry, queue.index, packets, num, wait); @@ -2068,6 +2074,9 @@ int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[], return -1; } + if (odp_unlikely(entry->s.state != PKTIO_STATE_STARTED)) + return 0; + if (_ODP_PCAPNG) _odp_dump_pcapng_pkts(entry, queue.index, packets, num); diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 043a467f5..eb662f0f7 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1833,9 +1833,6 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index, int i; unsigned cache_idx; - if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) - return 0; - if (!pkt_dpdk->lockless_rx) odp_ticketlock_lock(&pkt_dpdk->rx_lock[index]); /** @@ -1905,9 +1902,6 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, int i; int mbufs; - if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) - return 0; - if (_ODP_DPDK_ZERO_COPY) mbufs = pkt_to_mbuf_zero(pktio_entry, tx_mbufs, pkt_table, num, &copy_count); diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 47611724f..e1a5da773 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -908,9 +908,6 @@ static int netmap_fd_set(pktio_entry_t *pktio_entry, int index, fd_set *readfds) int i; int max_fd = 0; - if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) - return 0; - if (!pkt_nm->lockless_rx) odp_ticketlock_lock(&pkt_nm->rx_desc_ring[index].s.lock); @@ -949,9 +946,6 @@ static int netmap_recv(pktio_entry_t *pktio_entry, int index, int max_fd = 0; fd_set empty_rings; - if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) - return 0; - FD_ZERO(&empty_rings); if (!pkt_nm->lockless_rx) @@ -1074,9 +1068,6 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, unsigned slot_id; char *buf; - if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) - return 0; - /* Only one netmap tx ring per pktout queue */ desc_id = pkt_nm->tx_desc_ring[index].s.cur; desc = pkt_nm->tx_desc_ring[index].s.desc[desc_id]; diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 9bb7f2035..4332348b6 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -231,7 +231,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_lock(&pktio_entry->s.rxl); - if (pktio_entry->s.state != PKTIO_STATE_STARTED || !pcap->rx) { + if (odp_unlikely(!pcap->rx)) { odp_ticketlock_unlock(&pktio_entry->s.rxl); return 0; } @@ -318,11 +318,6 @@ static int pcapif_send_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_lock(&pktio_entry->s.txl); - if (pktio_entry->s.state != PKTIO_STATE_STARTED) { - odp_ticketlock_unlock(&pktio_entry->s.txl); - return 0; - } - for (i = 0; i < num; ++i) { int pkt_len = odp_packet_len(pkts[i]); diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index e3d5151a7..747b1cc33 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -76,6 +76,12 @@ int sock_recv_mq_tmo_try_int_driven(const struct odp_pktin_queue_t queues[], *trial_successful = 0; return -1; } + + if (odp_unlikely(entry[i]->s.state != PKTIO_STATE_STARTED)) { + *trial_successful = 0; + return 0; + } + if (entry[i]->s.ops->recv_mq_tmo == NULL && entry[i]->s.ops->fd_set == NULL) { *trial_successful = 0; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_packet_io.c | 31 +++++++++++++++++++---------- platform/linux-generic/pktio/dpdk.c | 6 ------ platform/linux-generic/pktio/netmap.c | 9 --------- platform/linux-generic/pktio/pcap.c | 7 +------ platform/linux-generic/pktio/pktio_common.c | 16 ++++++++++----- 5 files changed, 32 insertions(+), 37 deletions(-) hooks/post-receive -- [View Less]

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-369-gce93696c8

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 ce93696c8c016fadb4d1b6cd6a7e203f135b1194 (commit) from 83eb1d9d4cabb56a6afd3b45b8db178d28cb7ea8 (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 ---------------… [View More]-------------------------------------------------- commit ce93696c8c016fadb4d1b6cd6a7e203f135b1194 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 26 16:01:58 2019 +0200 travis: add packet and packet IO align test Test new packet/buffer/pktin alignment configuration file options. Uses pktio_run.sh to run packets through various pktio types. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index e07fadf61..e75ec5dc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -199,6 +199,19 @@ jobs: -e CONF="" -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/inline-timer.conf ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check_inline_timer.sh + - stage: test + env: TEST=packet_align + install: + - true + compiler: gcc + script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi + - docker run --privileged -i -t + -v `pwd`:/odp --shm-size 8g + -e CC="${CC}" + -e CONF="" + -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/packet_align.conf + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check_pktio.sh - stage: test env: TEST=distcheck compiler: gcc diff --git a/platform/linux-generic/test/packet_align.conf b/platform/linux-generic/test/packet_align.conf new file mode 100644 index 000000000..5cae76f63 --- /dev/null +++ b/platform/linux-generic/test/packet_align.conf @@ -0,0 +1,21 @@ +# Mandatory fields +odp_implementation = "linux-generic" +config_file_version = "0.1.12" + +pool: { + pkt: { + # Non-zero, larger than cache line size, power of two value. + base_align = 128 + } + + buf: { + # Non-zero, larger than cache line size, power of two value. + min_align = 256 + } +} + +pktio: { + # Ethernet header offset is 2 bytes, so that Ethernet payload + # starts at 16 byte alignment. + pktin_frame_offset = 2 +} diff --git a/scripts/ci/check_pktio.sh b/scripts/ci/check_pktio.sh new file mode 100755 index 000000000..d82fe8aad --- /dev/null +++ b/scripts/ci/check_pktio.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +"`dirname "$0"`"/build_x86_64.sh + +cd "$(dirname "$0")"/../.. + +echo 1000 | tee /proc/sys/vm/nr_hugepages +mkdir -p /mnt/huge +mount -t hugetlbfs nodev /mnt/huge + +./platform/linux-generic/test/validation/api/pktio/pktio_run.sh + +umount /mnt/huge ----------------------------------------------------------------------- Summary of changes: .travis.yml | 13 +++++++++++++ platform/linux-generic/test/packet_align.conf | 21 +++++++++++++++++++++ .../ci/{check_inline_timer.sh => check_pktio.sh} | 4 +--- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 platform/linux-generic/test/packet_align.conf copy scripts/ci/{check_inline_timer.sh => check_pktio.sh} (51%) hooks/post-receive -- [View Less]

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-368-g83eb1d9d

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 83eb1d9d4cabb56a6afd3b45b8db178d28cb7ea8 (commit) via 25e3e77fc41de7d90a9195941fb9ddc6e15fe6dd (commit) via 576f69f97fa5ba1ef93bf3fbc14076760991bdb6 (commit) via c978c1ed62901815ab4abd484a820665157f85d6 (commit) via d074c91300194e7fa527f8f5186328e8d0613c1a (… [View More]commit) via 6586675011635bb26d701d9c940d76b0c1d53709 (commit) via 8e1a2b2efd96405f9304984703fc6368a39dba46 (commit) via e5f8a95eeea5a8f4261f8e5bcff95a4cd5cc9b79 (commit) via 4ec7054a33c24c745cee20448055a003c7d1e4bc (commit) via 5caadb73c59095fe6520b26accea26148cc83100 (commit) via 10a0418039d3d8770e80766d33bd3224d1bd88a3 (commit) via ab5574db4e04e097170dff2d30a77281ebc85278 (commit) from 807aa18bcd266a7e7f66e2293db7ee2fe4923a2d (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 83eb1d9d4cabb56a6afd3b45b8db178d28cb7ea8 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 20 12:22:27 2019 +0200 linux-gen: netmap: implement frame offset config 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/netmap.c b/platform/linux-generic/pktio/netmap.c index 313ebd5e..47611724 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -790,12 +790,14 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, odp_packet_hdr_t parsed_hdr; int i; int num; - int alloc_len; + uint32_t max_len; + uint16_t frame_offset = pktio_entry->s.pktin_frame_offset; /* Allocate maximum sized packets */ - alloc_len = pkt_priv(pktio_entry)->mtu; + max_len = pkt_priv(pktio_entry)->mtu; - num = packet_alloc_multi(pool, alloc_len, pkt_tbl, slot_num); + num = packet_alloc_multi(pool, max_len + frame_offset, + pkt_tbl, slot_num); for (i = 0; i < num; i++) { netmap_slot_t slot; @@ -815,10 +817,10 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, pkt = pkt_tbl[i]; pkt_hdr = packet_hdr(pkt); - pull_tail(pkt_hdr, alloc_len - len); + pull_tail(pkt_hdr, max_len - len); + if (frame_offset) + pull_head(pkt_hdr, frame_offset); - /* For now copy the data in the mbuf, - worry about zero-copy later */ if (odp_packet_copy_from_mem(pkt, 0, len, slot.buf) != 0) goto fail; commit 25e3e77fc41de7d90a9195941fb9ddc6e15fe6dd Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 20 09:55:10 2019 +0200 linux-gen: pcap: implement frame offset config 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/pcap.c b/platform/linux-generic/pktio/pcap.c index e5709e5f..9bb7f203 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -227,6 +227,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pkt_pcap_t *pcap = pkt_priv(pktio_entry); odp_time_t ts_val; odp_time_t *ts = NULL; + uint16_t frame_offset = pktio_entry->s.pktin_frame_offset; odp_ticketlock_lock(&pktio_entry->s.rxl); @@ -252,7 +253,8 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pkt_len = hdr->caplen; - ret = packet_alloc_multi(pcap->pool, pkt_len, &pkt, 1); + ret = packet_alloc_multi(pcap->pool, pkt_len + frame_offset, + &pkt, 1); if (odp_unlikely(ret != 1)) break; @@ -260,8 +262,10 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, ts_val = odp_time_global(); pkt_hdr = packet_hdr(pkt); + if (frame_offset) + pull_head(pkt_hdr, frame_offset); - if (odp_packet_copy_from_mem(pkt, 0, hdr->caplen, data) != 0) { + if (odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0) { ODP_ERR("failed to copy packet data\n"); break; } commit 576f69f97fa5ba1ef93bf3fbc14076760991bdb6 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 19 16:57:46 2019 +0200 linux-gen: tap: implement frame offset config 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/tap.c b/platform/linux-generic/pktio/tap.c index 638edec9..db5c701b 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -276,6 +276,7 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, odp_packet_hdr_t *pkt_hdr; odp_packet_hdr_t parsed_hdr; int num; + uint16_t frame_offset = pktio_entry->s.pktin_frame_offset; if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, data, len, len, @@ -285,19 +286,22 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, } } - num = packet_alloc_multi(pkt_priv(pktio_entry)->pool, len, &pkt, 1); - + num = packet_alloc_multi(pkt_priv(pktio_entry)->pool, + len + frame_offset, &pkt, 1); if (num != 1) return ODP_PACKET_INVALID; + pkt_hdr = packet_hdr(pkt); + + if (frame_offset) + pull_head(pkt_hdr, frame_offset); + if (odp_packet_copy_from_mem(pkt, 0, len, data) < 0) { ODP_ERR("failed to copy packet data\n"); odp_packet_free(pkt); return ODP_PACKET_INVALID; } - pkt_hdr = packet_hdr(pkt); - if (pktio_cls_enabled(pktio_entry)) copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); else commit c978c1ed62901815ab4abd484a820665157f85d6 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 19 16:49:36 2019 +0200 linux-gen: socket: implement frame offset config 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/socket.c b/platform/linux-generic/pktio/socket.c index 76fee0ad..d148edf0 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -221,11 +221,15 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, int nb_pkts; int recv_msgs; int i; + uint16_t frame_offset = pktio_entry->s.pktin_frame_offset; + uint32_t alloc_len = pkt_sock->mtu + frame_offset; memset(msgvec, 0, sizeof(msgvec)); - nb_pkts = packet_alloc_multi(pool, pkt_sock->mtu, pkt_table, num); + nb_pkts = packet_alloc_multi(pool, alloc_len, pkt_table, num); for (i = 0; i < nb_pkts; i++) { + if (frame_offset) + pull_head(packet_hdr(pkt_table[i]), frame_offset); msgvec[i].msg_hdr.msg_iovlen = _rx_pkt_to_iovec(pkt_table[i], iovecs[i]); msgvec[i].msg_hdr.msg_iov = iovecs[i]; commit d074c91300194e7fa527f8f5186328e8d0613c1a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 19 14:43:07 2019 +0200 linux-gen: socket_mmap: implement frame offset config 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/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 6ae0e295..2cceb564 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -168,6 +168,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, unsigned nb_rx; struct ring *ring; odp_pool_t pool = pkt_sock->pool; + uint16_t frame_offset = pktio_entry->s.pktin_frame_offset; if (pktio_entry->s.config.pktin.bit.ts_all || pktio_entry->s.config.pktin.bit.ts_ptp) @@ -207,7 +208,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, continue; } - ret = packet_alloc_multi(pool, pkt_len, &pkt, 1); + ret = packet_alloc_multi(pool, pkt_len + frame_offset, &pkt, 1); if (odp_unlikely(ret != 1)) { /* Stop receiving packets when pool is empty. Leave @@ -237,6 +238,9 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, } hdr = packet_hdr(pkt); + if (frame_offset) + pull_head(hdr, frame_offset); + ret = odp_packet_copy_from_mem(pkt, 0, pkt_len, pkt_buf); if (ret != 0) { odp_packet_free(pkt); commit 6586675011635bb26d701d9c940d76b0c1d53709 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 19 13:50:34 2019 +0200 linux-gen: dpdk: implement frame offset config Implement frame start offset configuration option for (normal) DPDK pktio. Zero-copy version does not support the config. 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 cd6ca084..3ba76449 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -235,6 +235,14 @@ static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr, dst_hdr->timestamp = src_hdr->timestamp; } +static inline void pull_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_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) { odp_packet_hdr_t *last = packet_last_seg(pkt_hdr); diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index f7eca579..0e6a8a33 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -70,6 +70,7 @@ struct pktio_entry { odp_ticketlock_t txl; /**< TX ticketlock */ uint8_t cls_enabled; /**< classifier enabled */ uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ + uint16_t pktin_frame_offset; odp_pktio_t handle; /**< pktio handle */ unsigned char ODP_ALIGNED_CACHE pkt_priv[PKTIO_PRIVATE_SIZE]; enum { diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index a0bfce6e..d17674f4 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -160,14 +160,6 @@ static inline void push_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) pkt_hdr->seg_len += len; } -static inline void pull_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); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 019d3537..7c4b72a6 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -285,6 +285,7 @@ static odp_pktio_t setup_pktio_entry(const char *name, odp_pool_t pool, int pktio_if; char pktio_type[PKTIO_NAME_LEN]; const char *if_name; + uint16_t pktin_frame_offset = pktio_global->config.pktin_frame_offset; if (strlen(name) >= PKTIO_NAME_LEN - 1) { /* ioctl names limitation */ @@ -311,6 +312,7 @@ static odp_pktio_t setup_pktio_entry(const char *name, odp_pool_t pool, pktio_entry->s.pool = pool; memcpy(&pktio_entry->s.param, param, sizeof(odp_pktio_param_t)); pktio_entry->s.handle = hdl; + pktio_entry->s.pktin_frame_offset = pktin_frame_offset; odp_pktio_config_init(&pktio_entry->s.config); diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 61099668..043a467f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -538,19 +538,21 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, uint16_t pkt_len; struct rte_mbuf *mbuf; void *data; - int i, j; - int alloc_len, num; + int i, j, num; + uint32_t max_len; int nb_pkts = 0; pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); odp_pool_t pool = pkt_dpdk->pool; odp_pktin_config_opt_t pktin_cfg = pktio_entry->s.config.pktin; odp_proto_layer_t parse_layer = pktio_entry->s.config.parser.layer; odp_pktio_t input = pktio_entry->s.handle; + uint16_t frame_offset = pktio_entry->s.pktin_frame_offset; /* Allocate maximum sized packets */ - alloc_len = pkt_dpdk->data_room; + max_len = pkt_dpdk->data_room; - num = packet_alloc_multi(pool, alloc_len, pkt_table, mbuf_num); + num = packet_alloc_multi(pool, max_len + frame_offset, + pkt_table, mbuf_num); if (num != mbuf_num) { ODP_DBG("packet_alloc_multi() unable to allocate all packets: " "%d/%" PRIu16 " allocated\n", num, mbuf_num); @@ -596,7 +598,9 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, pkt = pkt_table[i]; pkt_hdr = packet_hdr(pkt); - pull_tail(pkt_hdr, alloc_len - pkt_len); + pull_tail(pkt_hdr, max_len - pkt_len); + if (frame_offset) + pull_head(pkt_hdr, frame_offset); if (odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0) goto fail; @@ -1621,6 +1625,9 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, RTE_PKTMBUF_HEADROOM; pkt_dpdk->data_room = RTE_MIN(pool_entry->seg_len, data_room); + /* Reserve room for packet input offset */ + pkt_dpdk->data_room -= pktio_entry->s.pktin_frame_offset; + /* Mbuf chaining not yet supported */ pkt_dpdk->mtu = RTE_MIN(pkt_dpdk->mtu, pkt_dpdk->data_room); commit 8e1a2b2efd96405f9304984703fc6368a39dba46 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 19 10:22:03 2019 +0200 linux-gen: pktio: add pktin frame offset config option Added config file option to control frame start offset in packet input. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index 4b19c102..5a3ca72f 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.11" +config_file_version = "0.1.12" # Shared memory options shm: { @@ -74,6 +74,16 @@ pool: { } } +# General pktio options +pktio: { + # Frame start offset from packet base pointer at packet input. This can + # be used (together with pool.pkt.base_align option) to tune packet data + # alignment for received frames. Currently, packet IO drivers + # (zero-copy DPDK, loop and ipc) that do not copy data ignore this + # option. + pktin_frame_offset = 0 +} + # DPDK pktio options pktio_dpdk: { # Default options diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index fe26612a..f7eca579 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -139,6 +139,11 @@ typedef struct { odp_spinlock_t lock; odp_shm_t shm; + struct { + /* Frame start offset from base pointer at packet input */ + uint16_t pktin_frame_offset; + } config; + pktio_entry_t entries[ODP_CONFIG_PKTIO_ENTRIES]; } pktio_global_t; diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 81ce4846..019d3537 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -28,6 +28,7 @@ #include <odp/api/plat/time_inlines.h> #include <odp_pcapng.h> #include <odp/api/plat/queue_inlines.h> +#include <odp_libconfig_internal.h> #include <string.h> #include <inttypes.h> @@ -58,6 +59,32 @@ static inline pktio_entry_t *pktio_entry_by_index(int index) return pktio_entry_ptr[index]; } +static int read_config_file(pktio_global_t *pktio_glb) +{ + const char *str; + int val = 0; + + ODP_PRINT("Packet IO config:\n"); + + str = "pktio.pktin_frame_offset"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + if (val < 0 || val > UINT16_MAX) { + ODP_ERR("Bad value %s = %i\n", str, val); + return -1; + } + + pktio_glb->config.pktin_frame_offset = val; + ODP_PRINT(" %s: %i\n", str, val); + + ODP_PRINT("\n"); + + return 0; +} + int _odp_pktio_init_global(void) { pktio_entry_t *pktio_entry; @@ -76,6 +103,12 @@ int _odp_pktio_init_global(void) odp_spinlock_init(&pktio_global->lock); + if (read_config_file(pktio_global)) { + odp_shm_free(shm); + pktio_global = NULL; + return -1; + } + for (i = 0; i < ODP_CONFIG_PKTIO_ENTRIES; ++i) { pktio_entry = &pktio_global->entries[i]; diff --git a/platform/linux-generic/test/inline-timer.conf b/platform/linux-generic/test/inline-timer.conf index 45b456e8..42ed09fb 100644 --- a/platform/linux-generic/test/inline-timer.conf +++ b/platform/linux-generic/test/inline-timer.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.11" +config_file_version = "0.1.12" timer: { # Enable inline timer implementation diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index fd766e62..10cf4891 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.11" +config_file_version = "0.1.12" # Shared memory options shm: { commit e5f8a95eeea5a8f4261f8e5bcff95a4cd5cc9b79 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 15 16:51:47 2019 +0200 linux-gen: pktio: rename global variable Renamed pktio global variable for better code readability. Also save SHM handle into global data and use it, instead of doing lookup by name. 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_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index ba2e7c6b..fe26612a 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -134,10 +134,14 @@ typedef union { uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pktio_entry))]; } pktio_entry_t; +/* Global variables */ typedef struct { odp_spinlock_t lock; + odp_shm_t shm; + pktio_entry_t entries[ODP_CONFIG_PKTIO_ENTRIES]; -} pktio_table_t; + +} pktio_global_t; typedef struct pktio_if_ops { const char *name; diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 33ba8fdb..81ce4846 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -47,7 +47,8 @@ /* Max wait time supported to avoid potential overflow */ #define MAX_WAIT_TIME (UINT64_MAX / 1024) -static pktio_table_t *pktio_tbl; +/* Global variables */ +static pktio_global_t *pktio_global; /* pktio pointer entries ( for inlines) */ void *pktio_entry_ptr[ODP_CONFIG_PKTIO_ENTRIES]; @@ -64,20 +65,19 @@ int _odp_pktio_init_global(void) odp_shm_t shm; int pktio_if; - shm = odp_shm_reserve("_odp_pktio_entries", - sizeof(pktio_table_t), - sizeof(pktio_entry_t), - 0); + shm = odp_shm_reserve("_odp_pktio_global", sizeof(pktio_global_t), + ODP_CACHE_LINE_SIZE, 0); if (shm == ODP_SHM_INVALID) return -1; - pktio_tbl = odp_shm_addr(shm); - memset(pktio_tbl, 0, sizeof(pktio_table_t)); + pktio_global = odp_shm_addr(shm); + memset(pktio_global, 0, sizeof(pktio_global_t)); + pktio_global->shm = shm; - odp_spinlock_init(&pktio_tbl->lock); + odp_spinlock_init(&pktio_global->lock); for (i = 0; i < ODP_CONFIG_PKTIO_ENTRIES; ++i) { - pktio_entry = &pktio_tbl->entries[i]; + pktio_entry = &pktio_global->entries[i]; odp_ticketlock_init(&pktio_entry->s.rxl); odp_ticketlock_init(&pktio_entry->s.txl); @@ -175,7 +175,7 @@ static odp_pktio_t alloc_lock_pktio_entry(void) int i; for (i = 0; i < ODP_CONFIG_PKTIO_ENTRIES; ++i) { - entry = &pktio_tbl->entries[i]; + entry = &pktio_global->entries[i]; if (is_free(entry)) { lock_entry(entry); if (is_free(entry)) { @@ -356,9 +356,9 @@ odp_pktio_t odp_pktio_open(const char *name, odp_pool_t pool, return ODP_PKTIO_INVALID; } - odp_spinlock_lock(&pktio_tbl->lock); + odp_spinlock_lock(&pktio_global->lock); hdl = setup_pktio_entry(name, pool, param); - odp_spinlock_unlock(&pktio_tbl->lock); + odp_spinlock_unlock(&pktio_global->lock); ODP_DBG("interface: %s, driver: %s\n", name, driver_name(hdl)); @@ -467,9 +467,9 @@ int odp_pktio_close(odp_pktio_t hdl) entry->s.num_in_queue = 0; entry->s.num_out_queue = 0; - odp_spinlock_lock(&pktio_tbl->lock); + odp_spinlock_lock(&pktio_global->lock); res = _pktio_close(entry); - odp_spinlock_unlock(&pktio_tbl->lock); + odp_spinlock_unlock(&pktio_global->lock); if (res) ODP_ABORT("unable to close pktio\n"); @@ -652,7 +652,7 @@ odp_pktio_t odp_pktio_lookup(const char *name) ifname = strip_pktio_type(name, NULL); - odp_spinlock_lock(&pktio_tbl->lock); + odp_spinlock_lock(&pktio_global->lock); for (i = 0; i < ODP_CONFIG_PKTIO_ENTRIES; ++i) { entry = pktio_entry_by_index(i); @@ -671,7 +671,7 @@ odp_pktio_t odp_pktio_lookup(const char *name) break; } - odp_spinlock_unlock(&pktio_tbl->lock); + odp_spinlock_unlock(&pktio_global->lock); return hdl; } @@ -1312,14 +1312,17 @@ void odp_pktio_print(odp_pktio_t hdl) int _odp_pktio_term_global(void) { + odp_shm_t shm; + int i, pktio_if; int ret = 0; - int i; - int pktio_if; + + if (pktio_global == NULL) + return 0; for (i = 0; i < ODP_CONFIG_PKTIO_ENTRIES; ++i) { pktio_entry_t *pktio_entry; - pktio_entry = &pktio_tbl->entries[i]; + pktio_entry = &pktio_global->entries[i]; if (is_free(pktio_entry)) continue; @@ -1353,9 +1356,10 @@ int _odp_pktio_term_global(void) ODP_ERR("Failed to terminate pcapng\n"); } - ret = odp_shm_free(odp_shm_lookup("_odp_pktio_entries")); + shm = pktio_global->shm; + ret = odp_shm_free(shm); if (ret != 0) - ODP_ERR("shm free failed for _odp_pktio_entries"); + ODP_ERR("shm free failed\n"); return ret; } commit 4ec7054a33c24c745cee20448055a003c7d1e4bc Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Nov 19 10:56:57 2019 +0200 linux-gen: pool: check global pointer on terminate Global pointer is NULL, if init fails. 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/odp_pool.c b/platform/linux-generic/odp_pool.c index 02f934d8..5d5217aa 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -261,6 +261,7 @@ int _odp_pool_init_global(void) if (read_config_file(_odp_pool_glb)) { odp_shm_free(shm); + _odp_pool_glb = NULL; return -1; } @@ -286,6 +287,9 @@ int _odp_pool_term_global(void) int ret = 0; int rc = 0; + if (_odp_pool_glb == NULL) + return 0; + for (i = 0; i < ODP_CONFIG_POOLS; i++) { pool = pool_entry(i); commit 5caadb73c59095fe6520b26accea26148cc83100 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 15 15:58:05 2019 +0200 linux-gen: pool: use align config options Setup alignment according to config file options. 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/odp_pool.c b/platform/linux-generic/odp_pool.c index 82083356..02f934d8 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -44,10 +44,6 @@ /* Define a practical limit for contiguous memory allocations */ #define MAX_SIZE (10 * 1024 * 1024) -/* Minimum supported buffer alignment. Requests for values below this will be - * rounded up to this value. */ -#define BUFFER_ALIGN_MIN ODP_CACHE_LINE_SIZE - ODP_STATIC_ASSERT(CONFIG_PACKET_SEG_LEN_MIN >= 256, "ODP Segment size must be a minimum of 256 bytes"); @@ -502,11 +498,15 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, align = 0; - if (params->type == ODP_POOL_BUFFER) - align = params->buf.align; + if (params->type == ODP_POOL_PACKET) { + align = _odp_pool_glb->config.pkt_base_align; + } else { + if (params->type == ODP_POOL_BUFFER) + align = params->buf.align; - if (align < BUFFER_ALIGN_MIN) - align = BUFFER_ALIGN_MIN; + if (align < _odp_pool_glb->config.buf_min_align) + align = _odp_pool_glb->config.buf_min_align; + } /* Validate requested buffer alignment */ if (align > ODP_CONFIG_BUFFER_ALIGN_MAX || commit 10a0418039d3d8770e80766d33bd3224d1bd88a3 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 15 15:39:32 2019 +0200 linux-gen: pool: add data align config file options Added packet and buffer data alignment options into the config file. For packets, this is the segment base address alignment. For buffers, this is minimum data alignment, application alignment requirements are rounded up to this value. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index b3508994..4b19c102 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.10" +config_file_version = "0.1.11" # Shared memory options shm: { @@ -60,6 +60,17 @@ pool: { # Maximum number of packets per pool. Power of two minus one # results optimal memory usage (e.g. (256 * 1024) - 1). max_num = 262143 + + # Base alignment for segment data. When set to zero, + # cache line size is used. Use power of two values. + base_align = 0 + } + + buf: { + # Minimum data alignment. The alignment request in pool + # parameters is rounded up to this value. When set to zero, + # cache line size is used. Use power of two values. + min_align = 0 } } diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 37b10aa1..a74f4660 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -97,6 +97,8 @@ typedef struct pool_global_t { uint32_t pkt_max_num; uint32_t local_cache_size; uint32_t burst_size; + uint32_t pkt_base_align; + uint32_t buf_min_align; } config; } pool_global_t; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 0937c8b3..82083356 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -142,7 +142,7 @@ static void cache_flush(pool_cache_t *cache, pool_t *pool) static int read_config_file(pool_global_t *pool_glb) { - uint32_t local_cache_size, burst_size; + uint32_t local_cache_size, burst_size, align; const char *str; int val = 0; @@ -155,7 +155,7 @@ static int read_config_file(pool_global_t *pool_glb) } if (val > CONFIG_POOL_CACHE_MAX_SIZE || val < 0) { - ODP_ERR("Bad value %s = %u, max %d\n", str, val, + ODP_ERR("Bad value %s = %i, max %i\n", str, val, CONFIG_POOL_CACHE_MAX_SIZE); return -1; } @@ -171,7 +171,7 @@ static int read_config_file(pool_global_t *pool_glb) } if (val <= 0) { - ODP_ERR("Bad value %s = %u\n", str, val); + ODP_ERR("Bad value %s = %i\n", str, val); return -1; } @@ -197,13 +197,49 @@ static int read_config_file(pool_global_t *pool_glb) } if (val > CONFIG_POOL_MAX_NUM || val < POOL_MAX_NUM_MIN) { - ODP_ERR("Bad value %s = %u\n", str, val); + ODP_ERR("Bad value %s = %i\n", str, val); return -1; } pool_glb->config.pkt_max_num = val; ODP_PRINT(" %s: %i\n", str, val); + str = "pool.pkt.base_align"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + align = val; + if (val == 0) + align = ODP_CACHE_LINE_SIZE; + + if (!CHECK_IS_POWER2(align)) { + ODP_ERR("Not a power of two: %s = %i\n", str, val); + return -1; + } + + pool_glb->config.pkt_base_align = align; + ODP_PRINT(" %s: %u\n", str, align); + + str = "pool.buf.min_align"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + align = val; + if (val == 0) + align = ODP_CACHE_LINE_SIZE; + + if (!CHECK_IS_POWER2(align)) { + ODP_ERR("Not a power of two: %s = %i\n", str, val); + return -1; + } + + pool_glb->config.buf_min_align = align; + ODP_PRINT(" %s: %u\n", str, align); + ODP_PRINT("\n"); return 0; diff --git a/platform/linux-generic/test/inline-timer.conf b/platform/linux-generic/test/inline-timer.conf index 362ecd55..45b456e8 100644 --- a/platform/linux-generic/test/inline-timer.conf +++ b/platform/linux-generic/test/inline-timer.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.10" +config_file_version = "0.1.11" timer: { # Enable inline timer implementation diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index 6fb08aea..fd766e62 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.10" +config_file_version = "0.1.11" # Shared memory options shm: { commit ab5574db4e04e097170dff2d30a77281ebc85278 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 15 14:40:42 2019 +0200 linux-gen: pool: rename pool global variable Renamed global variable for better code readability. Use _odp prefix as the name is visible to application when APIs are inlined. 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_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 42a2cf16..37b10aa1 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -89,7 +89,7 @@ typedef struct pool_t { } pool_t; -typedef struct pool_table_t { +typedef struct pool_global_t { pool_t pool[ODP_CONFIG_POOLS]; odp_shm_t shm; @@ -99,18 +99,18 @@ typedef struct pool_table_t { uint32_t burst_size; } config; -} pool_table_t; +} pool_global_t; -extern pool_table_t *pool_tbl; +extern pool_global_t *_odp_pool_glb; static inline pool_t *pool_entry(uint32_t pool_idx) { - return &pool_tbl->pool[pool_idx]; + return &_odp_pool_glb->pool[pool_idx]; } static inline pool_t *pool_entry_from_hdl(odp_pool_t pool_hdl) { - return &pool_tbl->pool[_odp_typeval(pool_hdl) - 1]; + return &_odp_pool_glb->pool[_odp_typeval(pool_hdl) - 1]; } static inline odp_buffer_hdr_t *buf_hdl_to_hdr(odp_buffer_t buf) diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 95dcb688..0937c8b3 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -60,7 +60,7 @@ typedef struct pool_local_t { int thr_id; } pool_local_t; -pool_table_t *pool_tbl; +pool_global_t *_odp_pool_glb; static __thread pool_local_t local; #include <odp/visibility_begin.h> @@ -89,8 +89,8 @@ static inline void cache_init(pool_cache_t *cache) { memset(cache, 0, sizeof(pool_cache_t)); - cache->size = pool_tbl->config.local_cache_size; - cache->burst_size = pool_tbl->config.burst_size; + cache->size = _odp_pool_glb->config.local_cache_size; + cache->burst_size = _odp_pool_glb->config.burst_size; } static inline uint32_t cache_pop(pool_cache_t *cache, @@ -140,8 +140,9 @@ static void cache_flush(pool_cache_t *cache, pool_t *pool) ring_ptr_enq(ring, mask, buf_hdr); } -static int read_config_file(pool_table_t *pool_tbl) +static int read_config_file(pool_global_t *pool_glb) { + uint32_t local_cache_size, burst_size; const char *str; int val = 0; @@ -159,7 +160,8 @@ static int read_config_file(pool_table_t *pool_tbl) return -1; } - pool_tbl->config.local_cache_size = val; + local_cache_size = val; + pool_glb->config.local_cache_size = local_cache_size; ODP_PRINT(" %s: %i\n", str, val); str = "pool.burst_size"; @@ -173,18 +175,17 @@ static int read_config_file(pool_table_t *pool_tbl) return -1; } - pool_tbl->config.burst_size = val; + burst_size = val; + pool_glb->config.burst_size = burst_size; ODP_PRINT(" %s: %i\n", str, val); /* Check local cache size and burst size relation */ - if (pool_tbl->config.local_cache_size % pool_tbl->config.burst_size) { + if (local_cache_size % burst_size) { ODP_ERR("Pool cache size not multiple of burst size\n"); return -1; } - if (pool_tbl->config.local_cache_size && - (pool_tbl->config.local_cache_size / - pool_tbl->config.burst_size < 2)) { + if (local_cache_size && (local_cache_size / burst_size < 2)) { ODP_ERR("Cache burst size too large compared to cache size\n"); return -1; } @@ -200,7 +201,7 @@ static int read_config_file(pool_table_t *pool_tbl) return -1; } - pool_tbl->config.pkt_max_num = val; + pool_glb->config.pkt_max_num = val; ODP_PRINT(" %s: %i\n", str, val); ODP_PRINT("\n"); @@ -214,19 +215,19 @@ int _odp_pool_init_global(void) odp_shm_t shm; shm = odp_shm_reserve("_odp_pool_table", - sizeof(pool_table_t), + sizeof(pool_global_t), ODP_CACHE_LINE_SIZE, 0); - pool_tbl = odp_shm_addr(shm); + _odp_pool_glb = odp_shm_addr(shm); - if (pool_tbl == NULL) + if (_odp_pool_glb == NULL) return -1; - memset(pool_tbl, 0, sizeof(pool_table_t)); - pool_tbl->shm = shm; + memset(_odp_pool_glb, 0, sizeof(pool_global_t)); + _odp_pool_glb->shm = shm; - if (read_config_file(pool_tbl)) { + if (read_config_file(_odp_pool_glb)) { odp_shm_free(shm); return -1; } @@ -264,7 +265,7 @@ int _odp_pool_term_global(void) UNLOCK(&pool->lock); } - ret = odp_shm_free(pool_tbl->shm); + ret = odp_shm_free(_odp_pool_glb->shm); if (ret < 0) { ODP_ERR("SHM free failed\n"); rc = -1; @@ -678,7 +679,7 @@ static int check_params(odp_pool_param_t *params) { odp_pool_capability_t capa; odp_bool_t cache_warning = false; - uint32_t cache_size = pool_tbl->config.local_cache_size; + uint32_t cache_size = _odp_pool_glb->config.local_cache_size; int num_threads = odp_global_ro.init_param.num_control + odp_global_ro.init_param.num_worker; @@ -686,7 +687,7 @@ static int check_params(odp_pool_param_t *params) return -1; if (num_threads) - cache_size = num_threads * pool_tbl->config.local_cache_size; + cache_size = num_threads * cache_size; switch (params->type) { case ODP_POOL_BUFFER: @@ -1064,7 +1065,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) /* Packet pools */ capa->pkt.max_pools = max_pools; capa->pkt.max_len = CONFIG_PACKET_MAX_LEN; - capa->pkt.max_num = pool_tbl->config.pkt_max_num; + capa->pkt.max_num = _odp_pool_glb->config.pkt_max_num; capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.max_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 23 ++++- .../linux-generic/include/odp_packet_internal.h | 8 ++ .../linux-generic/include/odp_packet_io_internal.h | 12 ++- platform/linux-generic/include/odp_pool_internal.h | 12 ++- platform/linux-generic/odp_packet.c | 8 -- platform/linux-generic/odp_packet_io.c | 81 +++++++++++----- platform/linux-generic/odp_pool.c | 105 ++++++++++++++------- platform/linux-generic/pktio/dpdk.c | 17 +++- platform/linux-generic/pktio/netmap.c | 14 +-- platform/linux-generic/pktio/pcap.c | 8 +- platform/linux-generic/pktio/socket.c | 6 +- platform/linux-generic/pktio/socket_mmap.c | 6 +- platform/linux-generic/pktio/tap.c | 12 ++- platform/linux-generic/test/inline-timer.conf | 2 +- platform/linux-generic/test/process-mode.conf | 2 +- 15 files changed, 227 insertions(+), 89 deletions(-) hooks/post-receive -- [View Less]

5 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp