From ac4c40ab13bbd42145331766f74c3928bc9e6d51 Mon Sep 17 00:00:00 2001

From: Edward Cree <ecree@solarflare.com>

Date: Fri, 9 Mar 2018 15:03:46 +0000

Subject: [PATCH 15/18] ethtool-copy.h: sync with net-next

This covers kernel changes up to commit 84a1d9c48200,

    net: ethtool: extend RXNFC API to support RSS spreading of filter matches

Signed-off-by: Edward Cree <ecree@solarflare.com>

Signed-off-by: John W. Linville <linville@tuxdriver.com>

(cherry picked from commit 23b2e3b14405221b564c5dd6d7bf48c48e3db2c8)

---

 ethtool-copy.h | 32 ++++++++++++++++++++++++++------

 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/ethtool-copy.h b/ethtool-copy.h

index f4e7bb2..8cc61e9 100644

--- a/ethtool-copy.h

+++ b/ethtool-copy.h

@@ -912,12 +912,15 @@ static __inline__ __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie)

  * @flow_type: Type of flow to be affected, e.g. %TCP_V4_FLOW

  * @data: Command-dependent value

  * @fs: Flow classification rule

+ * @rss_context: RSS context to be affected

  * @rule_cnt: Number of rules to be affected

  * @rule_locs: Array of used rule locations

  *

  * For %ETHTOOL_GRXFH and %ETHTOOL_SRXFH, @data is a bitmask indicating

  * the fields included in the flow hash, e.g. %RXH_IP_SRC.  The following

- * structure fields must not be used.

+ * structure fields must not be used, except that if @flow_type includes

+ * the %FLOW_RSS flag, then @rss_context determines which RSS context to

+ * act on.

  *

  * For %ETHTOOL_GRXRINGS, @data is set to the number of RX rings/queues

  * on return.

@@ -929,7 +932,9 @@ static __inline__ __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie)

  * set in @data then special location values should not be used.

  *

  * For %ETHTOOL_GRXCLSRULE, @fs.@location specifies the location of an

- * existing rule on entry and @fs contains the rule on return.

+ * existing rule on entry and @fs contains the rule on return; if

+ * @fs.@flow_type includes the %FLOW_RSS flag, then @rss_context is

+ * filled with the RSS context ID associated with the rule.

  *

  * For %ETHTOOL_GRXCLSRLALL, @rule_cnt specifies the array size of the

  * user buffer for @rule_locs on entry.  On return, @data is the size

@@ -940,7 +945,11 @@ static __inline__ __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie)

  * For %ETHTOOL_SRXCLSRLINS, @fs specifies the rule to add or update.

  * @fs.@location either specifies the location to use or is a special

  * location value with %RX_CLS_LOC_SPECIAL flag set.  On return,

- * @fs.@location is the actual rule location.

+ * @fs.@location is the actual rule location.  If @fs.@flow_type

+ * includes the %FLOW_RSS flag, @rss_context is the RSS context ID to

+ * use for flow spreading traffic which matches this rule.  The value

+ * from the rxfh indirection table will be added to @fs.@ring_cookie

+ * to choose which ring to deliver to.

  *

  * For %ETHTOOL_SRXCLSRLDEL, @fs.@location specifies the location of an

  * existing rule on entry.

@@ -961,7 +970,10 @@ struct ethtool_rxnfc {

 	__u32				flow_type;

 	__u64				data;

 	struct ethtool_rx_flow_spec	fs;

-	__u32				rule_cnt;

+	union {

+		__u32			rule_cnt;

+		__u32			rss_context;

+	};

 	__u32				rule_locs[0];

 };

@@ -988,7 +1000,11 @@ struct ethtool_rxfh_indir {

 /**

  * struct ethtool_rxfh - command to get/set RX flow hash indir or/and hash key.

  * @cmd: Specific command number - %ETHTOOL_GRSSH or %ETHTOOL_SRSSH

- * @rss_context: RSS context identifier.

+ * @rss_context: RSS context identifier.  Context 0 is the default for normal

+ *	traffic; other contexts can be referenced as the destination for RX flow

+ *	classification rules.  %ETH_RXFH_CONTEXT_ALLOC is used with command

+ *	%ETHTOOL_SRSSH to allocate a new RSS context; on return this field will

+ *	contain the ID of the newly allocated context.

  * @indir_size: On entry, the array size of the user buffer for the

  *	indirection table, which may be zero, or (for %ETHTOOL_SRSSH),

  *	%ETH_RXFH_INDIR_NO_CHANGE.  On return from %ETHTOOL_GRSSH,

@@ -1007,7 +1023,8 @@ struct ethtool_rxfh_indir {

  * size should be returned.  For %ETHTOOL_SRSSH, an @indir_size of

  * %ETH_RXFH_INDIR_NO_CHANGE means that indir table setting is not requested

  * and a @indir_size of zero means the indir table should be reset to default

- * values. An hfunc of zero means that hash function setting is not requested.

+ * values (if @rss_context == 0) or that the RSS context should be deleted.

+ * An hfunc of zero means that hash function setting is not requested.

  */

 struct ethtool_rxfh {

 	__u32   cmd;

@@ -1019,6 +1036,7 @@ struct ethtool_rxfh {

 	__u32	rsvd32;

 	__u32   rss_config[0];

 };

+#define ETH_RXFH_CONTEXT_ALLOC		0xffffffff

 #define ETH_RXFH_INDIR_NO_CHANGE	0xffffffff

 /**

@@ -1633,6 +1651,8 @@ static __inline__ int ethtool_validate_duplex(__u8 duplex)

 /* Flag to enable additional fields in struct ethtool_rx_flow_spec */

 #define	FLOW_EXT	0x80000000

 #define	FLOW_MAC_EXT	0x40000000

+/* Flag to enable RSS spreading of traffic matching rule (nfc only) */

+#define	FLOW_RSS	0x20000000

 /* L3-L4 network traffic flow hash options */

 #define	RXH_L2DA	(1 << 1)

-- 

1.8.3.1