diff options
| author | Amritha Nambiar | 2017-09-07 13:00:22 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2017-10-13 23:06:37 +0200 |
| commit | a9ce82f744dc401ec27c787e2eacf3bbb33565ec (patch) | |
| tree | dac2a2b68724893f22e68fe4887f0c3a2381da17 /drivers/net/ethernet/intel/i40e/i40e.h | |
| parent | i40e: Add infrastructure for queue channel support (diff) | |
| download | kernel-qcow2-linux-a9ce82f744dc401ec27c787e2eacf3bbb33565ec.tar.gz kernel-qcow2-linux-a9ce82f744dc401ec27c787e2eacf3bbb33565ec.tar.xz kernel-qcow2-linux-a9ce82f744dc401ec27c787e2eacf3bbb33565ec.zip | |
i40e: Enable 'channel' mode in mqprio for TC configs
The i40e driver is modified to enable the new mqprio hardware
offload mode and factor the TCs and queue configuration by
creating channel VSIs. In this mode, the priority to traffic
class mapping and the user specified queue ranges are used
to configure the traffic classes by setting the mode option to
'channel'.
Example:
map 0 0 0 0 1 2 2 3 queues 2@0 2@2 1@4 1@5\
hw 1 mode channel
qdisc mqprio 8038: root tc 4 map 0 0 0 0 1 2 2 3 0 0 0 0 0 0 0 0
queues:(0:1) (2:3) (4:4) (5:5)
mode:channel
shaper:dcb
The HW channels created are removed and all the queue configuration
is set to default when the qdisc is detached from the root of the
device.
This patch also disables setting up channels via ethtool (ethtool -L)
when the TCs are configured using mqprio scheduler.
The patch also limits setting ethtool Rx flow hash indirection
(ethtool -X eth0 equal N) to max queues configured via mqprio.
The Rx flow hash indirection input through ethtool should be
validated so that it is within in the queue range configured via
tc/mqprio. The bound checking is achieved by reporting the current
rss size to the kernel when queues are configured via mqprio.
Example:
map 0 0 0 1 0 2 3 0 queues 2@0 4@2 8@6 11@14\
hw 1 mode channel
Cannot set RX flow hash configuration: Invalid argument
Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e.h')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index bde982541772..024c88474951 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -54,6 +54,7 @@ #include <linux/clocksource.h> #include <linux/net_tstamp.h> #include <linux/ptp_clock_kernel.h> +#include <net/pkt_cls.h> #include "i40e_type.h" #include "i40e_prototype.h" #include "i40e_client.h" @@ -700,6 +701,7 @@ struct i40e_vsi { enum i40e_vsi_type type; /* VSI type, e.g., LAN, FCoE, etc */ s16 vf_id; /* Virtual function ID for SRIOV VSIs */ + struct tc_mqprio_qopt_offload mqprio_qopt; /* queue parameters */ struct i40e_tc_configuration tc_config; struct i40e_aqc_vsi_properties_data info; @@ -725,6 +727,7 @@ struct i40e_vsi { u16 cnt_q_avail; /* num of queues available for channel usage */ u16 orig_rss_size; u16 current_rss_size; + bool reconfig_rss; u16 next_base_queue; /* next queue to be used for channel setup */ |