git: 2c6edd6dc94e - stable/13 - ice(4): properly use kernel option RSS

The branch stable/13 has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=2c6edd6dc94e7d429ce022262b9e25d159ce61e5

commit 2c6edd6dc94e7d429ce022262b9e25d159ce61e5
Author:     Brian Poole <brian90013@gmail.com>
AuthorDate: 2024-10-11 19:57:52 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2024-11-13 15:49:33 +0000

    ice(4): properly use kernel option RSS
    
    Header ice_rss.h uses the kernel RSS interface if option RSS is defined.
    However when ice_rss.h is included by ice_lib.h there is no prior
    inclusion of ice_opts.h to set RSS causing ifdef RSS to always fail. Add
    ice_opts.h to the top of ice_lib.h (like ice_iflib.h) so RSS can be
    defined when ice_rss.h is parsed.
    
    With that in place, compilation fails due to a missing defintion of
    ICE_DEFAULT_RSS_HASH_CONFIG. It is defined in ice_rss.h only when RSS is
    not defined. Since this define is not part of the kernel RSS interface
    but ice-specific, it should always be defined. Move its definition
    outside of ifdef RSS.
    
    PR:             255309
    Reviewed by:    mhorne, erj (earlier version)
    MFC after:      3 days
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/1460
    
    (cherry picked from commit 6e5650896fe47398e49e3d81af60cc60dbb09e6e)
---
 sys/dev/ice/ice_lib.h |  3 +++
 sys/dev/ice/ice_rss.h | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h
index 6c010cffc0fd..09385d3be34b 100644
--- a/sys/dev/ice/ice_lib.h
+++ b/sys/dev/ice/ice_lib.h
@@ -40,6 +40,9 @@
 #ifndef _ICE_LIB_H_
 #define _ICE_LIB_H_
 
+/* include kernel options first */
+#include "ice_opts.h"
+
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
diff --git a/sys/dev/ice/ice_rss.h b/sys/dev/ice/ice_rss.h
index ede1fad5abe7..df485f4b1f5a 100644
--- a/sys/dev/ice/ice_rss.h
+++ b/sys/dev/ice/ice_rss.h
@@ -68,14 +68,6 @@ CTASSERT(ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE >= RSS_KEYSIZE);
 #define	RSS_HASHTYPE_RSS_UDP_IPV6	(1 << 9)	/* IPv6 UDP 4-tuple */
 #define	RSS_HASHTYPE_RSS_UDP_IPV6_EX	(1 << 10)	/* IPv6 UDP 4-tuple + ext hdrs */
 
-#define ICE_DEFAULT_RSS_HASH_CONFIG \
-	((u_int)(RSS_HASHTYPE_RSS_IPV4 | \
-		 RSS_HASHTYPE_RSS_TCP_IPV4 | \
-		 RSS_HASHTYPE_RSS_UDP_IPV4 | \
-		 RSS_HASHTYPE_RSS_IPV6 | \
-		 RSS_HASHTYPE_RSS_TCP_IPV6 | \
-		 RSS_HASHTYPE_RSS_UDP_IPV6))
-
 #define rss_getkey(key) ice_get_default_rss_key(key)
 #define rss_getnumbuckets() (mp_ncpus)
 #define rss_get_indirection_to_bucket(index) (index)
@@ -113,4 +105,12 @@ rss_hash2bucket(uint32_t hash_val, uint32_t hash_type, uint32_t *bucket_id)
 
 #endif /* !RSS */
 
+#define ICE_DEFAULT_RSS_HASH_CONFIG \
+	((u_int)(RSS_HASHTYPE_RSS_IPV4 | \
+		 RSS_HASHTYPE_RSS_TCP_IPV4 | \
+		 RSS_HASHTYPE_RSS_UDP_IPV4 | \
+		 RSS_HASHTYPE_RSS_IPV6 | \
+		 RSS_HASHTYPE_RSS_TCP_IPV6 | \
+		 RSS_HASHTYPE_RSS_UDP_IPV6))
+
 #endif /* _ICE_COMMON_COMPAT_H_ */