git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.15.0.0-115-g65d0fbba

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 65d0fbba8366f68a8fe24426bc0e16ea3cd3cd04 (commit) from edc288690b65167b347a0e8c2c171198e4d2fbe3 (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 65d0fbba8366f68a8fe24426bc0e16ea3cd3cd04 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Aug 8 15:13:33 2017 +0300 linux-gen: dpdk: make sure mbuf memory is allocated from huge pages DPDK requires that mbuf memory is allocated from huge pages to ensure page locking. Modify zero-copy dpdk pktio to fall back to packet copy if transmitted ODP packet is not allocated from huge page memory. 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/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index f2d2e2ca..edf75d6e 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -71,6 +71,7 @@ typedef struct pool_t { uint8_t *uarea_base_addr; /* Used by DPDK zero-copy pktio */ + uint8_t mem_from_huge_pages; pool_destroy_cb_fn ext_destroy; void *ext_desc; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index c739adbc..35e39f5d 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -8,6 +8,7 @@ #include <odp/api/shared_memory.h> #include <odp/api/align.h> #include <odp/api/ticketlock.h> +#include <odp/api/system_info.h> #include <odp_pool_internal.h> #include <odp_internal.h> @@ -281,6 +282,22 @@ static void init_buffers(pool_t *pool) } } +static bool shm_is_from_huge_pages(odp_shm_t shm) +{ + odp_shm_info_t info; + uint64_t huge_page_size = odp_sys_huge_page_size(); + + if (huge_page_size == 0) + return 0; + + if (odp_shm_info(shm, &info)) { + ODP_ERR("Failed to fetch shm info\n"); + return 0; + } + + return (info.page_size >= huge_page_size); +} + static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, uint32_t shmflags) { @@ -406,6 +423,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, goto error; } + pool->mem_from_huge_pages = shm_is_from_huge_pages(pool->shm); + pool->base_addr = odp_shm_addr(pool->shm); pool->uarea_shm = ODP_SHM_INVALID; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 9e3e583d..19310651 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -129,14 +129,13 @@ static void mbuf_init(struct rte_mempool *mp, struct rte_mbuf *mbuf, { void *buf_addr = pkt_hdr->buf_hdr.base_data - RTE_PKTMBUF_HEADROOM; - rte_mem_lock_page(buf_addr); - memset(mbuf, 0, sizeof(struct rte_mbuf)); mbuf->priv_size = 0; mbuf->buf_addr = buf_addr; mbuf->buf_physaddr = rte_mem_virt2phy(buf_addr); - if (odp_unlikely(mbuf->buf_physaddr == RTE_BAD_PHYS_ADDR)) + if (odp_unlikely(mbuf->buf_physaddr == RTE_BAD_PHYS_ADDR || + mbuf->buf_physaddr == 0)) ODP_ABORT("Failed to map virt addr to phy"); mbuf->buf_len = (uint16_t)rte_pktmbuf_data_room_size(mp); @@ -163,6 +162,11 @@ static struct rte_mempool *mbuf_pool_create(const char *name, unsigned num; uint16_t data_room_size; + if (!(pool_entry->mem_from_huge_pages)) { + ODP_ERR("DPDK requires memory is allocated from huge pages\n"); + return NULL; + } + num = pool_entry->num; data_room_size = pool_entry->max_seg_len + CONFIG_PACKET_HEADROOM; elt_size = sizeof(struct rte_mbuf) + (unsigned)data_room_size; @@ -485,12 +489,11 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf_table[], const odp_packet_t pkt_table[], uint16_t num, - uint16_t *seg_count) + uint16_t *copy_count) { pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; int i; - - *seg_count = 0; + *copy_count = 0; for (i = 0; i < num; i++) { odp_packet_t pkt = pkt_table[i]; @@ -502,20 +505,26 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, if (odp_unlikely(pkt_len > pkt_dpdk->mtu)) goto fail; - if (odp_likely(pkt_hdr->buf_hdr.segcount == 1)) { - if (odp_unlikely(pkt_hdr->extra_type != - PKT_EXTRA_TYPE_DPDK)) - mbuf_init(pkt_dpdk->pkt_pool, mbuf, pkt_hdr); - + if (odp_likely(pkt_hdr->buf_hdr.segcount == 1 && + pkt_hdr->extra_type == PKT_EXTRA_TYPE_DPDK)) { mbuf_update(mbuf, pkt_hdr, pkt_len); } else { - /* Fall back to packet copy */ - if (odp_unlikely(pkt_to_mbuf(pktio_entry, &mbuf, - &pkt, 1) != 1)) - goto fail; - (*seg_count)++; - } + pool_t *pool_entry = pkt_hdr->buf_hdr.pool_ptr; + + if (pkt_hdr->buf_hdr.segcount != 1 || + !pool_entry->mem_from_huge_pages) { + /* Fall back to packet copy */ + if (odp_unlikely(pkt_to_mbuf(pktio_entry, &mbuf, + &pkt, 1) != 1)) + goto fail; + (*copy_count)++; + } else { + mbuf_init(pkt_dpdk->pkt_pool, mbuf, + pkt_hdr); + mbuf_update(mbuf, pkt_hdr, pkt_len); + } + } mbuf_table[i] = mbuf; } return i; @@ -1148,7 +1157,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, { struct rte_mbuf *tx_mbufs[num]; pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; - uint16_t seg_count = 0; + uint16_t copy_count = 0; int tx_pkts; int i; int mbufs; @@ -1158,7 +1167,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, if (ODP_DPDK_ZERO_COPY) mbufs = pkt_to_mbuf_zero(pktio_entry, tx_mbufs, pkt_table, num, - &seg_count); + &copy_count); else mbufs = pkt_to_mbuf(pktio_entry, tx_mbufs, pkt_table, num); @@ -1172,11 +1181,11 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, odp_ticketlock_unlock(&pkt_dpdk->tx_lock[index]); if (ODP_DPDK_ZERO_COPY) { - /* Free copied segmented packets */ - if (odp_unlikely(seg_count)) { + /* Free copied packets */ + if (odp_unlikely(copy_count)) { uint16_t freed = 0; - for (i = 0; i < mbufs && freed != seg_count; i++) { + for (i = 0; i < mbufs && freed != copy_count; i++) { odp_packet_t pkt = pkt_table[i]; odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_pool_internal.h | 1 + platform/linux-generic/odp_pool.c | 19 ++++++++ platform/linux-generic/pktio/dpdk.c | 53 +++++++++++++--------- 3 files changed, 51 insertions(+), 22 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch cloud-dev updated. v1.15.0.0-587-g7dce7af2

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, cloud-dev has been updated via 7dce7af2c3a936f711e845ffcf765bfb1cc3c95a (commit) from 863d61cc3ed82f9f0725c792910e8a05cc5d5a82 (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 7dce7af2c3a936f711e845ffcf765bfb1cc3c95a Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Aug 10 09:06:16 2017 +0300 example: ddf_app: fix build failure with dpdk PMDs Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=3198 by changing build flags. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> diff --git a/example/ddf_app/Makefile.am b/example/ddf_app/Makefile.am index e654202a..49f0170f 100644 --- a/example/ddf_app/Makefile.am +++ b/example/ddf_app/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_ddf_app$(EXEEXT) -odp_ddf_app_LDFLAGS = $(AM_LDFLAGS) -shared +odp_ddf_app_LDFLAGS = $(AM_LDFLAGS) -static -Wl,--export-dynamic odp_ddf_app_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example noinst_HEADERS = \ ----------------------------------------------------------------------- Summary of changes: example/ddf_app/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.15.0.0-114-gedc28869

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 edc288690b65167b347a0e8c2c171198e4d2fbe3 (commit) from bb3400df72401d88aa8e79fb0244a2b90f3bd138 (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 edc288690b65167b347a0e8c2c171198e4d2fbe3 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Jul 27 17:16:06 2017 +0300 example: generator : use packet reference API to generate udp and icmp traffic Signed-off-by: Bogdan Pricope <bogdan.pricope(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/example/generator/odp_generator.c b/example/generator/odp_generator.c index 9336cec1..f3ec43be 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -136,6 +136,7 @@ static void millisleep(uint32_t ms, uint64_t ticks = odp_timer_ns_to_tick(tp, 1000000ULL * ms); odp_event_t ev = odp_timeout_to_event(tmo); int rc = odp_timer_set_rel(tim, ticks, &ev); + if (rc != ODP_TIMER_SUCCESS) EXAMPLE_ABORT("odp_timer_set_rel() failed\n"); /* Spin waiting for timeout event */ @@ -186,12 +187,76 @@ static int scan_ip(char *buf, unsigned int *paddr) } /** + * Setup array of reference packets + * + * @param pool Packet pool + * @param pkt_ref_array Packet array + * @param pkt_ref_array_size Packet array size + * @param setup_ref Packet setup function + * @return 0 success, -1 failed +*/ +static int setup_pkt_ref_array(odp_pool_t pool, + odp_packet_t *pkt_ref_array, + int pkt_ref_array_size, + odp_packet_t (*setup_ref)(odp_pool_t)) +{ + int i; + + for (i = 0; i < pkt_ref_array_size; i++) { + pkt_ref_array[i] = (*setup_ref)(pool); + if (pkt_ref_array[i] == ODP_PACKET_INVALID) + break; + } + + if (i < pkt_ref_array_size) { + odp_packet_free_multi(pkt_ref_array, i); + return -1; + } + return 0; +} + +/** + * Setup array of packets + * + * @param pkt_ref_array Reference packet array + * @param pkt_array Packet array + * @param pkt_array_size Packet array size + * @param setup_pkt Packet setup function + * @return 0 success, -1 failed +*/ +static int setup_pkt_array(odp_packet_t *pkt_ref_array, + odp_packet_t *pkt_array, + int pkt_array_size, + int (*setup_pkt)(odp_packet_t)) +{ + int i; + + for (i = 0; i < pkt_array_size; i++) { + if ((*setup_pkt)(pkt_ref_array[i])) + break; + + pkt_array[i] = odp_packet_ref_static(pkt_ref_array[i]); + if (pkt_array[i] == ODP_PACKET_INVALID) + break; + } + if (i < pkt_array_size) { + if (i) + odp_packet_free_multi(pkt_array, i - 1); + + return -1; + } + return 0; +} + +/** * set up an udp packet reference * * @param pool Buffer pool to create packet in * - * @return Handle of created packet + * + * @retval Handle of created packet * @retval ODP_PACKET_INVALID Packet could not be created + * */ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool) { @@ -246,37 +311,27 @@ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool) /** * set up an udp packet * - * @param pool Buffer pool to create packet in - * @param pkt_ref Reference UDP packet + * @param pkt Reference UDP packet * - * @return Handle of created packet - * @retval ODP_PACKET_INVALID Packet could not be created + * @return Success/Failed + * @retval 0 on success, -1 on fail */ -static odp_packet_t pack_udp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) +static int setup_udp_pkt(odp_packet_t pkt) { - odp_packet_t pkt; char *buf; odph_ipv4hdr_t *ip; unsigned short seq; - pkt = odp_packet_alloc(pool, args->appl.payload + ODPH_UDPHDR_LEN + - ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN); - - if (pkt == ODP_PACKET_INVALID) - return pkt; - buf = (char *)odp_packet_data(pkt); - odp_memcpy(buf, odp_packet_data(pkt_ref), - args->appl.payload + ODPH_UDPHDR_LEN + - ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN); /*Update IP ID and checksum*/ ip = (odph_ipv4hdr_t *)(buf + ODPH_ETHHDR_LEN); seq = odp_atomic_fetch_add_u64(&counters.seq, 1) % 0xFFFF; ip->id = odp_cpu_to_be_16(seq); + ip->chksum = 0; ip->chksum = odph_chksum(ip, ODPH_IPV4HDR_LEN); - return pkt; + return 0; } /** @@ -337,15 +392,13 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool) /** * Set up an icmp packet * - * @param pool Buffer pool to create packet in - * @param pkt_ref Reference ICMP packet + * @param pkt Reference ICMP packet * - * @return Handle of created packet - * @retval ODP_PACKET_INVALID Packet could not be created + * @return Success/Failed + * @retval 0 on success, -1 on fail */ -static odp_packet_t pack_icmp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) +static int setup_icmp_pkt(odp_packet_t pkt) { - odp_packet_t pkt; char *buf; odph_ipv4hdr_t *ip; odph_icmphdr_t *icmp; @@ -353,21 +406,13 @@ static odp_packet_t pack_icmp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) uint8_t *tval_d; unsigned short seq; - pkt = odp_packet_alloc(pool, args->appl.payload + ODPH_ICMPHDR_LEN + - ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN); - - if (pkt == ODP_PACKET_INVALID) - return pkt; - buf = (char *)odp_packet_data(pkt); - odp_memcpy(buf, odp_packet_data(pkt_ref), - args->appl.payload + ODPH_ICMPHDR_LEN + - ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN); /* ip */ ip = (odph_ipv4hdr_t *)(buf + ODPH_ETHHDR_LEN); seq = odp_atomic_fetch_add_u64(&counters.seq, 1) % 0xffff; ip->id = odp_cpu_to_be_16(seq); + ip->chksum = 0; ip->chksum = odph_chksum(ip, ODPH_IPV4HDR_LEN); /* icmp */ @@ -382,7 +427,7 @@ static odp_packet_t pack_icmp_pkt(odp_pool_t pool, odp_packet_t pkt_ref) icmp->chksum = 0; icmp->chksum = odph_chksum(icmp, args->appl.payload + ODPH_ICMPHDR_LEN); - return pkt; + return 0; } /** @@ -479,33 +524,40 @@ static int create_pktio(const char *dev, odp_pool_t pool, static int gen_send_thread(void *arg) { int thr; - int ret, i; + int ret = 0; thread_args_t *thr_args; odp_pktout_queue_t pktout; + odp_packet_t pkt_ref_array[MAX_UDP_TX_BURST]; odp_packet_t pkt_array[MAX_UDP_TX_BURST]; int pkt_array_size; int burst_start, burst_size; - odp_packet_t pkt_ref = ODP_PACKET_INVALID; + odp_packet_t (*setup_pkt_ref)(odp_pool_t) = NULL; + int (*setup_pkt)(odp_packet_t) = NULL; thr = odp_thread_id(); thr_args = arg; pktout = thr_args->pktout; + /* Create reference packets*/ if (args->appl.mode == APPL_MODE_UDP) { - pkt_ref = setup_udp_pkt_ref(thr_args->pool); pkt_array_size = args->appl.udp_tx_burst; + setup_pkt_ref = setup_udp_pkt_ref; + setup_pkt = setup_udp_pkt; } else if (args->appl.mode == APPL_MODE_PING) { - pkt_ref = setup_icmp_pkt_ref(thr_args->pool); pkt_array_size = 1; + setup_pkt_ref = setup_icmp_pkt_ref; + setup_pkt = setup_icmp_pkt; } else { EXAMPLE_ERR(" [%02i] Error: invalid processing mode %d\n", thr, args->appl.mode); return -1; } - if (pkt_ref == ODP_PACKET_INVALID) { - EXAMPLE_ERR(" [%2i] Error: reference packet creation failed\n", - thr); + + if (setup_pkt_ref_array(thr_args->pool, pkt_ref_array, + pkt_array_size, setup_pkt_ref)) { + EXAMPLE_ERR("[%02i] Error: failed to create" + " reference packets\n", thr); return -1; } @@ -519,30 +571,15 @@ static int gen_send_thread(void *arg) (unsigned int)args->appl.number) break; - if (args->appl.mode == APPL_MODE_UDP) { - for (i = 0; i < pkt_array_size; i++) { - pkt_array[i] = pack_udp_pkt(thr_args->pool, - pkt_ref); - if (!odp_packet_is_valid(pkt_array[i])) - break; - } - if (i != pkt_array_size) { - EXAMPLE_ERR(" [%2i] alloc_multi failed\n", - thr); - odp_packet_free_multi(pkt_array, i); - break; - } - } else if (args->appl.mode == APPL_MODE_PING) { - pkt_array[0] = pack_icmp_pkt(thr_args->pool, pkt_ref); - if (!odp_packet_is_valid(pkt_array[0])) { - EXAMPLE_ERR(" [%2i] alloc_single failed\n", - thr); - break; - } - } else { + /* Setup TX burst*/ + if (setup_pkt_array(pkt_ref_array, pkt_array, + pkt_array_size, setup_pkt)) { + EXAMPLE_ERR("[%02i] Error: failed to setup packets\n", + thr); break; } + /* Send TX burst*/ for (burst_start = 0, burst_size = pkt_array_size;;) { ret = odp_pktout_send(pktout, &pkt_array[burst_start], burst_size); @@ -572,7 +609,6 @@ static int gen_send_thread(void *arg) thr_args->tim, thr_args->tq, thr_args->tmo_ev); - } } @@ -590,7 +626,8 @@ static int gen_send_thread(void *arg) args->appl.timeout--; } } - odp_packet_free(pkt_ref); + + odp_packet_free_multi(pkt_ref_array, pkt_array_size); return 0; } @@ -1084,7 +1121,6 @@ int main(int argc, char *argv[]) odph_odpthreads_create(&thread_tbl[i], &thd_mask, &thr_params); cpu = odp_cpumask_next(&cpumask, cpu); - } } @@ -1132,7 +1168,6 @@ int main(int argc, char *argv[]) return 0; } - /** * Parse and store the command line arguments * ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 165 +++++++++++++++++++++++--------------- 1 file changed, 100 insertions(+), 65 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch cloud-dev updated. v1.15.0.0-586-g863d61cc

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, cloud-dev has been updated via 863d61cc3ed82f9f0725c792910e8a05cc5d5a82 (commit) via e420668cd3886f003c8bd6022e210bf08a0ee3b5 (commit) via bb3400df72401d88aa8e79fb0244a2b90f3bd138 (commit) via 2bbf95311cb8136b7e769deda6254a9e9b26250b (commit) via 4ce95649367da9edd140ba9c25daaaf292edf883 (commit) via 03aa7c3572865dc03df1cf8c33b969ca4b17c7e8 (commit) via dca4f5bd8218f30a593f6fb37c060de41d1ca9b1 (commit) via 5a6d8798bc436fa3a7e90fcf105362eabb21db0c (commit) via cd15a2125781f4eefdab1f765999a59504fb2939 (commit) via 757439849936bb76885f27677fc8997a67fa2a3c (commit) via 92ad20c03bf4737558265a1ff942666d7c4ec3d8 (commit) via fd2ca1209dc19c8e8199ee556ad2c9a786eabf78 (commit) via 2394317ab247fa14b4e239aec512afee7eac4524 (commit) via 09ce9406e09eacadf8f739ae8499323ad1401d36 (commit) via a165ff4093f666e5481ae5113f70b41e3354520d (commit) via 41abc837a5c25d8df3429398bcb51c72b83999e5 (commit) via e76b25aa5cafbf96133fcbd83b856090b0e95f33 (commit) via ab62d19d4811e2699ac0614bf4ba1d481bb3b2b1 (commit) via 641717bac482831a8f9702af7f941cfc349ada91 (commit) via c5436c447df98e0ec78de3620c7fe48141fef760 (commit) via 2fff8b0247a0da108c45c9febc1029bc8e12d347 (commit) via 8390f890d4bd2babb63a24f7b15d2f4763e44050 (commit) via e02f89b3a981d5f87332cd9a3dfd6b532f92c3bc (commit) via 8eeb3366d62c34665bcef2392b22b73489d70f88 (commit) via 705062dc19a4ce5e6ae2224c21bc9e32dae64ebc (commit) via b4cd6c50f9f0c2e1fa975b768253d4f4b35fad07 (commit) via e65248393a0d7263a26e4e8e4f64ac12c7142c54 (commit) via 4537d096721a753086592ed5a989beab5647bcfa (commit) via 93cbd8caf4ab5ccf22c092d42df4028969ed8a7b (commit) via 2050915d34995f4be695a88dd99e9275f346733b (commit) via ded0918391865956e3b00df3c43e4311a7285d4b (commit) via a2040db93b114fb9e1da9aeca1d0a1ea91699448 (commit) via 999042e51837a7ed8c7fb616f75707349515fc3d (commit) via aaceddaf56175ee207fcbf9c241a7839bdea091b (commit) via a1786671550c5f83a6c9e7cecd9da4cead7b4cc9 (commit) via cd0cd7af17c1c042288141b7968ccf5385398493 (commit) via c177532c1033b0dfa918774670bb61ad13f56730 (commit) via f319f7fe8524a2606b32979c365855b83fb4571e (commit) via 2e474c1a2af0bc4ef28706deee59000c5c6f34f4 (commit) via acb029364daa3299ea416f1fd2e8feb60e99d0fd (commit) via d4fe8e46c05d9b590c762502489386421ee025b1 (commit) via 8745330b32579ab66354f9d2043154f8ef326290 (commit) via e0738b61c3257145c50d4751bcf4e20b5fc5f0ec (commit) via a4afaf9198ac0621b4c8e5ade82cb4f98aeb61cd (commit) via 30ed14c05ac17406c2f7890b34c4ac580b5e7a45 (commit) via bb0ca193f8c28036fdf8b3d6c8aa5d4f11980e6c (commit) via 10ef82e6d4db8c02dd5caa2e97172688e829b90c (commit) via c16f1363303cd5fc11324acbc4dfebe0a9680a41 (commit) via fbdc9ca1e38e6c97014e68bf7b83e59096a170b7 (commit) via 2e08ac6e40551704c43233b40a9227a19fd4623b (commit) via 5386c44d204f0b42f2773cf87126ff8981bf3270 (commit) via 56dbc8702500f7d7e518fcea4f3b1ff853722004 (commit) via 70714a8c35381330647a3578d3b853af4ea4a045 (commit) via 79336f5eaee25168a5e4ad7fc0aee07395d4ca1f (commit) via ed136f929f0edf2edd4bb8cf2243b678b5f5971e (commit) via c84d3a864bf6471b2a1d433ad378c3b609460e5d (commit) via b6308d6f7cf7bf42b5ff6807ae659db83a66ce78 (commit) via 422ed4f2be27223b53c39a3d3f7b973781a6a420 (commit) via d3cae7aa012174bac6eecdca4ee3189c62400c48 (commit) via c444e19382a27c5d15e537f55c90a03963b86901 (commit) via 985db92075ffcdc48eb89954a90429e4cb9b4501 (commit) via daa04baf2cc2fc562dbf4ee8eaeed00f9594e08a (commit) via f4f7679d16917d9a7c1b2220e351fd27733ee96b (commit) via fa9550ca8f4f0a77baf6d156b441fa2d703bbdf8 (commit) via 063d713d0c167c56b4497be566b2310a5a2daf42 (commit) via 3eeb249a4774f12d2d16ca349a591654eae620ae (commit) via 4d2cf5b4a536c243089f41ade86d5dc60844f3d3 (commit) via 3a79862d2a8f9ea8eaa53d408f0763e44e522da7 (commit) via db7cc41aeb559dd296f3a6d8570aa10326a31d5e (commit) via 95ba4b394009d92c29c2e22f0776e90bb4c6edec (commit) via 9bb623dfe97590991dfe3ab04e1dcfb9ff745169 (commit) via 8b1dd78079de09d5f51c61b5b2ede2766ac74685 (commit) via 920857807c4d7831ada68ebed4ffa542564ee3a5 (commit) via 43bfbbf66db3d8fd6a22762d7ac346461857f653 (commit) via a959a61e3d00965af8b93536e3fbc3bc09cad1e9 (commit) via 9e4826c45af05eb339d129140ac88bc9d4e5a2fd (commit) via fc539b10fff8b92c234f422905eec2266ec13b26 (commit) via 04e5b3dd319d1affb61e0f6860e255082a6c15df (commit) via c65cfd73c6103d02f33a62099391a98cf60d098f (commit) via ae42f98c1a1c309c0718a3b5fc8589660de0f867 (commit) via 7e71ca2883bbdeb4765e476fcfe3334e4fbfbd88 (commit) via 333c585111723d2cb7dae0cf1517cc1f3453df4d (commit) via bc36acc21368ff3f27d5b3836e8524747e0ab4c9 (commit) via f49ce736d461c3e8c2534ed216e8a70e8bee954e (commit) via d4b85d07214fb1f566b8ac346375cfe097c0bb51 (commit) via 127c73198b07dfe413e8ce401bb26f3e5ff71e91 (commit) via 2cd78610004d755dbe7a8e9c29086791793aea19 (commit) via e58e1fc97f392f63a267c2252656367b12417152 (commit) via a3ff4f6726582e41dd1398a6939a1877b9f25edc (commit) via 4e3598f34f16aa9e50ac1aaae2b4074cd806e419 (commit) via 697c4a58d57c286e679dd570722d8875ccf05a27 (commit) via 6879ecd2d136508e59cf8d9b8f15c6475ba74c99 (commit) via 698d82ce41a3f6ca08c6f218784d3eea6ac81e42 (commit) via cd097450cbf9d7bb6cd24654f8d43ceade5b114a (commit) via 490f4bf22129638899ce71c99a8847e8ba849692 (commit) via 77f1b6743f97c6265e18cd47d0f597b44f71be2d (commit) via dcea50f7ad1f5473d74797e58eac5ba4abb939d1 (commit) via 7fc6d27e937b57b31360b07028388c811f8300dc (commit) via 104993f09d06c9ffc5ff1b2b57e44bfddefb3062 (commit) via c6dc5055a2acdf4f22e37823a86bb76b86f40b63 (commit) via 66898d97524683ae6f39b0624ce5a67f1cd8f603 (commit) via 51dc8377db6b67090224cab32a6663d7168c4e05 (commit) via 780073842dd6d2d52a52e9d59def2f13ae7d8427 (commit) via 89b7caa359acc5f213e233a3eb1ee1e9c661c246 (commit) via ce8c72bb9e8b1e162765b26b4249b7ecf1b32355 (commit) via a664b1d5e6e75a2b2110025c5bbf7ae727142bf4 (commit) via ee5be324411a7520528a367967c28fc529d3bc2e (commit) via 533a2fe155aa16268bfe4091a3a056a78d5dbfc6 (commit) via b4edd15ea49b38a0c1ed2bd021ee36aa296a79b0 (commit) via 99b74cbb3c77902322933192ce68f8c1abe21e84 (commit) via d0e3acc0cfdab0d4c66b49ea70207d8938569b80 (commit) via c6e3edd5dc52764e4f1772341dc568a549d7eaa9 (commit) via 26644862f90f4dc2f6ed99534d16f8b4d136de82 (commit) via e777674f2d484e98e3329c3e22022fb4c6d86069 (commit) via d9473fe65b531bfbe54d83d4e429d72e553c17dc (commit) via 98b09c8289e0888ce09f68f454a066a415597ea2 (commit) via f72ae9c821eed99323a98a012659acd655095bb3 (commit) via 08863bb877feb8643d1583e29912cc08f2ca8105 (commit) via d55156b2eacf07e88cbff9f51d60238536dfb7ad (commit) via 1239cc0c12ad2be11d329eebbe4df7fad05b03d7 (commit) via e3fce2fca6067b03f7fd18c9a438d2058521fe11 (commit) via 29ad363b5ab3c5e6569f20ddf63e64cc53eeb019 (commit) via 8ef745b7b78b49fc58d14e7b79b450c0bb560558 (commit) via d9c85310cb82f83010c839b6a1bbb5a1fa672ceb (commit) via 5a38050f431d904b7354cd50611304da0a601727 (commit) via 200782c3da2104a020f278691b3b23b8d55893e0 (commit) via 0275cc02d5cdb54b955cfce1988f5ee158ad0423 (commit) via d30dc0774647b3f635afea67e56147b8e6e3f24e (commit) via bf5d48ee13aa4fb737ee430038d5f2b865f45d47 (commit) via 1ba2bcd7b9ebfa1a5d8dda257c7b309d3553fa03 (commit) via 8869e18f490d0ffc35e0359a92ef96eacbf5b0b7 (commit) via 91c4f94f1ed01ed22b7cd489016016b0599f4065 (commit) via 1cb0a8863eb8309c3e532a168fed34d6e3257218 (commit) via faf97a341df8e92fd692029fe2c6c353f043950b (commit) via 29641a1e0d0868c09f35f9f32e6c8491efb62b2d (commit) via cfaee18006aab817656ffaf09e644b570ff32c8e (commit) via b02fe5f06a81a190d4c4fe65af74b800cf073436 (commit) via c7718962c6633c80eb71a0400d89c31f11f88045 (commit) via 79ce62cf3266b0d1b05acc68be382cd6271b7371 (commit) via 39e4ebd39f2d171bbfef5bfee6596033b83c56a0 (commit) via f9e7f458cf7151c75a9145272c62306b96f9ff27 (commit) via 5a2ed3eefb1a263139282c376741adb2c355bd5a (commit) via b668182d6ea0cb942c2cf43771c618c9457bf146 (commit) via eb564bfb6f813ec3f2fe8a8d4ce0da25220b4215 (commit) via 8fea9ff7d8fde984981e681f49133dbda8429b7f (commit) via 2541e8688750f2a045aff3dbf544868be3ebf787 (commit) via b2b516c03ae6eb57e0055c98b33e946e9529f215 (commit) via d5d52b65d262698694a5fab0b3d9bd12fa4a6460 (commit) via 6e594990575df83dcbb70f5f86ad52f7c5a0f96d (commit) via c50d47bd420c675552dd0b82638a073b67b2ae4f (commit) via 933fd66f5b7230a00ee0ef7acde5cc1c9af63b45 (commit) via 8ae6373c8844408ad080b58fb3083b30e8dc7ea6 (commit) via 15c97427d01c81dc9f4d0aafe9b0a99cdb2d1fc6 (commit) via 96b36df87f23bf32ab218321f1fc35703f092eb4 (commit) via 61e4b959b31854f83695cbbdd2e2fa0389fa4da6 (commit) via 6096ae389fe221d366d1a7ba8a7169c836a820de (commit) via df2cf17f3cdd3313c9982aacc7adcddfd20ea29a (commit) via fbd17f06236c14c05fb2d577b9027f96cec94a87 (commit) via e33884ef62a274c187c30f4bebb34d8a48190cfa (commit) via 0893a0d99b3b718369d77eacd88db3b7aedc8332 (commit) via 05a9cff266565a8c7d24eb29d6128f2ad70bbccb (commit) via 00a21c6dce65a30c8250db59a42a43c658e8ca1b (commit) via 08463cdedd4ab64ea94dbf90c7417bf403bf7aaa (commit) via 500cb603d5e1cb4926986242ad51d995b494c2e8 (commit) via dd394c9d9a88161e157317fa8a6eba92cb6f2e01 (commit) via 60ad22e8bd7624432e9504d32309c691fedcf27f (commit) via 4a38c7c61a370007bea53f9bb36279ce3ba42233 (commit) via e91a24138eec9054fc083174e3d071269dc1e4b6 (commit) via 3687001250f4b50af8c2f9d9aa61d3ee99976a1e (commit) via ceeab69f3af67701adb524c7b9757d19cefb1110 (commit) via 7a5813042d58598e1c66243d8cfed548302edfc4 (commit) via 759a54bf66317fee539f2b2649c283be937d832a (commit) via 9fd48a9215a7831ca951839b7187bd1eb3f7bb06 (commit) via bf554b2d9472ed8ed04580904d0aa906cdbe1e83 (commit) via ac89f9c568830498b186dff33e908053dbdc88c7 (commit) via 5b08cc290a4a84ed0ffbc4a591427f1891b9ace3 (commit) via 5551c0d76bd721110a0fa4ba1423fe1edb0fd530 (commit) via 9b78da8e2373ab0530cfbbd72b2229059b57ddf1 (commit) via 689145bcef5ada4304f1d97d6b72e10bf8308ac0 (commit) via c6a309f00f882fabe70fa535ebe8b765f6e9bd11 (commit) via a4add29291572219143dc667db4e8a7832a5692b (commit) via 497c339f94e35d5fadeff539cebfbf44d698dc7e (commit) via fdd3df3547c78d81d1244eac3fa65512e9023237 (commit) via e5b211403233dda67507f18fd91f9826022fd287 (commit) via d232db102fc77e6cb2fd9d62ba387c22f68c042a (commit) from 370f93139e16633390cb28acda6296da8fee006d (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 863d61cc3ed82f9f0725c792910e8a05cc5d5a82 Merge: 370f9313 e420668c Author: Yi He <yi.he(a)linaro.org> Date: Wed Aug 9 09:28:17 2017 +0800 Merge branch 'api-next' into cloud-dev Signed-off-by: Yi He <yi.he(a)linaro.org> diff --cc platform/linux-generic/Makefile.am index 4a7b77b8,cfccaa98..1d703cea --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -6,9 -6,9 +6,10 @@@ include $(top_srcdir)/platform/@with_pl AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include +AM_CFLAGS += -I$(top_srcdir)/frameworks/modular AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/include + AM_CFLAGS += -I$(top_srcdir)/arch/@ARCH_DIR@ AM_CFLAGS += -Iinclude AM_CFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" AM_CFLAGS += -D_ODP_PKTIO_IPC @@@ -293,14 -321,16 +324,23 @@@ if HAVE_PCA __LIB__libodp_linux_la_SOURCES += pktio/pcap.c endif +# Build modular framework into odp-linux library +modularframeworkdir = $(top_srcdir)/frameworks/modular +noinst_HEADERS += $(modularframeworkdir)/list.h \ + $(modularframeworkdir)/odp_module.h + +__LIB__libodp_linux_la_SOURCES += ../../frameworks/modular/odp_module.c + __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) + __LIB__libodp_linux_la_LIBADD += $(OPENSSL_LIBS) + __LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS) $(DPDK_PMDS) + __LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS) + __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) + __LIB__libodp_linux_la_LIBADD += $(LIBCONFIG_LIBS) + + if HAVE_PCAP + __LIB__libodp_linux_la_LIBADD += $(PCAP_LIBS) + endif # Create symlink for ABI header files. Application does not need to use the arch # specific include path for installed files. ----------------------------------------------------------------------- Summary of changes: .travis.yml | 178 +- DEPENDENCIES | 5 +- Makefile.am | 10 +- configure.ac | 11 +- doc/Doxyfile_common | 12 + doc/Makefile.am | 8 +- doc/Makefile.inc | 6 +- doc/application-api-guide/Doxyfile | 2 - doc/driver-api-guide/Doxyfile | 8 - doc/helper-guide/Doxyfile | 8 - doc/implementers-guide/Makefile.am | 5 +- doc/platform-api-guide/Doxyfile | 9 - doc/process-guide/Makefile.am | 45 +- doc/users-guide/Makefile.am | 89 +- doc/users-guide/users-guide-pktio.adoc | 14 +- doc/users-guide/users-guide-timer.adoc | 3 +- doc/users-guide/users-guide-tm.adoc | 4 +- doc/users-guide/users-guide.adoc | 32 +- example/Makefile.inc | 2 +- example/generator/odp_generator.c | 9 +- example/ipfragreass/odp_ipfragreass_atomics_arm.h | 19 +- example/ipsec/Makefile.am | 2 + example/ipsec/odp_ipsec.c | 124 +- example/ipsec/odp_ipsec_cache.c | 6 +- example/ipsec/odp_ipsec_cache.h | 1 + example/ipsec/odp_ipsec_misc.h | 2 +- example/timer/odp_timer_simple.c | 10 +- example/timer/odp_timer_test.c | 9 +- helper/cuckootable.c | 1 + helper/iplookuptable.c | 1 + include/odp/api/spec/classification.h | 91 +- include/odp/api/spec/crypto.h | 170 +- include/odp/api/spec/ipsec.h | 282 +-- include/odp/api/spec/packet_io.h | 8 +- include/odp/api/spec/system_info.h | 19 + include/odp/api/spec/timer.h | 27 + include/odp/arch/default/api/abi/buffer.h | 7 +- include/odp/arch/default/api/abi/event.h | 5 +- m4/ax_check_compile_flag.m4 | 72 + m4/ax_valgrind_check.m4 | 145 +- pkgconfig/libodp-linux.pc.in | 4 +- platform/Makefile.inc | 3 +- platform/linux-generic/Makefile.am | 42 +- platform/linux-generic/_fdserver.c | 33 +- platform/linux-generic/_ishm.c | 131 +- platform/linux-generic/arch/arm/odp_atomic.h | 212 +++ platform/linux-generic/arch/arm/odp_cpu.h | 73 + platform/linux-generic/arch/arm/odp_cpu_idling.h | 51 + platform/linux-generic/arch/arm/odp_llsc.h | 253 +++ platform/linux-generic/arch/default/odp_cpu.h | 43 + platform/linux-generic/arch/mips64/odp_cpu.h | 43 + platform/linux-generic/arch/powerpc/odp_cpu.h | 43 + platform/linux-generic/arch/x86/odp_cpu.h | 43 + platform/linux-generic/include/_ishm_internal.h | 1 + .../include/odp/api/plat/buffer_types.h | 6 +- .../include/odp/api/plat/event_types.h | 5 +- .../include/odp/api/plat/packet_flag_inlines.h | 3 +- .../include/odp/api/plat/packet_inlines.h | 74 +- .../include/odp/api/plat/packet_inlines_api.h | 16 - .../include/odp/api/plat/packet_types.h | 12 + .../include/odp/api/plat/schedule_types.h | 4 +- .../include/odp/api/plat/strong_types.h | 4 +- .../include/odp/api/plat/timer_types.h | 2 +- platform/linux-generic/include/odp_bitset.h | 212 +++ .../linux-generic/include/odp_buffer_inlines.h | 6 +- .../linux-generic/include/odp_buffer_internal.h | 32 +- .../include/odp_classification_datamodel.h | 64 +- .../include/odp_classification_inlines.h | 2 +- .../include/odp_classification_internal.h | 92 +- .../linux-generic/include/odp_config_internal.h | 23 +- .../linux-generic/include/odp_crypto_internal.h | 11 +- platform/linux-generic/include/odp_internal.h | 6 +- platform/linux-generic/include/odp_llqueue.h | 311 +++ platform/linux-generic/include/odp_packet_dpdk.h | 2 - .../linux-generic/include/odp_packet_internal.h | 169 +- .../linux-generic/include/odp_packet_io_internal.h | 18 +- .../include/odp_packet_io_ipc_internal.h | 8 - .../linux-generic/include/odp_packet_io_queue.h | 48 - platform/linux-generic/include/odp_pool_internal.h | 42 +- platform/linux-generic/include/odp_queue_if.h | 20 +- .../linux-generic/include/odp_queue_internal.h | 12 - .../include/odp_queue_scalable_internal.h | 104 + platform/linux-generic/include/odp_schedule_if.h | 16 +- .../linux-generic/include/odp_schedule_scalable.h | 139 ++ .../include/odp_schedule_scalable_config.h | 52 + .../include/odp_schedule_scalable_ordered.h | 132 ++ platform/linux-generic/include/protocols/thash.h | 105 ++ platform/linux-generic/m4/configure.m4 | 18 +- platform/linux-generic/m4/odp_dpdk.m4 | 41 +- platform/linux-generic/m4/odp_netmap.m4 | 7 +- platform/linux-generic/m4/odp_openssl.m4 | 17 +- platform/linux-generic/m4/odp_pcap.m4 | 10 +- platform/linux-generic/m4/odp_pthread.m4 | 5 - platform/linux-generic/m4/odp_schedule.m4 | 55 +- platform/linux-generic/m4/odp_timer.m4 | 8 + platform/linux-generic/odp_buffer.c | 4 +- platform/linux-generic/odp_classification.c | 312 ++- platform/linux-generic/odp_crypto.c | 418 +++-- platform/linux-generic/odp_event.c | 15 + platform/linux-generic/odp_init.c | 79 +- platform/linux-generic/odp_packet.c | 767 +++++--- platform/linux-generic/odp_packet_io.c | 171 +- platform/linux-generic/odp_pkt_queue.c | 39 +- platform/linux-generic/odp_pool.c | 158 +- platform/linux-generic/odp_queue.c | 195 +- platform/linux-generic/odp_queue_if.c | 8 + platform/linux-generic/odp_queue_scalable.c | 997 ++++++++++ platform/linux-generic/odp_schedule.c | 161 +- platform/linux-generic/odp_schedule_if.c | 6 + platform/linux-generic/odp_schedule_iquery.c | 161 +- platform/linux-generic/odp_schedule_scalable.c | 1980 ++++++++++++++++++++ .../linux-generic/odp_schedule_scalable_ordered.c | 345 ++++ platform/linux-generic/odp_schedule_sp.c | 18 +- platform/linux-generic/odp_system_info.c | 36 + platform/linux-generic/odp_time.c | 4 +- platform/linux-generic/odp_timer.c | 101 +- platform/linux-generic/odp_traffic_mngr.c | 12 +- platform/linux-generic/pktio/dpdk.c | 692 +++++-- platform/linux-generic/pktio/ipc.c | 97 +- platform/linux-generic/pktio/socket_mmap.c | 6 +- test/Makefile.inc | 3 +- test/common_plat/common/Makefile.am | 1 + test/common_plat/m4/validation.m4 | 19 +- test/common_plat/performance/odp_crypto.c | 156 +- test/common_plat/performance/odp_l2fwd.c | 12 +- test/common_plat/performance/odp_pktio_ordered.c | 4 + test/common_plat/validation/api/Makefile.inc | 3 + test/common_plat/validation/api/buffer/buffer.c | 50 +- .../validation/api/classification/classification.h | 1 + .../api/classification/odp_classification_basic.c | 4 +- .../api/classification/odp_classification_common.c | 5 +- .../classification/odp_classification_test_pmr.c | 131 +- .../api/classification/odp_classification_tests.c | 2 + .../classification/odp_classification_testsuites.h | 3 +- test/common_plat/validation/api/crypto/crypto.c | 12 +- .../validation/api/crypto/odp_crypto_test_inp.c | 341 +++- .../validation/api/crypto/odp_crypto_test_inp.h | 8 +- test/common_plat/validation/api/packet/packet.c | 21 +- test/common_plat/validation/api/queue/queue.c | 8 +- test/common_plat/validation/api/system/system.c | 21 + test/common_plat/validation/api/system/system.h | 1 + test/common_plat/validation/api/time/Makefile.am | 1 + test/common_plat/validation/api/timer/timer.c | 62 +- .../validation/api/traffic_mngr/Makefile.am | 3 +- test/linux-generic/Makefile.inc | 4 +- test/linux-generic/pktio_ipc/ipc_common.h | 4 + test/linux-generic/pktio_ipc/pktio_ipc1.c | 38 +- test/linux-generic/pktio_ipc/pktio_ipc2.c | 24 +- test/linux-generic/pktio_ipc/pktio_ipc_run.sh | 39 +- .../validation/api/shmem/shmem_common.h | 5 +- .../validation/api/shmem/shmem_linux.c | 40 +- .../validation/api/shmem/shmem_odp1.c | 10 +- .../validation/api/shmem/shmem_odp2.c | 5 +- 153 files changed, 9886 insertions(+), 2286 deletions(-) mode change 100755 => 100644 doc/users-guide/users-guide.adoc create mode 100644 m4/ax_check_compile_flag.m4 create mode 100644 platform/linux-generic/arch/arm/odp_atomic.h create mode 100644 platform/linux-generic/arch/arm/odp_cpu.h create mode 100644 platform/linux-generic/arch/arm/odp_cpu_idling.h create mode 100644 platform/linux-generic/arch/arm/odp_llsc.h create mode 100644 platform/linux-generic/arch/default/odp_cpu.h create mode 100644 platform/linux-generic/arch/mips64/odp_cpu.h create mode 100644 platform/linux-generic/arch/powerpc/odp_cpu.h create mode 100644 platform/linux-generic/arch/x86/odp_cpu.h create mode 100644 platform/linux-generic/include/odp_bitset.h create mode 100644 platform/linux-generic/include/odp_llqueue.h delete mode 100644 platform/linux-generic/include/odp_packet_io_queue.h create mode 100644 platform/linux-generic/include/odp_queue_scalable_internal.h create mode 100644 platform/linux-generic/include/odp_schedule_scalable.h create mode 100644 platform/linux-generic/include/odp_schedule_scalable_config.h create mode 100644 platform/linux-generic/include/odp_schedule_scalable_ordered.h create mode 100644 platform/linux-generic/include/protocols/thash.h create mode 100644 platform/linux-generic/m4/odp_timer.m4 create mode 100644 platform/linux-generic/odp_queue_scalable.c create mode 100644 platform/linux-generic/odp_schedule_scalable.c create mode 100644 platform/linux-generic/odp_schedule_scalable_ordered.c hooks/post-receive --

7 years, 10 months

[COMMIT] branch odp-dpdk-import created. v1.15.0.0-401-g370f9313

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, odp-dpdk-import has been created at 370f93139e16633390cb28acda6296da8fee006d (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive --

7 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-556-ge420668c

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 e420668cd3886f003c8bd6022e210bf08a0ee3b5 (commit) via bb3400df72401d88aa8e79fb0244a2b90f3bd138 (commit) via 2bbf95311cb8136b7e769deda6254a9e9b26250b (commit) via 4ce95649367da9edd140ba9c25daaaf292edf883 (commit) via 03aa7c3572865dc03df1cf8c33b969ca4b17c7e8 (commit) via dca4f5bd8218f30a593f6fb37c060de41d1ca9b1 (commit) via 5a6d8798bc436fa3a7e90fcf105362eabb21db0c (commit) via cd15a2125781f4eefdab1f765999a59504fb2939 (commit) via 757439849936bb76885f27677fc8997a67fa2a3c (commit) via 92ad20c03bf4737558265a1ff942666d7c4ec3d8 (commit) via fd2ca1209dc19c8e8199ee556ad2c9a786eabf78 (commit) from 2394317ab247fa14b4e239aec512afee7eac4524 (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 e420668cd3886f003c8bd6022e210bf08a0ee3b5 Merge: 2394317a bb3400df Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Aug 8 17:04:12 2017 +0300 Merge branch 'master' into api-next diff --cc platform/linux-generic/include/odp_classification_internal.h index aca8e8c6,369636d5..208b0f5b --- a/platform/linux-generic/include/odp_classification_internal.h +++ b/platform/linux-generic/include/odp_classification_internal.h @@@ -59,91 -49,14 +49,12 @@@ This function should be called during p **/ int pktio_classifier_init(pktio_entry_t *pktio); - /** - @internal - match_pmr_cos - - Match a PMR chain with a Packet and return matching CoS - This function gets called recursively to check the chained PMR Term value - with the packet. - - **/ - cos_t *match_pmr_cos(cos_t *cos, const uint8_t *pkt_addr, pmr_t *pmr, - odp_packet_hdr_t *hdr); --/** --@internal - CoS associated with L3 QoS value - - This function returns the CoS associated with L3 QoS value - **/ - cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, - odp_packet_hdr_t *hdr); - -Flow Signature Calculation +void _odp_cls_update_hash_proto(cos_t *cos, + odp_pktin_hash_proto_t hash_proto); - /** - @internal - CoS associated with L2 QoS value - - This function returns the CoS associated with L2 QoS value - **/ - cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, - odp_packet_hdr_t *hdr); - /** - @internal - Flow Signature Calculation - --This function calculates the Flow Signature for a packet based on --CoS and updates in Packet Meta Data --**/ --int update_flow_signature(uint8_t *pkt_addr, cos_t *cos); - - /** - @internal - Allocate a odp_pmr_t Handle - */ - odp_pmr_t alloc_pmr(pmr_t **pmr); - - /** - @internal - Pointer to pmr_t Handle - This function checks for validity of odp_pmr_t Handle - */ - pmr_t *get_pmr_entry(odp_pmr_t pmr_id); - - /** - @internal - Pointer to pmr_t Handle - */ - pmr_t *get_pmr_entry_internal(odp_pmr_t pmr_id); - - /** - @internal - Pointer to odp_cos_t Handle - */ - cos_t *get_cos_entry(odp_cos_t cos_id); - - /** - @internal - Pointer to odp_cos_t Handle - This function checks for validity of odp_cos_t Handle - */ - cos_t *get_cos_entry_internal(odp_cos_t cos_id); - - /** - @internal - Verify PMR with a Packet - - This function goes through each PMR_TERM value in pmr_t structure and - calls verification function for each term.Returns 1 if PMR matches or 0 - Otherwise. - **/ - int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr); - +uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, + odp_cls_hash_proto_t hash_proto, + const uint8_t *base); #ifdef __cplusplus } diff --cc platform/linux-generic/odp_classification.c index 5a76aa5e,5e9173dc..f9a82a2e --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@@ -31,18 -30,8 +31,19 @@@ static cos_tbl_t *cos_tbl; static pmr_tbl_t *pmr_tbl; +static _cls_queue_grp_tbl_t *queue_grp_tbl; + +const rss_key default_rss = { + .u8 = { + 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, + 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, + 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4, + 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c, + 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa, + } +}; + static cos_t *get_cos_entry_internal(odp_cos_t cos_id) { return &cos_tbl->cos_entry[_odp_typeval(cos_id)]; @@@ -293,9 -226,10 +299,10 @@@ odp_pmr_t alloc_pmr(pmr_t **pmr return ODP_PMR_INVAL; } + static cos_t *get_cos_entry(odp_cos_t cos_id) { - if (_odp_typeval(cos_id) >= ODP_COS_MAX_ENTRY || + if (_odp_typeval(cos_id) >= CLS_COS_MAX_ENTRY || cos_id == ODP_COS_INVALID) return NULL; if (cos_tbl->cos_entry[_odp_typeval(cos_id)].s.valid == 0) @@@ -303,9 -237,10 +310,10 @@@ return &cos_tbl->cos_entry[_odp_typeval(cos_id)]; } + static pmr_t *get_pmr_entry(odp_pmr_t pmr_id) { - if (_odp_typeval(pmr_id) >= ODP_PMR_MAX_ENTRY || + if (_odp_typeval(pmr_id) >= CLS_PMR_MAX_ENTRY || pmr_id == ODP_PMR_INVAL) return NULL; if (pmr_tbl->pmr[_odp_typeval(pmr_id)].s.valid == 0) @@@ -966,74 -871,7 +989,75 @@@ int cls_classify_packet(pktio_entry_t * return 0; } +uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, + odp_cls_hash_proto_t hash_proto, + const uint8_t *base) +{ + thash_tuple_t tuple; + const _odp_ipv4hdr_t *ipv4; + const _odp_udphdr_t *udp; + const _odp_tcphdr_t *tcp; + const _odp_ipv6hdr_t *ipv6; + uint32_t hash; + uint32_t tuple_len; + + tuple_len = 0; + hash = 0; + if (pkt_hdr->p.input_flags.ipv4) { + if (hash_proto.ipv4) { + /* add ipv4 */ + ipv4 = (const _odp_ipv4hdr_t *)base + + pkt_hdr->p.l3_offset; + tuple.v4.src_addr = ipv4->src_addr; + tuple.v4.dst_addr = ipv4->dst_addr; + tuple_len += 2; + } + + if (pkt_hdr->p.input_flags.tcp && hash_proto.tcp) { + /* add tcp */ + tcp = (const _odp_tcphdr_t *)base + + pkt_hdr->p.l4_offset; + tuple.v4.sport = tcp->src_port; + tuple.v4.dport = tcp->dst_port; + tuple_len += 1; + } else if (pkt_hdr->p.input_flags.udp && hash_proto.udp) { + /* add udp */ + udp = (const _odp_udphdr_t *)base + + pkt_hdr->p.l4_offset; + tuple.v4.sport = udp->src_port; + tuple.v4.dport = udp->dst_port; + tuple_len += 1; + } + } else if (pkt_hdr->p.input_flags.ipv6) { + if (hash_proto.ipv6) { + /* add ipv6 */ + ipv6 = (const _odp_ipv6hdr_t *)base + + pkt_hdr->p.l3_offset; + thash_load_ipv6_addr(ipv6, &tuple); + tuple_len += 8; + } + if (pkt_hdr->p.input_flags.tcp && hash_proto.tcp) { + tcp = (const _odp_tcphdr_t *)base + + pkt_hdr->p.l4_offset; + tuple.v4.sport = tcp->src_port; + tuple.v4.dport = tcp->dst_port; + tuple_len += 1; + } else if (pkt_hdr->p.input_flags.udp && hash_proto.udp) { + /* add udp */ + udp = (const _odp_udphdr_t *)base + + pkt_hdr->p.l4_offset; + tuple.v4.sport = udp->src_port; + tuple.v4.dport = udp->dst_port; + tuple_len += 1; + } + } + if (tuple_len) + hash = thash_softrss((uint32_t *)&tuple, + tuple_len, default_rss); + return hash; +} + + static cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr) { ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/_fdserver.c | 2 +- .../linux-generic/include/odp_buffer_internal.h | 4 - .../include/odp_classification_internal.h | 89 ---------------------- .../linux-generic/include/odp_packet_io_internal.h | 13 ---- .../linux-generic/include/odp_queue_internal.h | 5 -- platform/linux-generic/include/odp_schedule_if.h | 1 - platform/linux-generic/odp_classification.c | 31 ++++++++ platform/linux-generic/odp_packet_io.c | 28 +++---- platform/linux-generic/odp_pool.c | 13 ---- platform/linux-generic/odp_queue.c | 14 +--- platform/linux-generic/odp_schedule.c | 10 +-- platform/linux-generic/odp_schedule_iquery.c | 10 +-- 12 files changed, 56 insertions(+), 164 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.15.0.0-113-gbb3400df

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 bb3400df72401d88aa8e79fb0244a2b90f3bd138 (commit) via 2bbf95311cb8136b7e769deda6254a9e9b26250b (commit) via 4ce95649367da9edd140ba9c25daaaf292edf883 (commit) via 03aa7c3572865dc03df1cf8c33b969ca4b17c7e8 (commit) via dca4f5bd8218f30a593f6fb37c060de41d1ca9b1 (commit) via 5a6d8798bc436fa3a7e90fcf105362eabb21db0c (commit) via cd15a2125781f4eefdab1f765999a59504fb2939 (commit) via 757439849936bb76885f27677fc8997a67fa2a3c (commit) via 92ad20c03bf4737558265a1ff942666d7c4ec3d8 (commit) via fd2ca1209dc19c8e8199ee556ad2c9a786eabf78 (commit) from e76b25aa5cafbf96133fcbd83b856090b0e95f33 (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 bb3400df72401d88aa8e79fb0244a2b90f3bd138 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:37:49 2017 +0300 linux-gen: sched iquery: mark thread_local as static 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/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index ee2be031..c38c7c01 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -226,7 +226,7 @@ struct sched_thread_local { static sched_global_t *sched; /* Thread local scheduler context */ -__thread sched_thread_local_t thread_local; +static __thread sched_thread_local_t thread_local; static int schedule_init_global(void) { commit 2bbf95311cb8136b7e769deda6254a9e9b26250b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:37:49 2017 +0300 linux-gen: sched: mark sched_local as static 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/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 4c99f602..79b21ac7 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -264,7 +264,7 @@ typedef struct { static sched_global_t *sched; /* Thread local scheduler context */ -__thread sched_local_t sched_local; +static __thread sched_local_t sched_local; /* Function prototypes */ static inline void schedule_release_context(void); commit 4ce95649367da9edd140ba9c25daaaf292edf883 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:29:34 2017 +0300 linux-gen: queue: drop two unused functions 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/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index c5ff1e7d..dd846d59 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -61,9 +61,6 @@ union queue_entry_u { uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))]; }; -void queue_lock(queue_entry_t *queue); -void queue_unlock(queue_entry_t *queue); - static inline uint32_t queue_to_id(odp_queue_t handle) { return _odp_typeval(handle) - 1; diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index e2f8c067..7ad346ad 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -593,16 +593,6 @@ static int queue_init(queue_entry_t *queue, const char *name, return 0; } -void queue_lock(queue_entry_t *queue) -{ - LOCK(&queue->s.lock); -} - -void queue_unlock(queue_entry_t *queue) -{ - UNLOCK(&queue->s.lock); -} - static void queue_param_init(odp_queue_param_t *params) { memset(params, 0, sizeof(odp_queue_param_t)); commit 03aa7c3572865dc03df1cf8c33b969ca4b17c7e8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:26:28 2017 +0300 linux-gen: pktio: mark pktio_tbl as static 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/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 7958786d..9419adf6 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -36,7 +36,7 @@ * Must be power of two. */ #define SLEEP_CHECK 32 -pktio_table_t *pktio_tbl; +static pktio_table_t *pktio_tbl; /* pktio pointer entries ( for inlines) */ void *pktio_entry_ptr[ODP_CONFIG_PKTIO_ENTRIES]; commit dca4f5bd8218f30a593f6fb37c060de41d1ca9b1 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:25:41 2017 +0300 linux-gen: pktio: drop/staticize leftovers from single queue shim 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/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 20a86557..1a4e345f 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -252,19 +252,6 @@ static inline void pktio_cls_enabled_set(pktio_entry_t *entry, int ena) entry->s.cls_enabled = ena; } -/* - * Dummy single queue implementations of multi-queue API - */ -int single_capability(odp_pktio_capability_t *capa); -int single_input_queues_config(pktio_entry_t *entry, - const odp_pktin_queue_param_t *param); -int single_output_queues_config(pktio_entry_t *entry, - const odp_pktout_queue_param_t *param); -int single_recv_queue(pktio_entry_t *entry, int index, odp_packet_t packets[], - int num); -int single_send_queue(pktio_entry_t *entry, int index, - const odp_packet_t packets[], int num); - extern const pktio_if_ops_t netmap_pktio_ops; extern const pktio_if_ops_t dpdk_pktio_ops; extern const pktio_if_ops_t sock_mmsg_pktio_ops; diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index f78f70ae..7958786d 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1070,6 +1070,17 @@ int odp_pktio_term_global(void) return ret; } +static +int single_capability(odp_pktio_capability_t *capa) +{ + memset(capa, 0, sizeof(odp_pktio_capability_t)); + capa->max_input_queues = 1; + capa->max_output_queues = 1; + capa->set_op.op.promisc_mode = 1; + + return 0; +} + int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa) { pktio_entry_t *entry; @@ -1675,13 +1686,3 @@ int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[], return entry->s.ops->send(entry, queue.index, packets, num); } - -int single_capability(odp_pktio_capability_t *capa) -{ - memset(capa, 0, sizeof(odp_pktio_capability_t)); - capa->max_input_queues = 1; - capa->max_output_queues = 1; - capa->set_op.op.promisc_mode = 1; - - return 0; -} commit 5a6d8798bc436fa3a7e90fcf105362eabb21db0c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:25:05 2017 +0300 linux-gen: scheduler: drop unused callback 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/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 4cd8c3e5..e842fb46 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -67,7 +67,6 @@ extern const schedule_fn_t *sched_fn; /* Interface for the scheduler */ int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]); void sched_cb_pktio_stop_finalize(int pktio_index); -int sched_cb_num_pktio(void); odp_queue_t sched_cb_queue_handle(uint32_t queue_index); void sched_cb_queue_destroy_finalize(uint32_t queue_index); int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], int num); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index b4523389..f78f70ae 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -727,11 +727,6 @@ void sched_cb_pktio_stop_finalize(int pktio_index) unlock_entry(entry); } -int sched_cb_num_pktio(void) -{ - return ODP_CONFIG_PKTIO_ENTRIES; -} - uint32_t odp_pktio_mtu(odp_pktio_t hdl) { pktio_entry_t *entry; commit cd15a2125781f4eefdab1f765999a59504fb2939 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:23:39 2017 +0300 linux-gen: classification: mark several functions as static 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/platform/linux-generic/include/odp_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h index 78eaac90..369636d5 100644 --- a/platform/linux-generic/include/odp_classification_internal.h +++ b/platform/linux-generic/include/odp_classification_internal.h @@ -30,16 +30,6 @@ extern "C" { /** @internal -match_qos_cos - -Select a CoS for the given Packet based on QoS values -This function returns the COS object matching the L2 and L3 QoS -based on the l3_preference value of the pktio -**/ -cos_t *match_qos_cos(pktio_entry_t *entry, const uint8_t *pkt_addr, - odp_packet_hdr_t *hdr); -/** -@internal Packet Classifier @@ -61,34 +51,6 @@ int pktio_classifier_init(pktio_entry_t *pktio); /** @internal -match_pmr_cos - -Match a PMR chain with a Packet and return matching CoS -This function gets called recursively to check the chained PMR Term value -with the packet. - -**/ -cos_t *match_pmr_cos(cos_t *cos, const uint8_t *pkt_addr, pmr_t *pmr, - odp_packet_hdr_t *hdr); -/** -@internal -CoS associated with L3 QoS value - -This function returns the CoS associated with L3 QoS value -**/ -cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, - odp_packet_hdr_t *hdr); - -/** -@internal -CoS associated with L2 QoS value - -This function returns the CoS associated with L2 QoS value -**/ -cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, - odp_packet_hdr_t *hdr); -/** -@internal Flow Signature Calculation This function calculates the Flow Signature for a packet based on @@ -96,48 +58,6 @@ CoS and updates in Packet Meta Data **/ int update_flow_signature(uint8_t *pkt_addr, cos_t *cos); -/** -@internal -Allocate a odp_pmr_t Handle -*/ -odp_pmr_t alloc_pmr(pmr_t **pmr); - -/** -@internal -Pointer to pmr_t Handle -This function checks for validity of odp_pmr_t Handle -*/ -pmr_t *get_pmr_entry(odp_pmr_t pmr_id); - -/** -@internal -Pointer to pmr_t Handle -*/ -pmr_t *get_pmr_entry_internal(odp_pmr_t pmr_id); - -/** -@internal -Pointer to odp_cos_t Handle -*/ -cos_t *get_cos_entry(odp_cos_t cos_id); - -/** -@internal -Pointer to odp_cos_t Handle -This function checks for validity of odp_cos_t Handle -*/ -cos_t *get_cos_entry_internal(odp_cos_t cos_id); - -/** -@internal -Verify PMR with a Packet - -This function goes through each PMR_TERM value in pmr_t structure and -calls verification function for each term.Returns 1 if PMR matches or 0 -Otherwise. -**/ -int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr); - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 08b09078..5e9173dc 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -31,11 +31,13 @@ static cos_tbl_t *cos_tbl; static pmr_tbl_t *pmr_tbl; +static cos_t *get_cos_entry_internal(odp_cos_t cos_id) { return &cos_tbl->cos_entry[_odp_typeval(cos_id)]; } +static pmr_t *get_pmr_entry_internal(odp_pmr_t pmr_id) { return &pmr_tbl->pmr[_odp_typeval(pmr_id)]; @@ -200,6 +202,10 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) return ODP_COS_INVALID; } +/* + * Allocate an odp_pmr_t Handle + */ +static odp_pmr_t alloc_pmr(pmr_t **pmr) { int i; @@ -220,6 +226,7 @@ odp_pmr_t alloc_pmr(pmr_t **pmr) return ODP_PMR_INVAL; } +static cos_t *get_cos_entry(odp_cos_t cos_id) { if (_odp_typeval(cos_id) >= ODP_COS_MAX_ENTRY || @@ -230,6 +237,7 @@ cos_t *get_cos_entry(odp_cos_t cos_id) return &cos_tbl->cos_entry[_odp_typeval(cos_id)]; } +static pmr_t *get_pmr_entry(odp_pmr_t pmr_id) { if (_odp_typeval(pmr_id) >= ODP_PMR_MAX_ENTRY || @@ -599,6 +607,11 @@ odp_pool_t odp_cls_cos_pool(odp_cos_t cos_id) return cos->s.pool; } +/* + * This function goes through each PMR_TERM value in pmr_t structure and calls + * verification function for each term.Returns 1 if PMR matches or 0 otherwise. + */ +static int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr) { int pmr_failure = 0; @@ -717,6 +730,12 @@ int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr) return true; } +/* + * Match a PMR chain with a Packet and return matching CoS + * This function gets called recursively to check the chained PMR Term value + * with the packet. + */ +static cos_t *match_pmr_cos(cos_t *cos, const uint8_t *pkt_addr, pmr_t *pmr, odp_packet_hdr_t *hdr) { @@ -763,6 +782,10 @@ int pktio_classifier_init(pktio_entry_t *entry) return 0; } +static +cos_t *match_qos_cos(pktio_entry_t *entry, const uint8_t *pkt_addr, + odp_packet_hdr_t *hdr); + /** Select a CoS for the given Packet based on pktio @@ -848,6 +871,7 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, return 0; } +static cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr) { @@ -869,6 +893,7 @@ cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, return cos; } +static cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr) { @@ -888,6 +913,12 @@ cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, return cos; } +/* + * Select a CoS for the given Packet based on QoS values + * This function returns the COS object matching the L2 and L3 QoS + * based on the l3_preference value of the pktio +*/ +static cos_t *match_qos_cos(pktio_entry_t *entry, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr) { commit 757439849936bb76885f27677fc8997a67fa2a3c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:23:13 2017 +0300 linux-gen: fdserver: mark client_lock as static 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/platform/linux-generic/_fdserver.c b/platform/linux-generic/_fdserver.c index 4f74c614..d1b16f62 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/_fdserver.c @@ -69,7 +69,7 @@ #endif /* when accessing the client functions, clients should be mutexed: */ -odp_spinlock_t *client_lock; +static odp_spinlock_t *client_lock; /* define the tables of file descriptors handled by this server: */ #define FDSERVER_MAX_ENTRIES 256 commit 92ad20c03bf4737558265a1ff942666d7c4ec3d8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:22:44 2017 +0300 linux-gen: pool: drop two unused functions 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/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 20127004..a580c82d 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -107,10 +107,6 @@ ODP_STATIC_ASSERT(CONFIG_PACKET_MAX_SEGS < 256, ODP_STATIC_ASSERT(BUFFER_BURST_SIZE < 256, "BUFFER_BURST_SIZE_TOO_LARGE"); -/* Forward declarations */ -int seg_alloc_tail(odp_buffer_hdr_t *buf_hdr, int segcount); -void seg_free_tail(odp_buffer_hdr_t *buf_hdr, int segcount); - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index f2410b6e..c739adbc 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -890,19 +890,6 @@ uint64_t odp_pool_to_u64(odp_pool_t hdl) return _odp_pri(hdl); } -int seg_alloc_tail(odp_buffer_hdr_t *buf_hdr, int segcount) -{ - (void)buf_hdr; - (void)segcount; - return 0; -} - -void seg_free_tail(odp_buffer_hdr_t *buf_hdr, int segcount) -{ - (void)buf_hdr; - (void)segcount; -} - int odp_buffer_is_valid(odp_buffer_t buf) { pool_t *pool; commit fd2ca1209dc19c8e8199ee556ad2c9a786eabf78 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Aug 4 11:21:31 2017 +0300 linux-gen: hide get_qentry Replace two last index->qentry lookups with pointers to quentry, thus making it possible to make get_qentry static in odp_queue.c 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/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 032dde88..c5ff1e7d 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -61,8 +61,6 @@ union queue_entry_u { uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))]; }; -queue_entry_t *get_qentry(uint32_t queue_id); - void queue_lock(queue_entry_t *queue); void queue_unlock(queue_entry_t *queue); diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 904c9ef2..e2f8c067 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -43,6 +43,9 @@ typedef struct queue_table_t { static queue_table_t *queue_tbl; +static +queue_entry_t *get_qentry(uint32_t queue_id); + static inline queue_entry_t *handle_to_qentry(odp_queue_t handle) { uint32_t queue_id; @@ -56,6 +59,7 @@ static inline odp_queue_t queue_from_id(uint32_t queue_id) return _odp_cast_scalar(odp_queue_t, queue_id + 1); } +static queue_entry_t *get_qentry(uint32_t queue_id) { return &queue_tbl->queue[queue_id]; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index bbcc85a5..4c99f602 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -130,7 +130,7 @@ ODP_STATIC_ASSERT((8 * sizeof(pri_mask_t)) >= QUEUES_PER_PRIO, /* Storage for stashed enqueue operation arguments */ typedef struct { odp_buffer_hdr_t *buf_hdr[QUEUE_MULTI_MAX]; - uint32_t queue_index; + queue_entry_t *queue_entry; int num; } ordered_stash_t; @@ -682,12 +682,10 @@ static inline void ordered_stash_release(void) for (i = 0; i < sched_local.ordered.stash_num; i++) { queue_entry_t *queue_entry; - uint32_t queue_index; odp_buffer_hdr_t **buf_hdr; int num; - queue_index = sched_local.ordered.stash[i].queue_index; - queue_entry = get_qentry(queue_index); + queue_entry = sched_local.ordered.stash[i].queue_entry; buf_hdr = sched_local.ordered.stash[i].buf_hdr; num = sched_local.ordered.stash[i].num; @@ -788,7 +786,7 @@ static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[], return 0; } - sched_local.ordered.stash[stash_num].queue_index = dst_queue->s.index; + sched_local.ordered.stash[stash_num].queue_entry = dst_queue; sched_local.ordered.stash[stash_num].num = num; for (i = 0; i < num; i++) sched_local.ordered.stash[stash_num].buf_hdr[i] = buf_hdr[i]; diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index d374dedd..ee2be031 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -170,7 +170,7 @@ typedef struct { /* Storage for stashed enqueue operation arguments */ typedef struct { odp_buffer_hdr_t *buf_hdr[QUEUE_MULTI_MAX]; - uint32_t queue_index; + queue_entry_t *queue_entry; int num; } ordered_stash_t; @@ -1127,12 +1127,10 @@ static inline void ordered_stash_release(void) for (i = 0; i < thread_local.ordered.stash_num; i++) { queue_entry_t *queue_entry; - uint32_t queue_index; odp_buffer_hdr_t **buf_hdr; int num; - queue_index = thread_local.ordered.stash[i].queue_index; - queue_entry = get_qentry(queue_index); + queue_entry = thread_local.ordered.stash[i].queue_entry; buf_hdr = thread_local.ordered.stash[i].buf_hdr; num = thread_local.ordered.stash[i].num; @@ -1219,7 +1217,7 @@ static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[], return 0; } - thread_local.ordered.stash[stash_num].queue_index = dst_queue->s.index; + thread_local.ordered.stash[stash_num].queue_entry = dst_queue; thread_local.ordered.stash[stash_num].num = num; for (i = 0; i < num; i++) thread_local.ordered.stash[stash_num].buf_hdr[i] = buf_hdr[i]; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/_fdserver.c | 2 +- .../linux-generic/include/odp_buffer_internal.h | 4 -- .../include/odp_classification_internal.h | 80 ---------------------- .../linux-generic/include/odp_packet_io_internal.h | 13 ---- .../linux-generic/include/odp_queue_internal.h | 5 -- platform/linux-generic/include/odp_schedule_if.h | 1 - platform/linux-generic/odp_classification.c | 31 +++++++++ platform/linux-generic/odp_packet_io.c | 28 ++++---- platform/linux-generic/odp_pool.c | 13 ---- platform/linux-generic/odp_queue.c | 14 ++-- platform/linux-generic/odp_schedule.c | 10 ++- platform/linux-generic/odp_schedule_iquery.c | 10 ++- 12 files changed, 56 insertions(+), 155 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-545-g2394317a

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 2394317ab247fa14b4e239aec512afee7eac4524 (commit) from 09ce9406e09eacadf8f739ae8499323ad1401d36 (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 2394317ab247fa14b4e239aec512afee7eac4524 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Aug 7 16:07:58 2017 +0300 Revert "api: schedule: add thread removal correction" This reverts commit 09ce9406 api: schedule: add thread removal correction Needed some more discussion before merging this. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index f1671462..8244746d 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -234,9 +234,8 @@ odp_schedule_group_t odp_schedule_group_create(const char *name, * Schedule group destroy * * Destroys a schedule group. All queues belonging to the schedule group must - * be destroyed before destroying the group. All threads that have joined - * the group must leave before destroying the group. Other operations on this - * group must not be invoked in parallel. + * be destroyed before destroying the group. Other operations on this group + * must not be invoked in parallel. * * @param group Schedule group handle * ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/schedule.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-544-g09ce9406

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 09ce9406e09eacadf8f739ae8499323ad1401d36 (commit) from a165ff4093f666e5481ae5113f70b41e3354520d (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 09ce9406e09eacadf8f739ae8499323ad1401d36 Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Date: Wed Jun 14 16:48:24 2017 -0500 api: schedule: add thread removal correction Clarify thread removal status from scheduler group before calling odp_schedule_group_destroy. Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Ola Liljedahl <ola.liljedahl(a)arm.com> 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/schedule.h b/include/odp/api/spec/schedule.h index 8244746d..f1671462 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -234,8 +234,9 @@ odp_schedule_group_t odp_schedule_group_create(const char *name, * Schedule group destroy * * Destroys a schedule group. All queues belonging to the schedule group must - * be destroyed before destroying the group. Other operations on this group - * must not be invoked in parallel. + * be destroyed before destroying the group. All threads that have joined + * the group must leave before destroying the group. Other operations on this + * group must not be invoked in parallel. * * @param group Schedule group handle * ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/schedule.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch api-next updated. v1.15.0.0-543-ga165ff40

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 a165ff4093f666e5481ae5113f70b41e3354520d (commit) via 41abc837a5c25d8df3429398bcb51c72b83999e5 (commit) via e76b25aa5cafbf96133fcbd83b856090b0e95f33 (commit) via ab62d19d4811e2699ac0614bf4ba1d481bb3b2b1 (commit) via 641717bac482831a8f9702af7f941cfc349ada91 (commit) via c5436c447df98e0ec78de3620c7fe48141fef760 (commit) via 2fff8b0247a0da108c45c9febc1029bc8e12d347 (commit) from 8390f890d4bd2babb63a24f7b15d2f4763e44050 (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 a165ff4093f666e5481ae5113f70b41e3354520d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 24 16:57:30 2017 +0300 api: crypto: clarify compl_queue queue in crypto_session_param Properly mention odp_crypto_operation() in the compl_queue param description. 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/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 6d4807c4..3b8e9ddb 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -312,8 +312,9 @@ typedef struct odp_crypto_session_param_t { /** Async mode completion event queue * - * The completion queue is used to return odp_crypto_op_enq() - * results to the application. + * The completion queue is used to return completions from + * odp_crypto_operation() or odp_crypto_op_enq() results to the + * application. */ odp_queue_t compl_queue; commit 41abc837a5c25d8df3429398bcb51c72b83999e5 Merge: 8390f890 e76b25aa Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Aug 4 19:56:42 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/crypto.h | 5 +- platform/linux-generic/odp_classification.c | 3 - platform/linux-generic/odp_packet_io.c | 2 + platform/linux-generic/odp_pkt_queue.c | 39 +++++- .../validation/api/classification/classification.h | 1 + .../api/classification/odp_classification_basic.c | 4 +- .../api/classification/odp_classification_common.c | 5 +- .../classification/odp_classification_test_pmr.c | 131 ++++++++++++++++++--- .../api/classification/odp_classification_tests.c | 2 + .../classification/odp_classification_testsuites.h | 3 +- 10 files changed, 164 insertions(+), 31 deletions(-) hooks/post-receive --

7 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp