From: Ben Hutchings <ben@decadent.org.uk>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Venkat Duvvuru <VenkatKumar.Duvvuru@Emulex.com>
Subject: [PATCH net-next 2/8] ethtool: Name the 'no change' value for setting RSS hash key but not indir table
Date: Mon, 02 Jun 2014 02:01:36 +0100 [thread overview]
Message-ID: <1401670896.14007.96.camel@deadeye.wl.decadent.org.uk> (raw)
In-Reply-To: <1401670659.14007.94.camel@deadeye.wl.decadent.org.uk>
[-- Attachment #1: Type: text/plain, Size: 3760 bytes --]
We usually allocate special values of u32 fields starting from the top
down, so also change the value to 0xffffffff. As these operations
haven't been included in a stable release yet, it's not too late to
change.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
include/uapi/linux/ethtool.h | 12 +++++++-----
net/core/ethtool.c | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index d47d31d..cba18e3 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -850,7 +850,8 @@ 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.
- * @indir_size: On entry, the array size of the user buffer, which may be zero.
+ * @indir_size: On entry, the array size of the user buffer, which may be zero,
+ * or (for %ETHTOOL_SRSSH), %ETH_RXFH_INDIR_NO_CHANGE.
* On return from %ETHTOOL_GRSSH, the array size of the hardware
* indirection table.
* @key_size: On entry, the array size of the user buffer in bytes,
@@ -861,10 +862,10 @@ struct ethtool_rxfh_indir {
* of size @indir_size followed by hash key of size @key_size.
*
* For %ETHTOOL_GRSSH, a @indir_size and key_size of zero means that only the
- * size should be returned. For %ETHTOOL_SRSSH, a @indir_size of 0xDEADBEEF
- * means that indir table setting is not requested and a @indir_size of zero
- * means the indir table should be reset to default values. This last feature
- * is not supported by the original implementations.
+ * 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.
*/
struct ethtool_rxfh {
__u32 cmd;
@@ -874,6 +875,7 @@ struct ethtool_rxfh {
__u32 rsvd[2];
__u32 rss_config[0];
};
+#define ETH_RXFH_INDIR_NO_CHANGE 0xffffffff
/**
* struct ethtool_rx_ntuple_flow_spec - specification for RX flow filter
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index c834cb2..7156fe5 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -803,12 +803,13 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
/* If either indir or hash key is valid, proceed further.
*/
- if ((user_indir_size && ((user_indir_size != 0xDEADBEEF) &&
- user_indir_size != dev_indir_size)) ||
+ if ((user_indir_size &&
+ user_indir_size != ETH_RXFH_INDIR_NO_CHANGE &&
+ user_indir_size != dev_indir_size) ||
(user_key_size && (user_key_size != dev_key_size)))
return -EINVAL;
- if (user_indir_size != 0xDEADBEEF)
+ if (user_indir_size != ETH_RXFH_INDIR_NO_CHANGE)
indir_bytes = dev_indir_size * sizeof(indir[0]);
rss_config = kzalloc(indir_bytes + user_key_size, GFP_USER);
@@ -821,9 +822,10 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
goto out;
/* user_indir_size == 0 means reset the indir table to default.
- * user_indir_size == 0xDEADBEEF means indir setting is not requested.
+ * user_indir_size == ETH_RXFH_INDIR_NO_CHANGE means leave it unchanged.
*/
- if (user_indir_size && user_indir_size != 0xDEADBEEF) {
+ if (user_indir_size &&
+ user_indir_size != ETH_RXFH_INDIR_NO_CHANGE) {
indir = (u32 *)rss_config;
ret = ethtool_copy_validate_indir(indir,
useraddr + rss_cfg_offset,
--
Ben Hutchings
Any smoothly functioning technology is indistinguishable from a rigged demo.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
next prev parent reply other threads:[~2014-06-02 1:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-02 0:57 Pull request: Fixes for new ethtool RSS commands Ben Hutchings
2014-06-02 1:01 ` [PATCH net-next 1/8] ethtool: Return immediately on error in ethtool_copy_validate_indir() Ben Hutchings
2014-06-02 1:01 ` Ben Hutchings [this message]
2014-06-02 1:01 ` [PATCH net-next 3/8] ethtool: Improve explanation of the two arrays following struct ethtool_rxfh Ben Hutchings
2014-06-02 1:02 ` [PATCH net-next 4/8] ethtool: Expand documentation of ethtool_ops::{get,set}_rxfh() Ben Hutchings
2014-06-02 1:02 ` [PATCH net-next 5/8] ethtool: Disallow ETHTOOL_SRSSH with both indir table and hash key unchanged Ben Hutchings
2014-06-02 1:02 ` [PATCH net-next 6/8] ethtool, be2net: constify array pointer parameters to ethtool_ops::set_rxfh Ben Hutchings
2014-06-02 1:03 ` [PATCH net-next 7/8] ethtool: Replace ethtool_ops::{get,set}_rxfh_indir() with {get,set}_rxfh() Ben Hutchings
2014-06-02 3:09 ` Jeff Kirsher
2014-06-02 1:04 ` [PATCH net-next 8/8] ethtool: Check that reserved fields of struct ethtool_rxfh are 0 Ben Hutchings
2014-06-02 1:11 ` Pull request: Fixes for new ethtool RSS commands Ben Hutchings
2014-06-03 0:13 ` David Miller
2014-06-03 0:23 ` David Miller
2014-06-03 1:42 ` Ben Hutchings
2014-06-03 1:49 Ben Hutchings
2014-06-03 1:50 ` [PATCH net-next 2/8] ethtool: Name the 'no change' value for setting RSS hash key but not indir table Ben Hutchings
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401670896.14007.96.camel@deadeye.wl.decadent.org.uk \
--to=ben@decadent.org.uk \
--cc=VenkatKumar.Duvvuru@Emulex.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).