From patchwork Wed Apr 20 06:22:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Elo, Matias \(Nokia - FI/Espoo\)" X-Patchwork-Id: 66179 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2273628qge; Tue, 19 Apr 2016 23:31:04 -0700 (PDT) X-Received: by 10.50.67.36 with SMTP id k4mr1642950igt.89.1461133864643; Tue, 19 Apr 2016 23:31:04 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m5si8848476igu.15.2016.04.19.23.31.04; Tue, 19 Apr 2016 23:31:04 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE dis=NONE) header.from=nokia.com Received: by lists.linaro.org (Postfix, from userid 109) id 0FCE5673C4; Wed, 20 Apr 2016 06:31:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00,HTML_MESSAGE, MIME_HTML_MOSTLY, RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 5DE74673C8; Wed, 20 Apr 2016 06:24:12 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 4CE5C67415; Wed, 20 Apr 2016 06:24:05 +0000 (UTC) Received: from demumfd002.nsn-inter.net (demumfd002.nsn-inter.net [93.183.12.31]) by lists.linaro.org (Postfix) with ESMTPS id 83E62673C4 for ; Wed, 20 Apr 2016 06:22:50 +0000 (UTC) Received: from demuprx016.emea.nsn-intra.net ([10.150.129.55]) by demumfd002.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u3K6MmDI000578 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 20 Apr 2016 06:22:49 GMT Received: from DEMUHTC003.nsn-intra.net ([10.159.42.34]) by demuprx016.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id u3K6MmiN017925 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL); Wed, 20 Apr 2016 08:22:48 +0200 Received: from DEMUMBX011.nsn-intra.net ([169.254.11.224]) by DEMUHTC003.nsn-intra.net ([10.159.42.34]) with mapi id 14.03.0279.002; Wed, 20 Apr 2016 08:22:48 +0200 From: "Elo, Matias (Nokia - FI/Espoo)" To: EXT Bill Fischofer Thread-Topic: [lng-odp] [API-NEXT PATCH v2 08/11] validation: pktio: add pktin timestamping test Thread-Index: AQHRmnibYDkiX0h1lkOFYL4doEsSwp+SZMqA Date: Wed, 20 Apr 2016 06:22:48 +0000 Message-ID: References: <1460725470-4457-1-git-send-email-matias.elo@nokia.com> <1460725470-4457-9-git-send-email-matias.elo@nokia.com> In-Reply-To: Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.159.42.115] MIME-Version: 1.0 X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-size: 39934 X-purgate-ID: 151667::1461133369-00002418-B04FA322/0/0 X-Topics: patch Cc: LNG ODP Mailman List Subject: Re: [lng-odp] [API-NEXT PATCH v2 08/11] validation: pktio: add pktin timestamping test X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" OK, I just sent rebased patch set. -Matias From: EXT Bill Fischofer [mailto:bill.fischofer@linaro.org] Sent: Tuesday, April 19, 2016 11:18 PM To: Elo, Matias (Nokia - FI/Espoo) Cc: LNG ODP Mailman List Subject: Re: [lng-odp] [API-NEXT PATCH v2 08/11] validation: pktio: add pktin timestamping test Rebase needed? Attempting to apply part 8 of the v2 patch yields: bill@Ubuntu15:~/linaro/matias$ git am --reject ~/Mail/Incoming/Matias/8 Applying: validation: pktio: add pktin timestamping test Checking patch test/validation/pktio/pktio.c... error: while searching for: #define TX_BATCH_LEN 4 #define MAX_QUEUES 128 #undef DEBUG_STATS /** interface names used for testing */ error: patch failed: test/validation/pktio/pktio.c:26 error: while searching for: CU_ASSERT_FATAL(ret == 0); } static int create_pool(const char *iface, int num) { char pool_name[ODP_POOL_NAME_LEN]; error: patch failed: test/validation/pktio/pktio.c:1646 error: while searching for: ODP_TEST_INFO(pktio_test_recv_multi_event), ODP_TEST_INFO_CONDITIONAL(pktio_test_statistics_counters, pktio_check_statistics_counters), ODP_TEST_INFO_NULL }; error: patch failed: test/validation/pktio/pktio.c:1778 Checking patch test/validation/pktio/pktio.h... error: while searching for: void pktio_test_recv_multi_event(void); int pktio_check_statistics_counters(void); void pktio_test_statistics_counters(void); /* test arrays: */ extern odp_testinfo_t pktio_suite[]; error: patch failed: test/validation/pktio/pktio.h:40 Applying patch test/validation/pktio/pktio.c with 3 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Applying patch test/validation/pktio/pktio.h with 1 reject... Rejected hunk #1. Patch failed at 0001 validation: pktio: add pktin timestamping test The copy of the patch that failed is found in: /home/bill/linaro/matias/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". On Fri, Apr 15, 2016 at 8:04 AM, Matias Elo > wrote: Add validation test for packet input timestamping. Tests also odp_pktin_ts_res() and odp_pktin_ts_from_ns(). Signed-off-by: Matias Elo > --- test/validation/pktio/pktio.c | 123 ++++++++++++++++++++++++++++++++++++++++++ test/validation/pktio/pktio.h | 2 + 2 files changed, 125 insertions(+) -- 1.9.1 _______________________________________________ lng-odp mailing list lng-odp@lists.linaro.org https://lists.linaro.org/mailman/listinfo/lng-odp diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index 162156a..39b825c 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -26,6 +26,11 @@ #define TX_BATCH_LEN 4 #define MAX_QUEUES 128 +#define PKTIN_TS_INTERVAL (50 * ODP_TIME_MSEC_IN_NS) +#define PKTIN_TS_MIN_RES 1000 +#define PKTIN_TS_MAX_RES 10000000000 +#define PKTIN_TS_CMP_RES 1 + #undef DEBUG_STATS /** interface names used for testing */ @@ -1646,6 +1651,122 @@ void pktio_test_send_on_ronly(void) CU_ASSERT_FATAL(ret == 0); } +int pktio_check_pktin_ts(void) +{ + odp_pktio_t pktio; + odp_pktio_capability_t capa; + odp_pktio_param_t pktio_param; + int ret; + + odp_pktio_param_init(&pktio_param); + pktio_param.in_mode = ODP_PKTIN_MODE_DIRECT; + + pktio = odp_pktio_open(iface_name[0], pool[0], &pktio_param); + if (pktio == ODP_PKTIO_INVALID) + return ODP_TEST_INACTIVE; + + ret = odp_pktio_capability(pktio, &capa); + (void)odp_pktio_close(pktio); + + if (ret < 0 || !capa.config.pktin.bit.ts_all) + return ODP_TEST_INACTIVE; + + return ODP_TEST_ACTIVE; +} + +void pktio_test_pktin_ts(void) +{ + odp_pktio_t pktio_tx, pktio_rx; + odp_pktio_t pktio[MAX_NUM_IFACES]; + pktio_info_t pktio_rx_info; + odp_pktio_capability_t capa; + odp_pktio_config_t config; + odp_pktout_queue_t pktout_queue; + odp_packet_t pkt_tbl[TX_BATCH_LEN]; + uint32_t pkt_seq[TX_BATCH_LEN]; + uint64_t ns1, ns2; + uint64_t res; + odp_time_t ts_prev; + odp_time_t ts; + int num_rx = 0; + int ret; + int i; + + CU_ASSERT_FATAL(num_ifaces >= 1); + + /* Open and configure interfaces */ + for (i = 0; i < num_ifaces; ++i) { + pktio[i] = create_pktio(i, ODP_PKTIN_MODE_DIRECT, + ODP_PKTOUT_MODE_DIRECT); + CU_ASSERT_FATAL(pktio[i] != ODP_PKTIO_INVALID); + + CU_ASSERT_FATAL(odp_pktio_capability(pktio[i], &capa) == 0); + CU_ASSERT_FATAL(capa.config.pktin.bit.ts_all); + + odp_pktio_config_init(&config); + config.pktin.bit.ts_all = 1; + CU_ASSERT_FATAL(odp_pktio_config(pktio[i], &config) == 0); + + CU_ASSERT_FATAL(odp_pktio_start(pktio[i]) == 0); + } + + for (i = 0; i < num_ifaces; i++) + _pktio_wait_linkup(pktio[i]); + + pktio_tx = pktio[0]; + pktio_rx = (num_ifaces > 1) ? pktio[1] : pktio_tx; + pktio_rx_info.id = pktio_rx; + pktio_rx_info.inq = ODP_QUEUE_INVALID; + pktio_rx_info.in_mode = ODP_PKTIN_MODE_DIRECT; + + /* Test odp_pktin_ts_res() and odp_pktin_ts_from_ns() */ + res = odp_pktin_ts_res(pktio_tx); + CU_ASSERT(res > PKTIN_TS_MIN_RES); + CU_ASSERT(res < PKTIN_TS_MAX_RES); + ns1 = 100; + ts = odp_pktin_ts_from_ns(pktio_tx, ns1); + ns2 = odp_time_to_ns(ts); + /* Allow some arithmetic tolerance */ + CU_ASSERT((ns2 <= (ns1 + PKTIN_TS_CMP_RES)) && + (ns2 >= (ns1 - PKTIN_TS_CMP_RES))); + + ret = create_packets(pkt_tbl, pkt_seq, TX_BATCH_LEN, pktio_tx, + pktio_rx); + CU_ASSERT_FATAL(ret == TX_BATCH_LEN); + + ret = odp_pktout_queue(pktio_tx, &pktout_queue, 1); + CU_ASSERT_FATAL(ret > 0); + + /* Send packets one at a time and add delay between the packets */ + for (i = 0; i < TX_BATCH_LEN; i++) { + CU_ASSERT_FATAL(odp_pktout_send(pktout_queue, + &pkt_tbl[i], 1) == 1); + ret = wait_for_packets(&pktio_rx_info, &pkt_tbl[i], &pkt_seq[i], + 1, ODP_PKTIN_MODE_DIRECT, + ODP_TIME_SEC_IN_NS); + if (ret != 1) + break; + odp_time_wait_ns(PKTIN_TS_INTERVAL); + } + num_rx = i; + CU_ASSERT(num_rx == TX_BATCH_LEN); + + ts_prev = ODP_TIME_NULL; + for (i = 0; i < num_rx; i++) { + ts = odp_packet_ts(pkt_tbl[i]); + + CU_ASSERT(odp_time_cmp(ts, ts_prev) > 0); + + ts_prev = ts; + odp_packet_free(pkt_tbl[i]); + } + + for (i = 0; i < num_ifaces; i++) { + CU_ASSERT_FATAL(odp_pktio_stop(pktio[i]) == 0); + CU_ASSERT_FATAL(odp_pktio_close(pktio[i]) == 0); + } +} + static int create_pool(const char *iface, int num) { char pool_name[ODP_POOL_NAME_LEN]; @@ -1778,6 +1899,8 @@ odp_testinfo_t pktio_suite_unsegmented[] = { ODP_TEST_INFO(pktio_test_recv_multi_event), ODP_TEST_INFO_CONDITIONAL(pktio_test_statistics_counters, pktio_check_statistics_counters), + ODP_TEST_INFO_CONDITIONAL(pktio_test_pktin_ts, + pktio_check_pktin_ts), ODP_TEST_INFO_NULL }; diff --git a/test/validation/pktio/pktio.h b/test/validation/pktio/pktio.h index 4bc2980..33f8649 100644 --- a/test/validation/pktio/pktio.h +++ b/test/validation/pktio/pktio.h @@ -40,6 +40,8 @@ void pktio_test_sched_multi_event(void); void pktio_test_recv_multi_event(void); int pktio_check_statistics_counters(void); void pktio_test_statistics_counters(void); +int pktio_check_pktin_ts(void); +void pktio_test_pktin_ts(void); /* test arrays: */ extern odp_testinfo_t pktio_suite[];