git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[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 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 --

6 years, 2 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 ----------------------------------------------------------------- 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 --

6 years, 2 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 (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 --

6 years, 2 months

[COMMIT] branch master updated. v1.21.0.0-356-g807aa18bc

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 807aa18bcd266a7e7f66e2293db7ee2fe4923a2d (commit) via 878ca435ac623687b4506e0ec3c6391566a31e3f (commit) via 4063f3df1a50ef2d41270eef7a1426f0fb451b8b (commit) via ad57370a0cb158aa87acb85e5004a42d73a82f06 (commit) via 44431af475b89d16b81dfcb92db27b03b7475b74 (commit) via f55749bb0598ba9447a9ed312782821c057ef3a4 (commit) via 76cf03d62e77c6eea7e67f66cde729e8f64a618f (commit) via df93cd4cdf73df1bc9d63161bab18db611041a5c (commit) via 4898f2ff2054c2365588baef44f64e4c67003a57 (commit) from 88deaa9611c7d16d8438b8b8c7732d74889fc4af (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 807aa18bcd266a7e7f66e2293db7ee2fe4923a2d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 15 10:39:46 2019 +0200 validation: packet: add max pools test Test that maximum number of packet pools can be created. Suite init has created already one, so this test creates "max_pools - 1" pools more. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 47e20c049..90226819c 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -2554,6 +2554,70 @@ static void packet_test_ref(void) odp_packet_free(ref_pkt[1]); } +static void packet_test_max_pools(void) +{ + odp_pool_param_t param; + uint32_t i, num_pool, num_pkt; + void *addr; + odp_event_t ev; + uint32_t len = 500; + /* Suite init has created one pool already */ + uint32_t max_pools = pool_capa.pkt.max_pools - 1; + odp_pool_t pool[max_pools]; + odp_packet_t packet[max_pools]; + + CU_ASSERT_FATAL(max_pools != 0); + + printf("\n Creating %u pools\n", max_pools); + + odp_pool_param_init(&param); + param.type = ODP_POOL_PACKET; + param.pkt.len = len; + param.pkt.num = 1; + param.pkt.max_num = 1; + + for (i = 0; i < max_pools; i++) { + pool[i] = odp_pool_create(NULL, &param); + + if (pool[i] == ODP_POOL_INVALID) + break; + } + + num_pool = i; + + CU_ASSERT(num_pool == max_pools); + if (num_pool != max_pools) + printf("Error: created only %u pools\n", num_pool); + + for (i = 0; i < num_pool; i++) { + packet[i] = odp_packet_alloc(pool[i], len); + + if (packet[i] == ODP_PACKET_INVALID) + break; + + CU_ASSERT_FATAL(odp_packet_pool(packet[i]) == pool[i]); + + ev = odp_packet_to_event(packet[i]); + CU_ASSERT(odp_packet_from_event(ev) == packet[i]); + CU_ASSERT(odp_event_type(ev) == ODP_EVENT_PACKET); + + CU_ASSERT(odp_packet_len(packet[i]) == len); + addr = odp_packet_data(packet[i]); + + /* Write packet data */ + memset(addr, 0, len); + } + + num_pkt = i; + CU_ASSERT(num_pkt == num_pool); + + if (num_pkt) + odp_packet_free_multi(packet, num_pkt); + + for (i = 0; i < num_pool; i++) + CU_ASSERT(odp_pool_destroy(pool[i]) == 0); +} + static int packet_parse_suite_init(void) { int num_test_pkt, i; @@ -3493,6 +3557,7 @@ odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_align), ODP_TEST_INFO(packet_test_offset), ODP_TEST_INFO(packet_test_ref), + ODP_TEST_INFO(packet_test_max_pools), ODP_TEST_INFO_NULL, }; commit 878ca435ac623687b4506e0ec3c6391566a31e3f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 14 15:46:55 2019 +0200 validation: packet: use common pool capability Read pool capability in suite init and use it on all tests. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 777ea0dc7..47e20c049 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -12,7 +12,7 @@ #include <test_packet_parser.h> /* Reserve some tailroom for tests */ -#define PACKET_TAILROOM_RESERVE 4 +#define TAILROOM_RESERVE 4 /* Number of packets in the test packet pool */ #define PACKET_POOL_NUM 300 /* Number of large, possibly segmented, test packets */ @@ -24,6 +24,7 @@ ODP_STATIC_ASSERT(PACKET_POOL_NUM_SEG > 1 && /* Number of packets in parse test */ #define PARSE_TEST_NUM_PKT 10 +static odp_pool_capability_t pool_capa; static odp_pool_param_t default_param; static odp_pool_t default_pool; static uint32_t packet_len; @@ -148,7 +149,6 @@ static int fill_data_backward(odp_packet_t pkt, uint32_t offset, uint32_t len, static int packet_suite_init(void) { odp_pool_param_t params; - odp_pool_capability_t capa; odp_packet_t pkt_tbl[PACKET_POOL_NUM_SEG]; struct udata_struct *udat; uint32_t udat_size; @@ -157,34 +157,36 @@ static int packet_suite_init(void) uint32_t num = PACKET_POOL_NUM; int ret; - if (odp_pool_capability(&capa) < 0) { + memset(&pool_capa, 0, sizeof(odp_pool_capability_t)); + + if (odp_pool_capability(&pool_capa) < 0) { printf("pool_capability failed\n"); return -1; } - if (capa.pkt.max_segs_per_pkt == 0) - capa.pkt.max_segs_per_pkt = 10; + if (pool_capa.pkt.max_segs_per_pkt == 0) + pool_capa.pkt.max_segs_per_pkt = 10; /* Pick a typical packet size and decrement it to the single segment * limit if needed (min_seg_len maybe equal to max_len * on some systems). */ packet_len = 512; - while (packet_len > (capa.pkt.min_seg_len - PACKET_TAILROOM_RESERVE)) + while (packet_len > (pool_capa.pkt.min_seg_len - TAILROOM_RESERVE)) packet_len--; - if (capa.pkt.max_len) { - segmented_packet_len = capa.pkt.max_len; + if (pool_capa.pkt.max_len) { + segmented_packet_len = pool_capa.pkt.max_len; } else { - segmented_packet_len = capa.pkt.min_seg_len * - capa.pkt.max_segs_per_pkt; + segmented_packet_len = pool_capa.pkt.min_seg_len * + pool_capa.pkt.max_segs_per_pkt; } - if (capa.pkt.max_num != 0 && capa.pkt.max_num < num) - num = capa.pkt.max_num; + if (pool_capa.pkt.max_num != 0 && pool_capa.pkt.max_num < num) + num = pool_capa.pkt.max_num; odp_pool_param_init(&params); params.type = ODP_POOL_PACKET; - params.pkt.seg_len = capa.pkt.min_seg_len; - params.pkt.len = capa.pkt.min_seg_len; + params.pkt.seg_len = pool_capa.pkt.min_seg_len; + params.pkt.len = pool_capa.pkt.min_seg_len; params.pkt.num = num; params.pkt.uarea_size = sizeof(struct udata_struct); @@ -216,11 +218,11 @@ static int packet_suite_init(void) if (ret != PACKET_POOL_NUM_SEG) { if (ret > 0) odp_packet_free_multi(pkt_tbl, ret); - segmented_packet_len -= capa.pkt.min_seg_len; + segmented_packet_len -= pool_capa.pkt.min_seg_len; continue; } } while (ret != PACKET_POOL_NUM_SEG && - segmented_packet_len > capa.pkt.min_seg_len); + segmented_packet_len > pool_capa.pkt.min_seg_len); if (ret != PACKET_POOL_NUM_SEG) { printf("packet alloc failed\n"); @@ -281,16 +283,13 @@ static void packet_test_alloc_free(void) odp_pool_t pool; odp_packet_t packet; odp_pool_param_t params; - odp_pool_capability_t capa; odp_event_subtype_t subtype; - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - odp_pool_param_init(&params); params.type = ODP_POOL_PACKET; - params.pkt.seg_len = capa.pkt.min_seg_len; - params.pkt.len = capa.pkt.min_seg_len; + params.pkt.seg_len = pool_capa.pkt.min_seg_len; + params.pkt.len = pool_capa.pkt.min_seg_len; params.pkt.num = 1; pool = odp_pool_create("packet_pool_alloc", &params); @@ -355,15 +354,12 @@ static void packet_test_alloc_free_multi(void) odp_packet_t packet[2 * num_pkt + 1]; odp_packet_t inval_pkt[num_pkt]; odp_pool_param_t params; - odp_pool_capability_t capa; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); odp_pool_param_init(&params); params.type = ODP_POOL_PACKET; - params.pkt.seg_len = capa.pkt.min_seg_len; - params.pkt.len = capa.pkt.min_seg_len; + params.pkt.seg_len = pool_capa.pkt.min_seg_len; + params.pkt.len = pool_capa.pkt.min_seg_len; params.pkt.num = num_pkt; pool[0] = odp_pool_create("packet_pool_alloc_multi_0", &params); @@ -432,13 +428,10 @@ static void packet_test_free_sp(void) int i, ret; odp_packet_t packet[num_pkt]; odp_pool_param_t params; - odp_pool_capability_t capa; uint32_t len = packet_len; - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len < len) - len = capa.pkt.max_len; + if (pool_capa.pkt.max_len < len) + len = pool_capa.pkt.max_len; odp_pool_param_init(&params); @@ -477,26 +470,25 @@ static void packet_test_alloc_segmented(void) uint32_t max_len; odp_pool_t pool; odp_pool_param_t params; - odp_pool_capability_t capa; int ret, i, num_alloc; - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - if (capa.pkt.max_segs_per_pkt == 0) - capa.pkt.max_segs_per_pkt = 10; + if (pool_capa.pkt.max_segs_per_pkt == 0) + pool_capa.pkt.max_segs_per_pkt = 10; - if (capa.pkt.max_len) - max_len = capa.pkt.max_len; + if (pool_capa.pkt.max_len) + max_len = pool_capa.pkt.max_len; else - max_len = capa.pkt.min_seg_len * capa.pkt.max_segs_per_pkt; + max_len = pool_capa.pkt.min_seg_len * + pool_capa.pkt.max_segs_per_pkt; odp_pool_param_init(&params); params.type = ODP_POOL_PACKET; - params.pkt.seg_len = capa.pkt.min_seg_len; + params.pkt.seg_len = pool_capa.pkt.min_seg_len; params.pkt.len = max_len; /* Ensure that 'num' segmented packets can be allocated */ - params.pkt.num = num * capa.pkt.max_segs_per_pkt; + params.pkt.num = num * pool_capa.pkt.max_segs_per_pkt; pool = odp_pool_create("pool_alloc_segmented", &params); CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); @@ -629,9 +621,6 @@ static void packet_test_length(void) odp_packet_t pkt = test_packet; uint32_t buf_len, headroom, tailroom, seg_len; void *data; - odp_pool_capability_t capa; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); buf_len = odp_packet_buf_len(pkt); headroom = odp_packet_headroom(pkt); @@ -643,8 +632,8 @@ static void packet_test_length(void) CU_ASSERT(odp_packet_seg_len(pkt) <= packet_len); CU_ASSERT(odp_packet_data_seg_len(pkt, &seg_len) == data); CU_ASSERT(seg_len == odp_packet_seg_len(pkt)); - CU_ASSERT(headroom >= capa.pkt.min_headroom); - CU_ASSERT(tailroom >= capa.pkt.min_tailroom); + CU_ASSERT(headroom >= pool_capa.pkt.min_headroom); + CU_ASSERT(tailroom >= pool_capa.pkt.min_tailroom); CU_ASSERT(buf_len >= packet_len + headroom + tailroom); } @@ -874,14 +863,11 @@ static void packet_test_headroom(void) uint32_t room; uint32_t seg_data_len; uint32_t push_val, pull_val; - odp_pool_capability_t capa; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); room = odp_packet_headroom(pkt); - CU_ASSERT(room >= capa.pkt.min_headroom); + CU_ASSERT(room >= pool_capa.pkt.min_headroom); seg_data_len = odp_packet_seg_len(pkt); CU_ASSERT(seg_data_len >= 1); @@ -995,16 +981,13 @@ static void packet_test_tailroom(void) uint32_t room; uint32_t seg_data_len; uint32_t push_val, pull_val; - odp_pool_capability_t capa; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); segment = odp_packet_last_seg(pkt); CU_ASSERT(segment != ODP_PACKET_SEG_INVALID); room = odp_packet_tailroom(pkt); - CU_ASSERT(room >= capa.pkt.min_tailroom); + CU_ASSERT(room >= pool_capa.pkt.min_tailroom); seg_data_len = odp_packet_seg_data_len(pkt, segment); CU_ASSERT(seg_data_len >= 1); @@ -1197,12 +1180,9 @@ static void packet_test_add_rem_data(void) void *usr_ptr; struct udata_struct *udat, *new_udat; int ret; - odp_pool_capability_t capa; uint32_t min_seg_len; - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - min_seg_len = capa.pkt.min_seg_len; + min_seg_len = pool_capa.pkt.min_seg_len; pkt = odp_packet_alloc(default_pool, packet_len); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); @@ -1609,7 +1589,6 @@ static void packet_test_concatsplit(void) static void packet_test_concat_small(void) { - odp_pool_capability_t capa; odp_pool_t pool; odp_pool_param_t param; odp_packet_t pkt, pkt2; @@ -1619,10 +1598,8 @@ static void packet_test_concat_small(void) uint32_t len = PACKET_POOL_NUM / 4; uint8_t buf[len]; - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; + if (pool_capa.pkt.max_len && pool_capa.pkt.max_len < len) + len = pool_capa.pkt.max_len; odp_pool_param_init(&param); @@ -1672,7 +1649,6 @@ static void packet_test_concat_small(void) static void packet_test_concat_extend_trunc(void) { - odp_pool_capability_t capa; odp_pool_t pool; odp_pool_param_t param; odp_packet_t pkt, pkt2; @@ -1680,10 +1656,8 @@ static void packet_test_concat_extend_trunc(void) uint32_t alloc_len, ext_len, trunc_len, cur_len; uint32_t len = 1900; - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; + if (pool_capa.pkt.max_len && pool_capa.pkt.max_len < len) + len = pool_capa.pkt.max_len; alloc_len = len / 8; ext_len = len / 4; @@ -1760,7 +1734,6 @@ static void packet_test_concat_extend_trunc(void) static void packet_test_extend_small(void) { - odp_pool_capability_t capa; odp_pool_t pool; odp_pool_param_t param; odp_packet_t pkt; @@ -1771,10 +1744,8 @@ static void packet_test_extend_small(void) uint32_t len = 32000; uint8_t buf[len]; - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; + if (pool_capa.pkt.max_len && pool_capa.pkt.max_len < len) + len = pool_capa.pkt.max_len; odp_pool_param_init(&param); @@ -1852,7 +1823,6 @@ static void packet_test_extend_small(void) static void packet_test_extend_large(void) { - odp_pool_capability_t capa; odp_pool_t pool; odp_pool_param_t param; odp_packet_t pkt; @@ -1865,10 +1835,8 @@ static void packet_test_extend_large(void) uint32_t len = 32000; uint8_t buf[len]; - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; + if (pool_capa.pkt.max_len && pool_capa.pkt.max_len < len) + len = pool_capa.pkt.max_len; odp_pool_param_init(&param); @@ -1972,7 +1940,6 @@ static void packet_test_extend_large(void) static void packet_test_extend_mix(void) { - odp_pool_capability_t capa; odp_pool_t pool; odp_pool_param_t param; odp_packet_t pkt; @@ -1984,10 +1951,8 @@ static void packet_test_extend_mix(void) uint32_t len = 32000; uint8_t buf[len]; - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; + if (pool_capa.pkt.max_len && pool_capa.pkt.max_len < len) + len = pool_capa.pkt.max_len; odp_pool_param_init(&param); @@ -2088,9 +2053,6 @@ static void packet_test_extend_ref(void) { odp_packet_t max_pkt, ref; uint32_t hr, tr, max_len; - odp_pool_capability_t capa; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); max_pkt = odp_packet_copy(segmented_test_packet, odp_packet_pool(segmented_test_packet)); @@ -2104,7 +2066,7 @@ static void packet_test_extend_ref(void) odp_packet_push_tail(max_pkt, tr); /* Max packet should not be extendable at either end */ - if (max_len == capa.pkt.max_len) { + if (max_len == pool_capa.pkt.max_len) { CU_ASSERT(odp_packet_extend_tail(&max_pkt, 1, NULL, NULL) < 0); CU_ASSERT(odp_packet_extend_head(&max_pkt, 1, NULL, NULL) < 0); } @@ -2598,6 +2560,13 @@ static int packet_parse_suite_init(void) uint32_t max_len; odp_pool_param_t param; + memset(&pool_capa, 0, sizeof(odp_pool_capability_t)); + + if (odp_pool_capability(&pool_capa) < 0) { + printf("pool_capability failed\n"); + return -1; + } + num_test_pkt = sizeof(parse_test_pkt_len) / sizeof(uint32_t); max_len = 0; commit 4063f3df1a50ef2d41270eef7a1426f0fb451b8b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 14 15:26:18 2019 +0200 validation: packet: remove reset test packet from suite init This packet is only used in packet reset test case. Moved packet alloc and free inside the test case. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index d9fbc867d..777ea0dc7 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -31,7 +31,7 @@ static uint32_t packet_len; static uint32_t segmented_packet_len; static odp_bool_t segmentation_supported = true; -odp_packet_t test_packet, segmented_test_packet, test_reset_packet; +odp_packet_t test_packet, segmented_test_packet; static struct udata_struct { uint64_t u64; @@ -208,13 +208,6 @@ static int packet_suite_init(void) data++; } - test_reset_packet = odp_packet_alloc(default_pool, packet_len); - - if (test_reset_packet == ODP_PACKET_INVALID) { - printf("test_reset_packet alloc failed\n"); - return -1; - } - /* Try to allocate PACKET_POOL_NUM_SEG largest possible packets to see * if segmentation is supported */ do { @@ -275,7 +268,6 @@ static int packet_suite_init(void) static int packet_suite_term(void) { odp_packet_free(test_packet); - odp_packet_free(test_reset_packet); odp_packet_free(segmented_test_packet); if (odp_pool_destroy(default_pool) != 0) @@ -662,11 +654,15 @@ static void packet_test_reset(void) uint32_t len, headroom; uintptr_t ptr_len; void *data, *new_data, *tail, *new_tail; - odp_packet_t pkt = test_reset_packet; + odp_packet_t pkt; + + pkt = odp_packet_alloc(default_pool, packet_len); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); len = odp_packet_len(pkt); + CU_ASSERT(len == packet_len); + headroom = odp_packet_headroom(pkt); - CU_ASSERT(len > 1); if (headroom) { data = odp_packet_data(pkt); @@ -719,6 +715,8 @@ static void packet_test_reset(void) len = len - len / 2; CU_ASSERT(odp_packet_reset(pkt, len) == 0); CU_ASSERT(odp_packet_len(pkt) == len); + + odp_packet_free(pkt); } static void packet_test_prefetch(void) commit ad57370a0cb158aa87acb85e5004a42d73a82f06 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 14 15:12:59 2019 +0200 validation: packet: rename default pool Rename the default (global) packet pool. This improves code readability. Also, couple of buggy pool handle checks were corrected (checked global pool handle vs newly created local one). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 8a42d9e08..d9fbc867d 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -25,7 +25,7 @@ ODP_STATIC_ASSERT(PACKET_POOL_NUM_SEG > 1 && #define PARSE_TEST_NUM_PKT 10 static odp_pool_param_t default_param; -static odp_pool_t packet_pool; +static odp_pool_t default_pool; static uint32_t packet_len; static uint32_t segmented_packet_len; @@ -190,13 +190,13 @@ static int packet_suite_init(void) memcpy(&default_param, &params, sizeof(odp_pool_param_t)); - packet_pool = odp_pool_create("packet_pool", &params); - if (packet_pool == ODP_POOL_INVALID) { - printf("pool_create failed: 1\n"); + default_pool = odp_pool_create("default_pool", &params); + if (default_pool == ODP_POOL_INVALID) { + printf("default pool create failed\n"); return -1; } - test_packet = odp_packet_alloc(packet_pool, packet_len); + test_packet = odp_packet_alloc(default_pool, packet_len); if (test_packet == ODP_PACKET_INVALID) { printf("test_packet alloc failed\n"); @@ -208,7 +208,7 @@ static int packet_suite_init(void) data++; } - test_reset_packet = odp_packet_alloc(packet_pool, packet_len); + test_reset_packet = odp_packet_alloc(default_pool, packet_len); if (test_reset_packet == ODP_PACKET_INVALID) { printf("test_reset_packet alloc failed\n"); @@ -218,7 +218,7 @@ static int packet_suite_init(void) /* Try to allocate PACKET_POOL_NUM_SEG largest possible packets to see * if segmentation is supported */ do { - ret = odp_packet_alloc_multi(packet_pool, segmented_packet_len, + ret = odp_packet_alloc_multi(default_pool, segmented_packet_len, pkt_tbl, PACKET_POOL_NUM_SEG); if (ret != PACKET_POOL_NUM_SEG) { if (ret > 0) @@ -257,7 +257,7 @@ static int packet_suite_init(void) return -1; } - odp_pool_print(packet_pool); + odp_pool_print(default_pool); memcpy(udat, &test_packet_udata, sizeof(struct udata_struct)); udat = odp_packet_user_area(segmented_test_packet); @@ -278,7 +278,7 @@ static int packet_suite_term(void) odp_packet_free(test_reset_packet); odp_packet_free(segmented_test_packet); - if (odp_pool_destroy(packet_pool) != 0) + if (odp_pool_destroy(default_pool) != 0) return -1; return 0; @@ -1206,7 +1206,7 @@ static void packet_test_add_rem_data(void) min_seg_len = capa.pkt.min_seg_len; - pkt = odp_packet_alloc(packet_pool, packet_len); + pkt = odp_packet_alloc(default_pool, packet_len); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); pkt_len = odp_packet_len(pkt); @@ -1633,7 +1633,7 @@ static void packet_test_concat_small(void) param.pkt.num = PACKET_POOL_NUM; pool = odp_pool_create("packet_pool_concat", &param); - CU_ASSERT(packet_pool != ODP_POOL_INVALID); + CU_ASSERT(pool != ODP_POOL_INVALID); pkt = odp_packet_alloc(pool, 1); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); @@ -1698,7 +1698,7 @@ static void packet_test_concat_extend_trunc(void) param.pkt.num = PACKET_POOL_NUM; pool = odp_pool_create("packet_pool_concat", &param); - CU_ASSERT_FATAL(packet_pool != ODP_POOL_INVALID); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); pkt = odp_packet_alloc(pool, alloc_len); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); @@ -1785,7 +1785,7 @@ static void packet_test_extend_small(void) param.pkt.num = PACKET_POOL_NUM; pool = odp_pool_create("packet_pool_extend", &param); - CU_ASSERT_FATAL(packet_pool != ODP_POOL_INVALID); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); for (round = 0; round < 2; round++) { pkt = odp_packet_alloc(pool, 1); @@ -1879,7 +1879,7 @@ static void packet_test_extend_large(void) param.pkt.num = PACKET_POOL_NUM; pool = odp_pool_create("packet_pool_extend", &param); - CU_ASSERT_FATAL(packet_pool != ODP_POOL_INVALID); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); for (round = 0; round < 2 * num_div; round++) { ext_len = len / div; @@ -1998,7 +1998,7 @@ static void packet_test_extend_mix(void) param.pkt.num = PACKET_POOL_NUM; pool = odp_pool_create("packet_pool_extend", &param); - CU_ASSERT_FATAL(packet_pool != ODP_POOL_INVALID); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); for (round = 0; round < 2; round++) { small_count = 30; commit 44431af475b89d16b81dfcb92db27b03b7475b74 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 14 15:03:48 2019 +0200 validation: packet: remove pools from suite init Moved two pool creates from suite init into the test case that uses those. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index b3001693c..8a42d9e08 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -24,7 +24,8 @@ ODP_STATIC_ASSERT(PACKET_POOL_NUM_SEG > 1 && /* Number of packets in parse test */ #define PARSE_TEST_NUM_PKT 10 -static odp_pool_t packet_pool, packet_pool_no_uarea, packet_pool_double_uarea; +static odp_pool_param_t default_param; +static odp_pool_t packet_pool; static uint32_t packet_len; static uint32_t segmented_packet_len; @@ -187,32 +188,14 @@ static int packet_suite_init(void) params.pkt.num = num; params.pkt.uarea_size = sizeof(struct udata_struct); + memcpy(&default_param, &params, sizeof(odp_pool_param_t)); + packet_pool = odp_pool_create("packet_pool", &params); if (packet_pool == ODP_POOL_INVALID) { printf("pool_create failed: 1\n"); return -1; } - params.pkt.uarea_size = 0; - packet_pool_no_uarea = odp_pool_create("packet_pool_no_uarea", - &params); - if (packet_pool_no_uarea == ODP_POOL_INVALID) { - odp_pool_destroy(packet_pool); - printf("pool_create failed: 2\n"); - return -1; - } - - params.pkt.uarea_size = 2 * sizeof(struct udata_struct); - packet_pool_double_uarea = odp_pool_create("packet_pool_double_uarea", - &params); - - if (packet_pool_double_uarea == ODP_POOL_INVALID) { - odp_pool_destroy(packet_pool_no_uarea); - odp_pool_destroy(packet_pool); - printf("pool_create failed: 3\n"); - return -1; - } - test_packet = odp_packet_alloc(packet_pool, packet_len); if (test_packet == ODP_PACKET_INVALID) { @@ -295,9 +278,7 @@ static int packet_suite_term(void) odp_packet_free(test_reset_packet); odp_packet_free(segmented_test_packet); - if (odp_pool_destroy(packet_pool_double_uarea) != 0 || - odp_pool_destroy(packet_pool_no_uarea) != 0 || - odp_pool_destroy(packet_pool) != 0) + if (odp_pool_destroy(packet_pool) != 0) return -1; return 0; @@ -1383,12 +1364,23 @@ static void packet_test_copy(void) { odp_packet_t pkt; odp_packet_t pkt_copy, pkt_part; - odp_pool_t pool; + odp_pool_param_t param; + odp_pool_t pool, pool_double_uarea, pool_no_uarea; uint32_t i, plen, src_offset, dst_offset; uint32_t seg_len = 0; void *pkt_data; - pkt = odp_packet_copy(test_packet, packet_pool_no_uarea); + memcpy(&param, &default_param, sizeof(odp_pool_param_t)); + + param.pkt.uarea_size = 0; + pool_no_uarea = odp_pool_create("no_uarea", &param); + CU_ASSERT_FATAL(pool_no_uarea != ODP_POOL_INVALID); + + param.pkt.uarea_size = 2 * sizeof(struct udata_struct); + pool_double_uarea = odp_pool_create("double_uarea", &param); + CU_ASSERT_FATAL(pool_double_uarea != ODP_POOL_INVALID); + + pkt = odp_packet_copy(test_packet, pool_no_uarea); CU_ASSERT(pkt == ODP_PACKET_INVALID); if (pkt != ODP_PACKET_INVALID) odp_packet_free(pkt); @@ -1413,7 +1405,7 @@ static void packet_test_copy(void) odp_packet_free(pkt_copy); odp_packet_free(pkt); - pkt = odp_packet_copy(test_packet, packet_pool_double_uarea); + pkt = odp_packet_copy(test_packet, pool_double_uarea); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); packet_compare_data(pkt, test_packet); pool = odp_packet_pool(pkt); @@ -1480,6 +1472,9 @@ static void packet_test_copy(void) odp_packet_free(pkt_part); odp_packet_free(pkt); + + CU_ASSERT(odp_pool_destroy(pool_no_uarea) == 0); + CU_ASSERT(odp_pool_destroy(pool_double_uarea) == 0); } static void packet_test_copydata(void) commit f55749bb0598ba9447a9ed312782821c057ef3a4 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 14 13:59:35 2019 +0200 validation: buffer: rewrite buffer tests Improved buffer test coverage by checking more APIs, and creating max num pools and more events per pool. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c index 2d665279a..54a834dd2 100644 --- a/test/validation/api/buffer/buffer.c +++ b/test/validation/api/buffer/buffer.c @@ -1,4 +1,5 @@ /* Copyright (c) 2014-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -9,68 +10,79 @@ #define BUF_ALIGN ODP_CACHE_LINE_SIZE #define BUF_SIZE 1500 +#define BUF_NUM 100 +#define BURST 8 -static odp_pool_t raw_pool; -static odp_buffer_t raw_buffer = ODP_BUFFER_INVALID; +static odp_pool_capability_t pool_capa; +static odp_pool_param_t default_param; static int buffer_suite_init(void) { - odp_pool_param_t params; + uint32_t size, num, align; - odp_pool_param_init(&params); - params.type = ODP_POOL_BUFFER; - params.buf.size = BUF_SIZE; - params.buf.align = BUF_ALIGN; - params.buf.num = 100; - - raw_pool = odp_pool_create("raw_pool", &params); - if (raw_pool == ODP_POOL_INVALID) - return -1; - raw_buffer = odp_buffer_alloc(raw_pool); - if (raw_buffer == ODP_BUFFER_INVALID) + if (odp_pool_capability(&pool_capa)) { + printf("pool capability failed\n"); return -1; - return 0; -} + } + + size = BUF_SIZE; + if (pool_capa.buf.max_size && size > pool_capa.buf.max_size) + size = pool_capa.buf.max_size; + + num = BUF_NUM; + if (pool_capa.buf.max_num && num > pool_capa.buf.max_num) + num = pool_capa.buf.max_num; + + align = BUF_ALIGN; + if (align > pool_capa.buf.max_align) + align = pool_capa.buf.max_align; + + odp_pool_param_init(&default_param); + default_param.type = ODP_POOL_BUFFER; + default_param.buf.size = size; + default_param.buf.num = num; + default_param.buf.align = align; + + printf("Default buffer pool\n"); + printf(" size %u\n", size); + printf(" num %u\n", num); + printf(" align %u\n\n", align); -static int buffer_suite_term(void) -{ - odp_buffer_free(raw_buffer); - if (odp_pool_destroy(raw_pool) != 0) - return -1; return 0; } -static void buffer_test_pool_alloc(void) +static void buffer_test_pool_alloc_free(void) { odp_pool_t pool; - const int num = 3; - odp_buffer_t buffer[num]; odp_event_t ev; - int index; + uint32_t i; + void *addr; + odp_event_subtype_t subtype; + uint32_t num = default_param.buf.num; + uint32_t size = default_param.buf.size; + uint32_t align = default_param.buf.align; + odp_buffer_t buffer[num]; odp_bool_t wrong_type = false, wrong_subtype = false; odp_bool_t wrong_size = false, wrong_align = false; - odp_pool_param_t params; - odp_pool_param_init(&params); - params.type = ODP_POOL_BUFFER; - params.buf.size = BUF_SIZE; - params.buf.align = BUF_ALIGN; - params.buf.num = num; + pool = odp_pool_create("default pool", &default_param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); - pool = odp_pool_create("buffer_pool_alloc", &params); odp_pool_print(pool); - /* Try to allocate num items from the pool */ - for (index = 0; index < num; index++) { - uintptr_t addr; - odp_event_subtype_t subtype; - - buffer[index] = odp_buffer_alloc(pool); + for (i = 0; i < num; i++) { + buffer[i] = odp_buffer_alloc(pool); - if (buffer[index] == ODP_BUFFER_INVALID) + if (buffer[i] == ODP_BUFFER_INVALID) break; - ev = odp_buffer_to_event(buffer[index]); + CU_ASSERT(odp_buffer_is_valid(buffer[i]) == 1) + + CU_ASSERT(odp_buffer_pool(buffer[i]) == pool); + + ev = odp_buffer_to_event(buffer[i]); + CU_ASSERT(odp_buffer_from_event(ev) == buffer[i]); + if (odp_event_type(ev) != ODP_EVENT_BUFFER) wrong_type = true; if (odp_event_subtype(ev) != ODP_EVENT_NO_SUBTYPE) @@ -79,82 +91,78 @@ static void buffer_test_pool_alloc(void) wrong_type = true; if (subtype != ODP_EVENT_NO_SUBTYPE) wrong_subtype = true; - if (odp_buffer_size(buffer[index]) < BUF_SIZE) + if (odp_buffer_size(buffer[i]) != size) wrong_size = true; - addr = (uintptr_t)odp_buffer_addr(buffer[index]); + addr = odp_buffer_addr(buffer[i]); - if ((addr % BUF_ALIGN) != 0) + if (((uintptr_t)addr % align) != 0) wrong_align = true; - if (wrong_type || wrong_size || wrong_align) - odp_buffer_print(buffer[index]); - } + if (wrong_type || wrong_subtype || wrong_size || wrong_align) { + printf("Buffer has error\n"); + odp_buffer_print(buffer[i]); + break; + } - /* Check that the pool had at least num items */ - CU_ASSERT(index == num); - /* index points out of buffer[] or it point to an invalid buffer */ - index--; + /* Write buffer data */ + memset(addr, 0, size); + } - /* Check that the pool had correct buffers */ + CU_ASSERT(i == num); CU_ASSERT(!wrong_type); CU_ASSERT(!wrong_subtype); CU_ASSERT(!wrong_size); CU_ASSERT(!wrong_align); - for (; index >= 0; index--) - odp_buffer_free(buffer[index]); + for (i = 0; i < num; i++) + odp_buffer_free(buffer[i]); CU_ASSERT(odp_pool_destroy(pool) == 0); } -/* Wrapper to call odp_buffer_alloc_multi multiple times until - * either no mure buffers are returned, or num buffers were alloced */ -static int buffer_alloc_multi(odp_pool_t pool, odp_buffer_t buffer[], int num) -{ - int ret, total = 0; - - do { - ret = odp_buffer_alloc_multi(pool, buffer + total, num - total); - CU_ASSERT(ret >= 0); - CU_ASSERT(ret <= num - total); - total += ret; - } while (total < num && ret); - - return total; -} - -static void buffer_test_pool_alloc_multi(void) +static void buffer_test_pool_alloc_free_multi(void) { odp_pool_t pool; - const int num = 3; - odp_buffer_t buffer[num + 1]; + uint32_t i, num_buf; + int ret; odp_event_t ev; - int index; + void *addr; + odp_event_subtype_t subtype; + uint32_t num = default_param.buf.num; + uint32_t size = default_param.buf.size; + uint32_t align = default_param.buf.align; + odp_buffer_t buffer[num + BURST]; odp_bool_t wrong_type = false, wrong_subtype = false; odp_bool_t wrong_size = false, wrong_align = false; - odp_pool_param_t params; - odp_pool_param_init(&params); - params.type = ODP_POOL_BUFFER; - params.buf.size = BUF_SIZE; - params.buf.align = BUF_ALIGN; - params.buf.num = num; + pool = odp_pool_create("default pool", &default_param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); - pool = odp_pool_create("buffer_pool_alloc_multi", &params); - odp_pool_print(pool); + ret = 0; + for (i = 0; i < num; i += ret) { + ret = odp_buffer_alloc_multi(pool, &buffer[i], BURST); + CU_ASSERT(ret >= 0); + CU_ASSERT(ret <= BURST); - /* Try to allocate num + 1 items from the pool */ - CU_ASSERT_FATAL(buffer_alloc_multi(pool, buffer, num + 1) == num); + if (ret <= 0) + break; + } - for (index = 0; index < num; index++) { - uintptr_t addr; - odp_event_subtype_t subtype; + num_buf = i; + CU_ASSERT(num_buf == num); - if (buffer[index] == ODP_BUFFER_INVALID) + for (i = 0; i < num_buf; i++) { + if (buffer[i] == ODP_BUFFER_INVALID) break; - ev = odp_buffer_to_event(buffer[index]); + CU_ASSERT(odp_buffer_is_valid(buffer[i]) == 1) + + CU_ASSERT(odp_buffer_pool(buffer[i]) == pool); + + ev = odp_buffer_to_event(buffer[i]); + CU_ASSERT(odp_buffer_from_event(ev) == buffer[i]); + if (odp_event_type(ev) != ODP_EVENT_BUFFER) wrong_type = true; if (odp_event_subtype(ev) != ODP_EVENT_NO_SUBTYPE) @@ -163,131 +171,214 @@ static void buffer_test_pool_alloc_multi(void) wrong_type = true; if (subtype != ODP_EVENT_NO_SUBTYPE) wrong_subtype = true; - if (odp_buffer_size(buffer[index]) < BUF_SIZE) + if (odp_buffer_size(buffer[i]) != size) wrong_size = true; - addr = (uintptr_t)odp_buffer_addr(buffer[index]); + addr = odp_buffer_addr(buffer[i]); - if ((addr % BUF_ALIGN) != 0) + if (((uintptr_t)addr % align) != 0) wrong_align = true; - if (wrong_type || wrong_size || wrong_align) - odp_buffer_print(buffer[index]); - } + if (wrong_type || wrong_subtype || wrong_size || wrong_align) { + printf("Buffer has error\n"); + odp_buffer_print(buffer[i]); + break; + } - /* Check that the pool had at least num items */ - CU_ASSERT(index == num); + /* Write buffer data */ + memset(addr, 0, size); + } - /* Check that the pool had correct buffers */ + CU_ASSERT(i == num_buf); CU_ASSERT(!wrong_type); CU_ASSERT(!wrong_subtype); CU_ASSERT(!wrong_size); CU_ASSERT(!wrong_align); - odp_buffer_free_multi(buffer, num); + if (num_buf) + odp_buffer_free_multi(buffer, num_buf); CU_ASSERT(odp_pool_destroy(pool) == 0); } -static void buffer_test_pool_free(void) +static void buffer_test_pool_single_pool(void) { odp_pool_t pool; odp_buffer_t buffer; - odp_pool_param_t params; + odp_pool_param_t param; - odp_pool_param_init(&params); - params.type = ODP_POOL_BUFFER; - params.buf.size = 64; - params.buf.align = BUF_ALIGN; - params.buf.num = 1; + memcpy(&param, &default_param, sizeof(odp_pool_param_t)); + param.buf.num = 1; - pool = odp_pool_create("buffer_pool_free", &params); + pool = odp_pool_create("pool 0", &param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + odp_pool_print(pool); /* Allocate the only buffer from the pool */ buffer = odp_buffer_alloc(pool); - CU_ASSERT_FATAL(buffer != ODP_BUFFER_INVALID); + CU_ASSERT(buffer != ODP_BUFFER_INVALID); - /* Pool should have only one buffer */ - CU_ASSERT_FATAL(odp_buffer_alloc(pool) == ODP_BUFFER_INVALID) + /* Pool should be empty */ + CU_ASSERT(odp_buffer_alloc(pool) == ODP_BUFFER_INVALID) - odp_buffer_free(buffer); + if (buffer != ODP_BUFFER_INVALID) { + odp_event_t ev = odp_buffer_to_event(buffer); + + CU_ASSERT(odp_buffer_to_u64(buffer) != + odp_buffer_to_u64(ODP_BUFFER_INVALID)); + CU_ASSERT(odp_event_to_u64(ev) != + odp_event_to_u64(ODP_EVENT_INVALID)); + CU_ASSERT(odp_buffer_pool(buffer) == pool); + odp_buffer_print(buffer); + odp_buffer_free(buffer); + } /* Check that the buffer was returned back to the pool */ buffer = odp_buffer_alloc(pool); - CU_ASSERT_FATAL(buffer != ODP_BUFFER_INVALID); + CU_ASSERT(buffer != ODP_BUFFER_INVALID); + + if (buffer != ODP_BUFFER_INVALID) + odp_buffer_free(buffer); - odp_buffer_free(buffer); CU_ASSERT(odp_pool_destroy(pool) == 0); } -static void buffer_test_pool_free_multi(void) +static void buffer_test_pool_two_pools(void) { - odp_pool_t pool[2]; - odp_buffer_t buffer[4]; - odp_buffer_t buf_inval[2]; - odp_pool_param_t params; - - odp_pool_param_init(&params); - params.type = ODP_POOL_BUFFER; - params.buf.size = 64; - params.buf.align = BUF_ALIGN; - params.buf.num = 2; - - pool[0] = odp_pool_create("buffer_pool_free_multi_0", &params); - pool[1] = odp_pool_create("buffer_pool_free_multi_1", &params); - CU_ASSERT_FATAL(pool[0] != ODP_POOL_INVALID); - CU_ASSERT_FATAL(pool[1] != ODP_POOL_INVALID); - - /* Allocate all the buffers from the pools */ - CU_ASSERT_FATAL(buffer_alloc_multi(pool[0], &buffer[0], 2) == 2); - CU_ASSERT_FATAL(buffer_alloc_multi(pool[1], &buffer[2], 2) == 2); - - /* Pools should have no more buffer */ - CU_ASSERT(odp_buffer_alloc_multi(pool[0], buf_inval, 2) == 0); - CU_ASSERT(odp_buffer_alloc_multi(pool[1], buf_inval, 2) == 0); - - /* Try to free both buffers from both pools at once */ - odp_buffer_free_multi(buffer, 4); - - /* Check that all buffers were returned back to the pools */ - CU_ASSERT_FATAL(buffer_alloc_multi(pool[0], &buffer[0], 2) == 2); - CU_ASSERT_FATAL(buffer_alloc_multi(pool[1], &buffer[2], 2) == 2); - - odp_buffer_free_multi(buffer, 4); - CU_ASSERT(odp_pool_destroy(pool[0]) == 0); - CU_ASSERT(odp_pool_destroy(pool[1]) == 0); + odp_pool_t pool0, pool1; + odp_buffer_t buf, buffer[2]; + odp_pool_param_t param; + int num = 0; + + if (pool_capa.buf.max_pools < 2) + return; + + memcpy(&param, &default_param, sizeof(odp_pool_param_t)); + param.buf.num = 1; + + pool0 = odp_pool_create("pool 0", &param); + CU_ASSERT_FATAL(pool0 != ODP_POOL_INVALID); + + pool1 = odp_pool_create("pool 1", &param); + CU_ASSERT_FATAL(pool1 != ODP_POOL_INVALID); + + buffer[0] = odp_buffer_alloc(pool0); + CU_ASSERT(buffer[0] != ODP_BUFFER_INVALID); + + buffer[1] = odp_buffer_alloc(pool1); + CU_ASSERT(buffer[1] != ODP_BUFFER_INVALID); + + if (buffer[0] != ODP_BUFFER_INVALID) { + CU_ASSERT(odp_buffer_pool(buffer[0]) == pool0); + num++; + } + if (buffer[1] != ODP_BUFFER_INVALID) { + CU_ASSERT(odp_buffer_pool(buffer[1]) == pool1); + num++; + } + + CU_ASSERT(odp_buffer_alloc(pool0) == ODP_BUFFER_INVALID); + CU_ASSERT(odp_buffer_alloc(pool1) == ODP_BUFFER_INVALID); + + /* free buffers from two different pools */ + if (num) + odp_buffer_free_multi(buffer, num); + + /* Check that buffers were returned back into pools */ + buf = odp_buffer_alloc(pool0); + CU_ASSERT(buf != ODP_BUFFER_INVALID); + + if (buf != ODP_BUFFER_INVALID) { + CU_ASSERT(odp_buffer_pool(buf) == pool0); + odp_buffer_free(buf); + } + + CU_ASSERT(odp_pool_destroy(pool0) == 0); + + buf = odp_buffer_alloc(pool1); + CU_ASSERT(buf != ODP_BUFFER_INVALID); + + if (buf != ODP_BUFFER_INVALID) { + CU_ASSERT(odp_buffer_pool(buf) == pool1); + odp_buffer_free(buf); + } + + CU_ASSERT(odp_pool_destroy(pool1) == 0); } -static void buffer_test_management_basic(void) +static void buffer_test_pool_max_pools(void) { - odp_event_t ev = odp_buffer_to_event(raw_buffer); - odp_event_subtype_t subtype; + odp_pool_param_t param; + uint32_t i, num_pool, num_buf; + void *addr; + odp_event_t ev; + uint32_t max_pools = pool_capa.buf.max_pools; + uint32_t size = default_param.buf.size; + uint32_t align = default_param.buf.align; + odp_pool_t pool[max_pools]; + odp_buffer_t buffer[max_pools]; + + CU_ASSERT_FATAL(max_pools != 0); + + printf("\n Creating %u pools\n", max_pools); + + memcpy(&param, &default_param, sizeof(odp_pool_param_t)); + param.buf.num = 1; + + for (i = 0; i < max_pools; i++) { + pool[i] = odp_pool_create(NULL, &param); + + if (pool[i] == ODP_POOL_INVALID) + break; + } + + num_pool = i; + + CU_ASSERT(num_pool == max_pools); + if (num_pool != max_pools) + printf("Error: created only %u pools\n", num_pool); + + for (i = 0; i < num_pool; i++) { + buffer[i] = odp_buffer_alloc(pool[i]); + + if (buffer[i] == ODP_BUFFER_INVALID) + break; + + CU_ASSERT_FATAL(odp_buffer_pool(buffer[i]) == pool[i]); + + ev = odp_buffer_to_event(buffer[i]); + CU_ASSERT(odp_buffer_from_event(ev) == buffer[i]); + CU_ASSERT(odp_event_type(ev) == ODP_EVENT_BUFFER); + + addr = odp_buffer_addr(buffer[i]); + CU_ASSERT(((uintptr_t)addr % align) == 0); + + /* Write buffer data */ + memset(addr, 0, size); + } + + num_buf = i; + CU_ASSERT(num_buf == num_pool); + + if (num_buf) + odp_buffer_free_multi(buffer, num_buf); - CU_ASSERT(odp_buffer_is_valid(raw_buffer) == 1); - CU_ASSERT(odp_buffer_pool(raw_buffer) != ODP_POOL_INVALID); - CU_ASSERT(odp_event_type(ev) == ODP_EVENT_BUFFER); - CU_ASSERT(odp_event_subtype(ev) == ODP_EVENT_NO_SUBTYPE); - CU_ASSERT(odp_event_types(ev, &subtype) == ODP_EVENT_BUFFER); - CU_ASSERT(subtype == ODP_EVENT_NO_SUBTYPE); - CU_ASSERT(odp_buffer_size(raw_buffer) >= BUF_SIZE); - CU_ASSERT(odp_buffer_addr(raw_buffer) != NULL); - odp_buffer_print(raw_buffer); - CU_ASSERT(odp_buffer_to_u64(raw_buffer) != - odp_buffer_to_u64(ODP_BUFFER_INVALID)); - CU_ASSERT(odp_event_to_u64(ev) != odp_event_to_u64(ODP_EVENT_INVALID)); + for (i = 0; i < num_pool; i++) + CU_ASSERT(odp_pool_destroy(pool[i]) == 0); } odp_testinfo_t buffer_suite[] = { - ODP_TEST_INFO(buffer_test_pool_alloc), - ODP_TEST_INFO(buffer_test_pool_free), - ODP_TEST_INFO(buffer_test_pool_alloc_multi), - ODP_TEST_INFO(buffer_test_pool_free_multi), - ODP_TEST_INFO(buffer_test_management_basic), + ODP_TEST_INFO(buffer_test_pool_alloc_free), + ODP_TEST_INFO(buffer_test_pool_alloc_free_multi), + ODP_TEST_INFO(buffer_test_pool_single_pool), + ODP_TEST_INFO(buffer_test_pool_two_pools), + ODP_TEST_INFO(buffer_test_pool_max_pools), ODP_TEST_INFO_NULL, }; odp_suiteinfo_t buffer_suites[] = { - {"buffer tests", buffer_suite_init, buffer_suite_term, buffer_suite}, + {"buffer tests", buffer_suite_init, NULL, buffer_suite}, ODP_SUITE_INFO_NULL, }; commit 76cf03d62e77c6eea7e67f66cde729e8f64a618f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 14 14:08:33 2019 +0200 linux-gen: pool: decrease number of pools capa At least one pool needs to be reserved from ODP_CONFIG_POOLS for internal usage. 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 fcd3e3a0e..95dcb6884 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -1048,19 +1048,21 @@ void odp_buffer_free_multi(const odp_buffer_t buf[], int num) int odp_pool_capability(odp_pool_capability_t *capa) { uint32_t max_seg_len = CONFIG_PACKET_MAX_SEG_LEN; + /* Reserve one for internal usage */ + int max_pools = ODP_CONFIG_POOLS - 1; memset(capa, 0, sizeof(odp_pool_capability_t)); - capa->max_pools = ODP_CONFIG_POOLS; + capa->max_pools = max_pools; /* Buffer pools */ - capa->buf.max_pools = ODP_CONFIG_POOLS; + capa->buf.max_pools = max_pools; capa->buf.max_align = ODP_CONFIG_BUFFER_ALIGN_MAX; capa->buf.max_size = MAX_SIZE; capa->buf.max_num = CONFIG_POOL_MAX_NUM; /* Packet pools */ - capa->pkt.max_pools = ODP_CONFIG_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.min_headroom = CONFIG_PACKET_HEADROOM; @@ -1072,7 +1074,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) capa->pkt.max_uarea_size = MAX_SIZE; /* Timeout pools */ - capa->tmo.max_pools = ODP_CONFIG_POOLS; + capa->tmo.max_pools = max_pools; capa->tmo.max_num = CONFIG_POOL_MAX_NUM; return 0; commit df93cd4cdf73df1bc9d63161bab18db611041a5c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 14 13:48:06 2019 +0200 linux-gen: config: decrease max number of pools The max number of pools is limited by the number of ISHM blocks. Reduced max pool count to match this limit. 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_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index e283472a0..67011b0d4 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -18,9 +18,9 @@ extern "C" { #define CONFIG_NUM_CPU 256 /* - * Maximum number of pools + * Maximum number of pools. Limited by ISHM_MAX_NB_BLOCKS. */ -#define ODP_CONFIG_POOLS 64 +#define ODP_CONFIG_POOLS 55 /* * Queues reserved for ODP internal use commit 4898f2ff2054c2365588baef44f64e4c67003a57 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 14 14:07:38 2019 +0200 linux-gen: pool: add line feed to error prints 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 e98027eb6..fcd3e3a0e 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -266,7 +266,7 @@ int _odp_pool_term_global(void) ret = odp_shm_free(pool_tbl->shm); if (ret < 0) { - ODP_ERR("shm free failed"); + ODP_ERR("SHM free failed\n"); rc = -1; } @@ -474,7 +474,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, /* Validate requested buffer alignment */ if (align > ODP_CONFIG_BUFFER_ALIGN_MAX || align != ROUNDDOWN_POWER2(align, align)) { - ODP_ERR("Bad align requirement"); + ODP_ERR("Bad align requirement\n"); return ODP_POOL_INVALID; } @@ -492,7 +492,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, case ODP_POOL_PACKET: if (params->pkt.headroom > CONFIG_PACKET_HEADROOM) { - ODP_ERR("Packet headroom size not supported."); + ODP_ERR("Packet headroom size not supported\n"); return ODP_POOL_INVALID; } @@ -514,7 +514,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, if ((max_len + seg_len - 1) / seg_len > PKT_MAX_SEGS) seg_len = (max_len + PKT_MAX_SEGS - 1) / PKT_MAX_SEGS; if (seg_len > CONFIG_PACKET_MAX_SEG_LEN) { - ODP_ERR("Pool unable to store 'max_len' packet"); + ODP_ERR("Pool unable to store 'max_len' packet\n"); return ODP_POOL_INVALID; } @@ -529,7 +529,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, break; default: - ODP_ERR("Bad pool type"); + ODP_ERR("Bad pool type\n"); return ODP_POOL_INVALID; } @@ -539,7 +539,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool = reserve_pool(shmflags); if (pool == NULL) { - ODP_ERR("No more free pools"); + ODP_ERR("No more free pools\n"); return ODP_POOL_INVALID; } @@ -627,7 +627,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->shm = shm; if (shm == ODP_SHM_INVALID) { - ODP_ERR("Shm reserve failed"); + ODP_ERR("SHM reserve failed\n"); goto error; } @@ -643,7 +643,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->uarea_shm = shm; if (shm == ODP_SHM_INVALID) { - ODP_ERR("Shm reserve failed (uarea)"); + ODP_ERR("SHM reserve failed (uarea)\n"); goto error; } ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_config_internal.h | 4 +- platform/linux-generic/odp_pool.c | 26 +- test/validation/api/buffer/buffer.c | 427 +++++++++++++-------- test/validation/api/packet/packet.c | 297 +++++++------- 4 files changed, 437 insertions(+), 317 deletions(-) hooks/post-receive --

6 years, 2 months

[COMMIT] branch master updated. v1.21.0.0-347-g88deaa961

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 88deaa9611c7d16d8438b8b8c7732d74889fc4af (commit) via 2aaaa9ea1c1635961c3e96474dc096312297c0d5 (commit) via c5e7097a66e519d6196010d1777714a63963f3fc (commit) via d71c7629711ef2092719f308a6ea3d0329a8d78b (commit) via 6e159d34801e47ad5ade60b7da960450da15c9cb (commit) via 94a4858bc741bff8560771363f660fd7b3cb4e60 (commit) via 16f64683fb32aae3cb2d74a49e623bdb5d13d67f (commit) via 121a67e892d00f9f0e204d526eafd15c68cc536b (commit) via 8cfa7ecd452711dbb235ebb770df318d5ea2896f (commit) via af744065bf793b0c0350fdd0f2aebc527198d82a (commit) via aa8547777264d3274a29080139202848fe0585c8 (commit) via 85881d71fbfd4f7015ae37d475cbcb6920b6f680 (commit) via 0e4d52b760d199f7561d0ea4b6e798af3ecd8cd8 (commit) via 7a57b819d215b689b3c9ed0f4d766de809c5a431 (commit) from a3e06266d1d6063ad1bf7176b02634f456433ef4 (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 88deaa9611c7d16d8438b8b8c7732d74889fc4af Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 13 12:24:38 2019 +0200 api: increment version to 1.23.1 Increment the minor API version digit to reflect addition of odp_packet_input_set() function and compress feature flag. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/configure.ac b/configure.ac index 4cff42913..030edb5e8 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.5]) ########################################################################## m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [23]) -m4_define([odpapi_minor_version], [0]) +m4_define([odpapi_minor_version], [1]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) commit 2aaaa9ea1c1635961c3e96474dc096312297c0d5 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 13 10:37:34 2019 +0200 test: use compress not used flag Use the new compression not used flag in test applications. 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 622814a95..35c8c612d 100644 --- a/example/timer/odp_timer_accuracy.c +++ b/example/timer/odp_timer_accuracy.c @@ -421,10 +421,11 @@ int main(int argc, char *argv[]) /* List features not to be used (may optimize performance) */ odp_init_param_init(&init); - init.not_used.feat.cls = 1; - init.not_used.feat.crypto = 1; - init.not_used.feat.ipsec = 1; - init.not_used.feat.tm = 1; + init.not_used.feat.cls = 1; + init.not_used.feat.compress = 1; + init.not_used.feat.crypto = 1; + init.not_used.feat.ipsec = 1; + init.not_used.feat.tm = 1; if (test_global.opt.init) init_ptr = &init; diff --git a/test/performance/odp_cpu_bench.c b/test/performance/odp_cpu_bench.c index 6a125a1c7..38c18513a 100644 --- a/test/performance/odp_cpu_bench.c +++ b/test/performance/odp_cpu_bench.c @@ -552,11 +552,12 @@ int main(int argc, char *argv[]) odp_init_param_init(&init); /* List features not to be used (may optimize performance) */ - init.not_used.feat.cls = 1; - init.not_used.feat.crypto = 1; - init.not_used.feat.ipsec = 1; - init.not_used.feat.timer = 1; - init.not_used.feat.tm = 1; + init.not_used.feat.cls = 1; + init.not_used.feat.compress = 1; + init.not_used.feat.crypto = 1; + init.not_used.feat.ipsec = 1; + init.not_used.feat.timer = 1; + init.not_used.feat.tm = 1; init.mem_model = helper_options.mem_model; diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 07777b8ec..fc1f04bd1 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -1480,11 +1480,12 @@ int main(int argc, char *argv[]) odp_init_param_init(&init); /* List features not to be used (may optimize performance) */ - init.not_used.feat.cls = 1; - init.not_used.feat.crypto = 1; - init.not_used.feat.ipsec = 1; - init.not_used.feat.timer = 1; - init.not_used.feat.tm = 1; + init.not_used.feat.cls = 1; + init.not_used.feat.compress = 1; + init.not_used.feat.crypto = 1; + init.not_used.feat.ipsec = 1; + init.not_used.feat.timer = 1; + init.not_used.feat.tm = 1; init.mem_model = helper_options.mem_model; diff --git a/test/performance/odp_pool_perf.c b/test/performance/odp_pool_perf.c index 26fe44be5..85dd4ba12 100644 --- a/test/performance/odp_pool_perf.c +++ b/test/performance/odp_pool_perf.c @@ -528,6 +528,7 @@ int main(int argc, char **argv) /* List features not to be used */ odp_init_param_init(&init); init.not_used.feat.cls = 1; + init.not_used.feat.compress = 1; init.not_used.feat.crypto = 1; init.not_used.feat.ipsec = 1; init.not_used.feat.schedule = 1; diff --git a/test/performance/odp_queue_perf.c b/test/performance/odp_queue_perf.c index 2c132ba6a..893861688 100644 --- a/test/performance/odp_queue_perf.c +++ b/test/performance/odp_queue_perf.c @@ -535,6 +535,7 @@ int main(int argc, char **argv) /* List features not to be used */ odp_init_param_init(&init); init.not_used.feat.cls = 1; + init.not_used.feat.compress = 1; init.not_used.feat.crypto = 1; init.not_used.feat.ipsec = 1; init.not_used.feat.schedule = 1; diff --git a/test/performance/odp_sched_perf.c b/test/performance/odp_sched_perf.c index 04d125be0..08623d2a7 100644 --- a/test/performance/odp_sched_perf.c +++ b/test/performance/odp_sched_perf.c @@ -874,6 +874,7 @@ int main(int argc, char **argv) /* List features not to be used */ odp_init_param_init(&init); init.not_used.feat.cls = 1; + init.not_used.feat.compress = 1; init.not_used.feat.crypto = 1; init.not_used.feat.ipsec = 1; init.not_used.feat.timer = 1; diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index bc5da01f3..8eb094873 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -1446,11 +1446,12 @@ int main(int argc, char *argv[]) /* List features not to be used (may optimize performance) */ odp_init_param_init(&init); - init.not_used.feat.cls = 1; - init.not_used.feat.crypto = 1; - init.not_used.feat.ipsec = 1; - init.not_used.feat.tm = 1; - init.not_used.feat.timer = 1; + init.not_used.feat.cls = 1; + init.not_used.feat.compress = 1; + init.not_used.feat.crypto = 1; + init.not_used.feat.ipsec = 1; + init.not_used.feat.tm = 1; + init.not_used.feat.timer = 1; if (test_options.timeout_us) init.not_used.feat.timer = 0; diff --git a/test/performance/odp_timer_perf.c b/test/performance/odp_timer_perf.c index c49baf0bd..5a2317aab 100644 --- a/test/performance/odp_timer_perf.c +++ b/test/performance/odp_timer_perf.c @@ -687,6 +687,7 @@ int main(int argc, char **argv) /* List features not to be used */ odp_init_param_init(&init); init.not_used.feat.cls = 1; + init.not_used.feat.compress = 1; init.not_used.feat.crypto = 1; init.not_used.feat.ipsec = 1; init.not_used.feat.tm = 1; commit c5e7097a66e519d6196010d1777714a63963f3fc Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 13 10:26:08 2019 +0200 validation: init: test compression not used flag Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/init/init_main.c b/test/validation/api/init/init_main.c index c250aeec3..e9c7f1b02 100644 --- a/test/validation/api/init/init_main.c +++ b/test/validation/api/init/init_main.c @@ -134,6 +134,7 @@ static void init_test_feature(int disable) if (disable) { param.not_used.feat.cls = 1; + param.not_used.feat.compress = 1; param.not_used.feat.crypto = 1; param.not_used.feat.ipsec = 1; param.not_used.feat.schedule = 1; commit d71c7629711ef2092719f308a6ea3d0329a8d78b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 13 10:23:45 2019 +0200 linux-gen: init: use compress not used flag Disable compress when it is not used according to global init parameters. 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_init.c b/platform/linux-generic/odp_init.c index bb8d13347..aff20e4cd 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -65,6 +65,7 @@ static void disable_features(odp_global_data_ro_t *global_ro, global_ro->disable.crypto = 1; global_ro->disable.traffic_mngr = init_param->not_used.feat.tm; + global_ro->disable.compress = init_param->not_used.feat.compress; } void odp_init_param_init(odp_init_t *param) commit 6e159d34801e47ad5ade60b7da960450da15c9cb Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 13 10:16:35 2019 +0200 api: feature: add compression feature flag Added a flag for compression APIs into ODP features definition. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/include/odp/api/spec/feature.h b/include/odp/api/spec/feature.h index f6a360e53..59f0b1282 100644 --- a/include/odp/api/spec/feature.h +++ b/include/odp/api/spec/feature.h @@ -37,6 +37,9 @@ typedef union odp_feature_t { /** Classifier APIs, e.g., odp_cls_xxx(), odp_cos_xxx() */ uint32_t cls:1; + /** Compression APIs, e.g., odp_comp_xxx() */ + uint32_t compress:1; + /** Crypto APIs, e.g., odp_crypto_xxx() */ uint32_t crypto:1; @@ -55,6 +58,7 @@ typedef union odp_feature_t { /** Traffic Manager APIs, e.g., odp_tm_xxx() */ uint32_t tm:1; } feat; + } odp_feature_t; /** commit 94a4858bc741bff8560771363f660fd7b3cb4e60 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 13 10:09:56 2019 +0200 validation: init: test features enabled and disabled Print system and SHM information with features enabled and disabled, so that difference in e.g. memory usage can be compared from logs. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index 071499f18..0d5fa3ce8 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -47,7 +47,8 @@ TESTS = \ init/init_abort$(EXEEXT) \ init/init_log$(EXEEXT) \ init/init_num_thr$(EXEEXT) \ - init/init_feature$(EXEEXT) \ + init/init_feature_enabled$(EXEEXT) \ + init/init_feature_disabled$(EXEEXT) \ ipsec/ipsec_sync$(EXEEXT) \ ipsec/ipsec_async$(EXEEXT) \ ipsec/ipsec_inline_in$(EXEEXT) \ diff --git a/test/validation/api/init/.gitignore b/test/validation/api/init/.gitignore index 8311f2c3f..05301baac 100644 --- a/test/validation/api/init/.gitignore +++ b/test/validation/api/init/.gitignore @@ -2,4 +2,5 @@ init_defaults init_abort init_log init_num_thr -init_feature +init_feature_enabled +init_feature_disabled diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index 6c0ef301f..297f33dc4 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -2,16 +2,19 @@ include ../Makefile.inc # Keep init test cases in separate binaries. Some implementations may not allow # the same application process to call odp_init_global() multiple times. -test_PROGRAMS = init_defaults init_abort init_log init_num_thr init_feature +test_PROGRAMS = init_defaults init_abort init_log init_num_thr \ + init_feature_enabled init_feature_disabled init_defaults_CPPFLAGS = -DINIT_TEST=0 $(AM_CPPFLAGS) init_abort_CPPFLAGS = -DINIT_TEST=1 $(AM_CPPFLAGS) init_log_CPPFLAGS = -DINIT_TEST=2 $(AM_CPPFLAGS) init_num_thr_CPPFLAGS = -DINIT_TEST=3 $(AM_CPPFLAGS) -init_feature_CPPFLAGS = -DINIT_TEST=4 $(AM_CPPFLAGS) +init_feature_enabled_CPPFLAGS = -DINIT_TEST=4 $(AM_CPPFLAGS) +init_feature_disabled_CPPFLAGS = -DINIT_TEST=5 $(AM_CPPFLAGS) init_defaults_SOURCES = init_main.c init_abort_SOURCES = init_main.c init_log_SOURCES = init_main.c init_num_thr_SOURCES = init_main.c -init_feature_SOURCES = init_main.c +init_feature_enabled_SOURCES = init_main.c +init_feature_disabled_SOURCES = init_main.c diff --git a/test/validation/api/init/init_main.c b/test/validation/api/init/init_main.c index 6878d36db..c250aeec3 100644 --- a/test/validation/api/init/init_main.c +++ b/test/validation/api/init/init_main.c @@ -123,21 +123,24 @@ static void init_test_num_thr(void) CU_ASSERT(ret == 0); } -static void init_test_feature(void) +static void init_test_feature(int disable) { int ret; odp_instance_t instance; odp_init_t param; odp_init_param_init(&param); - param.not_used.all_feat = 0; - param.not_used.feat.cls = 1; - param.not_used.feat.crypto = 1; - param.not_used.feat.ipsec = 1; - param.not_used.feat.schedule = 1; - param.not_used.feat.time = 1; - param.not_used.feat.timer = 1; - param.not_used.feat.tm = 1; + param.not_used.all_feat = 0; + + if (disable) { + param.not_used.feat.cls = 1; + param.not_used.feat.crypto = 1; + param.not_used.feat.ipsec = 1; + param.not_used.feat.schedule = 1; + param.not_used.feat.time = 1; + param.not_used.feat.timer = 1; + param.not_used.feat.tm = 1; + } ret = odp_init_global(&instance, &param, NULL); CU_ASSERT_FATAL(ret == 0); @@ -145,6 +148,11 @@ static void init_test_feature(void) ret = odp_init_local(instance, ODP_THREAD_CONTROL); CU_ASSERT_FATAL(ret == 0); + /* Print system and SHM information into test log. It may show + * e.g. memory usage difference when features are disabled. */ + odp_sys_info_print(); + odp_shm_print_all(); + ret = odp_term_local(); CU_ASSERT_FATAL(ret == 0); @@ -152,12 +160,23 @@ static void init_test_feature(void) CU_ASSERT(ret == 0); } +static void init_test_feature_enabled(void) +{ + init_test_feature(0); +} + +static void init_test_feature_disabled(void) +{ + init_test_feature(1); +} + odp_testinfo_t testinfo[] = { ODP_TEST_INFO(init_test_defaults), ODP_TEST_INFO(init_test_abort), ODP_TEST_INFO(init_test_log), ODP_TEST_INFO(init_test_num_thr), - ODP_TEST_INFO(init_test_feature) + ODP_TEST_INFO(init_test_feature_enabled), + ODP_TEST_INFO(init_test_feature_disabled) }; odp_testinfo_t init_suite[] = { commit 16f64683fb32aae3cb2d74a49e623bdb5d13d67f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 8 17:04:26 2019 +0200 linux-gen: init: set disable feature flags Read init parameter of odp_init_global() and set disable feature flags accordingly. 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_init.c b/platform/linux-generic/odp_init.c index f68379cda..bb8d13347 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -48,6 +48,25 @@ enum init_stage { odp_global_data_ro_t odp_global_ro; odp_global_data_rw_t *odp_global_rw; +static void disable_features(odp_global_data_ro_t *global_ro, + const odp_init_t *init_param) +{ + int disable_ipsec, disable_crypto; + + if (init_param == NULL) + return; + + disable_ipsec = init_param->not_used.feat.ipsec; + global_ro->disable.ipsec = disable_ipsec; + + disable_crypto = init_param->not_used.feat.crypto; + /* Crypto can be disabled only if IPSec is disabled */ + if (disable_ipsec && disable_crypto) + global_ro->disable.crypto = 1; + + global_ro->disable.traffic_mngr = init_param->not_used.feat.tm; +} + void odp_init_param_init(odp_init_t *param) { memset(param, 0, sizeof(odp_init_t)); @@ -291,6 +310,8 @@ int odp_init_global(odp_instance_t *instance, } stage = LIBCONFIG_INIT; + disable_features(&odp_global_ro, params); + if (_odp_cpumask_init_global(params)) { ODP_ERR("ODP cpumask init failed.\n"); goto init_failed; commit 121a67e892d00f9f0e204d526eafd15c68cc536b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 8 16:50:30 2019 +0200 linux-gen: tm: support global disable Check global disable flag to avoid shared memory consumption when traffic manager is not used. 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_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 9a40d0716..0acfa9c76 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -30,6 +30,7 @@ #include <odp_macros_internal.h> #include <odp_init_internal.h> #include <odp_errno_define.h> +#include <odp_global_data.h> /* Local vars */ static const @@ -2918,7 +2919,7 @@ odp_tm_t odp_tm_create(const char *name, uint32_t max_tm_queues, max_sorted_lists; int rc; - if (odp_global_ro.init_param.not_used.feat.tm) { + if (odp_global_ro.disable.traffic_mngr) { ODP_ERR("TM has been disabled\n"); return ODP_TM_INVALID; } @@ -4724,8 +4725,8 @@ int _odp_tm_init_global(void) { odp_shm_t shm; - if (odp_global_ro.init_param.not_used.feat.tm) { - ODP_DBG("TM disabled\n"); + if (odp_global_ro.disable.traffic_mngr) { + ODP_PRINT("\nODP traffic manager is DISABLED\n"); return 0; } @@ -4758,7 +4759,7 @@ int _odp_tm_init_global(void) int _odp_tm_term_global(void) { - if (odp_global_ro.init_param.not_used.feat.tm) + if (odp_global_ro.disable.traffic_mngr) return 0; if (odp_shm_free(tm_glb->shm)) { commit 8cfa7ecd452711dbb235ebb770df318d5ea2896f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 8 16:38:13 2019 +0200 linux-gen: comp: support global disable Check global disable flag to avoid shared memory consumption when compression is not used. 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_comp.c b/platform/linux-generic/odp_comp.c index a5dfb4aa7..0e9ce5a89 100644 --- a/platform/linux-generic/odp_comp.c +++ b/platform/linux-generic/odp_comp.c @@ -11,6 +11,7 @@ #include <odp/api/packet.h> #include <odp/api/plat/strong_types.h> #include <odp_packet_internal.h> +#include <odp_global_data.h> #include <odp_debug_internal.h> #include <odp_init_internal.h> @@ -610,11 +611,17 @@ int _odp_comp_init_global(void) odp_shm_t shm; int idx; + if (odp_global_ro.disable.compress) { + ODP_PRINT("\nODP compress is DISABLED\n"); + return 0; + } + /* Calculate the memory size we need */ mem_size = sizeof(*global); /* Allocate our globally shared memory */ - shm = odp_shm_reserve("comp_pool", mem_size, ODP_CACHE_LINE_SIZE, 0); + shm = odp_shm_reserve("_odp_comp_pool", mem_size, + ODP_CACHE_LINE_SIZE, 0); global = odp_shm_addr(shm); @@ -639,6 +646,9 @@ int _odp_comp_term_global(void) int count = 0; odp_comp_generic_session_t *session; + if (odp_global_ro.disable.compress) + return 0; + for (session = global->free; session != NULL; session = session->next) count++; commit af744065bf793b0c0350fdd0f2aebc527198d82a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 8 16:22:58 2019 +0200 linux-gen: ipsec: support global disable Check global disable flag to avoid shared memory consumption when ipsec is not used. 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_ipsec.c b/platform/linux-generic/odp_ipsec.c index 4968c87d8..7bb38c5c8 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -33,6 +33,11 @@ int odp_ipsec_capability(odp_ipsec_capability_t *capa) odp_crypto_capability_t crypto_capa; odp_queue_capability_t queue_capa; + if (odp_global_ro.disable.ipsec) { + ODP_ERR("IPSec is disabled\n"); + return -1; + } + memset(capa, 0, sizeof(odp_ipsec_capability_t)); capa->op_mode_sync = ODP_SUPPORT_PREFERRED; @@ -1775,6 +1780,9 @@ int _odp_ipsec_try_inline(odp_packet_t *pkt) odp_ipsec_packet_result_t *result; odp_packet_hdr_t *pkt_hdr; + if (odp_global_ro.disable.ipsec) + return -1; + memset(&status, 0, sizeof(status)); ipsec_sa = ipsec_in_single(*pkt, ODP_IPSEC_SA_INVALID, pkt, &status); @@ -1937,6 +1945,9 @@ int _odp_ipsec_init_global(void) { odp_shm_t shm; + if (odp_global_ro.disable.ipsec) + return 0; + shm = odp_shm_reserve("_odp_ipsec", sizeof(odp_ipsec_config_t), ODP_CACHE_LINE_SIZE, 0); @@ -1960,7 +1971,12 @@ int _odp_ipsec_init_global(void) int _odp_ipsec_term_global(void) { - odp_shm_t shm = odp_shm_lookup("_odp_ipsec"); + odp_shm_t shm; + + if (odp_global_ro.disable.ipsec) + return 0; + + shm = odp_shm_lookup("_odp_ipsec"); if (shm == ODP_SHM_INVALID || odp_shm_free(shm)) { ODP_ERR("Shm free failed for odp_ipsec"); diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index cbeb43780..bb786614a 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -12,6 +12,7 @@ #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> #include <odp_pool_internal.h> +#include <odp_global_data.h> /* Inlined API functions */ #include <odp/api/plat/event_inlines.h> @@ -32,6 +33,11 @@ int _odp_ipsec_events_init_global(void) { odp_pool_param_t param; + if (odp_global_ro.disable.ipsec) { + ODP_PRINT("\nODP IPSec is DISABLED\n"); + return 0; + } + odp_pool_param_init(&param); param.buf.size = sizeof(ipsec_status_hdr_t); @@ -55,6 +61,9 @@ int _odp_ipsec_events_term_global(void) { int ret; + if (odp_global_ro.disable.ipsec) + return 0; + ret = odp_pool_destroy(ipsec_status_pool); if (ret < 0) { ODP_ERR("status pool destroy failed"); diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 1fb814c5b..b22970791 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -13,6 +13,7 @@ #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> #include <odp_ring_mpmc_internal.h> +#include <odp_global_data.h> #include <odp/api/plat/atomic_inlines.h> #include <odp/api/plat/cpu_inlines.h> @@ -135,6 +136,9 @@ int _odp_ipsec_sad_init_global(void) odp_shm_t shm; unsigned i; + if (odp_global_ro.disable.ipsec) + return 0; + shm = odp_shm_reserve("_odp_ipsec_sa_table", sizeof(ipsec_sa_table_t), ODP_CACHE_LINE_SIZE, @@ -191,6 +195,9 @@ int _odp_ipsec_sad_term_global(void) int ret = 0; int rc = 0; + if (odp_global_ro.disable.ipsec) + return 0; + for (i = 0; i < ODP_CONFIG_IPSEC_SAS; i++) { ipsec_sa = ipsec_sa_entry(i); diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index a79d015cb..e6d004d43 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -17,6 +17,7 @@ #include <odp/api/plat/byteorder_inlines.h> #include <odp_queue_if.h> #include <odp/api/plat/queue_inlines.h> +#include <odp_global_data.h> #include <protocols/eth.h> #include <protocols/ip.h> @@ -390,8 +391,11 @@ static int loopback_init_capability(pktio_entry_t *pktio_entry) capa->config.pktout.bit.tcp_chksum = 1; capa->config.pktout.bit.udp_chksum = 1; capa->config.pktout.bit.sctp_chksum = 1; - capa->config.inbound_ipsec = 1; - capa->config.outbound_ipsec = 1; + + if (odp_global_ro.disable.ipsec == 0) { + capa->config.inbound_ipsec = 1; + capa->config.outbound_ipsec = 1; + } capa->config.pktout.bit.ipv4_chksum_ena = capa->config.pktout.bit.ipv4_chksum; commit aa8547777264d3274a29080139202848fe0585c8 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 8 15:45:47 2019 +0200 linux-gen: crypto: support global disable Check global disable flag to avoid shared memory consumption when crypto is not used. 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_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 29cd22c2f..fb4a0ddad 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -19,6 +19,7 @@ #include <odp/api/plat/thread_inlines.h> #include <odp_packet_internal.h> #include <odp/api/plat/queue_inlines.h> +#include <odp_global_data.h> /* Inlined API functions */ #include <odp/api/plat/event_inlines.h> @@ -1832,6 +1833,11 @@ static int process_digest_param(odp_crypto_generic_session_t *session, int odp_crypto_capability(odp_crypto_capability_t *capa) { + if (odp_global_ro.disable.crypto) { + ODP_ERR("Crypto is disabled\n"); + return -1; + } + if (NULL == capa) return -1; @@ -2075,6 +2081,15 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, odp_crypto_generic_session_t *session; int aes_gcm = 0; + if (odp_global_ro.disable.crypto) { + ODP_ERR("Crypto is disabled\n"); + /* Dummy output to avoid compiler warning about uninitialized + * variables */ + *status = ODP_CRYPTO_SES_CREATE_ERR_ENOMEM; + *session_out = ODP_CRYPTO_SESSION_INVALID; + return -1; + } + /* Allocate memory for this session */ session = alloc_session(); if (NULL == session) { @@ -2494,6 +2509,11 @@ int _odp_crypto_init_global(void) int idx; int nlocks = CRYPTO_num_locks(); + if (odp_global_ro.disable.crypto) { + ODP_PRINT("\nODP crypto is DISABLED\n"); + return 0; + } + /* Calculate the memory size we need */ mem_size = sizeof(odp_crypto_global_t); mem_size += nlocks * sizeof(odp_ticketlock_t); @@ -2539,6 +2559,9 @@ int _odp_crypto_term_global(void) int count = 0; odp_crypto_generic_session_t *session; + if (odp_global_ro.disable.crypto) + return 0; + for (session = global->free; session != NULL; session = session->next) count++; if (count != MAX_SESSIONS) { @@ -2567,6 +2590,9 @@ int _odp_crypto_init_local(void) memset(&local, 0, sizeof(local)); + if (odp_global_ro.disable.crypto) + return 0; + for (i = 0; i < MAX_SESSIONS; i++) { local.hmac_ctx[i] = HMAC_CTX_new(); local.cmac_ctx[i] = CMAC_CTX_new(); @@ -2595,6 +2621,9 @@ int _odp_crypto_term_local(void) { unsigned i; + if (odp_global_ro.disable.crypto) + return 0; + for (i = 0; i < MAX_SESSIONS; i++) { if (local.cmac_ctx[i] != NULL) CMAC_CTX_free(local.cmac_ctx[i]); commit 85881d71fbfd4f7015ae37d475cbcb6920b6f680 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 8 15:41:14 2019 +0200 linux-gen: init: add disabled feature globals These flags will be set in global init phase according to application input and configuration 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_global_data.h b/platform/linux-generic/include/odp_global_data.h index 08fd24f4a..4b3d72f5d 100644 --- a/platform/linux-generic/include/odp_global_data.h +++ b/platform/linux-generic/include/odp_global_data.h @@ -61,6 +61,15 @@ typedef struct odp_global_data_ro_t { config_t libconfig_runtime; odp_random_kind_t ipsec_rand_kind; + /* Disabled features during global init */ + struct { + uint8_t compress; + uint8_t crypto; + uint8_t ipsec; + uint8_t traffic_mngr; + + } disable; + } odp_global_data_ro_t; /* Modifiable global data. Memory region is shared and synchronized amongst all commit 0e4d52b760d199f7561d0ea4b6e798af3ecd8cd8 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Nov 8 15:37:21 2019 +0200 example: sysinfo: allow crypto capa to fail Continue system info print also when crypto capability fails. This may happen e.g. when crypto feature is disabled in the implementation. Other system info is still valid and interesting to the user Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/sysinfo/odp_sysinfo.c b/example/sysinfo/odp_sysinfo.c index 709f25d92..00a32f658 100644 --- a/example/sysinfo/odp_sysinfo.c +++ b/example/sysinfo/odp_sysinfo.c @@ -243,6 +243,7 @@ int main(void) char ava_mask_str[ODP_CPUMASK_STR_SIZE]; char work_mask_str[ODP_CPUMASK_STR_SIZE]; char ctrl_mask_str[ODP_CPUMASK_STR_SIZE]; + int crypto_ret; printf("\n"); printf("ODP system info example\n"); @@ -304,10 +305,9 @@ int main(void) return -1; } - if (odp_crypto_capability(&crypto_capa)) { + crypto_ret = odp_crypto_capability(&crypto_capa); + if (crypto_ret < 0) printf("crypto capability failed\n"); - return -1; - } printf("\n"); printf("S Y S T E M I N F O R M A T I O N\n"); @@ -417,22 +417,25 @@ int main(void) timer_capa.highest_res_ns); printf("\n"); - printf(" CRYPTO\n"); - printf(" max sessions: %" PRIu32 "\n", - crypto_capa.max_sessions); - printf(" sync mode support: %s\n", - support_level(crypto_capa.sync_mode)); - printf(" async mode support: %s\n", - support_level(crypto_capa.async_mode)); - printf(" cipher algorithms: "); - print_cipher_algos(crypto_capa.ciphers); - printf("\n"); - print_cipher_caps(crypto_capa.ciphers); - printf(" auth algorithms: "); - print_auth_algos(crypto_capa.auths); - printf("\n"); - print_auth_caps(crypto_capa.auths); - printf("\n"); + + if (crypto_ret == 0) { + printf(" CRYPTO\n"); + printf(" max sessions: %" PRIu32 "\n", + crypto_capa.max_sessions); + printf(" sync mode support: %s\n", + support_level(crypto_capa.sync_mode)); + printf(" async mode support: %s\n", + support_level(crypto_capa.async_mode)); + printf(" cipher algorithms: "); + print_cipher_algos(crypto_capa.ciphers); + printf("\n"); + print_cipher_caps(crypto_capa.ciphers); + printf(" auth algorithms: "); + print_auth_algos(crypto_capa.auths); + printf("\n"); + print_auth_caps(crypto_capa.auths); + printf("\n"); + } printf(" SHM MEMORY BLOCKS:\n"); odp_shm_print_all(); commit 7a57b819d215b689b3c9ed0f4d766de809c5a431 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 7 15:48:36 2019 +0200 linux-gen: init: type define global data structures 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_global_data.h b/platform/linux-generic/include/odp_global_data.h index fdb057b3e..08fd24f4a 100644 --- a/platform/linux-generic/include/odp_global_data.h +++ b/platform/linux-generic/include/odp_global_data.h @@ -39,7 +39,7 @@ typedef struct { /* Read-only global data. Members should not be modified after global init * to enable process more support. */ -struct odp_global_data_ro_t { +typedef struct odp_global_data_ro_t { odp_init_t init_param; /* directory for odp mmaped files */ char *shm_dir; @@ -60,17 +60,19 @@ struct odp_global_data_ro_t { config_t libconfig_default; config_t libconfig_runtime; odp_random_kind_t ipsec_rand_kind; -}; + +} odp_global_data_ro_t; /* Modifiable global data. Memory region is shared and synchronized amongst all * worker processes. */ -struct odp_global_data_rw_t { +typedef struct odp_global_data_rw_t { odp_bool_t dpdk_initialized; odp_bool_t inline_timers; -}; -extern struct odp_global_data_ro_t odp_global_ro; -extern struct odp_global_data_rw_t *odp_global_rw; +} odp_global_data_rw_t; + +extern odp_global_data_ro_t odp_global_ro; +extern odp_global_data_rw_t *odp_global_rw; #ifdef __cplusplus } diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 8a5b884b5..f68379cda 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -45,8 +45,8 @@ enum init_stage { ALL_INIT /* All init stages completed */ }; -struct odp_global_data_ro_t odp_global_ro; -struct odp_global_data_rw_t *odp_global_rw; +odp_global_data_ro_t odp_global_ro; +odp_global_data_rw_t *odp_global_rw; void odp_init_param_init(odp_init_t *param) { @@ -58,7 +58,7 @@ static int global_rw_data_init(void) odp_shm_t shm; shm = odp_shm_reserve("_odp_global_rw_data", - sizeof(struct odp_global_data_rw_t), + sizeof(odp_global_data_rw_t), ODP_CACHE_LINE_SIZE, 0); odp_global_rw = odp_shm_addr(shm); @@ -67,7 +67,7 @@ static int global_rw_data_init(void) return -1; } - memset(odp_global_rw, 0, sizeof(struct odp_global_data_rw_t)); + memset(odp_global_rw, 0, sizeof(odp_global_data_rw_t)); return 0; } @@ -266,7 +266,7 @@ int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params ODP_UNUSED) { - memset(&odp_global_ro, 0, sizeof(struct odp_global_data_ro_t)); + memset(&odp_global_ro, 0, sizeof(odp_global_data_ro_t)); odp_global_ro.main_pid = getpid(); enum init_stage stage = NO_INIT; ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- example/sysinfo/odp_sysinfo.c | 41 +++++++++++++----------- example/timer/odp_timer_accuracy.c | 9 +++--- include/odp/api/spec/feature.h | 4 +++ platform/linux-generic/include/odp_global_data.h | 23 +++++++++---- platform/linux-generic/odp_comp.c | 12 ++++++- platform/linux-generic/odp_crypto_openssl.c | 29 +++++++++++++++++ platform/linux-generic/odp_init.c | 32 +++++++++++++++--- platform/linux-generic/odp_ipsec.c | 18 ++++++++++- platform/linux-generic/odp_ipsec_events.c | 9 ++++++ platform/linux-generic/odp_ipsec_sad.c | 7 ++++ platform/linux-generic/odp_traffic_mngr.c | 9 +++--- platform/linux-generic/pktio/loop.c | 8 +++-- test/performance/odp_cpu_bench.c | 11 ++++--- test/performance/odp_l2fwd.c | 11 ++++--- test/performance/odp_pool_perf.c | 1 + test/performance/odp_queue_perf.c | 1 + test/performance/odp_sched_perf.c | 1 + test/performance/odp_sched_pktio.c | 11 ++++--- test/performance/odp_timer_perf.c | 1 + test/validation/api/Makefile.am | 3 +- test/validation/api/init/.gitignore | 3 +- test/validation/api/init/Makefile.am | 9 ++++-- test/validation/api/init/init_main.c | 40 +++++++++++++++++------ 24 files changed, 222 insertions(+), 73 deletions(-) hooks/post-receive --

6 years, 2 months

[COMMIT] branch master updated. v1.21.0.0-333-ga3e06266d

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 a3e06266d1d6063ad1bf7176b02634f456433ef4 (commit) via 9950baeb2203305e987013d8eedba1935a4530f9 (commit) via e8a456d98cfdf8ec645142f3dc87e05c349bc4f6 (commit) via ae888a272b644e77c97235a0025bdfadeeb91e65 (commit) via 632122387dec01a8663fdd9c08fd5bfa628e94b0 (commit) via de6ad3f90e98fcf0b53fda77a104313aca016f62 (commit) via 2bab933729635c4e1febad7b70739d939ffb83d0 (commit) via 63895aa11208343e731d7ce3cabf21ed25603ad0 (commit) via 17220218dbae2b69a3fc4f132d18aaa980034675 (commit) via 8b6a0bc62379c638c6fe112f2205fb7c79f56076 (commit) from d26fd80e75f6ff310afaf8c74458869a85f01934 (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 a3e06266d1d6063ad1bf7176b02634f456433ef4 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 7 10:59:54 2019 +0200 validation: pktio: test odp_packet_input_set() Test the new, packet input interface set function during pktio tests. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index a261067b8..773d5bf2a 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -879,6 +879,14 @@ static void pktio_txrx_multi(pktio_info_t *pktio_info_a, CU_ASSERT(odp_packet_user_ptr(pkt) == NULL); + odp_packet_input_set(pkt, ODP_PKTIO_INVALID); + CU_ASSERT(odp_packet_input(pkt) == ODP_PKTIO_INVALID); + CU_ASSERT(odp_packet_input_index(pkt) < 0); + + odp_packet_input_set(pkt, pktio_b); + CU_ASSERT(odp_packet_input(pkt) == pktio_b); + CU_ASSERT(odp_packet_input_index(pkt) == pktio_index_b); + /* Dummy read to ones complement in case pktio has set it */ sum = odp_packet_ones_comp(pkt, &range); if (range.length > 0) commit 9950baeb2203305e987013d8eedba1935a4530f9 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 6 15:35:13 2019 +0200 linux-gen: packet: implement odp_packet_input_set() Implemented the new API function. 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_packet.c b/platform/linux-generic/odp_packet.c index e9dccb8e8..a0bfce6e4 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1093,6 +1093,13 @@ void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ptr) pkt_hdr->p.flags.user_ptr_set = 1; } +void odp_packet_input_set(odp_packet_t pkt, odp_pktio_t pktio) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + pkt_hdr->input = pktio; +} + int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); commit e8a456d98cfdf8ec645142f3dc87e05c349bc4f6 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Nov 6 15:20:21 2019 +0200 api: packet: add odp_packet_input_set() An application may use this for testing or other purposes, when perception of the packet input interface need to be changed. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 91eb6c652..cbc3c2cbd 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1507,6 +1507,22 @@ odp_pool_t odp_packet_pool(odp_packet_t pkt); */ odp_pktio_t odp_packet_input(odp_packet_t pkt); +/** + * Set packet input interface + * + * Set packet input interface to a valid packet IO handle or ODP_PKTIO_INVALID. + * An application may use this for testing or other purposes, when perception + * of the packet input interface need to be changed. The call updates both + * input interface handle (odp_packet_input()) and index + * (odp_packet_input_index()). + * + * @param pkt Packet handle + * @param pktio Handle to a valid packet input interface or ODP_PKTIO_INVALID. + * ODP_PKTIO_INVALID indicates that the packet was not received by + * any packet IO interface. + */ +void odp_packet_input_set(odp_packet_t pkt, odp_pktio_t pktio); + /** * Packet input interface index * commit ae888a272b644e77c97235a0025bdfadeeb91e65 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 7 11:55:01 2019 +0200 validation: pktio: test user pointer on receive Test user pointer is NULL on packet receive. Set it before sending as e.g. a software loopback interface needs to clear it before receive. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index 9b163e000..a261067b8 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -491,6 +491,9 @@ static int create_packets_udp(odp_packet_t pkt_tbl[], pktio_pkt_set_macs(pkt_tbl[i], pktio_src, pktio_dst); + /* Set user pointer. It should be NULL on receive side. */ + odp_packet_user_ptr_set(pkt_tbl[i], (void *)1); + if (fix_cs) ret = pktio_fixup_checksums(pkt_tbl[i]); else @@ -874,6 +877,8 @@ static void pktio_txrx_multi(pktio_info_t *pktio_info_a, CU_ASSERT(odp_packet_has_udp(pkt)); } + CU_ASSERT(odp_packet_user_ptr(pkt) == NULL); + /* Dummy read to ones complement in case pktio has set it */ sum = odp_packet_ones_comp(pkt, &range); if (range.length > 0) commit 632122387dec01a8663fdd9c08fd5bfa628e94b0 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 7 14:33:01 2019 +0200 linux-gen: loop: update pkt_hdr when cls rule change pool Fix packet header pointer issue. It remained to point the old (freed) packet, when the packet is copied into another pool due to a classifier rule. 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/loop.c b/platform/linux-generic/pktio/loop.c index b82793b47..a79d015cb 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -161,7 +161,9 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, failed++; continue; } + pkt = new_pkt; + pkt_hdr = packet_hdr(new_pkt); } } else { packet_parse_layer(pkt_hdr, commit de6ad3f90e98fcf0b53fda77a104313aca016f62 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 7 14:08:41 2019 +0200 linux-gen: pktio: reset all flags on packet input User pointer and pktout flags need to be reset also on packet input. Packet parse API function does not reset non-parser flags (like user pointer). 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 a0e33222e..cd6ca0845 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -267,7 +267,18 @@ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, odp_proto_chksums_t chksums); /* Reset parser metadata for a new parse */ -void packet_parse_reset(odp_packet_hdr_t *pkt_hdr); +static inline void packet_parse_reset(odp_packet_hdr_t *pkt_hdr, int all) +{ + pkt_hdr->p.input_flags.all = 0; + pkt_hdr->p.l2_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; + + if (all) + pkt_hdr->p.flags.all_flags = 0; + else /* Keep user ptr and pktout flags */ + pkt_hdr->p.flags.all.error = 0; +} static inline int packet_hdr_has_l2(odp_packet_hdr_t *pkt_hdr) { diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 23069b662..8c6588444 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1415,7 +1415,7 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, uint32_t hash; if (parse) { - packet_parse_reset(pkt_hdr); + packet_parse_reset(pkt_hdr, 1); packet_set_len(pkt_hdr, pkt_len); packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 5511989c2..4968c87d8 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -778,7 +778,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - packet_parse_reset(pkt_hdr); + packet_parse_reset(pkt_hdr, 0); pkt_hdr->p.l3_offset = state.ip_offset; } else { odp_packet_parse_param_t parse_param; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index e491d2512..e9dccb8e8 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -308,16 +308,6 @@ int _odp_packet_copy_to_mem_seg(odp_packet_t pkt, uint32_t offset, #include <odp/visibility_end.h> -void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) -{ - /* Reset parser metadata before new parse */ - pkt_hdr->p.input_flags.all = 0; - pkt_hdr->p.flags.all.error = 0; - pkt_hdr->p.l2_offset = ODP_PACKET_OFFSET_INVALID; - pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; - pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; -} - static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) { int cur = 0; @@ -2633,7 +2623,8 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset, if (data == NULL) return -1; - packet_parse_reset(pkt_hdr); + /* Reset parser flags, keep other flags */ + packet_parse_reset(pkt_hdr, 0); if (proto == ODP_PROTO_ETH) { /* Assume valid L2 header, no CRC/FCS check in SW */ diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 039c38d36..610996685 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -575,7 +575,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; - packet_parse_reset(&parsed_hdr); + packet_parse_reset(&parsed_hdr, 1); packet_set_len(&parsed_hdr, pkt_len); if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data, pkt_len, pkt_len, @@ -859,7 +859,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; - packet_parse_reset(&parsed_hdr); + packet_parse_reset(&parsed_hdr, 1); packet_set_len(&parsed_hdr, pkt_len); if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data, pkt_len, pkt_len, diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 9dc6b5f94..b82793b47 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -121,7 +121,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pkt_len = odp_packet_len(pkt); pkt_hdr = packet_hdr(pkt); - packet_parse_reset(pkt_hdr); + packet_parse_reset(pkt_hdr, 1); if (pktio_cls_enabled(pktio_entry)) { odp_packet_t new_pkt; odp_pool_t new_pool; commit 2bab933729635c4e1febad7b70739d939ffb83d0 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 7 14:02:01 2019 +0200 validation: ipsec: packet input resets user pointer Do not expect user pointer to be set after packet input (when testing inline IPSec). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 6a6a3be96..705fbbabf 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -461,6 +461,7 @@ static void ipsec_check_packet(const ipsec_test_packet *itp, odp_packet_t pkt, uint8_t data[len]; const odph_ipv4hdr_t *itp_ip; odph_ipv4hdr_t *ip; + int inline_mode = 0; if (NULL == itp) return; @@ -469,7 +470,18 @@ static void ipsec_check_packet(const ipsec_test_packet *itp, odp_packet_t pkt, if (ODP_PACKET_INVALID == pkt) return; - CU_ASSERT_EQUAL(PACKET_USER_PTR, odp_packet_user_ptr(pkt)); + if ((!is_outbound && + suite_context.inbound_op_mode == ODP_IPSEC_OP_MODE_INLINE) || + (is_outbound && + suite_context.outbound_op_mode == ODP_IPSEC_OP_MODE_INLINE)) + inline_mode = 1; + + if (inline_mode) { + /* User pointer is reset during inline mode (packet IO) */ + CU_ASSERT(odp_packet_user_ptr(pkt) == NULL); + } else { + CU_ASSERT(odp_packet_user_ptr(pkt) == PACKET_USER_PTR); + } l3 = odp_packet_l3_offset(pkt); l4 = odp_packet_l4_offset(pkt); commit 63895aa11208343e731d7ce3cabf21ed25603ad0 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 7 11:21:02 2019 +0200 validation: pktio: check parser flags on receive Check L2, L3 and L4 parser results when RX interface capability indicates that those are supported. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index 4d33fd25a..9b163e000 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -749,6 +749,41 @@ static int send_packet_events(odp_queue_t queue, return 0; } +static void check_parser_capa(odp_pktio_t pktio, int *l2, int *l3, int *l4) +{ + int ret; + odp_pktio_capability_t capa; + + *l2 = 0; + *l3 = 0; + *l4 = 0; + + ret = odp_pktio_capability(pktio, &capa); + CU_ASSERT(ret == 0); + + if (ret < 0) + return; + + switch (capa.config.parser.layer) { + case ODP_PROTO_LAYER_ALL: + /* Fall through */ + case ODP_PROTO_LAYER_L4: + *l2 = 1; + *l3 = 1; + *l4 = 1; + break; + case ODP_PROTO_LAYER_L3: + *l2 = 1; + *l3 = 1; + break; + case ODP_PROTO_LAYER_L2: + *l2 = 1; + break; + default: + break; + } +} + static void pktio_txrx_multi(pktio_info_t *pktio_info_a, pktio_info_t *pktio_info_b, int num_pkts, txrx_mode_e mode) @@ -757,10 +792,14 @@ static void pktio_txrx_multi(pktio_info_t *pktio_info_a, odp_packet_t rx_pkt[num_pkts]; uint32_t tx_seq[num_pkts]; int i, ret, num_rx; + int parser_l2, parser_l3, parser_l4; odp_pktio_t pktio_a = pktio_info_a->id; odp_pktio_t pktio_b = pktio_info_b->id; int pktio_index_b = odp_pktio_index(pktio_b); + /* Check RX interface parser capability */ + check_parser_capa(pktio_b, &parser_l2, &parser_l3, &parser_l4); + if (packet_len == USE_MTU) { odp_pool_capability_t pool_capa; uint32_t maxlen; @@ -822,6 +861,18 @@ static void pktio_txrx_multi(pktio_info_t *pktio_info_a, CU_ASSERT(odp_packet_input(pkt) == pktio_b); CU_ASSERT(odp_packet_input_index(pkt) == pktio_index_b); CU_ASSERT(odp_packet_has_error(pkt) == 0); + if (parser_l2) { + CU_ASSERT(odp_packet_has_l2(pkt)); + CU_ASSERT(odp_packet_has_eth(pkt)); + } + if (parser_l3) { + CU_ASSERT(odp_packet_has_l3(pkt)); + CU_ASSERT(odp_packet_has_ipv4(pkt)); + } + if (parser_l4) { + CU_ASSERT(odp_packet_has_l4(pkt)); + CU_ASSERT(odp_packet_has_udp(pkt)); + } /* Dummy read to ones complement in case pktio has set it */ sum = odp_packet_ones_comp(pkt, &range); commit 17220218dbae2b69a3fc4f132d18aaa980034675 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 7 10:58:34 2019 +0200 validation: pktio: check pktio index Check pktio index in addition to the handle. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index f8796c7da..4d33fd25a 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -749,21 +749,25 @@ static int send_packet_events(odp_queue_t queue, return 0; } -static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b, +static void pktio_txrx_multi(pktio_info_t *pktio_info_a, + pktio_info_t *pktio_info_b, int num_pkts, txrx_mode_e mode) { odp_packet_t tx_pkt[num_pkts]; odp_packet_t rx_pkt[num_pkts]; uint32_t tx_seq[num_pkts]; int i, ret, num_rx; + odp_pktio_t pktio_a = pktio_info_a->id; + odp_pktio_t pktio_b = pktio_info_b->id; + int pktio_index_b = odp_pktio_index(pktio_b); if (packet_len == USE_MTU) { odp_pool_capability_t pool_capa; uint32_t maxlen; - maxlen = odp_pktout_maxlen(pktio_a->id); - if (odp_pktout_maxlen(pktio_b->id) < maxlen) - maxlen = odp_pktout_maxlen(pktio_b->id); + maxlen = odp_pktout_maxlen(pktio_a); + if (odp_pktout_maxlen(pktio_b) < maxlen) + maxlen = odp_pktout_maxlen(pktio_b); CU_ASSERT_FATAL(maxlen > 0); packet_len = maxlen; if (packet_len > PKT_LEN_MAX) @@ -777,8 +781,7 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b, } /* generate test packets to send */ - ret = create_packets(tx_pkt, tx_seq, num_pkts, pktio_a->id, - pktio_b->id); + ret = create_packets(tx_pkt, tx_seq, num_pkts, pktio_a, pktio_b); if (ret != num_pkts) { CU_FAIL("failed to generate test packets"); return; @@ -787,7 +790,8 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b, /* send packet(s) out */ if (mode == TXRX_MODE_SINGLE) { for (i = 0; i < num_pkts; ++i) { - ret = odp_pktout_send(pktio_a->pktout, &tx_pkt[i], 1); + ret = odp_pktout_send(pktio_info_a->pktout, + &tx_pkt[i], 1); if (ret != 1) { CU_FAIL_FATAL("failed to send test packet"); odp_packet_free(tx_pkt[i]); @@ -795,13 +799,13 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b, } } } else if (mode == TXRX_MODE_MULTI) { - send_packets(pktio_a->pktout, tx_pkt, num_pkts); + send_packets(pktio_info_a->pktout, tx_pkt, num_pkts); } else { - send_packet_events(pktio_a->queue_out, tx_pkt, num_pkts); + send_packet_events(pktio_info_a->queue_out, tx_pkt, num_pkts); } /* and wait for them to arrive back */ - num_rx = wait_for_packets(pktio_b, rx_pkt, tx_seq, + num_rx = wait_for_packets(pktio_info_b, rx_pkt, tx_seq, num_pkts, mode, ODP_TIME_SEC_IN_NS); CU_ASSERT(num_rx == num_pkts); if (num_rx != num_pkts) { @@ -815,7 +819,8 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b, odp_packet_t pkt = rx_pkt[i]; CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); - CU_ASSERT(odp_packet_input(pkt) == pktio_b->id); + CU_ASSERT(odp_packet_input(pkt) == pktio_b); + CU_ASSERT(odp_packet_input_index(pkt) == pktio_index_b); CU_ASSERT(odp_packet_has_error(pkt) == 0); /* Dummy read to ones complement in case pktio has set it */ commit 8b6a0bc62379c638c6fe112f2205fb7c79f56076 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Nov 7 14:43:31 2019 +0200 validation: cls: use odp_schedule_wait_time() Schedule call's wait time parameter is not nanoseconds, but return value of odp_schedule_wait_time() call. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c index 851f949cc..28d762f65 100644 --- a/test/validation/api/classification/odp_classification_common.c +++ b/test/validation/api/classification/odp_classification_common.c @@ -193,8 +193,9 @@ void enqueue_pktio_interface(odp_packet_t pkt, odp_pktio_t pktio) odp_packet_t receive_packet(odp_queue_t *queue, uint64_t ns) { odp_event_t ev; + uint64_t wait = odp_schedule_wait_time(ns); - ev = odp_schedule(queue, ns); + ev = odp_schedule(queue, wait); return odp_packet_from_event(ev); } ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet.h | 16 ++++ .../linux-generic/include/odp_packet_internal.h | 13 +++- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_ipsec.c | 2 +- platform/linux-generic/odp_packet.c | 20 +++-- platform/linux-generic/pktio/dpdk.c | 4 +- platform/linux-generic/pktio/loop.c | 4 +- .../api/classification/odp_classification_common.c | 3 +- test/validation/api/ipsec/ipsec.c | 14 +++- test/validation/api/pktio/pktio.c | 91 +++++++++++++++++++--- 10 files changed, 139 insertions(+), 30 deletions(-) hooks/post-receive --

6 years, 2 months

[COMMIT] tag v1.23.0.0 created. v1.21.0.0-323-gd26fd80e7

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 tag, v1.23.0.0 has been created at d26fd80e75f6ff310afaf8c74458869a85f01934 (commit) - Log ----------------------------------------------------------------- commit d26fd80e75f6ff310afaf8c74458869a85f01934 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Nov 12 10:15:25 2019 +0200 changelog: updates for odp v1.23.0.0 Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> ----------------------------------------------------------------------- hooks/post-receive --

6 years, 2 months

[COMMIT] branch master updated. v1.21.0.0-323-gd26fd80e7

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 d26fd80e75f6ff310afaf8c74458869a85f01934 (commit) from b8d4e0f27c0979cd4fb628318b10b57538d67fdf (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 d26fd80e75f6ff310afaf8c74458869a85f01934 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Nov 12 10:15:25 2019 +0200 changelog: updates for odp v1.23.0.0 Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/CHANGELOG b/CHANGELOG index 855f12acb..f3b366d8f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,166 @@ +== OpenDataPlane (1.23.0.0) +=== Summary of Changes +The ODP API changes in this release are related to the classifier module. + +The implementation changes include bug fixes (classifier, socket pktio), +configurability improvements (inline timer), new packet segmentation +implementation, and performance improvements (pool). + +=== API +==== Classifier +The PMR term documentation was not explicit about endianness of value and mask +fields. Most terms assumed CPU endian, but terms with larger data sizes assumed +big endian (MAC, IPv6 address and custom). + +Term specification was harmonized so that all terms expect value/mask data to be +in big-endian format, have fixed size, and allow free memory alignment. Packet +length term is an exception to this as it does not represent a field in a +packet. + +Added new `ODP_PMR_CUSTOM_L3` term to match custom layer 3 protocol fields. PMR +offset refers to the start of layer 3 in the packet. Other PMR rules (e.g. L2 +classification rules) may precede custom L3 rules. + +=== Helper +Duplicate `ODPH_UNUSED` macro has been removed. `ODP_UNUSED` should be used +instead. + +=== Validation Tests +==== Common +Improved test result output when some tests are inactive (skipped due to missing +capability). Now inactive tests are listed by default in the test suite results. + +==== Classifier +Cleaned up validation test code. Classifier implementation missed reporting some +capabilities, tests didn't check those capabilities and they were tested. Source +IPv4 term test was missing. + +Added serial PMR test, which tests series of PMR and CoS: + +* From default CoS to dest IPv4 CoS +* From dest IPv4 CoS to dest UDP CoS + +Added parallel PMR test, which test serial and parallel PMR and CoS: + +* From default CoS to dest IPv4 CoS +* From dest IPv4 CoS to a parallel UDP CoS per destination port number + +==== Scheduler +Added new validation tests to verify that packet order is maintained when events +are enqueued and dequeued to/from a plain queue while maintaining atomic/ordered +scheduling context. + +==== Timer +Added private timer pool test, which creates a timer pool with the `priv` flag +set. The same thread calls schedule / queue_deq that created the pool. + +=== Example Applications +==== timer_perf +Added new test application to measure schedule call CPU cycle consumption with +various timer pool parameter combinations. This measurement is mostly +interesting with software-based timer implementations, where timers may be +polled from the schedule call. + +==== New odp_ping application +This application replies to IPv4 ping requests. It can be used to test +connectivity with standard ping utility. ARP table needs to be setup manually on +the sender side as the application does not reply to ARP requests. + +==== odp_classifier +Added source CoS name into the parameter list of `-p` option. This enables +linking classification rules together. When a source CoS is not defined, the +default CoS is used as the source CoS. + +Option `-p` parameter list format is now: + + <term>:<xxx>:<yyy>:<src_cos>:<dst_cos> + +Where `<src_cos>` is optional and number of "xxx", "yyy", etc. parameters is +term depend. + +Added `-v` option which prints received packet with CoS queue +name. This can be used for debugging classification rules. + +Added support for `ODP_PMR_VLAN_ID_0`, `ODP_PMR_ETHTYPE_0`, `ODP_PMR_CUSTOM_L3`, +`ODP_PMR_ETHTYPE_X`, `ODP_PMR_VLAN_ID_X`, `ODP_PMR_UDP_DPORT`, +`ODP_PMR_UDP_SPORT`, `ODP_PMR_TCP_DPORT`, and `ODP_PMR_TCP_SPORT` rules. + +==== timer_accuracy +Fix bug in timer start offset calculation. Test results were offset by current +local time value. + +Added delay and extra schedule calls to ensure that (software) timer +implementation has passed its initial state before setting up timers. + +Added `-f` option to control offset to the first timer. This can be used e.g. to +avoid best/worst case synchronization of timers to timer tick boundaries / +resolution. + +==== packet_dump +Added ICMP support. Print ICMP offset and ICMPv4 type/code. This helps to verify +that ping requests are received. + +==== bench_packet +Added missing tests for the following packet functions: + +* `odp_packet_data_seg_len()` +* `odp_packet_free_sp()` +* `odp_packet_from_event_multi()` +* `odp_packet_to_event_multi()` +* `odp_packet_subtype()` +* `odp_packet_parse()` +* `odp_packet_parse_multi()` + +=== Implementation +==== Classifier +Cleaned up implementation. Fixed endianness. + +==== Inline Timer +Cleaned up code. Fixed accuracy issue with high resolution (<100us) timer pools. +Added configuration option `inline_poll_interval_nsec` to select default poll +interval in nsec. + +Added configure file option for inline timer (`inline_thread_type`) to select if +control threads poll shared timer pools or not. Control threads still poll their +private pools. With this user can configure control and worker threads to use +separate timer pools. + +==== Packet I/O +Enable explicit pktio type definition. The pktio type is selected by adding +pktio_type prefix in front of device name separated by a colon +(<pktio_type>:<if_name>). + +The socket mmsg pktio implementation has been refactored and performance has +been improved. + +The IPC pktio implementation has been modified to use standard ODP internal +`ring_ptr_t` rings to implement IPC rings. This enables removing the duplicate +`_ring_t` implementation. + +==== Pool +Packet segmentation has been reimplemented using a linked list. The new +implementation is simpler and has the added benefit of greatly reducing +packet and buffer header sizes. + +=== Bug Fixes +==== Unnumbered Bugs / Issues +* Fixed socket mmap pktio throughput collapse under heavy traffic + +* Fixed missing config header in install directory + +* Include only ODP defines in autogenerated header files + +* Fixed GCC 9 `address-of-packed-member` warnings + +* Disable building static test applications without static ODP lib + +* Fixed a segfault in `odp_pktin_recv_mq_tmo()` implementation + +* Fixed classifier vlan match bugs and tests + +* Fixed classifier matching of parallel PMRs + + == OpenDataPlane (1.22.0.0) === Summary of Changes ODP v1.22.0.0 adds several smaller API changes mainly related to API ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) hooks/post-receive --

6 years, 2 months

[COMMIT] branch master updated. v1.21.0.0-322-gb8d4e0f27

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 b8d4e0f27c0979cd4fb628318b10b57538d67fdf (commit) from 58e1522451ae4a4ce62acad5ea2c47d96dafe3cd (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 b8d4e0f27c0979cd4fb628318b10b57538d67fdf Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Nov 7 16:31:03 2019 +0200 validation: ipsec: memset ipsec_test_part structs to zero Explicitly initialize ipsec_test_part structs to zero to avoid "missing initializer for field" warnings with old compilers (Debian 8, GCC 4.9.2). Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reported-by: Risto Teittinen <risto.teittinen(a)nokia-bell-labs.com> diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c index 632e2ec8b..0e6497887 100644 --- a/test/validation/api/ipsec/ipsec_test_in.c +++ b/test/validation/api/ipsec/ipsec_test_in.c @@ -526,6 +526,9 @@ static void test_in_ipv4_ah_sha256_replay(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test_repl; + + memset(&test_repl, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, true, true, 123, NULL, @@ -550,15 +553,9 @@ static void test_in_ipv4_ah_sha256_replay(void) }, }; - ipsec_test_part test_repl = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.antireplay = 1, - .pkt_out = NULL }, - }, - }; + test_repl.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1; + test_repl.out_pkt = 1; + test_repl.out[0].status.error.antireplay = 1; ipsec_test_part test_1235 = { .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1235, @@ -632,6 +629,9 @@ static void test_in_ipv4_esp_null_sha256_replay(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test_repl; + + memset(&test_repl, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, true, false, 123, NULL, @@ -656,15 +656,9 @@ static void test_in_ipv4_esp_null_sha256_replay(void) }, }; - ipsec_test_part test_repl = { - .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.antireplay = 1, - .pkt_out = NULL }, - }, - }; + test_repl.pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1; + test_repl.out_pkt = 1; + test_repl.out[0].status.error.antireplay = 1; ipsec_test_part test_1235 = { .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1235, @@ -690,6 +684,9 @@ static void test_in_ipv4_ah_esp_pkt(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part)); /* This test will not work properly inbound inline mode. * test_in_ipv4_ah_esp_pkt_lookup will be used instead. */ @@ -706,15 +703,9 @@ static void test_in_ipv4_ah_esp_pkt(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.proto = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1; + test.out_pkt = 1; + test.out[0].status.error.proto = 1; ipsec_check_in_one(&test, sa); @@ -725,6 +716,9 @@ static void test_in_ipv4_esp_ah_pkt(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part)); /* This test will not work properly inbound inline mode. * test_in_ipv4_esp_ah_pkt_lookup will be used instead. */ @@ -741,15 +735,9 @@ static void test_in_ipv4_esp_ah_pkt(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.proto = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1; + test.out_pkt = 1; + test.out[0].status.error.proto = 1; ipsec_check_in_one(&test, sa); @@ -760,6 +748,9 @@ static void test_in_ipv4_ah_esp_pkt_lookup(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, true, true, 123, NULL, @@ -771,16 +762,10 @@ static void test_in_ipv4_ah_esp_pkt_lookup(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1, - .lookup = 1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.sa_lookup = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1; + test.lookup = 1; + test.out_pkt = 1; + test.out[0].status.error.sa_lookup = 1; ipsec_check_in_one(&test, ODP_IPSEC_SA_INVALID); @@ -791,6 +776,9 @@ static void test_in_ipv4_esp_ah_pkt_lookup(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, true, false, 123, NULL, @@ -802,16 +790,10 @@ static void test_in_ipv4_esp_ah_pkt_lookup(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1, - .lookup = 1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.sa_lookup = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1; + test.lookup = 1; + test.out_pkt = 1; + test.out[0].status.error.sa_lookup = 1; ipsec_check_in_one(&test, ODP_IPSEC_SA_INVALID); @@ -822,6 +804,9 @@ static void test_in_ipv4_ah_sha256_bad1(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, true, true, 123, NULL, @@ -833,15 +818,9 @@ static void test_in_ipv4_ah_sha256_bad1(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.auth = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad1; + test.out_pkt = 1; + test.out[0].status.error.auth = 1; ipsec_check_in_one(&test, sa); @@ -852,6 +831,9 @@ static void test_in_ipv4_ah_sha256_bad2(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, true, true, 123, NULL, @@ -863,15 +845,9 @@ static void test_in_ipv4_ah_sha256_bad2(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad2, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.auth = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad2; + test.out_pkt = 1; + test.out[0].status.error.auth = 1; ipsec_check_in_one(&test, sa); @@ -882,6 +858,9 @@ static void test_in_ipv4_esp_null_sha256_bad1(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, true, false, 123, NULL, @@ -893,15 +872,9 @@ static void test_in_ipv4_esp_null_sha256_bad1(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1_bad1, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.auth = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1_bad1; + test.out_pkt = 1; + test.out[0].status.error.auth = 1; ipsec_check_in_one(&test, sa); diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c index 36de0cca1..0bfb9cff8 100644 --- a/test/validation/api/ipsec/ipsec_test_out.c +++ b/test/validation/api/ipsec/ipsec_test_out.c @@ -558,6 +558,11 @@ static void test_out_ipv4_ah_sha256_frag_check(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + ipsec_test_part test2; + + memset(&test, 0, sizeof(ipsec_test_part)); + memset(&test2, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, false, true, 123, NULL, @@ -571,28 +576,16 @@ static void test_out_ipv4_ah_sha256_frag_check(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.mtu = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0; + test.out_pkt = 1; + test.out[0].status.error.mtu = 1; - ipsec_test_part test2 = { - .pkt_in = &pkt_ipv4_icmp_0, - .num_opt = 1, - .opt = { .flag.frag_mode = 1, - .frag_mode = ODP_IPSEC_FRAG_DISABLED, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .pkt_out = &pkt_ipv4_icmp_0_ah_sha256_1 }, - }, - }; + test2.pkt_in = &pkt_ipv4_icmp_0; + test2.num_opt = 1; + test2.opt.flag.frag_mode = 1; + test2.opt.frag_mode = ODP_IPSEC_FRAG_DISABLED; + test2.out_pkt = 1; + test2.out[0].pkt_out = &pkt_ipv4_icmp_0_ah_sha256_1; ipsec_check_out_one(&test, sa); @@ -605,6 +598,9 @@ static void test_out_ipv4_ah_sha256_frag_check_2(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, false, true, 123, NULL, @@ -618,15 +614,9 @@ static void test_out_ipv4_ah_sha256_frag_check_2(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.mtu = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0; + test.out_pkt = 1; + test.out[0].status.error.mtu = 1; ipsec_test_part test2 = { .pkt_in = &pkt_ipv4_icmp_0, @@ -651,6 +641,11 @@ static void test_out_ipv4_esp_null_sha256_frag_check(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + ipsec_test_part test2; + + memset(&test, 0, sizeof(ipsec_test_part)); + memset(&test2, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, false, false, 123, NULL, @@ -665,28 +660,16 @@ static void test_out_ipv4_esp_null_sha256_frag_check(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.mtu = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0; + test.out_pkt = 1; + test.out[0].status.error.mtu = 1; - ipsec_test_part test2 = { - .pkt_in = &pkt_ipv4_icmp_0, - .num_opt = 1, - .opt = { .flag.frag_mode = 1, - .frag_mode = ODP_IPSEC_FRAG_DISABLED, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .pkt_out = &pkt_ipv4_icmp_0_esp_null_sha256_1 }, - }, - }; + test2.pkt_in = &pkt_ipv4_icmp_0; + test2.num_opt = 1; + test2.opt.flag.frag_mode = 1; + test2.opt.frag_mode = ODP_IPSEC_FRAG_DISABLED; + test2.out_pkt = 1; + test2.out[0].pkt_out = &pkt_ipv4_icmp_0_esp_null_sha256_1; ipsec_check_out_one(&test, sa); @@ -699,6 +682,9 @@ static void test_out_ipv4_esp_null_sha256_frag_check_2(void) { odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; + ipsec_test_part test; + + memset(&test, 0, sizeof(ipsec_test_part)); ipsec_sa_param_fill(&param, false, false, 123, NULL, @@ -713,15 +699,9 @@ static void test_out_ipv4_esp_null_sha256_frag_check_2(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); - ipsec_test_part test = { - .pkt_in = &pkt_ipv4_icmp_0, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.mtu = 1, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_ipv4_icmp_0; + test.out_pkt = 1; + test.out[0].status.error.mtu = 1; ipsec_test_part test2 = { .pkt_in = &pkt_ipv4_icmp_0, @@ -1011,6 +991,11 @@ static void test_out_dummy_esp_null_sha256_tun_ipv4(void) odp_ipsec_sa_t sa2; uint32_t src = IPV4ADDR(10, 0, 111, 2); uint32_t dst = IPV4ADDR(10, 0, 222, 2); + ipsec_test_part test; + ipsec_test_part test_empty; + + memset(&test, 0, sizeof(ipsec_test_part)); + memset(&test_empty, 0, sizeof(ipsec_test_part)); memset(&tunnel, 0, sizeof(odp_ipsec_tunnel_param_t)); tunnel.type = ODP_IPSEC_TUNNEL_IPV4; @@ -1043,35 +1028,21 @@ static void test_out_dummy_esp_null_sha256_tun_ipv4(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2); - ipsec_test_part test = { - .pkt_in = &pkt_test_nodata, - .num_opt = 1, - .opt = { .flag.tfc_dummy = 1, - .tfc_pad_len = 16, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .l3_type = ODP_PROTO_L3_TYPE_IPV4, - .l4_type = ODP_PROTO_L4_TYPE_NO_NEXT, - .pkt_out = NULL }, - }, - }; - - ipsec_test_part test_empty = { - .pkt_in = &pkt_test_emtpy, - .num_opt = 1, - .opt = { .flag.tfc_dummy = 1, - .tfc_pad_len = 16, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .l3_type = ODP_PROTO_L3_TYPE_IPV4, - .l4_type = ODP_PROTO_L4_TYPE_NO_NEXT, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_test_nodata; + test.num_opt = 1; + test.opt .flag.tfc_dummy = 1; + test.opt.tfc_pad_len = 16; + test.out_pkt = 1; + test.out[0].l3_type = ODP_PROTO_L3_TYPE_IPV4; + test.out[0].l4_type = ODP_PROTO_L4_TYPE_NO_NEXT; + + test_empty.pkt_in = &pkt_test_emtpy; + test_empty.num_opt = 1; + test_empty.opt.flag.tfc_dummy = 1; + test_empty.opt.tfc_pad_len = 16; + test_empty.out_pkt = 1; + test_empty.out[0].l3_type = ODP_PROTO_L3_TYPE_IPV4; + test_empty.out[0].l4_type = ODP_PROTO_L4_TYPE_NO_NEXT; ipsec_check_out_in_one(&test, sa, sa2); ipsec_check_out_in_one(&test_empty, sa, sa2); @@ -1086,6 +1057,8 @@ static void test_out_dummy_esp_null_sha256_tun_ipv6(void) odp_ipsec_sa_param_t param; odp_ipsec_sa_t sa; odp_ipsec_sa_t sa2; + ipsec_test_part test; + ipsec_test_part test_empty; uint8_t src[16] = { 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a, @@ -1095,6 +1068,9 @@ static void test_out_dummy_esp_null_sha256_tun_ipv6(void) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, }; + memset(&test, 0, sizeof(ipsec_test_part)); + memset(&test_empty, 0, sizeof(ipsec_test_part)); + memset(&tunnel, 0, sizeof(odp_ipsec_tunnel_param_t)); tunnel.type = ODP_IPSEC_TUNNEL_IPV6; tunnel.ipv6.src_addr = src; @@ -1126,35 +1102,21 @@ static void test_out_dummy_esp_null_sha256_tun_ipv6(void) CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2); - ipsec_test_part test = { - .pkt_in = &pkt_test_nodata, - .num_opt = 1, - .opt = { .flag.tfc_dummy = 1, - .tfc_pad_len = 16, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .l3_type = ODP_PROTO_L3_TYPE_IPV4, - .l4_type = ODP_PROTO_L4_TYPE_NO_NEXT, - .pkt_out = NULL }, - }, - }; - - ipsec_test_part test_empty = { - .pkt_in = &pkt_test_emtpy, - .num_opt = 1, - .opt = { .flag.tfc_dummy = 1, - .tfc_pad_len = 16, }, - .out_pkt = 1, - .out = { - { .status.warn.all = 0, - .status.error.all = 0, - .l3_type = ODP_PROTO_L3_TYPE_IPV4, - .l4_type = ODP_PROTO_L4_TYPE_NO_NEXT, - .pkt_out = NULL }, - }, - }; + test.pkt_in = &pkt_test_nodata; + test.num_opt = 1; + test.opt .flag.tfc_dummy = 1; + test.opt.tfc_pad_len = 16; + test.out_pkt = 1; + test.out[0].l3_type = ODP_PROTO_L3_TYPE_IPV4; + test.out[0].l4_type = ODP_PROTO_L4_TYPE_NO_NEXT; + + test_empty.pkt_in = &pkt_test_emtpy; + test_empty.num_opt = 1; + test_empty.opt.flag.tfc_dummy = 1; + test_empty.opt.tfc_pad_len = 16; + test_empty.out_pkt = 1; + test_empty.out[0].l3_type = ODP_PROTO_L3_TYPE_IPV4; + test_empty.out[0].l4_type = ODP_PROTO_L4_TYPE_NO_NEXT; ipsec_check_out_in_one(&test, sa, sa2); ipsec_check_out_in_one(&test_empty, sa, sa2); ----------------------------------------------------------------------- Summary of changes: test/validation/api/ipsec/ipsec_test_in.c | 139 ++++++++------------ test/validation/api/ipsec/ipsec_test_out.c | 198 ++++++++++++----------------- 2 files changed, 136 insertions(+), 201 deletions(-) hooks/post-receive --

6 years, 2 months

[COMMIT] branch master updated. v1.21.0.0-321-g58e152245

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 58e1522451ae4a4ce62acad5ea2c47d96dafe3cd (commit) via fae79706192988fa1b89e68f11e3167c9495c771 (commit) from 3e3a204764ee055acb3f0ff0feff39a653362c38 (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 58e1522451ae4a4ce62acad5ea2c47d96dafe3cd Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Nov 6 09:50:28 2019 +0200 test: bench_packet: add tests for packet parse functions Add new tests for odp_packet_parse() and odp_packet_parse_multi() functions using IPv4-TCP, IPv4-UDP, IPv6-TCP, and IPv6-UDP packets. The test packets are imported from the packet validation tests. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c index 3bf61d86d..d139006b3 100644 --- a/test/performance/odp_bench_packet.c +++ b/test/performance/odp_bench_packet.c @@ -17,6 +17,8 @@ #include <inttypes.h> #include <signal.h> +#include <test_packet_parser.h> + #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -356,6 +358,77 @@ static void alloc_packets_twice(void) TEST_REPEAT_COUNT); } +static void alloc_parse_packets(const void *pkt_data, uint32_t len) +{ + int i; + + allocate_test_packets(len, gbl_args->pkt_tbl, TEST_REPEAT_COUNT); + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + if (odp_packet_copy_from_mem(gbl_args->pkt_tbl[i], 0, len, + pkt_data)) + ODPH_ABORT("Copying test packet failed\n"); + } +} + +static void alloc_parse_packets_ipv4_tcp(void) +{ + alloc_parse_packets(test_packet_ipv4_tcp, sizeof(test_packet_ipv4_tcp)); +} + +static void alloc_parse_packets_ipv4_udp(void) +{ + alloc_parse_packets(test_packet_ipv4_udp, sizeof(test_packet_ipv4_udp)); +} + +static void alloc_parse_packets_ipv6_tcp(void) +{ + alloc_parse_packets(test_packet_ipv6_tcp, sizeof(test_packet_ipv6_tcp)); +} + +static void alloc_parse_packets_ipv6_udp(void) +{ + alloc_parse_packets(test_packet_ipv6_udp, sizeof(test_packet_ipv6_udp)); +} + +static void alloc_parse_packets_multi(const void *pkt_data, uint32_t len) +{ + int i; + + allocate_test_packets(len, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT * gbl_args->appl.burst_size); + + for (i = 0; i < TEST_REPEAT_COUNT * gbl_args->appl.burst_size; i++) { + if (odp_packet_copy_from_mem(gbl_args->pkt_tbl[i], 0, len, + pkt_data)) + ODPH_ABORT("Copying test packet failed\n"); + } +} + +static void alloc_parse_packets_multi_ipv4_tcp(void) +{ + alloc_parse_packets_multi(test_packet_ipv4_tcp, + sizeof(test_packet_ipv4_tcp)); +} + +static void alloc_parse_packets_multi_ipv4_udp(void) +{ + alloc_parse_packets_multi(test_packet_ipv4_udp, + sizeof(test_packet_ipv4_udp)); +} + +static void alloc_parse_packets_multi_ipv6_tcp(void) +{ + alloc_parse_packets_multi(test_packet_ipv6_tcp, + sizeof(test_packet_ipv6_tcp)); +} + +static void alloc_parse_packets_multi_ipv6_udp(void) +{ + alloc_parse_packets_multi(test_packet_ipv6_udp, + sizeof(test_packet_ipv6_udp)); +} + static void create_packets(void) { int i; @@ -1352,6 +1425,53 @@ static int bench_packet_subtype(void) return i; } +static int bench_packet_parse(void) +{ + odp_packet_parse_param_t param; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + int ret = 0; + int i; + + memset(&param, 0, sizeof(odp_packet_parse_param_t)); + param.proto = ODP_PROTO_ETH; + param.last_layer = ODP_PROTO_LAYER_ALL; + param.chksums.chksum.ipv4 = 1; + param.chksums.chksum.tcp = 1; + param.chksums.chksum.udp = 1; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_parse(pkt_tbl[i], 0, &param); + + return !ret; +} + +static int bench_packet_parse_multi(void) +{ + int burst_size = gbl_args->appl.burst_size; + int ret = 0; + int i; + odp_packet_parse_param_t param; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t offsets[burst_size]; + + memset(&offsets, 0, sizeof(offsets)); + + memset(&param, 0, sizeof(odp_packet_parse_param_t)); + param.proto = ODP_PROTO_ETH; + param.last_layer = ODP_PROTO_LAYER_ALL; + param.chksums.chksum.ipv4 = 1; + param.chksums.chksum.tcp = 1; + param.chksums.chksum.udp = 1; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + int idx = i * burst_size; + + ret += odp_packet_parse_multi(&pkt_tbl[idx], offsets, + burst_size, &param); + } + return (ret == TEST_REPEAT_COUNT * burst_size); +} + /** * Prinf usage information */ @@ -1586,6 +1706,30 @@ bench_info_t test_suite[] = { free_packets_twice, NULL), BENCH_INFO(bench_packet_subtype, create_packets, free_packets, NULL), + BENCH_INFO(bench_packet_parse, alloc_parse_packets_ipv4_tcp, + free_packets, "bench_packet_parse_ipv4_tcp"), + BENCH_INFO(bench_packet_parse, alloc_parse_packets_ipv4_udp, + free_packets, "bench_packet_parse_ipv4_udp"), + BENCH_INFO(bench_packet_parse, alloc_parse_packets_ipv6_tcp, + free_packets, "bench_packet_parse_ipv6_tcp"), + BENCH_INFO(bench_packet_parse, alloc_parse_packets_ipv6_udp, + free_packets, "bench_packet_parse_ipv6_udp"), + BENCH_INFO(bench_packet_parse_multi, + alloc_parse_packets_multi_ipv4_tcp, + free_packets_multi, + "bench_packet_parse_multi_ipv4_tcp"), + BENCH_INFO(bench_packet_parse_multi, + alloc_parse_packets_multi_ipv4_udp, + free_packets_multi, + "bench_packet_parse_multi_ipv4_udp"), + BENCH_INFO(bench_packet_parse_multi, + alloc_parse_packets_multi_ipv6_tcp, + free_packets_multi, + "bench_packet_parse_multi_ipv6_tcp"), + BENCH_INFO(bench_packet_parse_multi, + alloc_parse_packets_multi_ipv6_udp, + free_packets_multi, + "bench_packet_parse_multi_ipv6_udp"), }; /** commit fae79706192988fa1b89e68f11e3167c9495c771 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Nov 6 09:50:03 2019 +0200 test: bench_packet: add tests for missing packet functions Added tests for the following packet functions: odp_packet_data_seg_len() odp_packet_free_sp() odp_packet_from_event_multi() odp_packet_to_event_multi() odp_packet_subtype() Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c index d050debb9..3bf61d86d 100644 --- a/test/performance/odp_bench_packet.c +++ b/test/performance/odp_bench_packet.c @@ -413,6 +413,18 @@ static void create_events(void) gbl_args->event_tbl[i] = odp_packet_to_event(pkt_tbl[i]); } +static void create_events_multi(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + allocate_test_packets(gbl_args->pkt.len, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT * gbl_args->appl.burst_size); + + for (i = 0; i < TEST_REPEAT_COUNT * gbl_args->appl.burst_size; i++) + gbl_args->event_tbl[i] = odp_packet_to_event(pkt_tbl[i]); +} + static void free_packets(void) { odp_packet_free_multi(gbl_args->pkt_tbl, TEST_REPEAT_COUNT); @@ -491,6 +503,19 @@ static int bench_packet_free_multi(void) return i; } +static int bench_packet_free_sp(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + int pkt_idx = i * gbl_args->appl.burst_size; + + odp_packet_free_sp(&gbl_args->pkt_tbl[pkt_idx], + gbl_args->appl.burst_size); + } + return i; +} + static int bench_packet_alloc_free(void) { int i; @@ -545,6 +570,20 @@ static int bench_packet_from_event(void) return i; } +static int bench_packet_from_event_multi(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + int idx = i * gbl_args->appl.burst_size; + + odp_packet_from_event_multi(&gbl_args->pkt_tbl[idx], + &gbl_args->event_tbl[idx], + gbl_args->appl.burst_size); + } + return i; +} + static int bench_packet_to_event(void) { int i; @@ -556,6 +595,20 @@ static int bench_packet_to_event(void) return i; } +static int bench_packet_to_event_multi(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + int idx = i * gbl_args->appl.burst_size; + + odp_packet_to_event_multi(&gbl_args->pkt_tbl[idx], + &gbl_args->event_tbl[idx], + gbl_args->appl.burst_size); + } + return i; +} + static int bench_packet_head(void) { int i; @@ -587,6 +640,18 @@ static int bench_packet_data(void) return i; } +static int bench_packet_data_seg_len(void) +{ + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t *output_tbl = gbl_args->output_tbl; + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_data_seg_len(pkt_tbl[i], + &output_tbl[i]); + return i; +} + static int bench_packet_seg_len(void) { int i; @@ -1276,6 +1341,17 @@ static int bench_packet_has_ref(void) return i; } +static int bench_packet_subtype(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->output_tbl[i] = odp_packet_subtype(pkt_tbl[i]); + + return i; +} + /** * Prinf usage information */ @@ -1371,20 +1447,28 @@ bench_info_t test_suite[] = { BENCH_INFO(bench_packet_free, create_packets, NULL, NULL), BENCH_INFO(bench_packet_free_multi, alloc_packets_multi, NULL, NULL), + BENCH_INFO(bench_packet_free_sp, alloc_packets_multi, NULL, + NULL), BENCH_INFO(bench_packet_alloc_free, NULL, NULL, NULL), BENCH_INFO(bench_packet_alloc_free_multi, NULL, NULL, NULL), BENCH_INFO(bench_packet_reset, create_packets, free_packets, NULL), BENCH_INFO(bench_packet_from_event, create_events, free_packets, NULL), + BENCH_INFO(bench_packet_from_event_multi, create_events_multi, + free_packets_multi, NULL), BENCH_INFO(bench_packet_to_event, create_packets, free_packets, NULL), + BENCH_INFO(bench_packet_to_event_multi, alloc_packets_multi, + free_packets_multi, NULL), BENCH_INFO(bench_packet_head, create_packets, free_packets, NULL), BENCH_INFO(bench_packet_buf_len, create_packets, free_packets, NULL), BENCH_INFO(bench_packet_data, create_packets, free_packets, NULL), + BENCH_INFO(bench_packet_data_seg_len, create_packets, + free_packets, NULL), BENCH_INFO(bench_packet_seg_len, create_packets, free_packets, NULL), BENCH_INFO(bench_packet_len, create_packets, free_packets, @@ -1500,6 +1584,8 @@ bench_info_t test_suite[] = { free_packets_twice, NULL), BENCH_INFO(bench_packet_has_ref, alloc_ref_packets, free_packets_twice, NULL), + BENCH_INFO(bench_packet_subtype, create_packets, free_packets, + NULL), }; /** ----------------------------------------------------------------------- Summary of changes: test/performance/odp_bench_packet.c | 230 ++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) hooks/post-receive --

6 years, 2 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp