validation: cls: add PMR_IP_DSCP tests

Added test cases for testing the new ODP_PMR_IP_DSCP packet
matching rule.

Signed-off-by: Petri Savolainen <petri.savolainen@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>

3 files changed, 56 insertions, 2 deletions

diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c
index dd8373b04..8eac41a1e 100644
--- a/test/validation/api/classification/odp_classification_common.c
+++ b/test/validation/api/classification/odp_classification_common.c
@@ -417,7 +417,7 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info)
 		ip->tot_len = odp_cpu_to_be_16(l3_len);
 		ip->ttl = DEFAULT_TTL;
 		ip->frag_offset = 0;
-		ip->tos = 0;
+		ip->tos = pkt_info.dscp << ODPH_IP_TOS_DSCP_SHIFT;
 		odp_packet_has_ipv4_set(pkt, 1);
 		odph_ipv4_csum_update(pkt);
 	} else {
@@ -425,7 +425,8 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info)
 		odp_packet_has_ipv6_set(pkt, 1);
 		ipv6 = (odph_ipv6hdr_t *)odp_packet_l3_ptr(pkt, NULL);
 		version     = ODPH_IPV6        << ODPH_IPV6HDR_VERSION_SHIFT;
-		tc          = DEFAULT_TOS << ODPH_IPV6HDR_TC_SHIFT;
+		tc   = pkt_info.dscp << ODPH_IP_TOS_DSCP_SHIFT;
+		tc <<= ODPH_IPV6HDR_TC_SHIFT;
 		flow        = seqno       << ODPH_IPV6HDR_FLOW_LABEL_SHIFT;
 		ver_tc_flow = version | tc | flow;
 
diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c
index 73696708c..0bba26abb 100644
--- a/test/validation/api/classification/odp_classification_test_pmr.c
+++ b/test/validation/api/classification/odp_classification_test_pmr.c
@@ -604,6 +604,49 @@ static void classification_test_pmr_term_ipv6_proto(void)
 	classification_test_pmr_term_proto(TEST_IPV6);
 }
 
+static void classification_test_pmr_term_dscp(odp_bool_t ipv6)
+{
+	odp_packet_t pkt;
+	uint8_t val;
+	uint8_t mask;
+	odp_pmr_param_t pmr_param;
+	cls_packet_info_t pkt_info;
+
+	val  = DSCP_CLASS4;
+	mask = 0x3f;
+
+	odp_cls_pmr_param_init(&pmr_param);
+	pmr_param.term = ODP_PMR_IP_DSCP;
+	pmr_param.match.value = &val;
+	pmr_param.match.mask = &mask;
+	pmr_param.val_sz = sizeof(val);
+
+	pkt_info = default_pkt_info;
+	pkt_info.ipv6    = ipv6;
+	pkt_info.l4_type = CLS_PKT_L4_UDP;
+	pkt_info.dscp    = DSCP_CLASS4;
+	pkt = create_packet(pkt_info);
+	CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+
+	test_pmr(&pmr_param, pkt, MATCH);
+
+	pkt_info.dscp = 0;
+	pkt = create_packet(pkt_info);
+	CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+
+	test_pmr(&pmr_param, pkt, NO_MATCH);
+}
+
+static void classification_test_pmr_term_ipv4_dscp(void)
+{
+	classification_test_pmr_term_dscp(TEST_IPV4);
+}
+
+static void classification_test_pmr_term_ipv6_dscp(void)
+{
+	classification_test_pmr_term_dscp(TEST_IPV6);
+}
+
 static void classification_test_pmr_term_dmac(void)
 {
 	odp_packet_t pkt;
@@ -1817,6 +1860,11 @@ static int check_capa_ip_proto(void)
 	return cls_capa.supported_terms.bit.ip_proto;
 }
 
+static int check_capa_ip_dscp(void)
+{
+	return cls_capa.supported_terms.bit.ip_dscp;
+}
+
 static int check_capa_dmac(void)
 {
 	return cls_capa.supported_terms.bit.dmac;
@@ -1963,6 +2011,10 @@ odp_testinfo_t classification_suite_pmr[] = {
 				  check_capa_ip_proto),
 	ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_ipv6_proto,
 				  check_capa_ip_proto),
+	ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_ipv4_dscp,
+				  check_capa_ip_dscp),
+	ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_ipv6_dscp,
+				  check_capa_ip_dscp),
 	ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_dmac,
 				  check_capa_dmac),
 	ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_pool_set,
diff --git a/test/validation/api/classification/odp_classification_testsuites.h b/test/validation/api/classification/odp_classification_testsuites.h
index b49e907d0..592f37cd6 100644
--- a/test/validation/api/classification/odp_classification_testsuites.h
+++ b/test/validation/api/classification/odp_classification_testsuites.h
@@ -28,6 +28,7 @@ typedef struct cls_packet_info {
 	odp_atomic_u32_t *seq;
 	cls_packet_l4_info l4_type;
 	odp_bool_t ipv6;
+	uint8_t dscp;
 	uint32_t len;
 } cls_packet_info_t;