From patchwork Thu Feb 5 06:04:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 2997 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 444BDB400; Thu, 5 Feb 2015 07:05:05 +0100 (CET) Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by dpdk.org (Postfix) with ESMTP id 06E75B3FF for ; Thu, 5 Feb 2015 07:05:03 +0100 (CET) Received: by mail-pa0-f46.google.com with SMTP id lj1so7828317pab.5 for ; Wed, 04 Feb 2015 22:05:02 -0800 (PST) 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=UaoJlJdQ6zN3jdyvccFaKdBDQlfG5yehuEkhDD95Axo=; b=TmkkD4qX7wvRlnTJOI7Udf1cfBfnk2ocLpVQspuBOKmuswpUKE8JSy6xW3Eok2K9Eh /iuxvbbbCkbU/f6pcfgrINxInRBnP/UpV42/aBwqXhJ+/bJ0vC3eYmiLuIFWyI7h4B1H D2fRiAPPSctOJqNJ/jT/7Bce/mhEcFMNTh9oMItL4559u/oBhZ3HDcfVLrNNjst3nfrS g2qCPARgVikDZ6csRn8So8eP6o2XuAt/iUcy/LRhkDwyGkgyRhH/vAUp7OUd5+3PBg8h tx6L+rp0VN3F21qkm2JvAPjMERlNFNxUanRK2gZy/oJeakX957ulibec31iZ64SHUw+h vAfw== X-Gm-Message-State: ALoCoQnfB63iMOtj/wxNUUZuCAt/eX96lbtCbDfNa4CaoxRkOidQucAGUNj9udYES4jItYyQwhrj X-Received: by 10.66.120.236 with SMTP id lf12mr2271534pab.67.1423116300679; Wed, 04 Feb 2015 22:05:00 -0800 (PST) Received: from urahara.brocade.com (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by mx.google.com with ESMTPSA id sl5sm3817154pbc.45.2015.02.04.22.04.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 22:05:00 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Date: Wed, 4 Feb 2015 22:04:49 -0800 Message-Id: <1423116294-17080-2-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1423116294-17080-1-git-send-email-stephen@networkplumber.org> References: <1423116294-17080-1-git-send-email-stephen@networkplumber.org> Cc: Stephen Hemminger Subject: [dpdk-dev] [PATCH v2 2/7] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: Konstantin Ananyev --- v2 use tag area rather than claiming reserved bit which isn't documented 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 16059c6..8f0c3a4 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -258,7 +258,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..dda287f 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;