git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch master updated. v1.15.0.0-296-gbd1b1adf

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 bd1b1adf37dd8d252f7daf761d4ae9a6d1ef156a (commit) via 4fafec8378b6e7d0b353d851e724ab27eb002b27 (commit) from 82419a31e6d1846e0676edfa7fb511a23098f5a9 (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 bd1b1adf37dd8d252f7daf761d4ae9a6d1ef156a Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Mar 16 14:50:36 2017 +0200 linux-gen: netmap: remove minimum frame len check Checking the minimum frame length is unnecessary as netmap drops truncated frames internally. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 4aecb242..297d54dc 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -649,11 +649,6 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, goto fail; } - if (odp_unlikely(len < _ODP_ETH_LEN_MIN)) { - ODP_ERR("RX: Frame truncated: %" PRIu16 "\n", len); - goto fail; - } - if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, (const uint8_t *)slot.buf, len, commit 4fafec8378b6e7d0b353d851e724ab27eb002b27 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Mar 16 13:53:30 2017 +0200 linux-gen: netmap: use thread id to make vdev mac addresses unique Previously the mac addresses of virtual netmap devices would clash if multiple odp processes were run on the same host. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 4c72a658..4aecb242 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -20,6 +20,7 @@ #include <protocols/eth.h> #include <sys/ioctl.h> +#include <sys/syscall.h> #include <poll.h> #include <linux/ethtool.h> #include <linux/sockios.h> @@ -388,6 +389,11 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, if (pkt_nm->is_virtual) { static unsigned mac; + uint32_t tid = syscall(SYS_gettid); + + if ((int)tid == -1) + ODP_DBG("Unable to fetch thread ID. VALE port MAC " + "addresses may not be unique.\n"); pkt_nm->capa.max_input_queues = 1; pkt_nm->capa.set_op.op.promisc_mode = 0; @@ -395,6 +401,10 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, pktio_entry->s.stats_type = STATS_UNSUPPORTED; /* Set MAC address for virtual interface */ pkt_nm->if_mac[0] = 0x2; + pkt_nm->if_mac[1] = (tid >> 24) & 0xff; + pkt_nm->if_mac[2] = (tid >> 16) & 0xff; + pkt_nm->if_mac[3] = (tid >> 8) & 0xff; + pkt_nm->if_mac[4] = tid & 0xff; pkt_nm->if_mac[5] = ++mac; return 0; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/netmap.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) hooks/post-receive --

8 years, 3 months

[COMMIT] branch api-next updated. v1.15.0.0-831-g63d92eb2

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, api-next has been updated via 63d92eb289261d1534b5b9e1e04291faa5e45d30 (commit) via 82419a31e6d1846e0676edfa7fb511a23098f5a9 (commit) via c0aeacf23dddfb7feae47fef6e4d10d6bdb9c812 (commit) via dd0498bb104c7319e2ec56b61e4d585167ea6c53 (commit) via e826613858543e50a2ec74598f8c2c6fd4bfa064 (commit) via 503722802274ff5de09144613d9262e2cfdb3077 (commit) via 5329228e260d36de62c3edf3c1a3f08ab95fd558 (commit) via 74d880d7e20ab4825868bd2013b164d4bc90eb45 (commit) from 825f75ed8644ef57c5648961e7982daf13cd9375 (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 63d92eb289261d1534b5b9e1e04291faa5e45d30 Merge: 825f75ed 82419a31 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Oct 25 10:15:03 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc .travis.yml index 49b922e3,2d397171..4608dae8 --- a/.travis.yml +++ b/.travis.yml @@@ -41,7 -41,7 +41,8 @@@ addons - clang-3.8 - automake autoconf libtool libssl-dev graphviz mscgen - libpcap-dev + - libconfig-dev + - libnuma-dev # coverity_scan: # project: # name: "$TRAVIS_REPO_SLUG" ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 45 ++++++++++ .travis.yml | 5 +- DEPENDENCIES | 6 +- platform/linux-generic/m4/odp_dpdk.m4 | 2 +- platform/linux-generic/odp_packet_io.c | 15 ++-- platform/linux-generic/pktio/dpdk.c | 99 ++++++++++++++++------ platform/linux-generic/test/.gitignore | 1 + .../test/validation/api/pktio/pktio_run_dpdk.sh | 2 +- scripts/Dockerfile | 24 ++++++ scripts/build-pktio-dpdk | 8 +- test/validation/api/.gitignore | 1 + 11 files changed, 172 insertions(+), 36 deletions(-) create mode 100644 .shippable.yml create mode 100644 scripts/Dockerfile hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.15.0.0-294-g82419a31

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 82419a31e6d1846e0676edfa7fb511a23098f5a9 (commit) via c0aeacf23dddfb7feae47fef6e4d10d6bdb9c812 (commit) from dd0498bb104c7319e2ec56b61e4d585167ea6c53 (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 82419a31e6d1846e0676edfa7fb511a23098f5a9 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 18 14:00:23 2017 +0300 linux-gen: dpdk: bump target dpdk version to 17.08 Changes: - Function rte_set_log_level() is now deprecated. Replace it with rte_log_set_global_level(). - New dependency added to libnuma. - Pcap-based virtual devices are renamed to net_pcap. - DPDK pktio devices cannot be restarted after calling rte_eth_dev_close(). Move rte_eth_dev_close() calls to global terminate from odp_pktio_close(). Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index d8da542c..2d397171 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,7 @@ addons: - clang-3.8 - automake autoconf libtool libssl-dev graphviz mscgen - libpcap-dev + - libnuma-dev # coverity_scan: # project: # name: "$TRAVIS_REPO_SLUG" @@ -150,7 +151,7 @@ install: - gem install asciidoctor # DPDK pktio. Note that cache must be purged if dpdk version changes. - - DPDK_VERS="17.02" + - DPDK_VERS="17.08" - | CACHED_DPDK_VERS=`fgrep Version dpdk/pkg/dpdk.spec | cut -d " " -f 2` if [ "${CACHED_DPDK_VERS}" != "${DPDK_VERS}" ]; then diff --git a/DEPENDENCIES b/DEPENDENCIES index e309b339..68c7b8be 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -160,13 +160,17 @@ Prerequisites for building the OpenDataPlane (ODP) API Use DPDK for ODP packet I/O. + DPDK pktio adds a depency to NUMA library. + # Debian/Ubuntu + $ sudo apt-get install libnuma-dev + Note: only packet I/O is accelerated with DPDK. Use https://git.linaro.org/lng/odp-dpdk.git for fully accelerated odp dpdk platform. 3.4.1 Building DPDK and ODP with DPDK pktio support - DPDK packet I/O has been tested to work with DPDK v17.02. + DPDK packet I/O has been tested to work with DPDK v17.08. Follow steps in ./scripts/build-pktio-dpdk diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index 9d90bbab..1e8fa2de 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -52,7 +52,7 @@ then AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], [Define to 1 to enable DPDK zero copy support]) - DPDK_LIBS="-L$DPDK_PATH/lib -ldpdk -lpthread -ldl -lpcap -lm" + DPDK_LIBS="-L$DPDK_PATH/lib -ldpdk -lpthread -ldl -lpcap -lm -lnuma" AC_SUBST([DPDK_CPPFLAGS]) AC_SUBST([DPDK_LIBS]) AC_SUBST([DPDK_PMDS]) diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 931cc711..de9295c4 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -924,12 +924,6 @@ static int dpdk_close(pktio_entry_t *pktio_entry) rte_pktmbuf_free(pkt_dpdk->rx_cache[i].s.pkt[idx++]); } - if (pktio_entry->s.state != PKTIO_STATE_OPENED) - rte_eth_dev_close(pkt_dpdk->port_id); - - if (!ODP_DPDK_ZERO_COPY) - rte_mempool_free(pkt_dpdk->pkt_pool); - return 0; } @@ -1016,7 +1010,7 @@ static int dpdk_pktio_init(void) } ODP_DBG("rte_eal_init OK\n"); - rte_set_log_level(RTE_LOG_WARNING); + rte_log_set_global_level(RTE_LOG_WARNING); i = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &original_cpuset); @@ -1059,6 +1053,28 @@ static int dpdk_pktio_init_local(void) return 0; } +static void dpdk_mempool_free(struct rte_mempool *mp, void *arg ODP_UNUSED) +{ + rte_mempool_free(mp); +} + +static int dpdk_pktio_term(void) +{ + uint8_t port_id; + + if (!dpdk_initialized) + return 0; + + RTE_ETH_FOREACH_DEV(port_id) { + rte_eth_dev_close(port_id); + } + + if (!ODP_DPDK_ZERO_COPY) + rte_mempool_walk(dpdk_mempool_free, NULL); + + return 0; +} + static int dpdk_input_queues_config(pktio_entry_t *pktio_entry, const odp_pktin_queue_param_t *p) { @@ -1244,11 +1260,17 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, pkt_pool = pool_create(pool_entry); } else { snprintf(pool_name, sizeof(pool_name), "pktpool_%s", netdev); - pkt_pool = rte_pktmbuf_pool_create(pool_name, - DPDK_NB_MBUF, - DPDK_MEMPOOL_CACHE_SIZE, 0, - DPDK_MBUF_BUF_SIZE, - rte_socket_id()); + /* Check if the pool exists already */ + pkt_pool = rte_mempool_lookup(pool_name); + if (pkt_pool == NULL) { + unsigned cache_size = DPDK_MEMPOOL_CACHE_SIZE; + + pkt_pool = rte_pktmbuf_pool_create(pool_name, + DPDK_NB_MBUF, + cache_size, 0, + DPDK_MBUF_BUF_SIZE, + rte_socket_id()); + } } if (pkt_pool == NULL) { ODP_ERR("Cannot init mbuf packet pool\n"); @@ -1557,7 +1579,7 @@ const pktio_if_ops_t dpdk_pktio_ops = { .name = "dpdk", .init_global = dpdk_pktio_init_global, .init_local = dpdk_pktio_init_local, - .term = NULL, + .term = dpdk_pktio_term, .open = dpdk_open, .close = dpdk_close, .start = dpdk_start, diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh index 14759142..24194cbc 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh @@ -74,7 +74,7 @@ run() if [ "$ODP_PKTIO_IF0" = "" ]; then setup_pktio_env clean - export ODP_PKTIO_DPDK_PARAMS="--no-pci --vdev eth_pcap0,iface=$IF0 --vdev eth_pcap1,iface=$IF1" + export ODP_PKTIO_DPDK_PARAMS="--no-pci --vdev net_pcap0,iface=$IF0 --vdev net_pcap1,iface=$IF1" export ODP_PKTIO_IF0=0 export ODP_PKTIO_IF1=1 fi diff --git a/scripts/build-pktio-dpdk b/scripts/build-pktio-dpdk index 6c6830ac..97916c1e 100755 --- a/scripts/build-pktio-dpdk +++ b/scripts/build-pktio-dpdk @@ -10,7 +10,13 @@ if [ "$?" != "0" ]; then echo "Error: pcap is not installed. You may need to install libpcap-dev" fi -git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v17.02 http://dpdk.org/git/dpdk dpdk +echo '#include "numa.h"' | cpp -H -o /dev/null 2>&1 +if [ "$?" != "0" ]; then + echo "Error: NUMA library is not installed. You need to install libnuma-dev" + exit 1 +fi + +git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v17.08 http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate commit c0aeacf23dddfb7feae47fef6e4d10d6bdb9c812 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Oct 20 15:44:55 2017 +0300 linux-gen: dpdk: create missing dpdk mempools in zero-copy mode In zero-copy dpdk pktio mode a matching dpdk mempool is required for each odp packet pool from which packets are sent using dpdk pktio. This is required for all packet pools, even for those which are not passed directly to pktio devices as odp_pktio_open() parameters. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 2e50a55f..931cc711 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -296,6 +296,36 @@ static void pool_destroy(void *pool) rte_mempool_free(mp); } +static struct rte_mempool *pool_create(pool_t *pool) +{ + struct rte_mempool *pkt_pool; + char pool_name[RTE_MEMPOOL_NAMESIZE]; + + odp_ticketlock_lock(&pool->lock); + + if (pool->ext_desc != NULL) { + odp_ticketlock_unlock(&pool->lock); + return (struct rte_mempool *)pool->ext_desc; + } + + snprintf(pool_name, sizeof(pool_name), + "dpdk_pktpool_%" PRIu32 "", pool->pool_idx); + pkt_pool = mbuf_pool_create(pool_name, pool); + + if (pkt_pool == NULL) { + odp_ticketlock_unlock(&pool->lock); + ODP_ERR("Creating external DPDK pool failed\n"); + return NULL; + } + + pool->ext_desc = pkt_pool; + pool->ext_destroy = pool_destroy; + + odp_ticketlock_unlock(&pool->lock); + + return pkt_pool; +} + static struct rte_mempool_ops ops_stack = { .name = "odp_pool", .alloc = pool_alloc, @@ -672,6 +702,11 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, } else { pool_t *pool_entry = pkt_hdr->buf_hdr.pool_ptr; + if (odp_unlikely(pool_entry->ext_desc == NULL)) { + if (pool_create(pool_entry) == NULL) + ODP_ABORT("Creating DPDK pool failed"); + } + if (pkt_hdr->buf_hdr.segcount != 1 || !pool_entry->mem_from_huge_pages) { /* Fall back to packet copy */ @@ -681,8 +716,8 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, (*copy_count)++; } else { - mbuf_init(pkt_dpdk->pkt_pool, mbuf, - pkt_hdr); + mbuf_init((struct rte_mempool *) + pool_entry->ext_desc, mbuf, pkt_hdr); mbuf_update(mbuf, pkt_hdr, pkt_len); if (pktout_cfg->all_bits) pkt_set_ol_tx(pktout_cfg, pkt_hdr, @@ -1203,16 +1238,10 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, else pkt_dpdk->min_rx_burst = 0; if (ODP_DPDK_ZERO_COPY) { - if (pool_entry->ext_desc != NULL) { + if (pool_entry->ext_desc != NULL) pkt_pool = (struct rte_mempool *)pool_entry->ext_desc; - } else { - snprintf(pool_name, sizeof(pool_name), - "pktpool_%" PRIu32 "", pool_entry->pool_idx); - pkt_pool = mbuf_pool_create(pool_name, - pool_entry); - pool_entry->ext_destroy = pool_destroy; - pool_entry->ext_desc = pkt_pool; - } + else + pkt_pool = pool_create(pool_entry); } else { snprintf(pool_name, sizeof(pool_name), "pktpool_%s", netdev); pkt_pool = rte_pktmbuf_pool_create(pool_name, ----------------------------------------------------------------------- Summary of changes: .travis.yml | 3 +- DEPENDENCIES | 6 +- platform/linux-generic/m4/odp_dpdk.m4 | 2 +- platform/linux-generic/pktio/dpdk.c | 99 ++++++++++++++++------ .../test/validation/api/pktio/pktio_run_dpdk.sh | 2 +- scripts/build-pktio-dpdk | 8 +- 6 files changed, 91 insertions(+), 29 deletions(-) hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.15.0.0-292-gdd0498bb

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 dd0498bb104c7319e2ec56b61e4d585167ea6c53 (commit) from e826613858543e50a2ec74598f8c2c6fd4bfa064 (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 dd0498bb104c7319e2ec56b61e4d585167ea6c53 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Oct 18 18:28:51 2017 +0300 linux-gen: pktio: ignore num_queues parameter if classifier enabled Api defines statemet: "When classifier is enabled in odp_pktin_queue_config() this value is ignored, otherwise at least one queue is required." https://bugs.linaro.org/show_bug.cgi?id=3289 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index f972bb78..0473483d 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1228,13 +1228,13 @@ int odp_pktin_queue_config(odp_pktio_t pktio, if (mode == ODP_PKTIN_MODE_DISABLED) return 0; - num_queues = param->num_queues; - - if (num_queues == 0) { - ODP_DBG("pktio %s: zero input queues\n", entry->s.name); + if (!param->classifier_enable && param->num_queues == 0) { + ODP_DBG("invalid num_queues for operation mode\n"); return -1; } + num_queues = param->classifier_enable ? 1 : param->num_queues; + rc = odp_pktio_capability(pktio, &capa); if (rc) { ODP_DBG("pktio %s: unable to read capabilities\n", @@ -1263,8 +1263,11 @@ int odp_pktin_queue_config(odp_pktio_t pktio, snprintf(name, sizeof(name), "odp-pktin-%i-%i", pktio_id, i); - memcpy(&queue_param, &param->queue_param, - sizeof(odp_queue_param_t)); + if (param->classifier_enable) + odp_queue_param_init(&queue_param); + else + memcpy(&queue_param, &param->queue_param, + sizeof(odp_queue_param_t)); queue_param.type = ODP_QUEUE_TYPE_PLAIN; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_packet_io.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.15.0.0-291-ge8266138

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 e826613858543e50a2ec74598f8c2c6fd4bfa064 (commit) via 503722802274ff5de09144613d9262e2cfdb3077 (commit) from 5329228e260d36de62c3edf3c1a3f08ab95fd558 (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 e826613858543e50a2ec74598f8c2c6fd4bfa064 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Mon Oct 23 20:04:53 2017 -0500 linux-generic: test: add missing file to .gitignore Add the tests-linux-generic.env file to .gitignore Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/test/.gitignore b/platform/linux-generic/test/.gitignore index 5dabf91c..2ff19897 100644 --- a/platform/linux-generic/test/.gitignore +++ b/platform/linux-generic/test/.gitignore @@ -1,3 +1,4 @@ *.log *.trs +tests-linux-generic.env tests-validation.env commit 503722802274ff5de09144613d9262e2cfdb3077 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Mon Oct 23 20:04:21 2017 -0500 test: validation: add missing file to .gitignore Add the tests-validation.env file to .gitignore. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/.gitignore b/test/validation/api/.gitignore index 7e563b8b..5dabf91c 100644 --- a/test/validation/api/.gitignore +++ b/test/validation/api/.gitignore @@ -1,2 +1,3 @@ *.log *.trs +tests-validation.env ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/test/.gitignore | 1 + test/validation/api/.gitignore | 1 + 2 files changed, 2 insertions(+) hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.15.0.0-289-g5329228e

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 5329228e260d36de62c3edf3c1a3f08ab95fd558 (commit) via 74d880d7e20ab4825868bd2013b164d4bc90eb45 (commit) from f5120355753ae3d69f81010cb9131abffdfb03fc (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 5329228e260d36de62c3edf3c1a3f08ab95fd558 Author: Tom Trahan <tom(a)shippable.com> Date: Sun Oct 22 08:50:46 2017 -0700 add sample shippable.yml and Dockerfile for Aarch64 builds Signed-off-by: Tom Trahan <tom(a)shippable.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.shippable.yml b/.shippable.yml new file mode 100644 index 00000000..9fbb2919 --- /dev/null +++ b/.shippable.yml @@ -0,0 +1,45 @@ +language: c + +compiler: + - gcc + - clang + +env: + matrix: + - CONF="" + # - CONF="--disable-abi-compat" + # - CONF="--enable-schedule-sp" + # - CONF="--enable-schedule-iquery" + # - CONF="--enable-dpdk-zero-copy" + # - CROSS_ARCH="arm64" + # - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" + # - CROSS_ARCH="powerpc" + # - CROSS_ARCH="i386" + global: + # - PLACEHOLDER="" + +build: + pre_ci: + # use Dockerfile to install additional CI dependencies + - docker build -t=odp/dev ./scripts + + # use image built in 'pre_ci' for CI job + pre_ci_boot: + image_name: odp/dev + image_tag: latest + pull: false + options: + + ci: + - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages + - sudo mkdir -p /mnt/huge + - sudo mount -t hugetlbfs nodev /mnt/huge + - mkdir -p /dev/shm/odp + - ./bootstrap + - ./configure --disable-test-perf + - make + - sudo env ODP_SHM_DIR=/dev/shm/odp make check + + on_failure: + - cat config.log + - find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done diff --git a/scripts/Dockerfile b/scripts/Dockerfile new file mode 100644 index 00000000..995330fa --- /dev/null +++ b/scripts/Dockerfile @@ -0,0 +1,24 @@ +FROM drydockaarch64/u16:v5.10.1 + +RUN if $(sudo update-alternatives --list gcc); \ + then sudo update-alternatives --remove-all gcc; \ + fi + +RUN sudo apt-get update && sudo apt-get install -yy \ + autoconf \ + automake \ + ccache \ + clang-3.8 \ + gcc-4.8 \ + graphviz \ + kmod \ + mscgen \ + libcunit1-dev \ + libpcap-dev \ + libssl-dev \ + libtool \ + linux-headers-`uname -r` \ + ruby-dev + +RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 10 +RUN sudo ln -s /usr/bin/clang-3.8 /usr/bin/clang commit 74d880d7e20ab4825868bd2013b164d4bc90eb45 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Oct 23 17:54:35 2017 +0300 travis: fix doxygen error capture grep in doxygen log, not in some test.log Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index dbaad146..d8da542c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -264,7 +264,7 @@ jobs: # doxygen does not trap on warnings, check for them here. - make doxygen-doc 2>&1 |tee doxygen.log - | - fgrep -rq warning ./test.log + fgrep -rq warning ./doxygen.log if [ $? -eq 0 ]; then false else ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 2 +- scripts/Dockerfile | 24 ++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 .shippable.yml create mode 100644 scripts/Dockerfile hooks/post-receive --

8 years, 3 months

[COMMIT] branch 2.0 updated. v1.15.0.0-811-gd37aa7f1

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, 2.0 has been updated via d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f (commit) from 7bab5c22f99bb4847bd941fea1f5ed59a1412899 (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 d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Oct 23 11:09:28 2017 +0300 linux-gen: modular-farmework: make modular framework symbols visible Make modular framework/subsystems symbols visible Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Yi He <yi.he(a)linaro.org> diff --git a/frameworks/modular/odp_module.h b/frameworks/modular/odp_module.h index 59f67c8d..b20501eb 100644 --- a/frameworks/modular/odp_module.h +++ b/frameworks/modular/odp_module.h @@ -38,6 +38,11 @@ #ifndef ODP_MODULE_H_ #define ODP_MODULE_H_ +#include <odp/visibility_begin.h> + +#ifdef __cplusplus +extern "C" { +#endif #include <stdbool.h> #include <odp/api/rwlock.h> @@ -293,4 +298,9 @@ int __subsystem_register_module( __subsystem_set_active(&__subsystem(name), base); \ }) +#ifdef __cplusplus +} +#endif + +#include <odp/visibility_end.h> #endif diff --git a/platform/linux-generic/include/odp_buffer_subsystem.h b/platform/linux-generic/include/odp_buffer_subsystem.h index 6b69c06f..3c791d20 100644 --- a/platform/linux-generic/include/odp_buffer_subsystem.h +++ b/platform/linux-generic/include/odp_buffer_subsystem.h @@ -8,6 +8,7 @@ #ifndef ODP_BUFFER_SUBSYSTEM_H_ #define ODP_BUFFER_SUBSYSTEM_H_ +#include <odp/visibility_begin.h> #ifdef __cplusplus extern "C" { @@ -58,5 +59,6 @@ typedef ODP_MODULE_CLASS(buffer) { } #endif +#include <odp/visibility_end.h> #endif diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index 34bc5a24..cb107fed 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -8,6 +8,11 @@ #ifndef ODP_PKTIO_OPS_SUBSYSTEM_H_ #define ODP_PKTIO_OPS_SUBSYSTEM_H_ +#include <odp/visibility_begin.h> + +#ifdef __cplusplus +extern "C" { +#endif #include <odp_module.h> #include <odp/api/packet_io.h> @@ -87,4 +92,9 @@ typedef ODP_MODULE_CLASS(pktio_ops) { #define odp_ops_data(_p, _mod) \ ((pktio_ops_ ## _mod ## _data_t *)(uintptr_t)_p->s.ops_data) +#ifdef __cplusplus +} +#endif + +#include <odp/visibility_end.h> #endif diff --git a/platform/linux-generic/include/odp_pool_subsystem.h b/platform/linux-generic/include/odp_pool_subsystem.h index 45537a86..0f34ad14 100644 --- a/platform/linux-generic/include/odp_pool_subsystem.h +++ b/platform/linux-generic/include/odp_pool_subsystem.h @@ -8,6 +8,7 @@ #ifndef ODP_POOL_SUBSYSTEM_H_ #define ODP_POOL_SUBSYSTEM_H_ +#include <odp/visibility_begin.h> #ifdef __cplusplus extern "C" { @@ -47,4 +48,5 @@ typedef ODP_MODULE_CLASS(pool) { } #endif +#include <odp/visibility_end.h> #endif diff --git a/platform/linux-generic/include/odp_queue_subsystem.h b/platform/linux-generic/include/odp_queue_subsystem.h index 601a254e..57fa68fd 100644 --- a/platform/linux-generic/include/odp_queue_subsystem.h +++ b/platform/linux-generic/include/odp_queue_subsystem.h @@ -8,6 +8,7 @@ #ifndef ODP_QUEUE_SUBSYSTEM_H #define ODP_QUEUE_SUBSYSTEM_H +#include <odp/visibility_begin.h> #ifdef __cplusplus extern "C" { @@ -74,4 +75,5 @@ typedef ODP_MODULE_CLASS(queue) { } #endif +#include <odp/visibility_end.h> #endif diff --git a/platform/linux-generic/include/odp_schedule_subsystem.h b/platform/linux-generic/include/odp_schedule_subsystem.h index 4b2f2958..7d924778 100644 --- a/platform/linux-generic/include/odp_schedule_subsystem.h +++ b/platform/linux-generic/include/odp_schedule_subsystem.h @@ -8,6 +8,11 @@ #ifndef ODP_SCHEDULE_SUBSYSTEM_H_ #define ODP_SCHEDULE_SUBSYSTEM_H_ +#include <odp/visibility_begin.h> + +#ifdef __cplusplus +extern "C" { +#endif /* API header files */ #include <odp/api/align.h> @@ -77,4 +82,9 @@ typedef ODP_MODULE_CLASS(schedule) { odp_api_proto(schedule, schedule_resume) schedule_resume; } odp_schedule_module_t; +#ifdef __cplusplus +} +#endif + +#include <odp/visibility_end.h> #endif /* ODP_SCHEDULE_SUBSYSTEM_H_ */ ----------------------------------------------------------------------- Summary of changes: frameworks/modular/odp_module.h | 10 ++++++++++ platform/linux-generic/include/odp_buffer_subsystem.h | 2 ++ platform/linux-generic/include/odp_pktio_ops_subsystem.h | 10 ++++++++++ platform/linux-generic/include/odp_pool_subsystem.h | 2 ++ platform/linux-generic/include/odp_queue_subsystem.h | 2 ++ platform/linux-generic/include/odp_schedule_subsystem.h | 10 ++++++++++ 6 files changed, 36 insertions(+) hooks/post-receive --

8 years, 3 months

[COMMIT] branch api-next updated. v1.15.0.0-823-g825f75ed

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, api-next has been updated via 825f75ed8644ef57c5648961e7982daf13cd9375 (commit) via 18977d0684ef7a26ddd6777ca341f7b1ca9e5c3e (commit) via f4d54b8831df52878b66bb145124a9adb4beab28 (commit) via e733d6ba6382ccbf9d6c84a6a10bf720c2e16c0d (commit) from ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 (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 825f75ed8644ef57c5648961e7982daf13cd9375 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Oct 20 15:48:24 2017 +0300 linux-gen: shm: implement odp_shm_print Implement the new block level debug print function. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index e7a6c235..238efb81 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -1837,3 +1837,52 @@ int _odp_ishm_status(const char *title) odp_spinlock_unlock(&ishm_tbl->lock); return nb_blocks; } + +void _odp_ishm_print(int block_index) +{ + ishm_block_t *block; + const char *str; + + odp_spinlock_lock(&ishm_tbl->lock); + + if ((block_index < 0) || + (block_index >= ISHM_MAX_NB_BLOCKS) || + (ishm_tbl->block[block_index].len == 0)) { + odp_spinlock_unlock(&ishm_tbl->lock); + ODP_ERR("Request for info on an invalid block\n"); + return; + } + + block = &ishm_tbl->block[block_index]; + + ODP_PRINT("\nSHM block info\n--------------\n"); + ODP_PRINT(" name: %s\n", block->name); + ODP_PRINT(" file: %s\n", block->filename); + ODP_PRINT(" expt: %s\n", block->exptname); + ODP_PRINT(" user_flags: 0x%x\n", block->user_flags); + ODP_PRINT(" flags: 0x%x\n", block->flags); + ODP_PRINT(" user_len: %lu\n", block->user_len); + ODP_PRINT(" start: %p\n", block->start); + ODP_PRINT(" len: %lu\n", block->len); + + switch (block->huge) { + case HUGE: + str = "huge"; + break; + case NORMAL: + str = "normal"; + break; + case EXTERNAL: + str = "external"; + break; + default: + str = "??"; + } + + ODP_PRINT(" page type: %s\n", str); + ODP_PRINT(" seq: %lu\n", block->seq); + ODP_PRINT(" refcnt: %lu\n", block->refcnt); + ODP_PRINT("\n"); + + odp_spinlock_unlock(&ishm_tbl->lock); +} diff --git a/platform/linux-generic/include/_ishm_internal.h b/platform/linux-generic/include/_ishm_internal.h index 005d6b55..34068bc0 100644 --- a/platform/linux-generic/include/_ishm_internal.h +++ b/platform/linux-generic/include/_ishm_internal.h @@ -45,6 +45,7 @@ void *_odp_ishm_address(int block_index); int _odp_ishm_info(int block_index, _odp_ishm_info_t *info); int _odp_ishm_status(const char *title); int _odp_ishm_cleanup_files(const char *dirpath); +void _odp_ishm_print(int block_index); #ifdef __cplusplus } diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index ccd25c8c..aabecd9b 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -116,6 +116,11 @@ void odp_shm_print_all(void) _odp_ishm_status("Memory allocation status:"); } +void odp_shm_print(odp_shm_t shm) +{ + _odp_ishm_print(from_handle(shm)); +} + uint64_t odp_shm_to_u64(odp_shm_t hdl) { return _odp_pri(hdl); diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c index 08587940..d5335afa 100644 --- a/test/validation/api/shmem/shmem.c +++ b/test/validation/api/shmem/shmem.c @@ -152,6 +152,8 @@ void shmem_test_basic(void) odp_cunit_thread_create(run_test_basic_thread, &thrdarg); CU_ASSERT(odp_cunit_thread_exit(&thrdarg) >= 0); + odp_shm_print(shm); + CU_ASSERT(0 == odp_shm_free(shm)); } commit 18977d0684ef7a26ddd6777ca341f7b1ca9e5c3e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Oct 20 15:06:55 2017 +0300 linux-gen: shm: make odp_shm_print_all readable again Use ODP_PRINT instead of ODP_DBG in the print function. The idea of a print function is that it prints information when application calls it. ODP_DBG does not print anything by default. Format printted output to be a readable table of shm blocks. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 6e5bc61f..e7a6c235 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -1708,11 +1708,28 @@ int _odp_ishm_status(const char *title) int nb_allocated_frgments = 0; /* nb frag describing an allocated VA */ int nb_blocks = 0; int single_va_blocks = 0; + int max_name_len = 0; odp_spinlock_lock(&ishm_tbl->lock); procsync(); - ODP_DBG("ishm blocks allocated at: %s\n", title); + /* find longest block name */ + for (i = 0; i < ISHM_MAX_NB_BLOCKS; i++) { + int str_len; + + if (ishm_tbl->block[i].len <= 0) + continue; + + str_len = strlen(ishm_tbl->block[i].name); + + if (max_name_len < str_len) + max_name_len = str_len; + } + + ODP_PRINT("ishm blocks allocated at: %s\n", title); + + ODP_PRINT(" %-*s flag len user_len seq ref start fd" + " file\n", max_name_len, "name"); /* display block table: 1 line per entry +1 extra line if mapped here */ for (i = 0; i < ISHM_MAX_NB_BLOCKS; i++) { @@ -1742,41 +1759,39 @@ int _odp_ishm_status(const char *title) huge = '?'; } proc_index = procfind_block(i); - ODP_DBG("%-3d: name:%-.24s file:%-.24s" - " flags:%s,%c len:0x%-08lx" - " user_len:%-8ld seq:%-3ld refcnt:%-4d\n", - i, - ishm_tbl->block[i].name, - ishm_tbl->block[i].filename, - flags, huge, - ishm_tbl->block[i].len, - ishm_tbl->block[i].user_len, - ishm_tbl->block[i].seq, - ishm_tbl->block[i].refcnt); + ODP_PRINT("%2i %-*s %s%c 0x%-08lx %-8lu %-3lu %-3lu", + i, max_name_len, ishm_tbl->block[i].name, + flags, huge, + ishm_tbl->block[i].len, + ishm_tbl->block[i].user_len, + ishm_tbl->block[i].seq, + ishm_tbl->block[i].refcnt); if (proc_index < 0) continue; - ODP_DBG(" start:%-08lx fd:%-3d\n", - ishm_proctable->entry[proc_index].start, - ishm_proctable->entry[proc_index].fd); + ODP_PRINT("%-08lx %-3d", + ishm_proctable->entry[proc_index].start, + ishm_proctable->entry[proc_index].fd); + + ODP_PRINT("%s\n", ishm_tbl->block[i].filename); } /* display the virtual space allocations... : */ - ODP_DBG("ishm virtual space:\n"); + ODP_PRINT("\nishm virtual space:\n"); for (fragmnt = ishm_ftbl->used_fragmnts; fragmnt; fragmnt = fragmnt->next) { if (fragmnt->block_index >= 0) { nb_allocated_frgments++; - ODP_DBG(" %08p - %08p: ALLOCATED by block:%d\n", - (uintptr_t)fragmnt->start, - (uintptr_t)fragmnt->start + fragmnt->len - 1, - fragmnt->block_index); + ODP_PRINT(" %08p - %08p: ALLOCATED by block:%d\n", + (uintptr_t)fragmnt->start, + (uintptr_t)fragmnt->start + fragmnt->len - 1, + fragmnt->block_index); consecutive_unallocated = 0; } else { - ODP_DBG(" %08p - %08p: NOT ALLOCATED\n", - (uintptr_t)fragmnt->start, - (uintptr_t)fragmnt->start + fragmnt->len - 1); + ODP_PRINT(" %08p - %08p: NOT ALLOCATED\n", + (uintptr_t)fragmnt->start, + (uintptr_t)fragmnt->start + fragmnt->len - 1); if (consecutive_unallocated++) ODP_ERR("defragmentation error\n"); } @@ -1807,9 +1822,9 @@ int _odp_ishm_status(const char *title) fragmnt; fragmnt = fragmnt->next) nb_unused_frgments++; - ODP_DBG("ishm: %d fragment used. %d fragments unused. (total=%d)\n", - nb_used_frgments, nb_unused_frgments, - nb_used_frgments + nb_unused_frgments); + ODP_PRINT("ishm: %d fragment used. %d fragments unused. (total=%d)\n", + nb_used_frgments, nb_unused_frgments, + nb_used_frgments + nb_unused_frgments); if ((nb_used_frgments + nb_unused_frgments) != ISHM_NB_FRAGMNTS) ODP_ERR("lost fragments!\n"); @@ -1817,7 +1832,7 @@ int _odp_ishm_status(const char *title) if (nb_blocks < ishm_proctable->nb_entries) ODP_ERR("process known block cannot exceed main total sum!\n"); - ODP_DBG("\n"); + ODP_PRINT("\n"); odp_spinlock_unlock(&ishm_tbl->lock); return nb_blocks; commit f4d54b8831df52878b66bb145124a9adb4beab28 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Oct 20 13:42:03 2017 +0300 api: shm: print shm block info Added function to print debugging information about the specified shared memory block. Info is implementation defined but should include information about allocated memory addresses, pages, etc. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 2c0db102..60a0cdde 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -209,12 +209,21 @@ void *odp_shm_addr(odp_shm_t shm); */ int odp_shm_info(odp_shm_t shm, odp_shm_info_t *info); - /** * Print all shared memory blocks */ void odp_shm_print_all(void); +/** + * Print shared memory block info + * + * Print implementation defined information about the specified shared memory + * block to the ODP log. The information is intended to be used for debugging. + * + * @param shm Block handle + */ +void odp_shm_print(odp_shm_t shm); + /** * Get printable value for an odp_shm_t * commit e733d6ba6382ccbf9d6c84a6a10bf720c2e16c0d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Oct 20 13:55:12 2017 +0300 api: shm: style clean up Clean up shm header file. Remove [in] Doxygen tags as function parameters are by default input. Move @note text to the main text block, as it's usual API specification text. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 1a9c1299..2c0db102 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -50,6 +50,7 @@ extern "C" { */ #define ODP_SHM_SW_ONLY 0x1 /**< Application SW only, no HW access */ #define ODP_SHM_PROC 0x2 /**< Share with external processes */ + /** * Single virtual address * @@ -58,6 +59,7 @@ extern "C" { * of ODP thread type (e.g. pthread vs. process (or fork process time)). */ #define ODP_SHM_SINGLE_VA 0x4 + /** * Export memory * @@ -70,11 +72,20 @@ extern "C" { * Shared memory block info */ typedef struct odp_shm_info_t { - const char *name; /**< Block name */ - void *addr; /**< Block address */ - uint64_t size; /**< Block size in bytes */ - uint64_t page_size; /**< Memory page size */ - uint32_t flags; /**< ODP_SHM_* flags */ + /** Block name */ + const char *name; + + /** Block address */ + void *addr; + + /** Block size in bytes */ + uint64_t size; + + /** Memory page size */ + uint64_t page_size; + + /** ODP_SHM_* flags */ + uint32_t flags; } odp_shm_info_t; /** @@ -116,11 +127,10 @@ int odp_shm_capability(odp_shm_capability_t *capa); /** * Reserve a contiguous block of shared memory * - * @param[in] name Name of the block (maximum ODP_SHM_NAME_LEN - 1 chars) - * @param[in] size Block size in bytes - * @param[in] align Block alignment in bytes - * @param[in] flags Shared memory parameter flags (ODP_SHM_*). - * Default value is 0. + * @param name Name of the block (maximum ODP_SHM_NAME_LEN - 1 chars) + * @param size Block size in bytes + * @param align Block alignment in bytes + * @param flags Shared memory parameter flags (ODP_SHM_*). Default value is 0. * * @return Handle of the reserved block * @retval ODP_SHM_INVALID on failure @@ -131,10 +141,10 @@ odp_shm_t odp_shm_reserve(const char *name, uint64_t size, uint64_t align, /** * Free a contiguous block of shared memory * - * Frees a previously reserved block of shared memory. - * @note Freeing memory that is in use will result in UNDEFINED behavior + * Frees a previously reserved block of shared memory. Freeing memory that is + * in use will result in UNDEFINED behavior * - * @param[in] shm Block handle + * @param shm Block handle * * @retval 0 on success * @retval <0 on failure @@ -144,7 +154,7 @@ int odp_shm_free(odp_shm_t shm); /** * Lookup for a block of shared memory * - * @param[in] name Name of the block + * @param name Name of the block * * @return A handle to the block if it is found by name * @retval ODP_SHM_INVALID on failure @@ -177,20 +187,21 @@ odp_shm_t odp_shm_import(const char *remote_name, /** * Shared memory block address * - * @param[in] shm Block handle + * @param shm Block handle * * @return Memory block address * @retval NULL on failure */ void *odp_shm_addr(odp_shm_t shm); - /** * Shared memory block info - * @note This is the only shared memory API function which accepts invalid - * shm handles (any bit value) without causing undefined behavior. * - * @param[in] shm Block handle + * Get information about the specified shared memory block. This is the only + * shared memory API function which accepts invalid shm handles (any bit value) + * without causing undefined behavior. + * + * @param shm Block handle * @param[out] info Block info pointer for output * * @retval 0 on success @@ -207,15 +218,15 @@ void odp_shm_print_all(void); /** * Get printable value for an odp_shm_t * - * @param hdl odp_shm_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * This routine is intended to be used for diagnostic purposes to enable + * applications to generate a printable value that represents an odp_shm_t + * handle. + * + * @param shm Block handle * - * @note This routine is intended to be used for diagnostic purposes - * to enable applications to generate a printable value that represents - * an odp_shm_t handle. + * @return uint64_t value that can be used to print this handle */ -uint64_t odp_shm_to_u64(odp_shm_t hdl); +uint64_t odp_shm_to_u64(odp_shm_t shm); /** * @} ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/shared_memory.h | 74 +++++++++------ platform/linux-generic/_ishm.c | 118 ++++++++++++++++++------ platform/linux-generic/include/_ishm_internal.h | 1 + platform/linux-generic/odp_shared_memory.c | 5 + test/validation/api/shmem/shmem.c | 2 + 5 files changed, 146 insertions(+), 54 deletions(-) hooks/post-receive --

8 years, 3 months

[COMMIT] branch api-next updated. v1.15.0.0-819-gec6510b3

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, api-next has been updated via ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 (commit) via af4565caa0f9d171db466554ee631338b9844cbe (commit) via f5120355753ae3d69f81010cb9131abffdfb03fc (commit) from afa7e20ab3b7a6e68a556f00b49aa19ea4a29be6 (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 ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Oct 20 13:05:41 2017 +0300 linux-gen: ipsec: update git ignore Update git .ignore file with correct executable file names. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/ipsec/.gitignore b/test/validation/api/ipsec/.gitignore index 2def047f..96735606 100644 --- a/test/validation/api/ipsec/.gitignore +++ b/test/validation/api/ipsec/.gitignore @@ -1 +1,4 @@ -ipsec_main +ipsec_sync +ipsec_async +ipsec_inline_in +ipsec_inline_out commit af4565caa0f9d171db466554ee631338b9844cbe Merge: afa7e20a f5120355 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Sat Oct 21 23:01:19 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - helper/.gitignore | 1 + platform/linux-generic/.gitignore | 1 + test/validation/api/ipsec/.gitignore | 5 ++++- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 helper/.gitignore hooks/post-receive --

8 years, 3 months

[COMMIT] branch master updated. v1.15.0.0-287-gf5120355

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 f5120355753ae3d69f81010cb9131abffdfb03fc (commit) from 54228421977f94d9da752290540c6ec4dc5306a0 (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 f5120355753ae3d69f81010cb9131abffdfb03fc Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Oct 21 12:16:23 2017 +0300 .gitinore: ignore moved .pc files pkg-config files were moved, but I forgot to update .gitignore files. Update them now. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.gitignore b/.gitignore index 3d4c58d6..b9c61424 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,5 @@ m4/libtool.m4 m4/lt*.m4 missing perf.data* -pkgconfig/libodp*.pc tags test-driver diff --git a/helper/.gitignore b/helper/.gitignore new file mode 100644 index 00000000..edf7a0ba --- /dev/null +++ b/helper/.gitignore @@ -0,0 +1 @@ +libodphelper.pc diff --git a/platform/linux-generic/.gitignore b/platform/linux-generic/.gitignore index 909756a1..442e82a9 100644 --- a/platform/linux-generic/.gitignore +++ b/platform/linux-generic/.gitignore @@ -1 +1,2 @@ include/odp/api/plat/static_inline.h +libodp-linux.pc ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - helper/.gitignore | 1 + platform/linux-generic/.gitignore | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 helper/.gitignore hooks/post-receive --

8 years, 3 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp