January 2018 - git-lng-odp - lists.linaro.org

[COMMIT] branch caterpillar updated. v1.15.0.0-962-g993e0cf7

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, caterpillar has been updated via 993e0cf7d033d25eac5113462b66c66a5bb6b737 (commit) from f87bb5146fb25f7cd62246500cb4f7e625375654 (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 993e0cf7d033d25eac5113462b66c66a5bb6b737 Author: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Date: Tue Jan 23 13:10:42 2018 +0200 pktio: mdev: coalesce tx descriptors for cxgb4 Increases tx performance from ~7Mpps -> 47Mpps Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Reviewed-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/pktio/mdev/cxgb4.c b/platform/linux-generic/pktio/mdev/cxgb4.c index f09835d9..acfd3bcf 100644 --- a/platform/linux-generic/pktio/mdev/cxgb4.c +++ b/platform/linux-generic/pktio/mdev/cxgb4.c @@ -33,11 +33,6 @@ #define MODULE_NAME "cxgb4" -#define CXGB4_TX_BUF_SIZE 2048U - -#define CXGB4_TX_INLINE_MAX (256 - sizeof(cxgb4_fw_eth_tx_pkt_wr_t) \ - - sizeof(cxgb4_cpl_tx_pkt_core_t)) - /* RX queue definitions */ #define CXGB4_RX_QUEUE_NUM_MAX 32 @@ -98,20 +93,52 @@ typedef struct ODP_ALIGNED_CACHE { /* TX queue definitions */ #define CXGB4_TX_QUEUE_NUM_MAX 32 +#define CXGB4_TX_BUF_SIZE 2048U typedef struct { odp_u64be_t data[8]; } cxgb4_tx_desc_t; +/* coalesced WR */ +typedef struct { + uint8_t pkt_count; + uint32_t pkt_acc_len; + uint32_t wr_len; + void *ptr; +} cxgb4_coalesce_t; + +#define COALESCE_WR_LEN 512 +#define CXGB4_DESCS_PER_BLOCK_SHIFT \ + __builtin_ctz(COALESCE_WR_LEN / sizeof(cxgb4_tx_desc_t)) +#define BLOCKS_TO_DESCS(__tmp) (__tmp << CXGB4_DESCS_PER_BLOCK_SHIFT) +#define DESCS_TO_BLOCKS(__tmp) (__tmp >> CXGB4_DESCS_PER_BLOCK_SHIFT) +/* + * Currently there are two types of coalesce WR. + * Type 0 needs 48 bytes per packet (if one sgl is present) + * and type 1 needs 32 bytes. + * type 0 can fit a maximum of 10 packets per WR and type 1 + * 15 packets. + * We only support type 1 +*/ +#define CXGB4_COALESCE_WR_TYPE1 1 + typedef struct { -#define CXGB4_FW_ETH_TX_PKT_WR 0x08000000UL - odp_u32be_t op_immdlen; +/* + * Chelsio's DPDK is using 0x09000000 Intel's 0x78000000 + * there seems to be no performance difference between these + */ +#define CXGB4_FW_ETH_TX_PKTS_WR (0x78UL << 24) +#define CXGB4_FW_WR_EQUEQ (1UL << 30) + odp_u32be_t op_pkd; odp_u32be_t equiq_to_len16; - odp_u64be_t r3; -} cxgb4_fw_eth_tx_pkt_wr_t; + odp_u32be_t r3; + odp_u16be_t pkt_acc_len; + uint8_t pkt_count; + uint8_t type; +} cxgb4_fw_eth_tx_pkts_wr_t; typedef struct { -#define CPL_TX_PKT_XT 0xEE000000UL +#define CPL_TX_PKT_XT (0xEEUL << 24) #define TXPKT_PF_S 8 #define TXPKT_PF_V(x) ((x) << TXPKT_PF_S) #define TXPKT_INTF_S 16 @@ -147,14 +174,16 @@ typedef struct { typedef struct ODP_ALIGNED_CACHE { cxgb4_tx_desc_t *tx_descs; /**< TX queue base */ cxgb4_tx_queue_stats *stats; /**< TX queue stats */ + cxgb4_coalesce_t coalesce; /**< coalesce information */ odp_u32le_t *doorbell_desc; /**< TX queue doorbell */ uint32_t doorbell_desc_key; /**< 'Key' to the doorbell */ uint16_t tx_queue_len; /**< Number of TX desc entries */ - uint16_t tx_next; /**< Next TX desc to insert */ + uint16_t pidx; /**< Next TX desc to insert */ mdev_dma_area_t tx_data; /**< TX packet payload area */ + uint64_t offset; /**< Payload offset */ odp_ticketlock_t lock; /**< TX queue lock */ } cxgb4_tx_queue_t; @@ -329,6 +358,14 @@ static int cxgb4_tx_queue_register(pktio_ops_cxgb4_data_t *pkt_cxgb4, return -1; } txq->tx_queue_len = ering.tx_pending; + /* + * We only support type1 coalescing on tx + */ + if (txq->tx_queue_len & 7) { + ODP_ERR("tx queue len needs to be a multiple of 8\n"); + return -1; + } + ret = sysfs_attr_u64_get(&val, "/sys/class/net/%s/queues/tx-%u/cxgb4/" "doorbell_desc_offset", @@ -361,8 +398,11 @@ static int cxgb4_tx_queue_register(pktio_ops_cxgb4_data_t *pkt_cxgb4, txq->stats = (cxgb4_tx_queue_stats *)(txq->tx_descs + txq->tx_queue_len); - - txq->tx_data.size = txq->tx_queue_len * CXGB4_TX_BUF_SIZE; + /* + * 1 descriptor holds 2 packets on type 1 coalescing + * we can fit 15 packets in 512 bytes(each descriptor is 64bytes long) + */ + txq->tx_data.size = 2 * txq->tx_queue_len * CXGB4_TX_BUF_SIZE; ret = mdev_dma_area_alloc(&pkt_cxgb4->mdev, &txq->tx_data); if (ret) { ODP_ERR("Cannot allocate TX queue DMA area\n"); @@ -667,118 +707,142 @@ static int cxgb4_recv(pktio_entry_t *pktio_entry, return rx_pkts; } +/* + * Fills in WR header for coalesced packets and submits it + * to the hardware + */ +static void submit_coalesced_wr(cxgb4_tx_queue_t *txq, cxgb4_tx_desc_t *txd) + +{ + uint32_t wr_mid; + cxgb4_fw_eth_tx_pkts_wr_t *wr; + + ODP_ASSERT(txq->coalesce.wr_len <= COALESCE_WR_LEN); + + /* fill the pkts WR header */ + wr = (cxgb4_fw_eth_tx_pkts_wr_t *)txd; + wr->op_pkd = odp_cpu_to_be_32(CXGB4_FW_ETH_TX_PKTS_WR); + + wr_mid = DIV_ROUND_UP(txq->coalesce.wr_len, 16); + /* Request CIDX update from firmware from time to time */ + if (!(txq->pidx & ((DESCS_TO_BLOCKS(txq->tx_queue_len) >> 2) - 1))) + wr_mid |= CXGB4_FW_WR_EQUEQ; + + wr->equiq_to_len16 = odp_cpu_to_be_32(wr_mid); + wr->pkt_acc_len = odp_cpu_to_be_16(txq->coalesce.pkt_acc_len); + wr->pkt_count = txq->coalesce.pkt_count; + wr->r3 = odp_cpu_to_be_32(0); + wr->type = CXGB4_COALESCE_WR_TYPE1; + + txq->pidx++; + if (odp_unlikely(txq->pidx >= DESCS_TO_BLOCKS(txq->tx_queue_len))) + txq->pidx = 0; + + /* zero out coalesce structure members */ + txq->coalesce.pkt_count = 0; + txq->coalesce.wr_len = 0; + txq->coalesce.pkt_acc_len = 0; + + /* + * Aggregate some coalesced wr's before ringing the doorbell + * This is going to have some impact on latency + * Chelsio default config is 1024 tx-descriptors + * We treat 512 bytes of descriptors as a single "block" which gives us + * 128 blocks in the default config. Every "block" can send up to 15 + * packets + * Instead of ringing the doorbell every block we do it every 4 blocks + * TODO implement a timer to send leftovers if a user tries to send + * less packets + */ + if (!(txq->pidx & ((DESCS_TO_BLOCKS(txq->tx_queue_len) >> 5) - 1))) + odpdrv_mmio_u32le_write(txq->doorbell_desc_key | + txq->tx_queue_len >> 5, + txq->doorbell_desc); +} + static int cxgb4_send(pktio_entry_t *pktio_entry, int txq_idx, const odp_packet_t pkt_table[], int num) { pktio_ops_cxgb4_data_t *pkt_cxgb4 = pktio_entry->s.ops_data; cxgb4_tx_queue_t *txq = &pkt_cxgb4->tx_queues[txq_idx]; - uint16_t budget, tx_txds = 0; + uint16_t budget, tx_blocks = 0; int tx_pkts = 0; if (!pkt_cxgb4->lockless_tx) odp_ticketlock_lock(&txq->lock); - /* Determine how many packets will fit in TX queue */ + /* Determine how many blocks will fit in TX queue */ budget = txq->tx_queue_len - 1; - budget -= txq->tx_next; + budget -= BLOCKS_TO_DESCS(txq->pidx); budget += odp_be_to_cpu_16(txq->stats->cidx); budget &= txq->tx_queue_len - 1; + budget = DESCS_TO_BLOCKS(budget); - while (tx_txds < budget && tx_pkts < num) { + while (tx_blocks < budget && tx_pkts < num) { uint16_t pkt_len = _odp_packet_len(pkt_table[tx_pkts]); - - cxgb4_tx_desc_t *txd = &txq->tx_descs[txq->tx_next]; - uint32_t txd_len; - - cxgb4_fw_eth_tx_pkt_wr_t *wr; + unsigned int wr_len = 0; + cxgb4_sg_list_t *sgl; + cxgb4_tx_desc_t *txd = + &txq->tx_descs[BLOCKS_TO_DESCS(txq->pidx)]; cxgb4_cpl_tx_pkt_core_t *cpl; - uint32_t op_immdlen; - - /* Skip oversized packets silently */ - if (odp_unlikely(pkt_len > CXGB4_TX_BUF_SIZE)) { - tx_pkts++; - continue; - } - - wr = (cxgb4_fw_eth_tx_pkt_wr_t *)txd; - cpl = (cxgb4_cpl_tx_pkt_core_t *)(wr + 1); - - txd_len = sizeof(*wr) + sizeof(*cpl); - op_immdlen = CXGB4_FW_ETH_TX_PKT_WR | sizeof(*cpl); - - if (pkt_len <= CXGB4_TX_INLINE_MAX) { - uint8_t *pos; - uint32_t left; - - txd_len += pkt_len; - - /* Try next time */ - if (tx_txds + DIV_ROUND_UP(txd_len, sizeof(*txd)) > - budget) - break; - - op_immdlen += pkt_len; - - /* Packet copying shall take care of wrapping */ - pos = (uint8_t *)(cpl + 1); - left = (uint8_t *)(txq->tx_descs + txq->tx_queue_len) - - pos; - - if (odp_likely(left >= pkt_len)) { - odp_packet_copy_to_mem(pkt_table[tx_pkts], 0, - pkt_len, pos); - } else { - odp_packet_copy_to_mem(pkt_table[tx_pkts], 0, - left, pos); - odp_packet_copy_to_mem(pkt_table[tx_pkts], left, - pkt_len - left, - &txq->tx_descs[0]); + /* Mandatory CPL header for each packet */ + wr_len = sizeof(cxgb4_cpl_tx_pkt_core_t); + + /* Mandatory SGL header with packet head addr & length */ + wr_len += sizeof(cxgb4_sg_list_t); + + if (txq->coalesce.pkt_count) { + /* + * add and check if we need to send packets when we + * reach sgl list limit + */ + if (txq->coalesce.wr_len + wr_len > COALESCE_WR_LEN) { + submit_coalesced_wr(txq, txd); + tx_blocks++; + continue; } } else { - uint32_t offset = txq->tx_next * CXGB4_TX_BUF_SIZE; - cxgb4_sg_list_t *sgl; - - txd_len += sizeof(*sgl); - - odp_packet_copy_to_mem(pkt_table[tx_pkts], 0, pkt_len, - (uint8_t *)txq->tx_data.vaddr + - offset); - - sgl = (cxgb4_sg_list_t *)(cpl + 1); - - sgl->sg_pairs_num = - odp_cpu_to_be_32(CXGB4_ULP_TX_SC_DSGL | 1); - sgl->addr0 = - odp_cpu_to_be_64(txq->tx_data.iova + offset); - sgl->len0 = odp_cpu_to_be_32(pkt_len); + /* new WR */ + txq->coalesce.wr_len = + sizeof(cxgb4_fw_eth_tx_pkts_wr_t); + txq->coalesce.ptr = + (uint8_t *)txd + txq->coalesce.wr_len; } - wr->op_immdlen = odp_cpu_to_be_32(op_immdlen); - wr->equiq_to_len16 = - odp_cpu_to_be_32(DIV_ROUND_UP(txd_len, 16)); - wr->r3 = odp_cpu_to_be_64(0); + cpl = (cxgb4_cpl_tx_pkt_core_t *)txq->coalesce.ptr; + /* update coalesce structure for this txq */ + txq->coalesce.wr_len += wr_len; + txq->coalesce.pkt_acc_len += pkt_len; + txq->coalesce.ptr = (uint8_t *)txq->coalesce.ptr + wr_len; - cpl->ctrl0 = - odp_cpu_to_be_32(CPL_TX_PKT_XT | - TXPKT_INTF_V(pkt_cxgb4->tx_channel) | - TXPKT_PF_V(pkt_cxgb4->phys_function)); + cpl->ctrl0 = odp_cpu_to_be_32(CPL_TX_PKT_XT | + TXPKT_INTF_V(pkt_cxgb4->tx_channel) | + TXPKT_PF_V(pkt_cxgb4->phys_function)); cpl->pack = odp_cpu_to_be_16(0); cpl->len = odp_cpu_to_be_16(pkt_len); - cpl->ctrl1 = - odp_cpu_to_be_64(TXPKT_L4CSUM_DIS_F | TXPKT_IPCSUM_DIS_F); - - txq->tx_next += DIV_ROUND_UP(txd_len, sizeof(*txd)); - if (odp_unlikely(txq->tx_next >= txq->tx_queue_len)) - txq->tx_next -= txq->tx_queue_len; - - tx_txds += DIV_ROUND_UP(txd_len, sizeof(*txd)); + cpl->ctrl1 = odp_cpu_to_be_64(TXPKT_L4CSUM_DIS_F | + TXPKT_IPCSUM_DIS_F); + + odp_packet_copy_to_mem(pkt_table[tx_pkts], 0, pkt_len, + (uint8_t *)txq->tx_data.vaddr + + txq->offset); + + sgl = (cxgb4_sg_list_t *)(cpl + 1); + /* TODO add support for pairs/fragments */ + sgl->sg_pairs_num = + odp_cpu_to_be_32(CXGB4_ULP_TX_SC_DSGL | 1); + sgl->addr0 = + odp_cpu_to_be_64(txq->tx_data.iova + txq->offset); + sgl->len0 = odp_cpu_to_be_32(pkt_len); + + txq->offset += CXGB4_TX_BUF_SIZE; + if (odp_unlikely(txq->offset >= txq->tx_data.size)) + txq->offset = 0; + + txq->coalesce.pkt_count++; tx_pkts++; } - /* Ring the doorbell */ - odpdrv_mmio_u32le_write(txq->doorbell_desc_key | tx_txds, - txq->doorbell_desc); - if (!pkt_cxgb4->lockless_tx) odp_ticketlock_unlock(&txq->lock); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/mdev/cxgb4.c | 262 +++++++++++++++++++----------- 1 file changed, 163 insertions(+), 99 deletions(-) hooks/post-receive --

6 years, 3 months

1
0
0 0

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-127-g6be7adab

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 6be7adab1a16a62e871bc4ed4f3c926645b2ecd0 (commit) from f7e4949e65f29f043115df1a171e0e49a4830ef6 (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 6be7adab1a16a62e871bc4ed4f3c926645b2ecd0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Jan 23 12:53:10 2018 +0200 linux-gen: test: update gitignore Add all .env files into gitignore. 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/test/.gitignore b/platform/linux-generic/test/.gitignore index 2ff19897..88eb4dce 100644 --- a/platform/linux-generic/test/.gitignore +++ b/platform/linux-generic/test/.gitignore @@ -1,4 +1,3 @@ *.log *.trs -tests-linux-generic.env -tests-validation.env +*.env ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/test/.gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive --

6 years, 3 months

1
0
0 0

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-126-gf7e4949e

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 f7e4949e65f29f043115df1a171e0e49a4830ef6 (commit) from 984686b0763495c6dd97d2094f292fc7e01937d0 (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 f7e4949e65f29f043115df1a171e0e49a4830ef6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jan 24 19:40:29 2018 +0300 travis: schedule long builds (distcheck) before short CROSS-tests long builds at the end of build schedule tend to prolongue build times. Move crosscompilation tests to be scheduled after coverage/distcheck tests. 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/.travis.yml b/.travis.yml index 7dd7522d..b7d6cd41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,14 +58,6 @@ env: - CONF="--enable-dpdk-zero-copy" - CONF="--disable-static-applications" - DPDK_SHARED="y" CONF="--disable-static-applications" - - CROSS_ARCH="arm64" - - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - - CROSS_ARCH="powerpc" - - CROSS_ARCH="i386" - - CROSS_ARCH="arm64" CONF="--disable-abi-compat" - - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" CONF="--disable-abi-compat" - - CROSS_ARCH="powerpc" CONF="--disable-abi-compat" - - CROSS_ARCH="i386" CONF="--disable-abi-compat" compiler: - gcc @@ -331,15 +323,6 @@ jobs: else true fi - - stage: test - env: TEST=checkpatch - compiler: gcc - install: - - true - script: - - echo ${TRAVIS_COMMIT_RANGE}; - - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`; - - ./scripts/ci-checkpatches.sh ${ODP_PATCHES}; - stage: "build only" env: CONF="" compiler: gcc @@ -372,6 +355,63 @@ jobs: - ./bootstrap - ./configure --enable-helper-linux $CROSS - make -j $(nproc) + - stage: test + compiler: gcc + env: CROSS_ARCH="arm64" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="arm64" + - stage: test + compiler: gcc + env: CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" + - stage: test + compiler: gcc + env: CROSS_ARCH="powerpc" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="powerpc" + - stage: test + compiler: gcc + env: CROSS_ARCH="i386" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="i386" + - stage: test + compiler: gcc + env: CROSS_ARCH="arm64" CONF="--disable-abi-compat" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="arm64" CONF="--disable-abi-compat" + - stage: test + compiler: gcc + env: CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" CONF="--disable-abi-compat" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" CONF="--disable-abi-compat" + - stage: test + compiler: gcc + env: CROSS_ARCH="powerpc" CONF="--disable-abi-compat" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="powerpc" CONF="--disable-abi-compat" + - stage: test + compiler: gcc + env: CROSS_ARCH="i386" CONF="--disable-abi-compat" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="i386" CONF="--disable-abi-compat" + - stage: test + env: TEST=checkpatch + compiler: gcc + install: + - true + script: + - echo ${TRAVIS_COMMIT_RANGE}; + - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`; + - ./scripts/ci-checkpatches.sh ${ODP_PATCHES}; after_failure: - cat config.log ----------------------------------------------------------------------- Summary of changes: .travis.yml | 74 +++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 17 deletions(-) hooks/post-receive --

6 years, 3 months

1
0
0 0

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-125-g984686b0

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 984686b0763495c6dd97d2094f292fc7e01937d0 (commit) from e678e44fe99ada59b80097f97e22b0546bcdadc8 (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 984686b0763495c6dd97d2094f292fc7e01937d0 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Jan 23 15:15:55 2018 +0530 linux-gen: cls: fix: incorrect rss hash calculation updates incorrect operator precedence updates v4 to v6 tuple in ipv6 hash generation Fixes: https://bugs.linaro.org/show_bug.cgi?id=3582 Fixes: https://bugs.linaro.org/show_bug.cgi?id=3581 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(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_classification.c b/platform/linux-generic/odp_classification.c index df49d0e4..668b41eb 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1026,8 +1026,8 @@ static uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, if (pkt_hdr->p.input_flags.ipv4) { if (hash_proto.ipv4) { /* add ipv4 */ - ipv4 = (const _odp_ipv4hdr_t *)base + - pkt_hdr->p.l3_offset; + 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; @@ -1035,15 +1035,15 @@ static uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, if (pkt_hdr->p.input_flags.tcp && hash_proto.tcp) { /* add tcp */ - tcp = (const _odp_tcphdr_t *)base + - pkt_hdr->p.l4_offset; + 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; + 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; @@ -1051,23 +1051,23 @@ static uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, } 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; + 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; + tcp = (const _odp_tcphdr_t *)(base + + pkt_hdr->p.l4_offset); + tuple.v6.sport = tcp->src_port; + tuple.v6.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; + udp = (const _odp_udphdr_t *)(base + + pkt_hdr->p.l4_offset); + tuple.v6.sport = udp->src_port; + tuple.v6.dport = udp->dst_port; tuple_len += 1; } } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_classification.c | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) hooks/post-receive --

6 years, 3 months

1
0
0 0

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-124-ge678e44f

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 e678e44fe99ada59b80097f97e22b0546bcdadc8 (commit) from 27480d82bd93a881ae683a3c314c11042a68ce29 (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 e678e44fe99ada59b80097f97e22b0546bcdadc8 Author: Philip Colmer <philip.colmer(a)linaro.org> Date: Wed Jan 24 13:08:06 2018 +0000 docs: fixing broken links Signed-off-by: Philip Colmer <philip.colmer(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/doc/implementers-guide/implementers-guide.adoc b/doc/implementers-guide/implementers-guide.adoc index 794beb00..f0ba0336 100644 --- a/doc/implementers-guide/implementers-guide.adoc +++ b/doc/implementers-guide/implementers-guide.adoc @@ -203,7 +203,7 @@ Examples of modules for the application interface includes "classification" (functions dealing with time, excluding timers which have their own module), timer, ... The complete module list can be seen at: -http://docs.opendataplane.org/master/linux-generic-doxygen-html/modules.html[ODP Modules] + +https://www.opendataplane.org/api-documentation/master/api/modules.html[ODP Modules] + Within the platform agnostic area, the validation tests for a given interface are also grouped by modules, matching the ODP interface modules: for instance, `test/common_plat/validation/api` mainly contains a list of diff --git a/doc/process-guide/release-guide.adoc b/doc/process-guide/release-guide.adoc index 595af91a..e5d72cb0 100644 --- a/doc/process-guide/release-guide.adoc +++ b/doc/process-guide/release-guide.adoc @@ -23,7 +23,7 @@ potentially backwards incompatible happening at lower frequency. Generation releases are significantly less frequent. The specific digits used for the generation and version numbering are described in the ODP API Documentation. The roles referenced in this document are defined in the -http://www.opendataplane.org/api-documentation/by-laws/[By-laws]. +https://www.opendataplane.org/developers/bylaws/index.html[By-laws]. === Patch to release flow === Changes to the API are staged in api-next until they have been sufficiently ----------------------------------------------------------------------- Summary of changes: doc/implementers-guide/implementers-guide.adoc | 2 +- doc/process-guide/release-guide.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

6 years, 3 months

1
0
0 0

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-123-g27480d82

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 27480d82bd93a881ae683a3c314c11042a68ce29 (commit) from fbcf3e60c699c5f450fd6a4e7a5c78980b3512c5 (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 27480d82bd93a881ae683a3c314c11042a68ce29 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Fri Jan 19 01:44:15 2018 +0530 linux-gen: cls: fix: update capability to return max hash queues updates cls capability to return max supported hash queues Fixes: https://bugs.linaro.org/show_bug.cgi?id=3579 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(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_classification.c b/platform/linux-generic/odp_classification.c index b41a5fd8..df49d0e4 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -194,6 +194,7 @@ int odp_cls_capability(odp_cls_capability_t *capability) capability->back_pressure = ODP_SUPPORT_NO; capability->threshold_red.all_bits = 0; capability->threshold_bp.all_bits = 0; + capability->max_hash_queues = CLS_COS_QUEUE_MAX; return 0; } @@ -226,8 +227,8 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) cos_t *cos; uint32_t tbl_index; - /* Packets are dropped if Queue or Pool is invalid*/ - if (param->num_queue > CLS_COS_QUEUE_MAX) + /* num_queue should not be zero */ + if (param->num_queue > CLS_COS_QUEUE_MAX || param->num_queue < 1) return ODP_COS_INVALID; drop_policy = param->drop_policy; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_classification.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive --

6 years, 3 months

1
0
0 0

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-122-gfbcf3e60

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 fbcf3e60c699c5f450fd6a4e7a5c78980b3512c5 (commit) via 4a6bae575eb67aa5a484d70d765f6283ea76c183 (commit) via b63e52ee345ae1d69435deded1391167d311bff3 (commit) via 9cb360c18f3948c14bb902351a0ace971479c336 (commit) via 99300f9db4c368e7519c52af93c93d702790b2b4 (commit) from 9ea61da809269644ac6332a1b0f53be68a7e26d7 (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 fbcf3e60c699c5f450fd6a4e7a5c78980b3512c5 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Jan 19 03:48:20 2018 +0300 travis: test ODP with shared DPDK Add testcase compiling and running ODP with shared DPDK lib 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/.travis.yml b/.travis.yml index ce1fd27e..7dd7522d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e + - DPDK_VERS="17.08" matrix: - CONF="" - CONF="--disable-abi-compat" @@ -56,6 +57,7 @@ env: - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" - CONF="--disable-static-applications" + - DPDK_SHARED="y" CONF="--disable-static-applications" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - CROSS_ARCH="powerpc" @@ -159,7 +161,6 @@ install: - gem install asciidoctor # DPDK pktio. Note that cache must be purged if dpdk version changes. - - DPDK_VERS="17.08" - | CACHED_DPDK_VERS=`fgrep Version dpdk/pkg/dpdk.spec | cut -d " " -f 2` if [ "${CACHED_DPDK_VERS}" != "${DPDK_VERS}" ]; then @@ -168,43 +169,53 @@ install: - | case "$CROSS_ARCH" in "arm64") - TARGET="arm64-armv8a-linuxapp-gcc" + DPDK_TARGET="arm64-armv8a-linuxapp-gcc" ;; "armhf") - TARGET="arm-armv7a-linuxapp-gcc" + DPDK_TARGET="arm-armv7a-linuxapp-gcc" ;; "i386") - TARGET="i686-native-linuxapp-gcc" + DPDK_TARGET="i686-native-linuxapp-gcc" ;; "") - TARGET="x86_64-native-linuxapp-gcc" + DPDK_TARGET="x86_64-native-linuxapp-gcc" DPDK_MACHINE=snb ;; esac - | - if [ -n "$TARGET" ] ; then - if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then + if [ -n "$DPDK_TARGET" ] ; then + if [ -n "$DPDK_SHARED" ] ; then + TARGET="$DPDK_TARGET"-shared + LIBDPDKEXT=so + export LD_LIBRARY_PATH="`pwd`/${TARGET}:$LD_LIBRARY_PATH" + echo $LD_LIBRARY_PATH + else + TARGET="$DPDK_TARGET" + LIBDPDKEXT=a + fi + if [ ! -f "dpdk/${TARGET}/lib/libdpdk.$LIBDPDKEXT" ]; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate - echo $CC # AArch64 && ARMv7 fixup sed -i -e 's/40900/40800/g' lib/librte_eal/common/include/arch/arm/rte_vect.h sed -i -e 's/!(/!(defined(__arm__) \&\& defined(__clang__) || /g' lib/librte_eal/common/include/arch/arm/rte_byteorder.h sed -i -e 's/__GNUC__/defined(__arm__) \&\& defined(__clang__) || __GNUC__/' lib/librte_eal/common/include/generic/rte_byteorder.h - make config T=${TARGET} O=${TARGET} + make config T=${DPDK_TARGET} O=${TARGET} pushd ${TARGET} sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config - cat .config |grep RTE_MACHINE if test -n "${DPDK_MACHINE}" ; then sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"'${DPDK_MACHINE}'",' .config fi + if test -n "${DPDK_SHARED}" ; then + sed -ri 's,(CONFIG_RTE_BUILD_SHARED_LIB=).*,\1y,' .config + fi if test -n "$CROSS_ARCH" ; then sed -ri -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' .config sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config fi popd - make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) + make build T=${DPDK_TARGET} O=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd fi @@ -243,11 +254,17 @@ script: - pushd $HOME - echo "Dynamic link.." - ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_dynamic `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux` - - echo "Static link.." - - ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_static `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static - if [ -z "$CROSS_ARCH" ] ; then - LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic ; - ./odp_hello_inst_static ; + LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic ; + fi + - | + # it is not possible to do static linking if we only have shared DPDK library. Compiler complains about missing -ldpdk + if [ -z "$TARGET" -o -z "$DPDK_SHARED" ] ; then + echo "Static link.." + ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_static `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static || exit 1 + if [ -z "$CROSS_ARCH" ] ; then + ./odp_hello_inst_static; + fi fi - popd - ccache -s commit 4a6bae575eb67aa5a484d70d765f6283ea76c183 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jan 24 03:48:06 2018 +0300 travis: merge variable sections Travis ignores first env setting once it encountered second one. Merge them together. 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/.travis.yml b/.travis.yml index fca06a0d..ce1fd27e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,28 +14,6 @@ group: deprecated-2017Q2 stages: - "build only" - test -env: - global: - # COVERITY_SCAN_TOKEN - # ** specific to your project ** - # Note: - # You should have a github account and travis linked travis account. - # The secure key to be filled below is the 685 character long encrypted - # token you can find as follow from your coverity dashboard - # (at https://scan.coverity.com/dashboard): - # Click on the github project (<you>/odp) - # Click on "submit build" - # Click on "Configure Travis CI" - # Look at the COVERITY_SCAN_TOKEN in the env: global: section - # of the configuration example. - # copy the secure:<key> below - # - - secure: "xxxx" - # - # By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see - # for individual commit validation. But you you want to track tests history - # you need generated new one at https://codecov.io specific for your repo. - - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e addons: apt: @@ -53,10 +31,6 @@ addons: # build_command: "make" # branch_pattern: coverity_scan -compiler: - - gcc - - clang-3.8 - cache: ccache: true pip: true @@ -67,6 +41,13 @@ cache: - $HOME/doxygen-install env: + global: + # + # By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see + # for individual commit validation. But you you want to track tests history + # you need generated new one at https://codecov.io specific for your repo. + - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e + matrix: - CONF="" - CONF="--disable-abi-compat" - CONF="--enable-deprecated" @@ -84,6 +65,10 @@ env: - CROSS_ARCH="powerpc" CONF="--disable-abi-compat" - CROSS_ARCH="i386" CONF="--disable-abi-compat" +compiler: + - gcc + - clang-3.8 + before_install: # Install cross toolchains, etc commit b63e52ee345ae1d69435deded1391167d311bff3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jan 22 13:34:52 2018 +0300 build: configure: print notice about unsupported configuration If we are using shared DPDK library, we can not guarantee that there will be a static one (to fullfill dependencies if gcc -static is used). Thus mark this configuration as not supported. 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/configure.ac b/configure.ac index 56a422b4..6d76bead 100644 --- a/configure.ac +++ b/configure.ac @@ -191,6 +191,12 @@ AC_ARG_ENABLE([static-applications], [ with ODP])], [], [enable_static_applications=yes]) AM_CONDITIONAL([STATIC_APPS], [test "x$enable_static_applications" != "xno"]) +if test "x$DPDK_SHARED" = "xyes" -a "x$enable_static_applications" != "xno" ; +then + AC_MSG_WARN([Static linking of examples and tests might fail when ] + [shared DPDK is detected. If build fails please retry with ] + [--disable-static-applications]) +fi ########################################################################## # Include m4 files commit 9cb360c18f3948c14bb902351a0ace971479c336 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jan 23 22:22:54 2018 +0300 build: odp_dpdk: print info on detected DPDK type and location 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/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 81ace08a..bf3dfccf 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -130,5 +130,8 @@ AS_IF([test "x$1" = "xsystem"], [dnl DPDK_SHARED=yes fi ]) +AS_IF([test "x$DPDK_SHARED" = "xyes"], + [AC_MSG_NOTICE([Using shared DPDK library found at $DPDK_PMD_PATH])], + [AC_MSG_NOTICE([Using static DPDK library found at $DPDK_PMD_PATH])]) _ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [$2], [$3]) ]) commit 99300f9db4c368e7519c52af93c93d702790b2b4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 18 04:59:56 2018 +0300 build: odp_dpdk: another fix for linking with shared libdpdk Older toolchains won't include all shared objects from the group so file to DT_NEEDED section. So use --as-needed/--no-as-needed flags to control linking with DPDK PMD libs. 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/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 1887b043..81ace08a 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -17,18 +17,29 @@ AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) # _ODP_DPDK_SET_LIBS # -------------------- -# Set DPDK_LIBS/DPDK_LIBS_LT depending on DPDK setup +# Set DPDK_LIBS/DPDK_LIBS_LT/DPDK_LIBS_LIBODP depending on DPDK setup AC_DEFUN([_ODP_DPDK_SET_LIBS], [dnl AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl - DPDK_LIBS_LT="" + # applications don't need to be linked to anything, just rpath + DPDK_LIBS_LT="$DPDK_RPATH_LT" + # static linking flags will need -ldpdk + DPDK_LIBS="-Wl,--no-as-needed,-ldpdk,--as-needed,`echo $DPDK_LIBS | sed -e 's/ /,/g'`" DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" + # link libodp-linux with -ldpdk + DPDK_LIBS_LIBODP="$DPDK_LIBS" ], [dnl ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + # build long list of libraries for applications, which should not be + # rearranged by libtool DPDK_LIBS_LT="`echo $DPDK_LIBS | sed -e 's/^/-Wc,/' -e 's/ /,/g'`" DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS_LT $DPDK_LIBS" + # static linking flags follow the suite DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" + # link libodp-linux with libtool linking flags + DPDK_LIBS_LIBODP="$DPDK_LIBS_LT" ]) AC_SUBST([DPDK_LIBS]) +AC_SUBST([DPDK_LIBS_LIBODP]) AC_SUBST([DPDK_LIBS_LT]) ]) @@ -99,7 +110,6 @@ AC_DEFUN([ODP_DPDK], [dnl AS_IF([test "x$1" = "xsystem"], [dnl DPDK_CPPFLAGS="-isystem/usr/include/dpdk" DPDK_LDFLAGS="" - DPDK_RPATH="" DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.so`" if test "x$DPDK_LIB_PATH" = "x" ; then DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.a`" @@ -115,10 +125,9 @@ AS_IF([test "x$1" = "xsystem"], [dnl DPDK_LDFLAGS="-L$DPDK_LIB_PATH" DPDK_PMD_PATH="$DPDK_LIB_PATH" if test -r "$DPDK_LIB_PATH"/libdpdk.so ; then - DPDK_RPATH="-R$DPDK_LIB_PATH" + DPDK_RPATH="-Wl,-rpath,$DPDK_LIB_PATH" + DPDK_RPATH_LT="-R$DPDK_LIB_PATH" DPDK_SHARED=yes - else - DPDK_RPATH= fi ]) _ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [$2], [$3]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4cfc7488..da5540fe 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -274,7 +274,7 @@ endif __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) __LIB__libodp_linux_la_LIBADD += $(OPENSSL_LIBS) -__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LT) +__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LIBODP) __LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS) __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) ----------------------------------------------------------------------- Summary of changes: .travis.yml | 84 +++++++++++++++++++------------------- configure.ac | 6 +++ m4/odp_dpdk.m4 | 24 ++++++++--- platform/linux-generic/Makefile.am | 2 +- 4 files changed, 68 insertions(+), 48 deletions(-) hooks/post-receive --

6 years, 3 months

1
0
0 0

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-117-g9ea61da8

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 9ea61da809269644ac6332a1b0f53be68a7e26d7 (commit) via 91b127d61530bcf0e8c5399b3d4117ef2389ca12 (commit) from b122176ee59494dd957f0f5ff41d4b55a1477e13 (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 9ea61da809269644ac6332a1b0f53be68a7e26d7 Author: Juha-Matti Tilli <juha-matti.tilli(a)iki.fi> Date: Sat Dec 23 19:58:05 2017 +0200 example: l2fwd_simple: do operations to increase code coverage Do some MTU, promiscuous mode and MAC address related operations in odp_l2fwd_simple to increase code coverage. Signed-off-by: Juha-Matti Tilli <juha-matti.tilli(a)iki.fi> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index ad866171..c74a523a 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -145,6 +145,8 @@ int main(int argc, char **argv) odph_odpthread_params_t thr_params; int opt; int long_index; + odph_ethaddr_t correct_src; + uint32_t mtu1, mtu2; static const struct option longopts[] = { {NULL, 0, NULL, 0} }; static const char *shortopts = ""; @@ -204,6 +206,23 @@ int main(int argc, char **argv) global.if1 = create_pktio(argv[optind + 1], pool, &global.if1in, &global.if1out); + /* Do some operations to increase code coverage in tests */ + if (odp_pktio_mac_addr(global.if0, &correct_src, sizeof(correct_src)) + != sizeof(correct_src)) + printf("Warning: can't get MAC address\n"); + else if (memcmp(&correct_src, &global.src, sizeof(correct_src)) != 0) + printf("Warning: src MAC invalid\n"); + + odp_pktio_promisc_mode_set(global.if0, true); + odp_pktio_promisc_mode_set(global.if1, true); + (void)odp_pktio_promisc_mode(global.if0); + (void)odp_pktio_promisc_mode(global.if1); + + mtu1 = odp_pktin_maxlen(global.if0); + mtu2 = odp_pktout_maxlen(global.if1); + if (mtu1 && mtu2 && mtu1 > mtu2) + printf("Warning: input MTU bigger than output MTU\n"); + odp_cpumask_default_worker(&cpumask, MAX_WORKERS); memset(&thr_params, 0, sizeof(thr_params)); commit 91b127d61530bcf0e8c5399b3d4117ef2389ca12 Author: Juha-Matti Tilli <juha-matti.tilli(a)iki.fi> Date: Sat Dec 23 11:58:32 2017 +0200 linux-generic: pktio: add null pktio support Sometimes, you may wish to run an application by using a dummy interface that never receives any packets and that discards transmitted packets. This is possible with non-looping pcap pktio with no input and output pcaps. So, the pktio would be just "pcap:". However, you cannot have two pktios named "pcap:" because there is code to check if the pktio is already opened. Also, the pcap pktio requires that ODP is compiled with the pcap library, which it may not be. Also, pcap is always single-queue and therefore not suitable for modern multi-queue applications. Also, recently a patch was provided to ODP to allow interruptible sleep when receiving packets. This, however, does not work with mixed pcap and socket/netmap pktio types. To fix these issues, a new "null" pktio is introduced. It is used by specifying the interface name to be "null:0", "null:1", or similar. All packets sent to the null pktio are discarded and no packets are received. The null pktio fully supports the interruptible sleep infrastructure, meaning applications can have 0% idle CPU load when one interface is a null interface and another interface is socket or netmap. Signed-off-by: Juha-Matti Tilli <juha-matti.tilli(a)iki.fi> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index 7deeef40..63f4ae60 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -3,3 +3,8 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_generator odp_generator_SOURCES = odp_generator.c + +if test_example +TESTS = generator_run.sh +endif +EXTRA_DIST = generator_run.sh diff --git a/example/generator/generator_run.sh b/example/generator/generator_run.sh new file mode 100755 index 00000000..2d741a8d --- /dev/null +++ b/example/generator/generator_run.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# +# Copyright (c) 2018, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +./odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u +STATUS=$? + +if [ "$STATUS" -ne 0 ]; then + echo "Error: status was: $STATUS, expected 0" + exit 1 +fi + +exit 0 diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh b/example/l2fwd_simple/l2fwd_simple_run.sh index 089d9f97..d09bd3cf 100755 --- a/example/l2fwd_simple/l2fwd_simple_run.sh +++ b/example/l2fwd_simple/l2fwd_simple_run.sh @@ -29,4 +29,17 @@ fi rm -f pcapout.pcap +./odp_l2fwd_simple${EXEEXT} null:0 null:1 \ + 02:00:00:00:00:01 02:00:00:00:00:02 & + +sleep 1 +kill -s SIGINT $! +wait $! +STATUS=$? + +if [ "$STATUS" -ne 255 ]; then + echo "Error: status was: $STATUS, expected 255" + exit 1 +fi + exit 0 diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8585080d..4cfc7488 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -107,6 +107,7 @@ noinst_HEADERS = \ include/odp_packet_dpdk.h \ include/odp_packet_socket.h \ include/odp_packet_tap.h \ + include/odp_packet_null.h \ include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ @@ -163,6 +164,7 @@ __LIB__libodp_linux_la_SOURCES = \ pktio/pktio_common.c \ pktio/loop.c \ pktio/netmap.c \ + pktio/null.c \ pktio/dpdk.c \ pktio/socket.c \ pktio/socket_mmap.c \ diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index dd47b936..ad34e964 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -34,6 +34,7 @@ extern "C" { #include <odp_packet_socket.h> #include <odp_packet_netmap.h> #include <odp_packet_tap.h> +#include <odp_packet_null.h> #include <odp_packet_dpdk.h> #define PKTIO_NAME_LEN 256 @@ -129,6 +130,7 @@ struct pktio_entry { #endif pkt_tap_t pkt_tap; /**< using TAP for IO */ _ipc_pktio_t ipc; /**< IPC pktio data */ + pkt_null_t pkt_null; /**< using null for IO */ }; enum { /* Not allocated */ @@ -271,6 +273,7 @@ extern const pktio_if_ops_t loopback_pktio_ops; extern const pktio_if_ops_t pcap_pktio_ops; #endif extern const pktio_if_ops_t tap_pktio_ops; +extern const pktio_if_ops_t null_pktio_ops; extern const pktio_if_ops_t ipc_pktio_ops; extern const pktio_if_ops_t * const pktio_if_ops[]; diff --git a/platform/linux-generic/include/odp_packet_null.h b/platform/linux-generic/include/odp_packet_null.h new file mode 100644 index 00000000..849f87d6 --- /dev/null +++ b/platform/linux-generic/include/odp_packet_null.h @@ -0,0 +1,16 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PACKET_NULL_H_ +#define ODP_PACKET_NULL_H_ + +#include <odp/api/pool.h> + +typedef struct { + int promisc; /**< whether promiscuous mode is on */ +} pkt_null_t; + +#endif diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index 40d7c164..3bbb5cd4 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -25,6 +25,7 @@ const pktio_if_ops_t * const pktio_if_ops[] = { #endif &ipc_pktio_ops, &tap_pktio_ops, + &null_pktio_ops, &sock_mmap_pktio_ops, &sock_mmsg_pktio_ops, NULL diff --git a/platform/linux-generic/pktio/null.c b/platform/linux-generic/pktio/null.c new file mode 100644 index 00000000..5a11076c --- /dev/null +++ b/platform/linux-generic/pktio/null.c @@ -0,0 +1,175 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp_api.h> +#include <odp_packet_io_internal.h> +#include <odp_packet_null.h> + +static int null_close(pktio_entry_t *pktio_entry ODP_UNUSED) +{ + return 0; +} + +static int null_open(odp_pktio_t id ODP_UNUSED, + pktio_entry_t *pktio_entry, + const char *devname, odp_pool_t pool ODP_UNUSED) +{ + if (strncmp(devname, "null:", 5) != 0) + return -1; + pktio_entry->s.pkt_null.promisc = 0; + return 0; +} + +static int null_recv(pktio_entry_t *pktio_entry ODP_UNUSED, + int index ODP_UNUSED, odp_packet_t pkt_table[] ODP_UNUSED, + int len ODP_UNUSED) +{ + return 0; +} + +static int null_fd_set(pktio_entry_t *pktio_entry ODP_UNUSED, + int index ODP_UNUSED, fd_set *readfds ODP_UNUSED) +{ + return 0; +} + +static int null_recv_tmo(pktio_entry_t *pktio_entry ODP_UNUSED, + int index ODP_UNUSED, + odp_packet_t pkt_table[] ODP_UNUSED, + int num ODP_UNUSED, uint64_t usecs) +{ + struct timeval timeout; + int maxfd = -1; + fd_set readfds; + + timeout.tv_sec = usecs / (1000 * 1000); + timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); + FD_ZERO(&readfds); + + select(maxfd + 1, &readfds, NULL, NULL, + usecs == ODP_PKTIN_WAIT ? NULL : &timeout); + + return 0; +} + +static int null_recv_mq_tmo(pktio_entry_t *pktio_entry[] ODP_UNUSED, + int index[] ODP_UNUSED, int num_q ODP_UNUSED, + odp_packet_t pkt_table[] ODP_UNUSED, + int num ODP_UNUSED, unsigned *from ODP_UNUSED, + uint64_t usecs) +{ + struct timeval timeout; + int maxfd = -1; + fd_set readfds; + + timeout.tv_sec = usecs / (1000 * 1000); + timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); + + FD_ZERO(&readfds); + + select(maxfd + 1, &readfds, NULL, NULL, + usecs == ODP_PKTIN_WAIT ? NULL : &timeout); + + return 0; +} + +static int null_send(pktio_entry_t *pktio_entry ODP_UNUSED, + int index ODP_UNUSED, const odp_packet_t pkt_table[], + int num) +{ + odp_packet_free_multi(pkt_table, num); + + return num; +} + +#define PKTIO_NULL_MTU (64 * 1024) + +static uint32_t null_mtu_get(pktio_entry_t *pktio_entry ODP_UNUSED) +{ + return PKTIO_NULL_MTU; +} + +static const char null_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x05}; + +static int null_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, + void *mac_addr) +{ + memcpy(mac_addr, null_mac, ETH_ALEN); + return ETH_ALEN; +} + +static int null_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) +{ + pktio_entry->s.pkt_null.promisc = !!enable; + return 0; +} + +static int null_promisc_mode_get(pktio_entry_t *pktio_entry) +{ + return pktio_entry->s.pkt_null.promisc; +} + +static int null_capability(pktio_entry_t *pktio_entry ODP_UNUSED, + odp_pktio_capability_t *capa) +{ + memset(capa, 0, sizeof(odp_pktio_capability_t)); + + capa->max_input_queues = PKTIO_MAX_QUEUES; + capa->max_output_queues = PKTIO_MAX_QUEUES; + capa->set_op.op.promisc_mode = 1; + + odp_pktio_config_init(&capa->config); + capa->config.pktin.bit.ts_all = 1; + capa->config.pktin.bit.ts_ptp = 1; + return 0; +} + +static int null_inqueues_config(pktio_entry_t *pktio_entry ODP_UNUSED, + const odp_pktin_queue_param_t *p ODP_UNUSED) +{ + return 0; +} + +static int null_outqueues_config(pktio_entry_t *pktio_entry ODP_UNUSED, + const odp_pktout_queue_param_t *p ODP_UNUSED) +{ + return 0; +} + +static int null_init_global(void) +{ + ODP_PRINT("PKTIO: initialized null interface.\n"); + return 0; +} + +const pktio_if_ops_t null_pktio_ops = { + .name = "null", + .print = NULL, + .init_global = null_init_global, + .init_local = NULL, + .term = NULL, + .open = null_open, + .close = null_close, + .start = NULL, + .stop = NULL, + .recv = null_recv, + .recv_tmo = null_recv_tmo, + .recv_mq_tmo = null_recv_mq_tmo, + .fd_set = null_fd_set, + .send = null_send, + .mtu_get = null_mtu_get, + .promisc_mode_set = null_promisc_mode_set, + .promisc_mode_get = null_promisc_mode_get, + .mac_get = null_mac_addr_get, + .capability = null_capability, + .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, + .config = NULL, + .input_queues_config = null_inqueues_config, + .output_queues_config = null_outqueues_config, +}; ----------------------------------------------------------------------- Summary of changes: example/generator/Makefile.am | 5 + example/generator/generator_run.sh | 17 ++ example/l2fwd_simple/l2fwd_simple_run.sh | 13 ++ example/l2fwd_simple/odp_l2fwd_simple.c | 19 +++ platform/linux-generic/Makefile.am | 2 + .../linux-generic/include/odp_packet_io_internal.h | 3 + platform/linux-generic/include/odp_packet_null.h | 16 ++ platform/linux-generic/pktio/io_ops.c | 1 + platform/linux-generic/pktio/null.c | 175 +++++++++++++++++++++ 9 files changed, 251 insertions(+) create mode 100755 example/generator/generator_run.sh create mode 100644 platform/linux-generic/include/odp_packet_null.h create mode 100644 platform/linux-generic/pktio/null.c hooks/post-receive --

6 years, 3 months

1
0
0 0

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-138-g44974a09

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 44974a09b01c79adb9637a5dff38539598a76737 (commit) via 38a3c6f89c2cae677d756fffa6af279e462330c1 (commit) via 5f142550eb114ccb600210bde6bdda63159d2046 (commit) via f0a2ead9b56aacb35fd1c2100f419b40fa0a5feb (commit) via 745a82b056d9264ac3d9eb531987d49a30f72d6c (commit) via 3a5a4f0253dabbf7a2074d7f894b1630c1e5ec42 (commit) from 4508f410a04cf1657d607d24aa2530a42ef011f7 (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 44974a09b01c79adb9637a5dff38539598a76737 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 12 17:06:38 2018 +0200 validation: packet: test user pointer init to NULL Test if user pointer is NULL after alloc and reset. 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/packet/packet.c b/test/validation/api/packet/packet.c index 184473ab..7d19e012 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -290,6 +290,9 @@ void packet_test_alloc_free(void) CU_ASSERT(odp_packet_to_u64(packet) != odp_packet_to_u64(ODP_PACKET_INVALID)); + /* User pointer should be NULL after alloc */ + CU_ASSERT(odp_packet_user_ptr(packet) == NULL); + /* Pool should have only one packet */ CU_ASSERT_FATAL(odp_packet_alloc(pool, packet_len) == ODP_PACKET_INVALID); @@ -369,6 +372,9 @@ void packet_test_alloc_free_multi(void) CU_ASSERT(subtype == ODP_EVENT_PACKET_BASIC); CU_ASSERT(odp_packet_to_u64(packet[i]) != odp_packet_to_u64(ODP_PACKET_INVALID)); + + /* User pointer should be NULL after alloc */ + CU_ASSERT(odp_packet_user_ptr(packet[i]) == NULL); } /* Pools should have no more packets */ @@ -648,7 +654,15 @@ void packet_test_context(void) CU_ASSERT(memcmp(udat, &test_packet_udata, sizeof(struct udata_struct)) == 0); + odp_packet_user_ptr_set(pkt, NULL); + CU_ASSERT(odp_packet_user_ptr(pkt) == NULL); + odp_packet_user_ptr_set(pkt, (void *)0xdead); + CU_ASSERT(odp_packet_user_ptr(pkt) == (void *)0xdead); + odp_packet_reset(pkt, packet_len); + + /* User pointer should be NULL after reset */ + CU_ASSERT(odp_packet_user_ptr(pkt) == NULL); } void packet_test_layer_offsets(void) commit 38a3c6f89c2cae677d756fffa6af279e462330c1 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 12 16:10:04 2018 +0200 linux-gen: packet: initialize user ptr to NULL Use a flag to record if user pointer has been set. This avoids resetting the pointer in every alloc. 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/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index dbfc6641..e8ebdabb 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -44,6 +44,7 @@ typedef struct _odp_packet_inline_offset_t { uint16_t flow_hash; uint16_t timestamp; uint16_t input_flags; + uint16_t flags; } _odp_packet_inline_offset_t; @@ -109,7 +110,12 @@ typedef union { uint32_t all_flags; struct { - uint32_t reserved1: 12; + uint32_t reserved1: 11; + + /* + * Init flags + */ + uint32_t user_ptr_set: 1; /* User has set a non-NULL value */ /* * Packet output flags @@ -135,8 +141,8 @@ typedef union { /* Flag groups */ struct { - uint32_t reserved2: 12; - uint32_t other: 12; /* All other flags */ + uint32_t reserved2: 11; + uint32_t other: 13; /* All other flags */ uint32_t error: 8; /* All error flags */ } all; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 3416b994..fe22d70a 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -102,6 +102,13 @@ static inline int _odp_packet_num_segs(odp_packet_t pkt) /** @internal Inline function @param pkt @return */ static inline void *_odp_packet_user_ptr(odp_packet_t pkt) { + _odp_packet_flags_t flags; + + flags.all_flags = _odp_pkt_get(pkt, uint32_t, flags); + + if (flags.user_ptr_set == 0) + return NULL; + return _odp_pkt_get(pkt, void *, user_ptr); } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index c8ba69e2..dc16e9be 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -43,7 +43,8 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { .l4_offset = offsetof(odp_packet_hdr_t, p.l4_offset), .flow_hash = offsetof(odp_packet_hdr_t, flow_hash), .timestamp = offsetof(odp_packet_hdr_t, timestamp), - .input_flags = offsetof(odp_packet_hdr_t, p.input_flags) + .input_flags = offsetof(odp_packet_hdr_t, p.input_flags), + .flags = offsetof(odp_packet_hdr_t, p.flags) }; @@ -1260,7 +1261,15 @@ int odp_packet_input_index(odp_packet_t pkt) void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ptr) { - packet_hdr(pkt)->buf_hdr.user_ptr = ptr; + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + if (odp_unlikely(ptr == NULL)) { + pkt_hdr->p.flags.user_ptr_set = 0; + return; + } + + pkt_hdr->buf_hdr.user_ptr = ptr; + pkt_hdr->p.flags.user_ptr_set = 1; } int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) commit 5f142550eb114ccb600210bde6bdda63159d2046 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 12 12:53:11 2018 +0200 api: packet: initialize user ptr to NULL Require that implementation initializes the pointer value to NULL. Application can use the pointer more robustly when it can tell if the pointer has been set previously or not. 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/packet.h b/include/odp/api/spec/packet.h index a1111325..3222ff5c 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1341,7 +1341,10 @@ int odp_packet_input_index(odp_packet_t pkt); /** * User context pointer * - * Return previously stored user context pointer. + * Return previously stored user context pointer. If not otherwise documented, + * the pointer value is maintained over packet manipulating operations. + * Implementation initializes the pointer value to NULL during new packet + * creation (e.g. alloc and packet input) and reset. * * @param pkt Packet handle * @@ -1357,10 +1360,10 @@ void *odp_packet_user_ptr(odp_packet_t pkt); * value of type intptr_t. ODP may use the pointer for data prefetching, but * must ignore any invalid addresses. * - * @param pkt Packet handle - * @param ctx User context pointer + * @param pkt Packet handle + * @param user_ptr User context pointer */ -void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx); +void odp_packet_user_ptr_set(odp_packet_t pkt, const void *user_ptr); /** * User area address commit f0a2ead9b56aacb35fd1c2100f419b40fa0a5feb Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jan 15 13:33:58 2018 +0200 linux-gen: packet: clean up error and output flags Removed three unused error flags. Combined error and output flags into a single uint32_t. This saves four bytes and init of those bytes. There's still room for 12 flags in this word. Later on, these and input flags could be also combined. Moved the combined flag structure to packet types header, so that it can be accessed from inlined packet code. 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/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 091598c2..dbfc6641 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -101,6 +101,47 @@ typedef union { } _odp_packet_input_flags_t; +/* + * Additional packet flags + */ +typedef union { + /* All flags */ + uint32_t all_flags; + + struct { + uint32_t reserved1: 12; + + /* + * Packet output flags + */ + uint32_t l3_chksum_set: 1; /* L3 chksum bit is valid */ + uint32_t l3_chksum: 1; /* L3 chksum override */ + uint32_t l4_chksum_set: 1; /* L4 chksum bit is valid */ + uint32_t l4_chksum: 1; /* L4 chksum override */ + uint32_t shaper_len_adj: 8; /* Adjustment for traffic mgr */ + + /* + * Error flags + */ + uint32_t snap_len_err: 1; /* Snap length error */ + uint32_t ip_err: 1; /* IP error */ + uint32_t l3_chksum_err: 1; /* L3 checksum error */ + uint32_t tcp_err: 1; /* TCP error */ + uint32_t udp_err: 1; /* UDP error */ + uint32_t l4_chksum_err: 1; /* L4 checksum error */ + uint32_t ipsec_err: 1; /* IPsec error */ + uint32_t crypto_err: 1; /* Crypto packet operation error */ + }; + + /* Flag groups */ + struct { + uint32_t reserved2: 12; + uint32_t other: 12; /* All other flags */ + uint32_t error: 8; /* All error flags */ + } all; + +} _odp_packet_flags_t; + /** @endcond */ #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 184b8f40..83bc27b1 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -33,65 +33,21 @@ extern "C" { /** Minimum segment length expected by packet_parse_common() */ #define PACKET_PARSE_SEG_LEN 96 - ODP_STATIC_ASSERT(sizeof(_odp_packet_input_flags_t) == sizeof(uint64_t), "INPUT_FLAGS_SIZE_ERROR"); -/** - * Packet error flags - */ -typedef union { - /* All error flags */ - uint32_t all; - - struct { - /* Bitfield flags for each detected error */ - uint32_t app_error:1; /**< Error bit for application use */ - uint32_t frame_len:1; /**< Frame length error */ - uint32_t snap_len:1; /**< Snap length error */ - uint32_t l2_chksum:1; /**< L2 checksum error, checks TBD */ - uint32_t ip_err:1; /**< IP error, checks TBD */ - uint32_t l3_chksum:1; /**< L3 checksum error */ - uint32_t tcp_err:1; /**< TCP error, checks TBD */ - uint32_t udp_err:1; /**< UDP error, checks TBD */ - uint32_t ipsec_err:1; /**< IPsec error */ - uint32_t crypto_err:1; /**< Crypto packet operation error */ - uint32_t l4_chksum:1; /**< L4 checksum error */ - }; -} error_flags_t; - -ODP_STATIC_ASSERT(sizeof(error_flags_t) == sizeof(uint32_t), - "ERROR_FLAGS_SIZE_ERROR"); - -/** - * Packet output flags - */ -typedef union { - /* All output flags */ - uint32_t all; - - struct { - /** adjustment for traffic mgr */ - uint32_t shaper_len_adj:8; - - /* Bitfield flags for each output option */ - uint32_t l3_chksum_set:1; /**< L3 chksum bit is valid */ - uint32_t l3_chksum:1; /**< L3 chksum override */ - uint32_t l4_chksum_set:1; /**< L3 chksum bit is valid */ - uint32_t l4_chksum:1; /**< L4 chksum override */ - }; -} output_flags_t; - -ODP_STATIC_ASSERT(sizeof(output_flags_t) == sizeof(uint32_t), - "OUTPUT_FLAGS_SIZE_ERROR"); +ODP_STATIC_ASSERT(sizeof(_odp_packet_flags_t) == sizeof(uint32_t), + "PACKET_FLAGS_SIZE_ERROR"); /** * Packet parser metadata */ typedef struct { + /* Packet input flags */ _odp_packet_input_flags_t input_flags; - error_flags_t error_flags; - output_flags_t output_flags; + + /* Other flags */ + _odp_packet_flags_t flags; /* offset to L2 hdr, e.g. Eth */ uint16_t l2_offset; @@ -232,8 +188,7 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) } pkt_hdr->p.input_flags.all = 0; - pkt_hdr->p.output_flags.all = 0; - pkt_hdr->p.error_flags.all = 0; + pkt_hdr->p.flags.all_flags = 0; pkt_hdr->p.l2_offset = 0; pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 8c7eb044..75757fe0 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -931,7 +931,7 @@ static inline cos_t *cls_select_cos(pktio_entry_t *entry, default_cos = cls->default_cos; /* Return error cos for error packet */ - if (pkt_hdr->p.error_flags.all) + if (pkt_hdr->p.flags.all.error) return cls->error_cos; /* Calls all the PMRs attached at the PKTIO level*/ for (i = 0; i < odp_atomic_load_u32(&default_cos->s.num_rule); i++) { diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index bcb0541b..e1d1c84b 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1418,7 +1418,7 @@ int odp_crypto_int(odp_packet_t pkt_in, (rc_auth == ODP_CRYPTO_ALG_ERR_NONE); pkt_hdr = odp_packet_hdr(out_pkt); - pkt_hdr->p.error_flags.crypto_err = !op_result->ok; + pkt_hdr->p.flags.crypto_err = !op_result->ok; /* Synchronous, simply return results */ *pkt_out = out_pkt; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index e9ff9cbd..b6192377 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -831,7 +831,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, err: pkt_hdr = odp_packet_hdr(pkt); - pkt_hdr->p.error_flags.ipsec_err = 1; + pkt_hdr->p.flags.ipsec_err = 1; *pkt_out = pkt; @@ -1408,7 +1408,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, err: pkt_hdr = odp_packet_hdr(pkt); - pkt_hdr->p.error_flags.ipsec_err = 1; + pkt_hdr->p.flags.ipsec_err = 1; *pkt_out = pkt; return ipsec_sa; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 73567047..c8ba69e2 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -339,9 +339,8 @@ void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) { /* Reset parser metadata before new parse */ - pkt_hdr->p.error_flags.all = 0; pkt_hdr->p.input_flags.all = 0; - pkt_hdr->p.output_flags.all = 0; + pkt_hdr->p.flags.all.error = 0; pkt_hdr->p.l2_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; @@ -1310,16 +1309,16 @@ void odp_packet_l3_chksum_insert(odp_packet_t pkt, int insert) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - pkt_hdr->p.output_flags.l3_chksum_set = 1; - pkt_hdr->p.output_flags.l3_chksum = insert; + pkt_hdr->p.flags.l3_chksum_set = 1; + pkt_hdr->p.flags.l3_chksum = insert; } void odp_packet_l4_chksum_insert(odp_packet_t pkt, int insert) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - pkt_hdr->p.output_flags.l4_chksum_set = 1; - pkt_hdr->p.output_flags.l4_chksum = insert; + pkt_hdr->p.flags.l4_chksum_set = 1; + pkt_hdr->p.flags.l4_chksum = insert; } odp_packet_chksum_status_t odp_packet_l3_chksum_status(odp_packet_t pkt) @@ -1329,7 +1328,7 @@ odp_packet_chksum_status_t odp_packet_l3_chksum_status(odp_packet_t pkt) if (!pkt_hdr->p.input_flags.l3_chksum_done) return ODP_PACKET_CHKSUM_UNKNOWN; - if (pkt_hdr->p.error_flags.l3_chksum) + if (pkt_hdr->p.flags.l3_chksum_err) return ODP_PACKET_CHKSUM_BAD; return ODP_PACKET_CHKSUM_OK; @@ -1342,7 +1341,7 @@ odp_packet_chksum_status_t odp_packet_l4_chksum_status(odp_packet_t pkt) if (!pkt_hdr->p.input_flags.l4_chksum_done) return ODP_PACKET_CHKSUM_UNKNOWN; - if (pkt_hdr->p.error_flags.l4_chksum) + if (pkt_hdr->p.flags.l4_chksum_err) return ODP_PACKET_CHKSUM_BAD; return ODP_PACKET_CHKSUM_OK; @@ -1784,11 +1783,8 @@ void odp_packet_print(odp_packet_t pkt) len += odp_buffer_snprint(&str[len], n - len, buf); len += snprintf(&str[len], n - len, " input_flags 0x%" PRIx64 "\n", hdr->p.input_flags.all); - len += snprintf(&str[len], n - len, " error_flags 0x%" PRIx32 "\n", - hdr->p.error_flags.all); - len += snprintf(&str[len], n - len, - " output_flags 0x%" PRIx32 "\n", - hdr->p.output_flags.all); + len += snprintf(&str[len], n - len, " flags 0x%" PRIx32 "\n", + hdr->p.flags.all_flags); len += snprintf(&str[len], n - len, " l2_offset %" PRIu32 "\n", hdr->p.l2_offset); len += snprintf(&str[len], n - len, @@ -1990,7 +1986,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, if (ethtype < _ODP_ETH_LEN_MAX) { prs->input_flags.snap = 1; if (ethtype > frame_len - *offset) { - prs->error_flags.snap_len = 1; + prs->flags.snap_len_err = 1; return 0; } ethtype = _odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) @@ -2037,7 +2033,7 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, if (odp_unlikely(ihl < _ODP_IPV4HDR_IHL_MIN) || odp_unlikely(ver != 4) || (l3_len > frame_len - *offset)) { - prs->error_flags.ip_err = 1; + prs->flags.ip_err = 1; return 0; } @@ -2079,7 +2075,7 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, /* Basic sanity checks on IPv6 header */ if ((_odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || l3_len > frame_len - *offset) { - prs->error_flags.ip_err = 1; + prs->flags.ip_err = 1; return 0; } @@ -2108,7 +2104,7 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, if (*offset >= prs->l3_offset + _odp_be_to_cpu_16(ipv6->payload_len)) { - prs->error_flags.ip_err = 1; + prs->flags.ip_err = 1; return 0; } @@ -2135,7 +2131,7 @@ static inline void parse_tcp(packet_parser_t *prs, const _odp_tcphdr_t *tcp = (const _odp_tcphdr_t *)*parseptr; if (tcp->hl < sizeof(_odp_tcphdr_t) / sizeof(uint32_t)) - prs->error_flags.tcp_err = 1; + prs->flags.tcp_err = 1; else if ((uint32_t)tcp->hl * 4 > sizeof(_odp_tcphdr_t)) prs->input_flags.tcpopt = 1; @@ -2154,7 +2150,7 @@ static inline void parse_udp(packet_parser_t *prs, uint32_t udplen = _odp_be_to_cpu_16(udp->length); if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) - prs->error_flags.udp_err = 1; + prs->flags.udp_err = 1; if (_odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) == udp->dst_port && udplen > 4) { @@ -2183,7 +2179,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, prs->l3_offset = offset; if (layer <= ODP_PROTO_LAYER_L2) - return prs->error_flags.all != 0; + return prs->flags.all.error != 0; /* Set l3 flag only for known ethtypes */ prs->input_flags.l3 = 1; @@ -2214,7 +2210,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, } if (layer == ODP_PROTO_LAYER_L3) - return prs->error_flags.all != 0; + return prs->flags.all.error != 0; /* Set l4 flag only for known ip_proto */ prs->input_flags.l4 = 1; @@ -2265,7 +2261,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, break; } - return prs->error_flags.all != 0; + return prs->flags.all.error != 0; } /** diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index adb1881e..0c33666e 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -24,7 +24,7 @@ int odp_packet_has_error(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - return pkt_hdr->p.error_flags.all != 0; + return pkt_hdr->p.flags.all.error != 0; } /* Get Input Flags */ @@ -34,9 +34,7 @@ int odp_packet_has_l2_error(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); /* L2 parsing is always done by default and hence no additional check is required */ - return pkt_hdr->p.error_flags.frame_len - | pkt_hdr->p.error_flags.snap_len - | pkt_hdr->p.error_flags.l2_chksum; + return pkt_hdr->p.flags.snap_len_err; } int odp_packet_has_l3(odp_packet_t pkt) @@ -48,7 +46,7 @@ int odp_packet_has_l3_error(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - return pkt_hdr->p.error_flags.ip_err; + return pkt_hdr->p.flags.ip_err; } int odp_packet_has_l4(odp_packet_t pkt) @@ -60,7 +58,7 @@ int odp_packet_has_l4_error(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - return pkt_hdr->p.error_flags.tcp_err | pkt_hdr->p.error_flags.udp_err; + return pkt_hdr->p.flags.tcp_err | pkt_hdr->p.flags.udp_err; } int odp_packet_has_eth_bcast(odp_packet_t pkt) @@ -169,14 +167,14 @@ void odp_packet_drop_eligible_set(odp_packet_t pkt, odp_bool_t drop) int8_t odp_packet_shaper_len_adjust(odp_packet_t pkt) { - retflag(pkt, output_flags.shaper_len_adj); + retflag(pkt, flags.shaper_len_adj); } void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - pkt_hdr->p.output_flags.shaper_len_adj = adj; + pkt_hdr->p.flags.shaper_len_adj = adj; } /* Set Input Flags */ diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 7078be80..63942cec 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -380,8 +380,8 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, return -1; pkt_hdr->p.input_flags.l3_chksum_done = 1; - pkt_hdr->p.error_flags.ip_err = 1; - pkt_hdr->p.error_flags.l3_chksum = 1; + pkt_hdr->p.flags.ip_err = 1; + pkt_hdr->p.flags.l3_chksum_err = 1; } } @@ -396,8 +396,8 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, return -1; pkt_hdr->p.input_flags.l4_chksum_done = 1; - pkt_hdr->p.error_flags.udp_err = 1; - pkt_hdr->p.error_flags.l4_chksum = 1; + pkt_hdr->p.flags.udp_err = 1; + pkt_hdr->p.flags.l4_chksum_err = 1; } } else if (pktin_cfg->bit.tcp_chksum && HAS_L4_PROTO(mbuf, RTE_PTYPE_L4_TCP)) { @@ -410,8 +410,8 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, return -1; pkt_hdr->p.input_flags.l4_chksum_done = 1; - pkt_hdr->p.error_flags.tcp_err = 1; - pkt_hdr->p.error_flags.l4_chksum = 1; + pkt_hdr->p.flags.tcp_err = 1; + pkt_hdr->p.flags.l4_chksum_err = 1; } } @@ -572,18 +572,18 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, ipv4_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.ipv4_chksum, pktout_capa->bit.ipv4_chksum, l3_proto_v4, - pkt_p->output_flags.l3_chksum_set, - pkt_p->output_flags.l3_chksum); + pkt_p->flags.l3_chksum_set, + pkt_p->flags.l3_chksum); udp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.udp_chksum, pktout_capa->bit.udp_chksum, (l4_proto == _ODP_IPPROTO_UDP), - pkt_p->output_flags.l4_chksum_set, - pkt_p->output_flags.l4_chksum); + pkt_p->flags.l4_chksum_set, + pkt_p->flags.l4_chksum); tcp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.tcp_chksum, pktout_capa->bit.tcp_chksum, (l4_proto == _ODP_IPPROTO_TCP), - pkt_p->output_flags.l4_chksum_set, - pkt_p->output_flags.l4_chksum); + pkt_p->flags.l4_chksum_set, + pkt_p->flags.l4_chksum); if (!ipv4_chksum_pkt && !udp_chksum_pkt && !tcp_chksum_pkt) return; commit 745a82b056d9264ac3d9eb531987d49a30f72d6c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jan 15 13:23:21 2018 +0200 linux-gen: packet: hide internal definitions from Doxygen This internal header file is included from API files and thus Doxygen sees it. Use Doxygen tag @cond to hide implementation internal definitions. Dummy Doxygen doxumentation is not needed any more. 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/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 2ac75152..091598c2 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -20,101 +20,89 @@ extern "C" { #include <stdint.h> -/** @internal Packet field accessor */ +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +/* Packet field accessor */ #define _odp_pkt_get(pkt, cast, field) \ (*(cast *)(uintptr_t)((uint8_t *)pkt + _odp_packet_inline.field)) -/** @internal Packet header field offsets for inline functions */ +/* Packet header field offsets for inline functions */ typedef struct _odp_packet_inline_offset_t { - /** @internal field offset */ uint16_t data; - /** @internal field offset */ uint16_t seg_len; - /** @internal field offset */ uint16_t frame_len; - /** @internal field offset */ uint16_t headroom; - /** @internal field offset */ uint16_t tailroom; - /** @internal field offset */ uint16_t pool; - /** @internal field offset */ uint16_t input; - /** @internal field offset */ uint16_t segcount; - /** @internal field offset */ uint16_t user_ptr; - /** @internal field offset */ uint16_t user_area; - /** @internal field offset */ uint16_t l2_offset; - /** @internal field offset */ uint16_t l3_offset; - /** @internal field offset */ uint16_t l4_offset; - /** @internal field offset */ uint16_t flow_hash; - /** @internal field offset */ uint16_t timestamp; - /** @internal field offset */ uint16_t input_flags; } _odp_packet_inline_offset_t; -/** @internal Packet input & protocol flags */ +/* Packet input & protocol flags */ typedef union { - /** All input flags */ + /* All input flags */ uint64_t all; - /** Individual input flags */ + /* Individual input flags */ struct { - uint64_t dst_queue:1; /**< Dst queue present */ + uint64_t dst_queue:1; /* Dst queue present */ - uint64_t flow_hash:1; /**< Flow hash present */ - uint64_t timestamp:1; /**< Timestamp present */ + uint64_t flow_hash:1; /* Flow hash present */ + uint64_t timestamp:1; /* Timestamp present */ - uint64_t l2:1; /**< known L2 protocol present */ - uint64_t l3:1; /**< known L3 protocol present */ - uint64_t l4:1; /**< known L4 protocol present */ + uint64_t l2:1; /* known L2 protocol present */ + uint64_t l3:1; /* known L3 protocol present */ + uint64_t l4:1; /* known L4 protocol present */ - uint64_t eth:1; /**< Ethernet */ - uint64_t eth_bcast:1; /**< Ethernet broadcast */ - uint64_t eth_mcast:1; /**< Ethernet multicast */ - uint64_t jumbo:1; /**< Jumbo frame */ - uint64_t vlan:1; /**< VLAN hdr found */ - uint64_t vlan_qinq:1; /**< Stacked VLAN found, QinQ */ + uint64_t eth:1; /* Ethernet */ + uint64_t eth_bcast:1; /* Ethernet broadcast */ + uint64_t eth_mcast:1; /* Ethernet multicast */ + uint64_t jumbo:1; /* Jumbo frame */ + uint64_t vlan:1; /* VLAN hdr found */ + uint64_t vlan_qinq:1; /* Stacked VLAN found, QinQ */ - uint64_t snap:1; /**< SNAP */ - uint64_t arp:1; /**< ARP */ + uint64_t snap:1; /* SNAP */ + uint64_t arp:1; /* ARP */ - uint64_t ipv4:1; /**< IPv4 */ - uint64_t ipv6:1; /**< IPv6 */ - uint64_t ip_bcast:1; /**< IP broadcast */ - uint64_t ip_mcast:1; /**< IP multicast */ - uint64_t ipfrag:1; /**< IP fragment */ - uint64_t ipopt:1; /**< IP optional headers */ + uint64_t ipv4:1; /* IPv4 */ + uint64_t ipv6:1; /* IPv6 */ + uint64_t ip_bcast:1; /* IP broadcast */ + uint64_t ip_mcast:1; /* IP multicast */ + uint64_t ipfrag:1; /* IP fragment */ + uint64_t ipopt:1; /* IP optional headers */ - uint64_t ipsec:1; /**< IPSec packet. Required by the + uint64_t ipsec:1; /* IPSec packet. Required by the odp_packet_has_ipsec_set() func. */ - uint64_t ipsec_ah:1; /**< IPSec authentication header */ - uint64_t ipsec_esp:1; /**< IPSec encapsulating security + uint64_t ipsec_ah:1; /* IPSec authentication header */ + uint64_t ipsec_esp:1; /* IPSec encapsulating security payload */ - uint64_t udp:1; /**< UDP */ - uint64_t tcp:1; /**< TCP */ - uint64_t tcpopt:1; /**< TCP options present */ - uint64_t sctp:1; /**< SCTP */ - uint64_t icmp:1; /**< ICMP */ - - uint64_t color:2; /**< Packet color for traffic mgmt */ - uint64_t nodrop:1; /**< Drop eligibility status */ - - uint64_t l3_chksum_done:1; /**< L3 checksum validation done */ - uint64_t l4_chksum_done:1; /**< L4 checksum validation done */ - uint64_t ipsec_udp:1; /**< UDP-encapsulated IPsec packet */ + uint64_t udp:1; /* UDP */ + uint64_t tcp:1; /* TCP */ + uint64_t tcpopt:1; /* TCP options present */ + uint64_t sctp:1; /* SCTP */ + uint64_t icmp:1; /* ICMP */ + + uint64_t color:2; /* Packet color for traffic mgmt */ + uint64_t nodrop:1; /* Drop eligibility status */ + + uint64_t l3_chksum_done:1; /* L3 checksum validation done */ + uint64_t l4_chksum_done:1; /* L4 checksum validation done */ + uint64_t ipsec_udp:1; /* UDP-encapsulated IPsec packet */ }; } _odp_packet_input_flags_t; +/** @endcond */ + #ifdef __cplusplus } #endif commit 3a5a4f0253dabbf7a2074d7f894b1630c1e5ec42 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 12 12:36:18 2018 +0200 linux-gen: packet: single user ptr field Remove unnecessary union of user context u64/pointer. Rename the field for better code readability. 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/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index d78c6c37..bd90ee15 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -84,13 +84,7 @@ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE]; /* --- Mostly read only data --- */ - - /* User context pointer or u64 */ - union { - uint64_t buf_u64; - void *buf_ctx; - const void *buf_cctx; /* const alias for ctx */ - }; + const void *user_ptr; /* Reference count */ odp_atomic_u32_t ref_cnt; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 2ac35678..73567047 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -36,7 +36,7 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { .pool = offsetof(odp_packet_hdr_t, buf_hdr.pool_ptr), .input = offsetof(odp_packet_hdr_t, input), .segcount = offsetof(odp_packet_hdr_t, buf_hdr.segcount), - .user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.buf_ctx), + .user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.user_ptr), .user_area = offsetof(odp_packet_hdr_t, buf_hdr.uarea_addr), .l2_offset = offsetof(odp_packet_hdr_t, p.l2_offset), .l3_offset = offsetof(odp_packet_hdr_t, p.l3_offset), @@ -266,7 +266,7 @@ static inline void packet_seg_copy_md(odp_packet_hdr_t *dst, dst->timestamp = src->timestamp; /* buffer header side packet metadata */ - dst->buf_hdr.buf_u64 = src->buf_hdr.buf_u64; + dst->buf_hdr.user_ptr = src->buf_hdr.user_ptr; dst->buf_hdr.uarea_addr = src->buf_hdr.uarea_addr; /* segmentation data is not copied: @@ -1259,9 +1259,9 @@ int odp_packet_input_index(odp_packet_t pkt) return odp_pktio_index(packet_hdr(pkt)->input); } -void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx) +void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ptr) { - packet_hdr(pkt)->buf_hdr.buf_cctx = ctx; + packet_hdr(pkt)->buf_hdr.user_ptr = ptr; } int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) @@ -1932,7 +1932,7 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) dsthdr->input = srchdr->input; dsthdr->dst_queue = srchdr->dst_queue; - dsthdr->buf_hdr.buf_u64 = srchdr->buf_hdr.buf_u64; + dsthdr->buf_hdr.user_ptr = srchdr->buf_hdr.user_ptr; if (dsthdr->buf_hdr.uarea_addr != NULL && srchdr->buf_hdr.uarea_addr != NULL) { memcpy(dsthdr->buf_hdr.uarea_addr, srchdr->buf_hdr.uarea_addr, ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet.h | 11 +- .../include/odp/api/plat/packet_inline_types.h | 147 +++++++++++++-------- .../include/odp/api/plat/packet_inlines.h | 7 + .../linux-generic/include/odp_buffer_internal.h | 8 +- .../linux-generic/include/odp_packet_internal.h | 59 +-------- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_crypto.c | 2 +- platform/linux-generic/odp_ipsec.c | 4 +- platform/linux-generic/odp_packet.c | 61 +++++---- platform/linux-generic/odp_packet_flags.c | 14 +- platform/linux-generic/pktio/dpdk.c | 24 ++-- test/validation/api/packet/packet.c | 14 ++ 12 files changed, 182 insertions(+), 171 deletions(-) hooks/post-receive --

6 years, 3 months

1
0
0 0

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-132-g4508f410

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 4508f410a04cf1657d607d24aa2530a42ef011f7 (commit) via b122176ee59494dd957f0f5ff41d4b55a1477e13 (commit) via 22193a06524fa8dc43dfd106cf7eab46745b86f4 (commit) via 6582992616b1d95844d41ba93aeb0bb6c7dd6bd7 (commit) via 5911355121d94a192c9336b036cebb3734a78db2 (commit) via d48d55d846c3e711c2632a66db485f9079a768cf (commit) via 3c2b4804a2c3bca57febe2aea8a56b586c44f035 (commit) via a4767f0cbe844cd7f61f43557f0f90eaa2969192 (commit) via 7915f861ea56bbb0f5a0c22d93a7b4ff6b3c76e2 (commit) via 741bdb906e946d22194ab5676c9ea06e3debb2a1 (commit) via ac8b5f2a26edfa6249e134572a151dbd36c8dce6 (commit) via 89b0cbaa9cf4b8d6e93258f4dc2fd5084f3287b3 (commit) via f4e4b30454d6d961d0401717a11c6da06a889a7b (commit) via beb496bad99c91f639ea0aefaed7d4d30ec1368c (commit) via 3f069804f73c39e3bf98a998bbccd169f6c948f7 (commit) via 9836cf55fa6a5177f95fed5f10c01af0254303ce (commit) via a841f6b5448b4190230047dc7307f80ff77d01f5 (commit) via 3ce9d6ab16d064b0f83508e2f0b2e476d64b15e1 (commit) via d7ec85bbba32e9747307bd1cd76a061a39e7c731 (commit) via a001621520f769f835ce963d1e7ef8c1af74ad66 (commit) via 33afa2d1d4f6df342214dd9d9e4aab4433da3d7d (commit) via 29e5037571610ee49830dd64a43a47a8ccbadb87 (commit) via 988ae5930a9db1ceb88e46a84a116e67b0108307 (commit) from 1f1233aab977fcd7ef84b1cb185b7918fb1a138c (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 4508f410a04cf1657d607d24aa2530a42ef011f7 Merge: 1f1233aa b122176e Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Jan 22 23:07:14 2018 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc platform/linux-generic/odp_ipsec.c index 15f2305b,521627f1..e9ff9cbd --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@@ -1080,12 -1081,11 +1082,12 @@@ static int ipsec_out_esp(odp_packet_t * return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); - esp.spi = odp_cpu_to_be_32(ipsec_sa->spi); - esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); + esp.spi = _odp_cpu_to_be_32(ipsec_sa->spi); + esp.seq_no = _odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; ----------------------------------------------------------------------- Summary of changes: .travis.yml | 60 +++++---- configure.ac | 11 ++ example/Makefile.inc | 12 +- platform/linux-generic/Makefile.am | 1 + .../include-abi/odp/api/abi/byteorder.h | 1 + .../include/odp/api/plat/byteorder_inlines.h | 24 ++-- .../include/odp/api/plat/byteorder_inlines_api.h | 88 ++++++++++++ .../include/odp/api/plat/static_inline.h | 43 ------ .../include/odp_classification_inlines.h | 30 +++-- platform/linux-generic/include/odp_packet_netmap.h | 1 - platform/linux-generic/include/odp_packet_socket.h | 1 + platform/linux-generic/include/protocols/thash.h | 8 +- platform/linux-generic/odp_byteorder.c | 1 + platform/linux-generic/odp_classification.c | 12 +- platform/linux-generic/odp_ipsec.c | 66 ++++----- platform/linux-generic/odp_packet.c | 41 +++--- platform/linux-generic/odp_traffic_mngr.c | 13 +- platform/linux-generic/pktio/ipc.c | 24 ++-- platform/linux-generic/pktio/loop.c | 44 ++++-- platform/linux-generic/pktio/netmap.c | 25 ++-- platform/linux-generic/pktio/pcap.c | 8 +- platform/linux-generic/pktio/socket.c | 27 ++-- platform/linux-generic/pktio/socket_mmap.c | 149 ++++++++++++++------- platform/linux-generic/pktio/tap.c | 12 +- platform/linux-generic/test/Makefile.am | 3 +- platform/linux-generic/test/ring/Makefile.am | 28 +++- test/Makefile.inc | 12 +- test/validation/api/packet/packet.c | 15 ++- 28 files changed, 477 insertions(+), 283 deletions(-) create mode 100644 platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/static_inline.h hooks/post-receive --

6 years, 3 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp January 2018