1 files changed, 20 insertions, 1 deletions

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index dce3ae0fbca2..ffa1d18f2c2c 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -1054,11 +1054,23 @@ static ssize_t traffic_class_show(struct netdev_queue *queue,
                 return -ENOENT;
 
         index = get_netdev_queue_index(queue);
+
+        /* If queue belongs to subordinate dev use its TC mapping */
+        dev = netdev_get_tx_queue(dev, index)->sb_dev ? : dev;
+
         tc = netdev_txq_to_tc(dev, index);
         if (tc < 0)
                 return -EINVAL;
 
-        return sprintf(buf, "%u\n", tc);
+        /* We can report the traffic class one of two ways:
+         * Subordinate device traffic classes are reported with the traffic
+         * class first, and then the subordinate class so for example TC0 on
+         * subordinate device 2 will be reported as "0-2". If the queue
+         * belongs to the root device it will be reported with just the
+         * traffic class, so just "0" for TC 0 for example.
+         */
+        return dev->num_tc < 0 ? sprintf(buf, "%u%d\n", tc, dev->num_tc) :
+                                 sprintf(buf, "%u\n", tc);
 }
 
 #ifdef CONFIG_XPS
@@ -1225,7 +1237,14 @@ static ssize_t xps_cpus_show(struct netdev_queue *queue,
         index = get_netdev_queue_index(queue);
 
         if (dev->num_tc) {
+                /* Do not allow XPS on subordinate device directly */
                 num_tc = dev->num_tc;
+                if (num_tc < 0)
+                        return -EINVAL;
+
+                /* If queue belongs to subordinate dev use its map */
+                dev = netdev_get_tx_queue(dev, index)->sb_dev ? : dev;
+
                 tc = netdev_txq_to_tc(dev, index);
                 if (tc < 0)
                         return -EINVAL;