sched: remove redundant code

Remove redundant data structure fields from port level data
structures and update the release notes.

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Signed-off-by: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>

diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst
index e77d226..2b4cbe6 100644 (file)
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -296,6 +296,11 @@ API Changes
   has been introduced in this release is used when used when all the packets
   enqueued in the tx adapter are destined for the same Ethernet port & Tx queue.
 
+* sched: The pipe nodes configuration parameters such as number of pipes,
+  pipe queue sizes, pipe profiles, etc., are moved from port level structure
+  to subport level. This allows different subports of the same port to
+  have different configuration for the pipe nodes.
+
 
 ABI Changes
 -----------
@@ -383,7 +388,7 @@ The libraries prepended with a plus sign were incremented in this version.
      librte_rcu.so.1
      librte_reorder.so.1
      librte_ring.so.2
-     librte_sched.so.3
+   + librte_sched.so.4
      librte_security.so.2
      librte_stack.so.1
      librte_table.so.3

diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c
index 1faa580..710ecf6 100644 (file)
--- a/lib/librte_sched/rte_sched.c
+++ b/lib/librte_sched/rte_sched.c
@@ -216,13 +216,6 @@ struct rte_sched_port {
        uint32_t mtu;
        uint32_t frame_overhead;
        int socket;
-       uint16_t qsize[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
-       uint32_t n_pipe_profiles;
-       uint32_t n_max_pipe_profiles;
-       uint32_t pipe_tc_be_rate_max;
-#ifdef RTE_SCHED_RED
-       struct rte_red_config red_config[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE][RTE_COLORS];
-#endif
 
        /* Timing */
        uint64_t time_cpu_cycles;     /* Current CPU time measured in CPU cyles */
@@ -230,48 +223,15 @@ struct rte_sched_port {
        uint64_t time;                /* Current NIC TX time measured in bytes */
        struct rte_reciprocal inv_cycles_per_byte; /* CPU cycles per byte */
 
-       /* Scheduling loop detection */
-       uint32_t pipe_loop;
-       uint32_t pipe_exhaustion;
-
-       /* Bitmap */
-       struct rte_bitmap *bmp;
-       uint32_t grinder_base_bmp_pos[RTE_SCHED_PORT_N_GRINDERS] __rte_aligned_16;
-
        /* Grinders */
-       struct rte_sched_grinder grinder[RTE_SCHED_PORT_N_GRINDERS];
-       uint32_t busy_grinders;
        struct rte_mbuf **pkts_out;
        uint32_t n_pkts_out;
        uint32_t subport_id;
 
-       /* Queue base calculation */
-       uint32_t qsize_add[RTE_SCHED_QUEUES_PER_PIPE];
-       uint32_t qsize_sum;
-
        /* Large data structures */
-       struct rte_sched_subport *subports[0];
-       struct rte_sched_subport *subport;
-       struct rte_sched_pipe *pipe;
-       struct rte_sched_queue *queue;
-       struct rte_sched_queue_extra *queue_extra;
-       struct rte_sched_pipe_profile *pipe_profiles;
-       uint8_t *bmp_array;
-       struct rte_mbuf **queue_array;
-       uint8_t memory[0] __rte_cache_aligned;
+       struct rte_sched_subport *subports[0] __rte_cache_aligned;
 } __rte_cache_aligned;
 
-enum rte_sched_port_array {
-       e_RTE_SCHED_PORT_ARRAY_SUBPORT = 0,
-       e_RTE_SCHED_PORT_ARRAY_PIPE,
-       e_RTE_SCHED_PORT_ARRAY_QUEUE,
-       e_RTE_SCHED_PORT_ARRAY_QUEUE_EXTRA,
-       e_RTE_SCHED_PORT_ARRAY_PIPE_PROFILES,
-       e_RTE_SCHED_PORT_ARRAY_BMP_ARRAY,
-       e_RTE_SCHED_PORT_ARRAY_QUEUE_ARRAY,
-       e_RTE_SCHED_PORT_ARRAY_TOTAL,
-};
-
 enum rte_sched_subport_array {
        e_RTE_SCHED_SUBPORT_ARRAY_PIPE = 0,
        e_RTE_SCHED_SUBPORT_ARRAY_QUEUE,

diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h
index 40f02f1..c82c23c 100644 (file)
--- a/lib/librte_sched/rte_sched.h
+++ b/lib/librte_sched/rte_sched.h
@@ -260,28 +260,6 @@ struct rte_sched_port_params {
         * the subports of the same port.
         */
        uint32_t n_pipes_per_subport;
-
-       /** Packet queue size for each traffic class.
-        * All the pipes within the same subport share the similar
-        * configuration for the queues.
-        */
-       uint16_t qsize[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
-
-       /** Pipe profile table.
-        * Every pipe is configured using one of the profiles from this table.
-        */
-       struct rte_sched_pipe_params *pipe_profiles;
-
-       /** Profiles in the pipe profile table */
-       uint32_t n_pipe_profiles;
-
-       /** Max profiles allowed in the pipe profile table */
-       uint32_t n_max_pipe_profiles;
-
-#ifdef RTE_SCHED_RED
-       /** RED parameters */
-       struct rte_red_params red_params[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE][RTE_COLORS];
-#endif
 };
 
 /*