From patchwork Wed May 3 09:25:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramanian Manoharan X-Patchwork-Id: 98474 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp204698qgd; Wed, 3 May 2017 02:25:18 -0700 (PDT) X-Received: by 10.237.48.66 with SMTP id 60mr34346641qte.25.1493803518469; Wed, 03 May 2017 02:25:18 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id n55si19962907qtf.332.2017.05.03.02.25.17; Wed, 03 May 2017 02:25:18 -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 sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id BDE8C609A5; Wed, 3 May 2017 09:25:17 +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=-3.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SORBS_WEB 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 9CD5D60828; Wed, 3 May 2017 09:25: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 8BF1F6085E; Wed, 3 May 2017 09:25:10 +0000 (UTC) Received: from mail-pf0-f177.google.com (mail-pf0-f177.google.com [209.85.192.177]) by lists.linaro.org (Postfix) with ESMTPS id ADC046081E for ; Wed, 3 May 2017 09:25:08 +0000 (UTC) Received: by mail-pf0-f177.google.com with SMTP id q66so9990704pfi.3 for ; Wed, 03 May 2017 02:25:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0omI71ITPGk4KfwtxzY6Dzhi2BQ3//brIS69U+Cj09M=; b=iEVtCHN8OMviHlR2h7n9cun33TApSrVXQRRjCHBjJutgb4kK0yxbF0m8BkfdCW0FRD ipg6yRFUBgEM8kaTshOk/Cw9z+2AnOuIH366pvvLYtDPCTr+L6vAA/cVW2y3l1L84PGI BbmkD/Ruw4IVevTII8Wq63FAaSBrbP6BzT+MpQjG+fiwpIrIj6vGRe/fWe0K6qGjKGDm Q2erm6rxc3oyWlQ6gDewvdI75Re2TJL6CJ6CgBcS1GzaZUqXv55UZt5de/VWsRyXyEDl ZHkE9k9qeUqVmDXTxksLR4RMe5nIJvI4sTdrqLc7RHuG+PX5+UZYeb2H+TTY4mYoPSaL x/5w== X-Gm-Message-State: AN3rC/6W/Wkhd11xJrNQB3DHnVjc9KH72iyFIfYcwRpu3VHpZXUqasuh jekm1eHXs4aIgqKUg6E= X-Received: by 10.98.194.69 with SMTP id l66mr3625919pfg.55.1493803507842; Wed, 03 May 2017 02:25:07 -0700 (PDT) Received: from bala-Vostro-2520.caveonetworks.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id r77sm4024361pfe.105.2017.05.03.02.25.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 May 2017 02:25:07 -0700 (PDT) From: Balasubramanian Manoharan To: lng-odp@lists.linaro.org Date: Wed, 3 May 2017 14:55:00 +0530 Message-Id: <1493803502-4500-1-git-send-email-bala.manoharan@linaro.org> X-Mailer: git-send-email 1.9.1 Subject: [lng-odp] [PATCH 1/3] api: classification: add support for packet hashing in classification 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" Enable packet hashing per CoS to be able to distribute incoming packets to multiple queues linked with a CoS. Signed-off-by: Balasubramanian Manoharan --- include/odp/api/spec/classification.h | 71 ++++++++++++++++++++++++++++++++--- include/odp/api/spec/packet_io.h | 21 +++++++++++ 2 files changed, 87 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 39831b2..b4b943a 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ - /** * @file * @@ -19,12 +18,13 @@ extern "C" { #endif +#include +#include /** @defgroup odp_classification ODP CLASSIFICATION * Classification operations. * @{ */ - /** * @typedef odp_cos_t * ODP Class of service handle @@ -126,6 +126,19 @@ typedef struct odp_cls_capability_t { /** Maximum number of CoS supported */ unsigned max_cos; + /* support mode for plain queue */ + odp_support_t plain_queue; + + /* support mode for sched queue */ + odp_support_t sched_queue; + + /** Maximun number of queue supported per CoS + * if the value is 1, then hashing is not supported*/ + unsigned max_queue_supported; + + /** Protocol header combination supported for Hashing */ + odp_pktin_hash_proto_t hash_supported; + /** A Boolean to denote support of PMR range */ odp_bool_t pmr_range_supported; } odp_cls_capability_t; @@ -164,9 +177,40 @@ typedef enum { * Used to communicate class of service creation options */ typedef struct odp_cls_cos_param { - odp_queue_t queue; /**< Queue associated with CoS */ - odp_pool_t pool; /**< Pool associated with CoS */ - odp_cls_drop_t drop_policy; /**< Drop policy associated with CoS */ + /* Number of queues to be linked to this CoS. + * If the number is greater than 1 then hashing has to be + * configured. If number is equal to 1 then hashing is disabled + * and queue has to be configured by the application. + * When hashing is enabled the queues are created by the implementation + * and application need not configure any queue to the class of service + * Depening on the implementation this number might be rounded-off to + * nearest supported value (e.g power of 2) + * */ + uint32_t num_queue; + + /** Queue type */ + odp_queue_type_t queue_type; + + /** ODP Queue dequeue mode + * This value is valid only for PLAIN queue types */ + odp_queue_op_mode_t deq_mode; + + /** Schedule parameters for the queue created */ + odp_schedule_param_t sched_param; + + /* Protocol header fields which are included in packet input + * hash calculation */ + odp_hash_proto_t hash_proto; + + /* If hashing is disabled, then application has to configure + * this queue and packets are delivered to this queue */ + odp_queue_t queue; + + /* Pool associated with CoS */ + odp_pool_t pool; + + /* Drop policy associated with CoS */ + odp_cls_drop_t drop_policy; } odp_cls_cos_param_t; /** @@ -209,6 +253,23 @@ int odp_cls_capability(odp_cls_capability_t *capability); odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param); /** + * Queue hash result + * Returns the queue within a CoS in which a particular packet will be enqueued + * based on the packet parameters and hash protocol field configured with the + * class of service. + * + * @param cos class of service + * @param packet Packet handle + * + * @retval Returns the queue handle on which this packet will be + * enqueued. + * @retval ODP_QUEUE_INVALID for error case + * + * @note The packet has to be updated with valid header pointers L2, L3 and L4. + */ +odp_queue_t odp_queue_hash_result(odp_cos_t cos, odp_packet_t packet); + +/** * Discard a class-of-service along with all its associated resources * * @param[in] cos_id class-of-service instance. diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 8802089..1a40a1f 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -131,6 +131,27 @@ typedef union odp_pktin_hash_proto_t { } odp_pktin_hash_proto_t; /** + * Packet hash protocols + * + * The list of protocol header field combination in enum format, which are + * included in packet hash calculation. + */ +typedef enum odp_hash_proto_t { + /** IPv4 address and UDP port numbers */ + ODP_HASH_PROTO_IPV4_UDP, + /** IPv4 addresses and TCP port numbers */ + ODP_HASH_PROTO_IPV4_TCP, + /** IPv4 addresses */ + ODP_HASH_PROTO_IPV4, + /** IPv6 addresses and UDP port numbers */ + ODP_HASH_PROTO_IPV6_UDP, + /** IPv6 addresses and TCP port numbers */ + ODP_HASH_PROTO_IPV6_TCP, + /** IPv6 addresses */ + ODP_HASH_PROTO_IPV6 +} odp_hash_proto_t; + +/** * Packet IO operation mode */ typedef enum odp_pktio_op_mode_t { From patchwork Wed May 3 09:25:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramanian Manoharan X-Patchwork-Id: 98475 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp204886qgd; Wed, 3 May 2017 02:25:54 -0700 (PDT) X-Received: by 10.55.59.139 with SMTP id i133mr1820109qka.248.1493803554614; Wed, 03 May 2017 02:25:54 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id i10si2402754qtc.275.2017.05.03.02.25.54; Wed, 03 May 2017 02:25:54 -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 sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 091A560846; Wed, 3 May 2017 09:25:54 +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=-2.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SORBS_SPAM, RCVD_IN_SORBS_WEB 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 0D22460C5D; Wed, 3 May 2017 09:25:18 +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 4CAA56085E; Wed, 3 May 2017 09:25:12 +0000 (UTC) Received: from mail-pg0-f47.google.com (mail-pg0-f47.google.com [74.125.83.47]) by lists.linaro.org (Postfix) with ESMTPS id 4ABF86081E for ; Wed, 3 May 2017 09:25:11 +0000 (UTC) Received: by mail-pg0-f47.google.com with SMTP id v1so75368310pgv.1 for ; Wed, 03 May 2017 02:25:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YaICWo7MPMzmqpFTqfGEVertu1TAuZ0WDBE+zPFe9HI=; b=QYXkHO9SWLuHdfz85z/8VlZuOgFyJtDnnglj0f6Bsso+w7upVum6CqegFOnB1Pc1yI U33/oXCHOXev+YYbapA9B0hMrgw4ujPf9oPGJkiIsxI48iI1sbgFNeKOpU2rUDzsbaXN F9yY/0ZAbe2z/FjPmOxpoAT4kRzLdsX7Wjjj7oZfrWcvmkFHYpHL+D9lk2Gol6F/ncrr +oqkghIyX9s+S04U1U5GNE/J48dGJJLrqZP3xjLYhTIHKdB70JRqTrRgFedVrl2Pldi+ QKzChk4srfnUx0W87ox1eRwbCYeg0zc7TZVJpqrRdYE631Rp2B6YsK2tDwmeJP+3GLgu 9/rg== X-Gm-Message-State: AN3rC/4pnesfPA4vccW/24llGqXJtvKnWPrbCRZWoXuTrvdJ/hS20+Hy hbGdWHCbX8H3Ayu62Hw= X-Received: by 10.84.224.77 with SMTP id a13mr27320314plt.132.1493803510520; Wed, 03 May 2017 02:25:10 -0700 (PDT) Received: from bala-Vostro-2520.caveonetworks.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id r77sm4024361pfe.105.2017.05.03.02.25.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 May 2017 02:25:10 -0700 (PDT) From: Balasubramanian Manoharan To: lng-odp@lists.linaro.org Date: Wed, 3 May 2017 14:55:01 +0530 Message-Id: <1493803502-4500-2-git-send-email-bala.manoharan@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493803502-4500-1-git-send-email-bala.manoharan@linaro.org> References: <1493803502-4500-1-git-send-email-bala.manoharan@linaro.org> Subject: [lng-odp] [PATCH 2/3] linux-generic: add Toeplitz hash algorithm 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" Implements Toeplitz hash algorithm for packet hashing Signed-off-by: Balasubramanian Manoharan --- platform/linux-generic/include/protocols/thash.h | 108 +++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 platform/linux-generic/include/protocols/thash.h -- 1.9.1 diff --git a/platform/linux-generic/include/protocols/thash.h b/platform/linux-generic/include/protocols/thash.h new file mode 100644 index 0000000..fe141e3 --- /dev/null +++ b/platform/linux-generic/include/protocols/thash.h @@ -0,0 +1,108 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP Toeplitz hash function + */ + +#ifndef ODPH_THASH_H_ +#define ODPH_THASH_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** IPv4 tuple + * + */ +typedef struct thash_ipv4_tuple { + uint32_t src_addr; + uint32_t dst_addr; + union { + struct { + uint16_t sport; + uint16_t dport; + }; + uint32_t sctp_tag; + }; +} thash_ipv4_tuple_t; + +typedef struct thash_ipv6_tuple { + uint8_t src_addr[16]; + uint8_t dst_addr[16]; + union { + struct { + uint16_t sport; + uint16_t dport; + }; + uint32_t sctp_tag; + }; +} thash_ipv6_tuple_t; + +#define ODP_THASH_V4_L4_LEN (sizeof(thash_ipv4_tuple_t) / 4) + +#define ODP_THASH_V4_L3_LEN ((sizeof(thash_ipv4_tuple_t) - \ + sizeof(((thash_ipv4_tuple_t *)0)->sctp_tag)) / 4) + +#define ODP_THASH_V6_L4_LEN (sizeof(thash_ipv6_tuple_t) / 4) + +#define ODP_THASH_V6_L3_LEN ((sizeof(thash_ipv6_tuple_t) - \ + sizeof(((thash_ipv6_tuple_t *)0)->sctp_tag)) / 4) + +typedef union { + thash_ipv4_tuple_t v4; + thash_ipv6_tuple_t v6; +} thash_tuple_t; + +static inline +void thash_load_ipv6_addr(const _odp_ipv6hdr_t *ipv6, + thash_tuple_t *tuple) +{ + int i; + + for (i = 0; i < 4; i++) { + *((uint32_t *)tuple->v6.src_addr + i) = + odp_be_to_cpu_32(*((const uint32_t *)ipv6->src_addr.u32 + i)); + + *((uint32_t *)tuple->v6.dst_addr + i) = + odp_be_to_cpu_32(*((const uint32_t *)ipv6->dst_addr.u32 + i)); + } +} + +static inline +uint32_t thash_softrss(uint32_t *tuple, uint8_t len, + const uint8_t *key) +{ + uint32_t i, j, ret; + + ret = 0; + for (j = 0; j < len; j++) { + for (i = 0; i < 32; i++) { + if (tuple[j] & (1 << (31 - i))) { + ret ^= odp_cpu_to_be_32(((const uint32_t *) + key)[j]) << i | (uint32_t)((uint64_t) + (odp_cpu_to_be_32(((const uint32_t *)key) + [j + 1])) >> (32 - i)); + } + } + } + + return ret; +} + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif From patchwork Wed May 3 09:25:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramanian Manoharan X-Patchwork-Id: 98476 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp205055qgd; Wed, 3 May 2017 02:26:24 -0700 (PDT) X-Received: by 10.55.198.89 with SMTP id b86mr1813574qkj.188.1493803584257; Wed, 03 May 2017 02:26:24 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id i186si1244776qkf.173.2017.05.03.02.26.24; Wed, 03 May 2017 02:26:24 -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 sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id EA97E6095A; Wed, 3 May 2017 09:26:23 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_WEB 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 8ECC5607D6; Wed, 3 May 2017 09:25:48 +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 8A9356083B; Wed, 3 May 2017 09:25:41 +0000 (UTC) Received: from mail-pg0-f42.google.com (mail-pg0-f42.google.com [74.125.83.42]) by lists.linaro.org (Postfix) with ESMTPS id 01CB26088B for ; Wed, 3 May 2017 09:25:13 +0000 (UTC) Received: by mail-pg0-f42.google.com with SMTP id y4so70092375pge.0 for ; Wed, 03 May 2017 02:25:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tYUBbJrghgMeVnazitHIMkyy20SRR4nVdkMBOX+yE8Y=; b=locqbvheSo3EO9PCYKLeWtxSXVFBl/iMjbe+ChnnnLEOL05xsMEHlkdsCMPSpNPoWV dcu5fqfg8bVuHTuJFAEHjderJxThw+lnjQQScENCQ2pqBvzFd9g0iHjnt6t9iRCjCTPJ lJnYtc4oyZrb24cpHLlHB+SvdPZOZixIaDNsvzr3sOFf3ITFKb79eCThcWfMuTDuIUU1 rUNFa3kiOQqlu/3k659GsihyvmxjC5a02uZyOZMA3Xnud+qi3RgCJP9gRfYfRFMvyoxJ RtxMHS+ocLjRLD+AQjlqn3wt7bUnSCQoi78rwF+nEJV8D/oPvUcU9HTypgiF/30KjqAH Mw9A== X-Gm-Message-State: AN3rC/4ubqVYvVNso3kmriDCdKzrl+z9q09dc0lEliIez+ipvpw325Y7 ZcXyDnRpO/Exeg6EVzc= X-Received: by 10.99.117.26 with SMTP id q26mr10022604pgc.21.1493803512097; Wed, 03 May 2017 02:25:12 -0700 (PDT) Received: from bala-Vostro-2520.caveonetworks.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id r77sm4024361pfe.105.2017.05.03.02.25.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 May 2017 02:25:11 -0700 (PDT) From: Balasubramanian Manoharan To: lng-odp@lists.linaro.org Date: Wed, 3 May 2017 14:55:02 +0530 Message-Id: <1493803502-4500-3-git-send-email-bala.manoharan@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493803502-4500-1-git-send-email-bala.manoharan@linaro.org> References: <1493803502-4500-1-git-send-email-bala.manoharan@linaro.org> Subject: [lng-odp] [PATCH 3/3] linux-generic: classification: implement packet hashing in classifier 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" Implement packet hashing feature to distribute incoming packet to multiple queues linked with CoS. Signed-off-by: Balasubramanian Manoharan --- .../include/odp_classification_datamodel.h | 18 +++ .../include/odp_classification_internal.h | 4 + platform/linux-generic/odp_classification.c | 161 +++++++++++++++++++-- 3 files changed, 168 insertions(+), 15 deletions(-) -- 1.9.1 diff --git a/platform/linux-generic/include/odp_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h index 9df756b..b44a547 100644 --- a/platform/linux-generic/include/odp_classification_datamodel.h +++ b/platform/linux-generic/include/odp_classification_datamodel.h @@ -46,6 +46,10 @@ extern "C" { /* Max PMR Term bits */ #define ODP_PMR_TERM_BYTES_MAX 16 +#define ODP_COS_QUEUE_MAX 32 + +#define ODP_CLS_QUEUE_GROUP_MAX (ODP_COS_MAX_ENTRY * ODP_COS_QUEUE_MAX) + /** Packet Matching Rule Term Value @@ -94,7 +98,12 @@ struct cos_s { size_t headroom; /* Headroom for this CoS */ odp_spinlock_t lock; /* cos lock */ odp_atomic_u32_t num_rule; /* num of PMRs attached with this CoS */ + bool queue_group; + odp_hash_proto_t hash_proto; + uint32_t num_queue; + odp_queue_param_t queue_param; char name[ODP_COS_NAME_LEN]; /* name */ + uint8_t index; }; typedef union cos_u { @@ -122,6 +131,15 @@ typedef union pmr_u { uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pmr_s))]; } pmr_t; +typedef struct _cls_queue_grp_tbl_s { + odp_queue_t queue[ODP_CLS_QUEUE_GROUP_MAX]; +} _cls_queue_grp_tbl_s; + +typedef union _cls_queue_grp_tbl_t { + _cls_queue_grp_tbl_s s; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(_cls_queue_grp_tbl_s))]; +} _cls_queue_grp_tbl_t; + /** L2 QoS and CoS Map diff --git a/platform/linux-generic/include/odp_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h index 78eaac9..f2ac608 100644 --- a/platform/linux-generic/include/odp_classification_internal.h +++ b/platform/linux-generic/include/odp_classification_internal.h @@ -138,6 +138,10 @@ Otherwise. **/ int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr); +uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, + odp_hash_proto_t hash_proto, + const uint8_t *base); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 7ebc47d..9028482 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -30,6 +31,16 @@ static cos_tbl_t *cos_tbl; static pmr_tbl_t *pmr_tbl; +static _cls_queue_grp_tbl_t *queue_grp_tbl; + +const uint8_t default_rss[] = { + 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, + 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, + 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4, + 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c, + 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa, +}; + cos_t *get_cos_entry_internal(odp_cos_t cos_id) { @@ -45,6 +56,7 @@ int odp_classification_init_global(void) { odp_shm_t cos_shm; odp_shm_t pmr_shm; + odp_shm_t queue_grp_shm; int i; cos_shm = odp_shm_reserve("shm_odp_cos_tbl", @@ -89,8 +101,22 @@ int odp_classification_init_global(void) LOCK_INIT(&pmr->s.lock); } + queue_grp_shm = odp_shm_reserve("shm_odp_cls_queue_grp_tbl", + sizeof(_cls_queue_grp_tbl_t), + sizeof(queue_entry_t *), 0); + + if (queue_grp_shm == ODP_SHM_INVALID) { + ODP_ERR("shm allocation failed for queue_grp_tbl"); + goto error_queue_grp; + } + + queue_grp_tbl = odp_shm_addr(queue_grp_shm); + memset(queue_grp_tbl, 0, sizeof(_cls_queue_grp_tbl_t)); + return 0; +error_queue_grp: + odp_shm_free(queue_grp_shm); error_pmr: odp_shm_free(pmr_shm); error_cos: @@ -124,6 +150,11 @@ void odp_cls_cos_param_init(odp_cls_cos_param_t *param) param->queue = ODP_QUEUE_INVALID; param->pool = ODP_POOL_INVALID; param->drop_policy = ODP_COS_DROP_NEVER; + param->num_queue = 1; + param->deq_mode = ODP_QUEUE_OP_MT; + param->sched_param.prio = ODP_SCHED_PRIO_DEFAULT; + param->sched_param.sync = ODP_SCHED_SYNC_PARALLEL; + param->sched_param.group = ODP_SCHED_GROUP_ALL; } void odp_cls_pmr_param_init(odp_pmr_param_t *param) @@ -159,19 +190,23 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) int i, j; queue_entry_t *queue; odp_cls_drop_t drop_policy; + cos_t *cos; /* Packets are dropped if Queue or Pool is invalid*/ if (param->queue == ODP_QUEUE_INVALID) queue = NULL; else queue = queue_to_qentry(param->queue); + if (param->num_queue > ODP_COS_QUEUE_MAX) + return ODP_COS_INVALID; drop_policy = param->drop_policy; for (i = 0; i < ODP_COS_MAX_ENTRY; i++) { - LOCK(&cos_tbl->cos_entry[i].s.lock); - if (0 == cos_tbl->cos_entry[i].s.valid) { - char *cos_name = cos_tbl->cos_entry[i].s.name; + cos = &cos_tbl->cos_entry[i]; + LOCK(&cos->s.lock); + if (0 == cos->s.valid) { + char *cos_name = cos->s.name; if (name == NULL) { cos_name[0] = 0; @@ -180,20 +215,32 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) cos_name[ODP_COS_NAME_LEN - 1] = 0; } for (j = 0; j < ODP_PMR_PER_COS_MAX; j++) { - cos_tbl->cos_entry[i].s.pmr[j] = NULL; - cos_tbl->cos_entry[i].s.linked_cos[j] = NULL; + cos->s.pmr[j] = NULL; + cos->s.linked_cos[j] = NULL; } - cos_tbl->cos_entry[i].s.queue = queue; - cos_tbl->cos_entry[i].s.pool = param->pool; - cos_tbl->cos_entry[i].s.headroom = 0; - cos_tbl->cos_entry[i].s.valid = 1; - cos_tbl->cos_entry[i].s.drop_policy = drop_policy; - odp_atomic_init_u32(&cos_tbl->cos_entry[i] - .s.num_rule, 0); - UNLOCK(&cos_tbl->cos_entry[i].s.lock); + + if (param->num_queue > 1) { + odp_queue_param_init(&cos->s.queue_param); + cos->s.queue_group = true; + cos->s.hash_proto = param->hash_proto; + cos->s.num_queue = param->num_queue; + cos->s.queue_param.type = + param->queue_type; + cos->s.queue_param.sched = + param->sched_param; + } + + cos->s.queue = queue; + cos->s.pool = param->pool; + cos->s.headroom = 0; + cos->s.valid = 1; + cos->s.drop_policy = drop_policy; + odp_atomic_init_u32(&cos->s.num_rule, 0); + cos->s.index = i; + UNLOCK(&cos->s.lock); return _odp_cast_scalar(odp_cos_t, i); } - UNLOCK(&cos_tbl->cos_entry[i].s.lock); + UNLOCK(&cos->s.lock); } ODP_ERR("ODP_COS_MAX_ENTRY reached"); @@ -830,6 +877,10 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, odp_packet_hdr_t *pkt_hdr) { cos_t *cos; + uint32_t tbl_index; + uint32_t hash; + odp_queue_t queue; + char queue_name[ODP_QUEUE_NAME_LEN]; packet_parse_reset(pkt_hdr); packet_set_len(pkt_hdr, pkt_len); @@ -846,11 +897,91 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, *pool = cos->s.pool; pkt_hdr->p.input_flags.dst_queue = 1; - pkt_hdr->dst_queue = cos->s.queue->s.handle; + if (!cos->s.queue_group) { + pkt_hdr->dst_queue = cos->s.queue->s.handle; + return 0; + } + + hash = packet_rss_hash(pkt_hdr, cos->s.hash_proto, base); + hash = hash & 0x1F; + hash = hash & cos->s.num_queue; + tbl_index = (cos->s.index * ODP_COS_QUEUE_MAX) + hash; + + if (!queue_grp_tbl->s.queue[tbl_index]) { + LOCK(&cos->s.lock); + if (!queue_grp_tbl->s.queue[tbl_index]) + UNLOCK(&cos->s.lock); + + sprintf(queue_name, "%s%d", "queue_group", tbl_index); + queue = odp_queue_create(queue_name, &cos->s.queue_param); + queue_grp_tbl->s.queue[tbl_index] = queue; + UNLOCK(&cos->s.lock); + } + + pkt_hdr->dst_queue = queue_grp_tbl->s.queue[tbl_index]; return 0; } +uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, + odp_hash_proto_t hash_proto, + const uint8_t *base) +{ + thash_tuple_t tuple; + const _odp_ipv4hdr_t *ipv4; + const _odp_udphdr_t *udp; + const _odp_tcphdr_t *tcp; + uint32_t hash; + + hash = 0; + switch (hash_proto) { + case ODP_HASH_PROTO_IPV4_UDP: /** IPV4 + UDP */ + ipv4 = (const _odp_ipv4hdr_t *)base + pkt_hdr->p.l3_offset; + udp = (const _odp_udphdr_t *)base + pkt_hdr->p.l4_offset; + tuple.v4.src_addr = ipv4->src_addr; + tuple.v4.dst_addr = ipv4->dst_addr; + tuple.v4.sport = udp->src_port; + tuple.v4.dport = udp->dst_port; + hash = thash_softrss((uint32_t *)&tuple, + ODP_THASH_V4_L4_LEN, default_rss); + break; + + case ODP_HASH_PROTO_IPV4_TCP: /** IPV4 + TCP */ + ipv4 = (const _odp_ipv4hdr_t *)base + pkt_hdr->p.l3_offset; + tcp = (const _odp_tcphdr_t *)base + pkt_hdr->p.l4_offset; + tuple.v4.src_addr = ipv4->src_addr; + tuple.v4.dst_addr = ipv4->dst_addr; + tuple.v4.sport = tcp->src_port; + tuple.v4.dport = tcp->dst_port; + hash = thash_softrss((uint32_t *)&tuple, + ODP_THASH_V4_L4_LEN, default_rss); + + break; + case ODP_HASH_PROTO_IPV4: /** IPV4 */ + 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; + hash = thash_softrss((uint32_t *)&tuple, + ODP_THASH_V4_L3_LEN, default_rss); + + break; + + case ODP_HASH_PROTO_IPV6_UDP: /** IPV6 + UDP */ + break; + + case ODP_HASH_PROTO_IPV6_TCP: /** IPV6 + TCP */ + break; + + case ODP_HASH_PROTO_IPV6: /** IPV6 */ + break; + + default: + break; + } + + return hash; +} + cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr) {