From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f180.google.com (mail-pd0-f180.google.com [209.85.192.180]) by dpdk.org (Postfix) with ESMTP id CFED6C97C for ; Wed, 29 Apr 2015 19:04:41 +0200 (CEST) Received: by pdbqd1 with SMTP id qd1so33655677pdb.2 for ; Wed, 29 Apr 2015 10:04:41 -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:in-reply-to :references; bh=BQW0cTfpY54KrO7GSLr5uK7XYCT6NzVjGd6mXGn+gUA=; b=di4ZwV35yqKKQutcRiWbLg0BV7StQ1NwPKtrGSM8kiHe500+8JY2QQcuT/NnqmQ6kC LMCbM6xLdTF5JRyT+jdzx/cUhaKCqcC0sakMIQ8A+hgid9ZMBIQ4TdoJOq4ABnLG6cn5 EFWKEcSOvl0JQlU5xxOYhPQ8/JQ1fFH56+5Zk9e+LQ8K2dgWe7ZaVM07dSCqhICqL8YN mY8vA0V0cfsDNxAi1okOGwLD9NQUroY1rvxyMr82S8/kY/GgEvDyAqZPK0jKQQc53Swy v69t7D2KmOmeRqpoQfOGetQmiyNwH3YkUtgrdBgG/FwB9J9IC7b9hWgrNZFCmvje1GMa 74+A== X-Gm-Message-State: ALoCoQnbWdy8M2RJaNlA9TL0NQJvNlIlh4utoQjdwiPc9JngL48dscdS/XW2wlMAYrVV52kivLYC X-Received: by 10.70.34.193 with SMTP id b1mr86678pdj.154.1430327081233; Wed, 29 Apr 2015 10:04:41 -0700 (PDT) Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by mx.google.com with ESMTPSA id i9sm25995113pdj.27.2015.04.29.10.04.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Apr 2015 10:04:40 -0700 (PDT) From: Stephen Hemminger To: cristian.dumitrescu@intel.com Date: Wed, 29 Apr 2015 10:04:36 -0700 Message-Id: <1430327080-12642-3-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1430327080-12642-1-git-send-email-stephen@networkplumber.org> References: <1430327080-12642-1-git-send-email-stephen@networkplumber.org> Cc: dev@dpdk.org, Stephen Hemminger Subject: [dpdk-dev] [PATCH 2/6] rte_sched: expand scheduler hierarchy for more VLAN's X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 17:04:42 -0000 From: Stephen Hemminger The QoS subport is limited to 8 bits in original code. But customers demanded ability to support full number of VLAN's (4096) therefore use the full part of the tag field of mbuf. Resize the pipe as well to allow for more pipes in future and avoid expensive bitfield access. Signed-off-by: Stephen Hemminger --- lib/librte_mbuf/rte_mbuf.h | 5 ++++- lib/librte_sched/rte_sched.h | 38 ++++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 70b0987..3dde695 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -285,7 +285,10 @@ struct rte_mbuf { /**< First 4 flexible bytes or FD ID, dependent on PKT_RX_FDIR_* flag in ol_flags. */ } fdir; /**< Filter identifier if FDIR enabled */ - uint32_t sched; /**< Hierarchical scheduler */ + struct { + uint32_t lo; + uint32_t hi; + } sched; /**< Hierarchical scheduler */ uint32_t usr; /**< User defined tags. See rte_distributor_process() */ } hash; /**< hash information */ diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h index e6bba22..bf5ef8d 100644 --- a/lib/librte_sched/rte_sched.h +++ b/lib/librte_sched/rte_sched.h @@ -195,16 +195,20 @@ struct rte_sched_port_params { #endif }; -/** Path through the scheduler hierarchy used by the scheduler enqueue operation to -identify the destination queue for the current packet. Stored in the field hash.sched -of struct rte_mbuf of each packet, typically written by the classification stage and read by -scheduler enqueue.*/ +/* + * Path through the scheduler hierarchy used by the scheduler enqueue + * operation to identify the destination queue for the current + * packet. Stored in the field pkt.hash.sched of struct rte_mbuf of + * each packet, typically written by the classification stage and read + * by scheduler enqueue. + */ struct rte_sched_port_hierarchy { - uint32_t queue:2; /**< Queue ID (0 .. 3) */ - uint32_t traffic_class:2; /**< Traffic class ID (0 .. 3)*/ - uint32_t pipe:20; /**< Pipe ID */ - uint32_t subport:6; /**< Subport ID */ - uint32_t color:2; /**< Color */ + uint16_t queue:2; /**< Queue ID (0 .. 3) */ + uint16_t traffic_class:2; /**< Traffic class ID (0 .. 3)*/ + uint16_t color:2; /**< Color */ + uint16_t unused:10; + uint16_t subport; /**< Subport ID */ + uint32_t pipe; /**< Pipe ID */ }; /* @@ -350,12 +354,15 @@ rte_sched_queue_read_stats(struct rte_sched_port *port, */ static inline void rte_sched_port_pkt_write(struct rte_mbuf *pkt, - uint32_t subport, uint32_t pipe, uint32_t traffic_class, uint32_t queue, enum rte_meter_color color) + uint32_t subport, uint32_t pipe, + uint32_t traffic_class, + uint32_t queue, enum rte_meter_color color) { - struct rte_sched_port_hierarchy *sched = (struct rte_sched_port_hierarchy *) &pkt->hash.sched; + struct rte_sched_port_hierarchy *sched + = (struct rte_sched_port_hierarchy *) &pkt->hash.sched; - sched->color = (uint32_t) color; sched->subport = subport; + sched->color = (uint32_t) color; sched->pipe = pipe; sched->traffic_class = traffic_class; sched->queue = queue; @@ -379,9 +386,12 @@ rte_sched_port_pkt_write(struct rte_mbuf *pkt, * */ static inline void -rte_sched_port_pkt_read_tree_path(struct rte_mbuf *pkt, uint32_t *subport, uint32_t *pipe, uint32_t *traffic_class, uint32_t *queue) +rte_sched_port_pkt_read_tree_path(struct rte_mbuf *pkt, uint32_t *subport, + uint32_t *pipe, uint32_t *traffic_class, + uint32_t *queue) { - struct rte_sched_port_hierarchy *sched = (struct rte_sched_port_hierarchy *) &pkt->hash.sched; + struct rte_sched_port_hierarchy *sched + = (struct rte_sched_port_hierarchy *) &pkt->hash.sched; *subport = sched->subport; *pipe = sched->pipe; -- 2.1.4