aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Poole <brian90013@gmail.com>2024-10-11 19:57:52 +0000
committerMitchell Horne <mhorne@FreeBSD.org>2024-11-04 15:01:37 +0000
commit6e5650896fe47398e49e3d81af60cc60dbb09e6e (patch)
tree1047b5b5cc44c3f164211e72124e26428e352a17
parenta471d2b401c9b2d3a95d9139c9a6b123f686a8e9 (diff)
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
-rw-r--r--sys/dev/ice/ice_lib.h3
-rw-r--r--sys/dev/ice/ice_rss.h16
2 files changed, 11 insertions, 8 deletions
diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h
index 466cb8701b79..b6b23ec82161 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_ */