From patchwork Thu Apr 21 06:19:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramanian Manoharan X-Patchwork-Id: 66305 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2859864qge; Wed, 20 Apr 2016 23:19:31 -0700 (PDT) X-Received: by 10.55.200.137 with SMTP id t9mr3911510qkl.41.1461219571426; Wed, 20 Apr 2016 23:19:31 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id l10si639319qgf.61.2016.04.20.23.19.30; Wed, 20 Apr 2016 23:19:31 -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=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C5ABA673EF; Thu, 21 Apr 2016 06:19:30 +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=-0.5 required=5.0 tests=BAYES_00, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_WEB,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 AE2DB673EF; Thu, 21 Apr 2016 06:19:24 +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 0B5386837A; Thu, 21 Apr 2016 06:19:23 +0000 (UTC) Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by lists.linaro.org (Postfix) with ESMTPS id F35A4673A1 for ; Thu, 21 Apr 2016 06:19:20 +0000 (UTC) Received: by mail-pa0-f49.google.com with SMTP id r5so23334286pag.1 for ; Wed, 20 Apr 2016 23:19:20 -0700 (PDT) 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; bh=6IAVU/vpE4vPjbTZLx/Ir1e+Hsr8egF2ZKjJ0rmO20Q=; b=Zn4D57sXWZykrQ3jC+vAAGAyaU6h6OV17zzDVyKHBa3XwTfzriakmPpI6bxBHWjfss AFxhluK/SzEL6p07Uu8gZdpsvSZcmMfU7RM8aTBEa0gq5/forTVLKnO61a1o0y3ffrrw 9wWwV7eYj4Vbfof2/vHM7Dux3pSawnAA6A012a6a3zdvJd7QmvvE2HIqEEaknP79NMkf xJP9bBCKIcjuAq54gvuUiz8CK+wi5Gdel6NOvpR4BJ8xu11fX01IbhBiCn5SLv2HBm0S HKqiLWWitVEwDndYccpAyEG7SPFZqap8NcT0Txmp/zNv1lGQos+ckfEuSNax+S6MxJNj vtRA== X-Gm-Message-State: AOPr4FVR9+tN5ihrNhIoB9oyP9fwQcq0h0Zt2kIfDXU6FUUMNHNfs7RMarCgdPhS4CiO2WmcLDU= X-Received: by 10.66.246.165 with SMTP id xx5mr18104646pac.87.1461219560217; Wed, 20 Apr 2016 23:19:20 -0700 (PDT) Received: from localhost.localdomain ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id v189sm1722577pfb.85.2016.04.20.23.19.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Apr 2016 23:19:19 -0700 (PDT) From: Balasubramanian Manoharan To: lng-odp@lists.linaro.org Date: Thu, 21 Apr 2016 11:49:02 +0530 Message-Id: <1461219545-14545-1-git-send-email-bala.manoharan@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: Classification Cc: petri.savolainen@nokia.com Subject: [lng-odp] [API-NEXT 1/4] api: classification: Adds capability and PMR range 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" Adds classification capability structure and PMR range functionality. odp_cls_capability_t structure defines system level classification capability. Signed-off-by: Balasubramanian Manoharan --- include/odp/api/spec/classification.h | 134 ++++++++++++++++++++++++++++------ 1 file changed, 112 insertions(+), 22 deletions(-) diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 076b3de..28619a9 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -55,6 +55,76 @@ extern "C" { */ /** + * Supported PMR term values + * + * Supported Packet Matching Rule term values in a bit field structure. + */ +typedef union odp_cls_pmr_supported_t { + struct { + /** Total length of received packet */ + uint64_t pmr_len:1; + /** Initial (outer) Ethertype only */ + uint64_t ethtype_0:1; + /** Ethertype of most inner VLAN tag */ + uint64_t ethtype_x:1; + /** First VLAN ID (outer) */ + uint64_t vlan_id_0:1; + /** Last VLAN ID (inner) */ + uint64_t vlan_id_x:1; + /** destination MAC address */ + uint64_t dmac:1; + /** IP Protocol or IPv6 Next Header */ + uint64_t ip_proto:1; + /** Destination UDP port, implies IPPROTO=17 */ + uint64_t udp_dport:1; + /** Destination TCP port implies IPPROTO=6 */ + uint64_t tcp_dport:1; + /** Source UDP Port */ + uint64_t udp_sport:1; + /** Source TCP port */ + uint64_t tcp_sport:1; + /** Source IP address */ + uint64_t sip_addr:1; + /** Destination IP address */ + uint64_t dip_addr:1; + /** Source IP address */ + uint64_t sip6_addr:1; + /** Destination IP address */ + uint64_t dip6_addr:1; + /** IPsec session identifier */ + uint64_t ipsec_spi:1; + /** NVGRE/VXLAN network identifier */ + uint64_t ld_vni:1; + /** Custom match rule, offset from start of + * frame. The match is defined by the offset, the + * expected value, and its size. + */ + uint64_t custom_frame:1; + + } proto; + uint64_t all_bits; +} odp_cls_pmr_supported_t; + +/** + * Classification capabilities + * This capability structure defines system level classfication capability + */ +typedef struct odp_cls_capability_t { + /** PMR terms supported by the classifier + * A mask one bit for each of odp_pmr_term_t + */ + odp_cls_pmr_supported_t pmr_terms; + /** Maximum number of PMR terms */ + unsigned max_pmr_terms; + /** Number of PMR terms available for use now */ + unsigned available_pmr_terms; + /** Maximum number of CoS supported */ + unsigned max_cos; + /** A Boolean to denote support of PMR range */ + odp_bool_t pmr_range_supported; +} odp_cls_capability_t; + +/** * class of service packet drop policies */ typedef enum { @@ -103,6 +173,17 @@ typedef struct odp_cls_cos_param { void odp_cls_cos_param_init(odp_cls_cos_param_t *param); /** + * Query classification capabilities + * + * Outputs classification capabilities on success. + * + * @param[out] capability Classification capability structure for output + * @retval 0 on success + * @retval <0 on failure + */ +int odp_cls_capability(odp_cls_capability_t *capability); + +/** * Create a class-of-service * * @param name String intended for debugging purposes. @@ -268,17 +349,40 @@ typedef enum { } odp_pmr_term_t; /** - * Following structure is used to define a packet matching rule + * Packet Matching Rule parameter structure */ -typedef struct odp_pmr_match_t { - odp_pmr_term_t term; /**< PMR term value to be matched */ - const void *val; /**< Value to be matched */ - const void *mask; /**< Masked set of bits to be matched */ +typedef struct odp_pmr_param_t { + odp_pmr_term_t term; /**< Packet Macthing Rule term */ + bool range_term; /**< True if the value is range and false if match */ + union { + struct { + /**< Value to be matched */ + const void *value; + /**< Masked set of bits to be matched */ + const void *mask; + } match; + struct { + /* Start and End values are included in the range */ + /**< start value of range */ + const void *val_start; + /**< End value of range */ + const void *val_end; + } range; + }; uint32_t val_sz; /**< Size of the term value */ uint32_t offset; /**< User-defined offset in packet Used if term == ODP_PMR_CUSTOM_FRAME only, ignored otherwise */ -} odp_pmr_match_t; +} odp_pmr_param_t; + +/** + * Intiailize packet matching rule parameters + * + * Initialize an odp_pmr_param_t to its default values for all fields + * + * @param param Address of the odp_pmr_param_t to be initialized + */ +void odp_cls_pmr_param_init(odp_pmr_param_t *param); /** * Create a packet match rule between source and destination class of service. @@ -293,7 +397,7 @@ typedef struct odp_pmr_match_t { * of inspecting the return value when installing such rules, and perform * appropriate fallback action. * - * @param[in] terms Array of odp_pmr_match_t entries, one entry per + * @param[in] terms Array of odp_pmr_param_t entries, one entry per * term desired. * @param[in] num_terms Number of terms in the match rule. * @param[in] src_cos source CoS handle @@ -302,7 +406,7 @@ typedef struct odp_pmr_match_t { * @return Handle to the Packet Match Rule. * @retval ODP_PMR_INVAL on failure */ -odp_pmr_t odp_cls_pmr_create(const odp_pmr_match_t *terms, int num_terms, +odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, odp_cos_t src_cos, odp_cos_t dst_cos); /** @@ -323,20 +427,6 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_match_t *terms, int num_terms, int odp_cls_pmr_destroy(odp_pmr_t pmr_id); /** - * Inquire about matching terms supported by the classifier - * - * @return A mask one bit per enumerated term, one for each of odp_pmr_term_t - */ -unsigned long long odp_pmr_terms_cap(void); - -/** - * Return the number of packet matching terms available for use - * - * @return A number of packet matcher resources available for use. - */ -unsigned odp_pmr_terms_avail(void); - -/** * Assigns a packet pool for a specific class of service. * All the packets belonging to the given class of service will * be allocated from the assigned packet pool.