From patchwork Fri Jan 15 17:28:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 59875 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp682318lbb; Fri, 15 Jan 2016 09:28:51 -0800 (PST) X-Received: by 10.55.74.209 with SMTP id x200mr14674562qka.106.1452878931464; Fri, 15 Jan 2016 09:28:51 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id w19si14196039qhw.97.2016.01.15.09.28.50; Fri, 15 Jan 2016 09:28:51 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CF45A61960; Fri, 15 Jan 2016 17:28:50 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=O4mh9RGN; dkim-adsp=none (unprotected policy); dkim-atps=neutral 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=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, 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 9E42661971; Fri, 15 Jan 2016 17:28:25 +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 3BC0361973; Fri, 15 Jan 2016 17:28:19 +0000 (UTC) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by lists.linaro.org (Postfix) with ESMTPS id 5630361953 for ; Fri, 15 Jan 2016 17:28:17 +0000 (UTC) Received: by mail-lb0-f170.google.com with SMTP id x4so62160511lbm.0 for ; Fri, 15 Jan 2016 09:28:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qH1YR9zBPvNnkI4n3hfOnv0d8hDnvW+F4U+AcCUXpFk=; b=O4mh9RGN4e+YPHNs5x62Z09WcB6n4rCHBCgeeHOctsY5tch+KX+WtEwvQKg5FWXM7z g2yuxKqI2fRyq0w51aPfszWPRfPbPdp8MEErPlFjZ3N60m5NzzA0XTtz9+8jbl2zZZXx cZ8vx5OAmcO6XQDbXpQVCPy2K3WWezv0q090M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qH1YR9zBPvNnkI4n3hfOnv0d8hDnvW+F4U+AcCUXpFk=; b=gK2XFhTci/ETzRE1NUCZMFAlRbqqzeFCKcaIupIOuCuk3GZccqAtaBmG4NcT8GEiNt h1xaN80XixGGhwHT8xdKfVEO6PSNHk5cK0f+OtyrYSdlw2uZL+rpWe5lVdTpt0uoEHCZ DAU0FQ8zK/U2ShsII0yfBRozWV2wm7pjy2EIOnh1U5sgjCAuiReQjYAN3BonZH+/D7tu lmjh/mOA4bGp2oEJy+pBIbWqw6b+cai4SlYC7Eo9MdqQVRRkbOdADtKvRd5G57xITcpF nxaF+O6HnM96w0eotlo/7Sc8kVZcMW7B7zm9e/J/e8rnr9UbUVT/EXEooFMRWfB7NLqt dmkw== X-Gm-Message-State: ALoCoQlXSsvwfK2xQD36OpMdfejF5cfe78r7NOQo8j/eLtfx6N+VDnOoPF4Rsh6c9qXKtN1xDJ/REzdcvupPF14oT/RU/9E5kQ== X-Received: by 10.112.12.233 with SMTP id b9mr3387730lbc.63.1452878895733; Fri, 15 Jan 2016 09:28:15 -0800 (PST) Received: from localhost.localdomain ([195.238.92.128]) by smtp.gmail.com with ESMTPSA id h187sm1495139lfg.18.2016.01.15.09.28.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jan 2016 09:28:14 -0800 (PST) From: Ivan Khoronzhuk To: lng-odp@lists.linaro.org Date: Fri, 15 Jan 2016 19:28:03 +0200 Message-Id: <1452878885-8508-2-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452878885-8508-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1452878885-8508-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH v2 1/3] validation: cls: adopt for supported l3 PMR 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" The classification tests should use supported l3 PMR where it's not important. For validating concrete PMRs the separate test exists. Signed-off-by: Ivan Khoronzhuk --- test/validation/classification/classification.h | 6 +-- .../classification/odp_classification_basic.c | 4 +- .../classification/odp_classification_common.c | 52 ++++++++++++++++++++++ .../classification/odp_classification_tests.c | 25 +++++------ .../classification/odp_classification_testsuites.h | 2 + 5 files changed, 69 insertions(+), 20 deletions(-) diff --git a/test/validation/classification/classification.h b/test/validation/classification/classification.h index 5728cc5..5508af7 100644 --- a/test/validation/classification/classification.h +++ b/test/validation/classification/classification.h @@ -31,18 +31,18 @@ #define CLS_PMR_CHAIN_SRC 2 #define CLS_PMR_CHAIN_DST 3 #define CLS_PMR_CHAIN_SADDR "10.0.0.5/32" -#define CLS_PMR_CHAIN_SPORT 3000 +#define CLS_PMR_CHAIN_PORT 3000 /* Config values for PMR */ #define TEST_PMR 1 #define CLS_PMR 4 -#define CLS_PMR_SPORT 4000 +#define CLS_PMR_PORT 4000 /* Config values for PMR SET */ #define TEST_PMR_SET 1 #define CLS_PMR_SET 5 #define CLS_PMR_SET_SADDR "10.0.0.6/32" -#define CLS_PMR_SET_SPORT 5000 +#define CLS_PMR_SET_PORT 5000 /* Config values for CoS L2 Priority */ #define TEST_L2_QOS 1 diff --git a/test/validation/classification/odp_classification_basic.c b/test/validation/classification/odp_classification_basic.c index f0b7a42..81077b6 100644 --- a/test/validation/classification/odp_classification_basic.c +++ b/test/validation/classification/odp_classification_basic.c @@ -78,7 +78,7 @@ void classification_test_create_pmr_match(void) val = 1024; mask = 0xffff; - match.term = ODP_PMR_TCP_SPORT; + match.term = find_first_supported_l3_pmr(); match.val = &val; match.mask = &mask; match.val_sz = sizeof(val); @@ -99,7 +99,7 @@ void classification_test_destroy_pmr(void) val = 1024; mask = 0xffff; - match.term = ODP_PMR_TCP_SPORT; + match.term = find_first_supported_l3_pmr(); match.val = &val; match.mask = &mask; match.val_sz = sizeof(val); diff --git a/test/validation/classification/odp_classification_common.c b/test/validation/classification/odp_classification_common.c index 89fdb89..bb937dc 100644 --- a/test/validation/classification/odp_classification_common.c +++ b/test/validation/classification/odp_classification_common.c @@ -313,3 +313,55 @@ odp_packet_t create_packet_len(odp_pool_t pool, bool vlan, return pkt; } + +odp_pmr_term_t find_first_supported_l3_pmr(void) +{ + unsigned long long cap; + odp_pmr_term_t term = ODP_PMR_TCP_DPORT; + + /* choose supported PMR */ + cap = odp_pmr_terms_cap(); + if (cap & (1 << ODP_PMR_UDP_SPORT)) + term = ODP_PMR_UDP_SPORT; + else if (cap & (1 << ODP_PMR_UDP_DPORT)) + term = ODP_PMR_UDP_DPORT; + else if (cap & (1 << ODP_PMR_TCP_SPORT)) + term = ODP_PMR_TCP_SPORT; + else if (cap & (1 << ODP_PMR_TCP_DPORT)) + term = ODP_PMR_TCP_DPORT; + else + CU_FAIL("Implementations doesn't support any TCP/UDP PMR"); + + return term; +} + +int set_first_supported_pmr_port(odp_packet_t pkt, uint16_t port) +{ + odph_udphdr_t *udp; + odph_tcphdr_t *tcp; + odp_pmr_term_t term; + + udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); + tcp = (odph_tcphdr_t *)odp_packet_l4_ptr(pkt, NULL); + port = odp_cpu_to_be_16(port); + term = find_first_supported_l3_pmr(); + switch (term) { + case ODP_PMR_UDP_SPORT: + udp->src_port = port; + break; + case ODP_PMR_UDP_DPORT: + udp->dst_port = port; + break; + case ODP_PMR_TCP_DPORT: + tcp->dst_port = port; + break; + case ODP_PMR_TCP_SPORT: + tcp->src_port = port; + break; + default: + CU_FAIL("Unsupported L3 term"); + return -1; + } + + return 0; +} diff --git a/test/validation/classification/odp_classification_tests.c b/test/validation/classification/odp_classification_tests.c index e11c3d8..a118728 100644 --- a/test/validation/classification/odp_classification_tests.c +++ b/test/validation/classification/odp_classification_tests.c @@ -10,6 +10,7 @@ #include #include #include +#include static odp_cos_t cos_list[CLS_ENTRIES]; static odp_pmr_t pmr_list[CLS_ENTRIES]; @@ -195,9 +196,9 @@ void configure_cls_pmr_chain(void) pmr_list[CLS_PMR_CHAIN_SRC] = odp_pmr_create(&match); CU_ASSERT_FATAL(pmr_list[CLS_PMR_CHAIN_SRC] != ODP_PMR_INVAL); - val = CLS_PMR_CHAIN_SPORT; + val = CLS_PMR_CHAIN_PORT; maskport = 0xffff; - match.term = ODP_PMR_UDP_SPORT; + match.term = find_first_supported_l3_pmr(); match.val = &val; match.mask = &maskport; match.val_sz = sizeof(val); @@ -218,7 +219,6 @@ void test_cls_pmr_chain(void) { odp_packet_t pkt; odph_ipv4hdr_t *ip; - odph_udphdr_t *udp; odp_queue_t queue; odp_pool_t pool; uint32_t addr = 0; @@ -236,8 +236,7 @@ void test_cls_pmr_chain(void) ip->chksum = 0; ip->chksum = odph_ipv4_csum_update(pkt); - udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); - udp->src_port = odp_cpu_to_be_16(CLS_PMR_CHAIN_SPORT); + set_first_supported_pmr_port(pkt, CLS_PMR_CHAIN_PORT); enqueue_pktio_interface(pkt, pktio_loop); @@ -513,9 +512,9 @@ void configure_pmr_cos(void) char queuename[ODP_QUEUE_NAME_LEN]; char poolname[ODP_POOL_NAME_LEN]; - val = CLS_PMR_SPORT; + val = CLS_PMR_PORT; mask = 0xffff; - match.term = ODP_PMR_UDP_SPORT; + match.term = find_first_supported_l3_pmr(); match.val = &val; match.mask = &mask; match.val_sz = sizeof(val); @@ -554,7 +553,6 @@ void configure_pmr_cos(void) void test_pmr_cos(void) { odp_packet_t pkt; - odph_udphdr_t *udp; odp_queue_t queue; odp_pool_t pool; uint32_t seqno = 0; @@ -563,8 +561,7 @@ void test_pmr_cos(void) CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); seqno = cls_pkt_get_seq(pkt); CU_ASSERT(seqno != TEST_SEQ_INVALID); - udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); - udp->src_port = odp_cpu_to_be_16(CLS_PMR_SPORT); + set_first_supported_pmr_port(pkt, CLS_PMR_PORT); enqueue_pktio_interface(pkt, pktio_loop); pkt = receive_packet(&queue, ODP_TIME_SEC_IN_NS); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); @@ -597,9 +594,9 @@ void configure_pktio_pmr_match_set_cos(void) pmr_terms[0].val_sz = sizeof(addr); - val = CLS_PMR_SET_SPORT; + val = CLS_PMR_SET_PORT; maskport = 0xffff; - pmr_terms[1].term = ODP_PMR_UDP_SPORT; + pmr_terms[1].term = find_first_supported_l3_pmr(); pmr_terms[1].val = &val; pmr_terms[1].mask = &maskport; pmr_terms[1].val_sz = sizeof(val); @@ -640,7 +637,6 @@ void test_pktio_pmr_match_set_cos(void) uint32_t addr = 0; uint32_t mask; odph_ipv4hdr_t *ip; - odph_udphdr_t *udp; odp_packet_t pkt; odp_pool_t pool; odp_queue_t queue; @@ -657,8 +653,7 @@ void test_pktio_pmr_match_set_cos(void) ip->chksum = 0; ip->chksum = odph_ipv4_csum_update(pkt); - udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); - udp->src_port = odp_cpu_to_be_16(CLS_PMR_SET_SPORT); + set_first_supported_pmr_port(pkt, CLS_PMR_SET_PORT); enqueue_pktio_interface(pkt, pktio_loop); pkt = receive_packet(&queue, ODP_TIME_SEC_IN_NS); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); diff --git a/test/validation/classification/odp_classification_testsuites.h b/test/validation/classification/odp_classification_testsuites.h index 397549b..19d5ae2 100644 --- a/test/validation/classification/odp_classification_testsuites.h +++ b/test/validation/classification/odp_classification_testsuites.h @@ -49,5 +49,7 @@ void test_pmr_cos(void); void configure_pktio_pmr_match_set_cos(void); void test_pktio_pmr_match_set_cos(void); int destroy_inq(odp_pktio_t pktio); +odp_pmr_term_t find_first_supported_l3_pmr(void); +int set_first_supported_pmr_port(odp_packet_t pkt, uint16_t port); #endif /* ODP_BUFFER_TESTSUITES_H_ */