diff mbox

Make possible speeds known to ethtool

Message ID 20090109025244.GA11336@gondor.apana.org.au
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Herbert Xu Jan. 9, 2009, 2:52 a.m. UTC 
On Thu, Jan 08, 2009 at 03:12:01AM +0000, Jeff Garzik wrote:
>
> The next release of ethtool is coming in about 4 weeks, and we can  
> definitely get something like this in there.

Jeff, any chance you can stick this patch in there to add the GRO
toggle?

ethtool: Add GRO toggle

This patch adds the -k toggles to query and set GRO on a device.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>


Thanks,

Comments

Jeff Garzik Jan. 9, 2009, 3:20 a.m. UTC | #1 
Herbert Xu wrote:
> On Thu, Jan 08, 2009 at 03:12:01AM +0000, Jeff Garzik wrote:
>> The next release of ethtool is coming in about 4 weeks, and we can  
>> definitely get something like this in there.
> 
> Jeff, any chance you can stick this patch in there to add the GRO
> toggle?
> 
> ethtool: Add GRO toggle
> 
> This patch adds the -k toggles to query and set GRO on a device.
> 
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> 
> diff --git a/ethtool-copy.h b/ethtool-copy.h
> index eadba25..3ca4e2c 100644
> --- a/ethtool-copy.h
> +++ b/ethtool-copy.h
> @@ -336,6 +336,8 @@ struct ethtool_rxnfc {
>  
>  #define	ETHTOOL_GRXFH		0x00000029 /* Get RX flow hash configuration */
>  #define	ETHTOOL_SRXFH		0x0000002a /* Set RX flow hash configuration */
> +#define	ETHTOOL_GGRO		0x0000002b /* Get GRO enable (ethtool_value) */
> +#define	ETHTOOL_SGRO		0x0000002c /* Set GRO enable (ethtool_value) */

Ugh...  is it too late to change this interface?

The person who added this should have used the new flags interface, and 
added ETH_FLAG_GRO right next to the pre-existing ETH_FLAG_LRO.

It is incorrect to add new ioctls just to toggle a boolean value.

	Jeff




--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Garzik March 6, 2009, 11:19 a.m. UTC | #2 
Herbert Xu wrote:
> On Thu, Jan 08, 2009 at 03:12:01AM +0000, Jeff Garzik wrote:
>> The next release of ethtool is coming in about 4 weeks, and we can  
>> definitely get something like this in there.
> 
> Jeff, any chance you can stick this patch in there to add the GRO
> toggle?
> 
> ethtool: Add GRO toggle
> 
> This patch adds the -k toggles to query and set GRO on a device.
> 
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

ugh.  this got buried in my mailbox, sorry.

I missed it completely... and recreated it from scratch just now.  Check 
the git repo, it should work now.

	Jeff




--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Herbert Xu March 6, 2009, 1:52 p.m. UTC | #3 
On Fri, Mar 06, 2009 at 06:19:04AM -0500, Jeff Garzik wrote:
>
> I missed it completely... and recreated it from scratch just now.  Check  
> the git repo, it should work now.

Thanks Jeff!
diff mbox

Patch

diff --git a/ethtool-copy.h b/ethtool-copy.h
index eadba25..3ca4e2c 100644
--- a/ethtool-copy.h
+++ b/ethtool-copy.h
@@ -336,6 +336,8 @@  struct ethtool_rxnfc {
 
 #define	ETHTOOL_GRXFH		0x00000029 /* Get RX flow hash configuration */
 #define	ETHTOOL_SRXFH		0x0000002a /* Set RX flow hash configuration */
+#define	ETHTOOL_GGRO		0x0000002b /* Get GRO enable (ethtool_value) */
+#define	ETHTOOL_SGRO		0x0000002c /* Set GRO enable (ethtool_value) */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET		ETHTOOL_GSET
diff --git a/ethtool.c b/ethtool.c
index a7c02d0..502fc8f 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -160,6 +160,7 @@  static struct option {
 	        "		[ tso on|off ]\n"
 	        "		[ ufo on|off ]\n"
 		"		[ gso on|off ]\n"
+		"		[ gro on|off ]\n"
 		"               [ lro on|off ]\n"
     },
     { "-i", "--driver", MODE_GDRV, "Show driver information" },
@@ -218,6 +219,7 @@  static int off_sg_wanted = -1;
 static int off_tso_wanted = -1;
 static int off_ufo_wanted = -1;
 static int off_gso_wanted = -1;
+static int off_gro_wanted = -1;
 static int off_lro_wanted = -1;
 
 static struct ethtool_pauseparam epause;
@@ -333,6 +335,7 @@  static struct cmdline_info cmdline_offload[] = {
 	{ "tso", CMDL_BOOL, &off_tso_wanted, NULL },
 	{ "ufo", CMDL_BOOL, &off_ufo_wanted, NULL },
 	{ "gso", CMDL_BOOL, &off_gso_wanted, NULL },
+	{ "gro", CMDL_BOOL, &off_gro_wanted, NULL },
 	{ "lro", CMDL_BOOL, &off_lro_wanted, NULL },
 };
 
@@ -1387,7 +1390,8 @@  static int dump_coalesce(void)
 	return 0;
 }
 
-static int dump_offload(int rx, int tx, int sg, int tso, int ufo, int gso, int lro)
+static int dump_offload(int rx, int tx, int sg, int tso, int ufo, int gso,
+			int gro, int lro)
 {
 	fprintf(stdout,
 		"rx-checksumming: %s\n"
@@ -1396,6 +1400,7 @@  static int dump_offload(int rx, int tx, int sg, int tso, int ufo, int gso, int l
 		"tcp segmentation offload: %s\n"
 		"udp fragmentation offload: %s\n"
 		"generic segmentation offload: %s\n"
+		"generic receive offload: %s\n"
 		"large receive offload: %s\n",
 		rx ? "on" : "off",
 		tx ? "on" : "off",
@@ -1403,6 +1408,7 @@  static int dump_offload(int rx, int tx, int sg, int tso, int ufo, int gso, int l
 		tso ? "on" : "off",
 		ufo ? "on" : "off",
 		gso ? "on" : "off",
+		gro ? "on" : "off",
 		lro ? "on" : "off");
 
 	return 0;
@@ -1714,7 +1720,7 @@  static int do_goffload(int fd, struct ifreq *ifr)
 {
 	struct ethtool_value eval;
 	int err, allfail = 1, rx = 0, tx = 0, sg = 0;
-	int tso = 0, ufo = 0, gso = 0, lro = 0;
+	int tso = 0, ufo = 0, gso = 0, gro = 0, lro = 0;
 
 	fprintf(stdout, "Offload parameters for %s:\n", devname);
 
@@ -1778,6 +1784,16 @@  static int do_goffload(int fd, struct ifreq *ifr)
 		allfail = 0;
 	}
 
+	eval.cmd = ETHTOOL_GGRO;
+	ifr->ifr_data = (caddr_t)&eval;
+	err = ioctl(fd, SIOCETHTOOL, ifr);
+	if (err)
+		perror("Cannot get device generic receive offload settings");
+	else {
+		gro = eval.data;
+		allfail = 0;
+	}
+
 	eval.cmd = ETHTOOL_GFLAGS;
 	ifr->ifr_data = (caddr_t)&eval;
 	err = ioctl(fd, SIOCETHTOOL, ifr);
@@ -1793,7 +1809,7 @@  static int do_goffload(int fd, struct ifreq *ifr)
 		return 83;
 	}
 
-	return dump_offload(rx, tx, sg, tso, ufo, gso, lro);
+	return dump_offload(rx, tx, sg, tso, ufo, gso, gro, lro);
 }
 
 static int do_soffload(int fd, struct ifreq *ifr)
@@ -1870,6 +1886,17 @@  static int do_soffload(int fd, struct ifreq *ifr)
 			return 90;
 		}
 	}
+	if (off_gro_wanted >= 0) {
+		changed = 1;
+		eval.cmd = ETHTOOL_SGRO;
+		eval.data = (off_gro_wanted == 1);
+		ifr->ifr_data = (caddr_t)&eval;
+		err = ioctl(fd, SIOCETHTOOL, ifr);
+		if (err) {
+			perror("Cannot set device generic receive offload settings");
+			return 93;
+		}
+	}
 	if (off_lro_wanted >= 0) {
 		changed = 1;
 		eval.cmd = ETHTOOL_GFLAGS;