Skip to contentSkip to conversation

linux-next: upstream tree build warnings

PATCH In review David Miller 4 participants 17 messages Apr 23, 2009 – May 5, 2009 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

David Miller

author maintainer
#1 lore raw

From: Stephen Rothwell <[email protected]>
Date: Thu, 23 Apr 2009 16:38:47 +1000

Quoted 10 lines

Today's linux-next build (powerpc allyesconfig gcc4.4.0) produced these warnings:

drivers/net/virtio_net.c: In function 'virnet_vlan_rx_add_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:746: note: 'sg' was declared here drivers/net/virtio_net.c: In function 'virnet_vlan_rx_kill_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:758: note: 'sg' was declared here

Quoted 3 lines

in each case, sg is uninitialised when its address is passed to sg_set_buf() which passes it to gs_set_page() which passes it to sg_assign_page() which dereferences it (to use ->page_link).

I wonder if this is a side effect of changes that went in via Rusty's tree? I don't remember touching this driver in a while.

#2 lore raw

Hi Dave,

Quoted 14 lines · On Thu, 23 Apr 2009 00:24:03 -0700 (PDT) David Miller <[email protected]>…

From: Stephen Rothwell <[email protected]>
Date: Thu, 23 Apr 2009 16:38:47 +1000

Quoted 10 lines

Today's linux-next build (powerpc allyesconfig gcc4.4.0) produced these warnings:

drivers/net/virtio_net.c: In function 'virnet_vlan_rx_add_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:746: note: 'sg' was declared here drivers/net/virtio_net.c: In function 'virnet_vlan_rx_kill_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:758: note: 'sg' was declared here

Quoted 6 lines
Quoted 3 lines

in each case, sg is uninitialised when its address is passed to sg_set_buf() which passes it to gs_set_page() which passes it to sg_assign_page() which dereferences it (to use ->page_link).

I wonder if this is a side effect of changes that went in via Rusty's tree? I don't remember touching this driver in a while.

The callers came in throught commit 0bde95690d65653e420d04856c5d5783155c747c ("virtio_net: Add support for VLAN filtering in the hypervisor") which I assume came in throught the net tree (it has you SOB on it). Committed Feb 5, 2009, went into Linus' tree before 2.6.30-rc1.

scatterlist.h hasn't changed since July, 2008.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#3 lore raw

Hi Dave,

Quoted 8 lines · On Thu, 23 Apr 2009 21:55:33 +1000 Stephen Rothwell <[email protected]>…

The callers came in throught commit 0bde95690d65653e420d04856c5d5783155c747c ("virtio_net: Add support for VLAN filtering in the hypervisor") which I assume came in throught the net tree (it has you SOB on it). Committed Feb 5, 2009, went into Linus' tree before 2.6.30-rc1.

scatterlist.h hasn't changed since July, 2008.

In other words, I think the bug has always been there and just never hit (yet).

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#4 lore raw
Quoted 10 lines · Stephen Rothwell

Hi Dave,

Quoted 7 lines · On Thu, 23 Apr 2009 21:55:33 +1000 Stephen Rothwell <[email protected]>…

The callers came in throught commit 0bde95690d65653e420d04856c5d5783155c747c ("virtio_net: Add support for VLAN filtering in the hypervisor") which I assume came in throught the net tree (it has you SOB on it). Committed Feb 5, 2009, went into Linus' tree before 2.6.30-rc1.

Quoted 4 lines
Quoted 1 line

scatterlist.h hasn't changed since July, 2008.

In other words, I think the bug has always been there and just never hit (yet).

Hmm, I can't seem to get the warning on an x86_64 allyesconfig build with gcc-4.4.0. Did all the archs other than powerpc miss this warning? Thanks,

Alex

#5 lore raw
In reply to David Miller
Quoted 13 lines · David Miller

From: Stephen Rothwell <[email protected]>
Date: Thu, 23 Apr 2009 16:38:47 +1000

Quoted 10 lines

Today's linux-next build (powerpc allyesconfig gcc4.4.0) produced these warnings:

drivers/net/virtio_net.c: In function 'virnet_vlan_rx_add_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:746: note: 'sg' was declared here drivers/net/virtio_net.c: In function 'virnet_vlan_rx_kill_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:758: note: 'sg' was declared here

Quoted 6 lines
Quoted 3 lines

in each case, sg is uninitialised when its address is passed to sg_set_buf() which passes it to gs_set_page() which passes it to sg_assign_page() which dereferences it (to use ->page_link).

I wonder if this is a side effect of changes that went in via Rusty's tree? I don't remember touching this driver in a while.

AFAICT gcc is right: it should be sg_init_one().

It doesn't currently *matter*, since no virtio add_buf implementation does that chained-sg crap (I had a patch once, but it made me barf) and so the uninitialized lower three bits are ignored.

Alex, if you agree, patch welcome...
Rusty.

author maintainer
#6 lore raw

From: Rusty Russell <[email protected]>
Date: Sun, 26 Apr 2009 21:53:10 +0930

Quoted 1 line

Alex, if you agree, patch welcome...

And please CC: netdev properly so that the patch gets tracked in patchwork, thanks.

#7 lore raw

PATCH 1/1 virtio_net: memset scatterlist before using

In reply to a message not in the archive

A powerpc gcc-4.4 build generates the following warnings:

drivers/net/virtio_net.c: In function 'virnet_vlan_rx_add_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:746: note: 'sg' was declared here drivers/net/virtio_net.c: In function 'virnet_vlan_rx_kill_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:758: note: 'sg' was declared here

We need to clear the scatterlist before using it. This sg entry will get copied into another scatterlist before it's used, so memset it rather than using sg_init_table or sg_init_one to avoid a bogus end marker.

--

drivers/net/virtio_net.c +2 -0
index 0718558..be1a9fe 100644
@@ -745,6 +745,7 @@ static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
 	struct virtnet_info *vi = netdev_priv(dev);
 	struct scatterlist sg;
 
+	memset(&sg, 0, sizeof(sg));
 	sg_set_buf(&sg, &vid, sizeof(vid));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
@@ -757,6 +758,7 @@ static void virnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
 	struct virtnet_info *vi = netdev_priv(dev);
 	struct scatterlist sg;
 
+	memset(&sg, 0, sizeof(sg));
 	sg_set_buf(&sg, &vid, sizeof(vid));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
#8 lore raw

Re: [PATCH] virtio_net: memset scatterlist before using

Quoted 9 lines · Alex Williamson

A powerpc gcc-4.4 build generates the following warnings:

drivers/net/virtio_net.c: In function 'virnet_vlan_rx_add_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:746: note: 'sg' was declared here drivers/net/virtio_net.c: In function 'virnet_vlan_rx_kill_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:758: note: 'sg' was declared here

Quoted 4 lines

We need to clear the scatterlist before using it. This sg entry will get copied into another scatterlist before it's used, so memset it rather than using sg_init_table or sg_init_one to avoid a bogus end marker.

This will break CONFIG_DEBUG_SG=y.

Why not sg_init_one? This is what it's for...

Thanks,
Rusty

author maintainer
#9 lore raw

Re: [PATCH] virtio_net: memset scatterlist before using

From: Rusty Russell <[email protected]>
Date: Sun, 26 Apr 2009 22:28:08 +0930

Quoted 10 lines · Alex Williamson
Quoted 9 lines

A powerpc gcc-4.4 build generates the following warnings:

drivers/net/virtio_net.c: In function 'virnet_vlan_rx_add_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:746: note: 'sg' was declared here drivers/net/virtio_net.c: In function 'virnet_vlan_rx_kill_vid':
include/linux/scatterlist.h:57: warning: 'sg' is used uninitialized in this function drivers/net/virtio_net.c:758: note: 'sg' was declared here

Quoted 8 lines
Quoted 4 lines

We need to clear the scatterlist before using it. This sg entry will get copied into another scatterlist before it's used, so memset it rather than using sg_init_table or sg_init_one to avoid a bogus end marker.

This will break CONFIG_DEBUG_SG=y.

Why not sg_init_one? This is what it's for...

Right.

Also, patch not sent to netdev due to a typo, and if it's not sent to netdev it won't get tracked in patchwork and is therefore likely to get lost.

#10 lore raw

PATCH 1/1 virtio_net: Cleanup command queue scatterlist usage

We were avoiding calling sg_init* on scatterlists passed into virtnet_send_command to prevent extraneous end markers. This caused build warnings for uninitialized variables. Cleanup the code to create proper scatterlists.

---

 drivers/net/virtio_net.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/virtio_net.c +10 -6
index 0718558..ed70df4 100644
@@ -616,10 +616,11 @@ static int virtnet_open(struct net_device *dev)
 static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
 				 struct scatterlist *data, int out, int in)
 {
-	struct scatterlist sg[VIRTNET_SEND_COMMAND_SG_MAX + 2];
+	struct scatterlist *s, sg[VIRTNET_SEND_COMMAND_SG_MAX + 2];
 	struct virtio_net_ctrl_hdr ctrl;
 	virtio_net_ctrl_ack status = ~0;
 	unsigned int tmp;
+	int i;
 
 	/* Caller should know better */
 	BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ||
@@ -634,7 +635,8 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
 	sg_init_table(sg, out + in);
 
 	sg_set_buf(&sg[0], &ctrl, sizeof(ctrl));
-	memcpy(&sg[1], data, sizeof(struct scatterlist) * (out + in - 2));
+	for_each_sg(data, s, out + in - 2, i)
+		sg_set_buf(&sg[i + 1], sg_virt(s), s->length);
 	sg_set_buf(&sg[out + in - 1], &status, sizeof(status));
 
 	BUG_ON(vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi));
@@ -688,7 +690,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 	promisc = ((dev->flags & IFF_PROMISC) != 0);
 	allmulti = ((dev->flags & IFF_ALLMULTI) != 0);
 
-	sg_set_buf(sg, &promisc, sizeof(promisc));
+	sg_init_one(sg, &promisc, sizeof(promisc));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
 				  VIRTIO_NET_CTRL_RX_PROMISC,
@@ -696,7 +698,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 		dev_warn(&dev->dev, "Failed to %sable promisc mode.\n",
 			 promisc ? "en" : "dis");
 
-	sg_set_buf(sg, &allmulti, sizeof(allmulti));
+	sg_init_one(sg, &allmulti, sizeof(allmulti));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
 				  VIRTIO_NET_CTRL_RX_ALLMULTI,
@@ -712,6 +714,8 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 		return;
 	}
 
+	sg_init_table(sg, 2);
+
 	/* Store the unicast list and count in the front of the buffer */
 	mac_data->entries = dev->uc_count;
 	addr = dev->uc_list;
@@ -745,7 +749,7 @@ static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
 	struct virtnet_info *vi = netdev_priv(dev);
 	struct scatterlist sg;
 
-	sg_set_buf(&sg, &vid, sizeof(vid));
+	sg_init_one(&sg, &vid, sizeof(vid));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
 				  VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0))
@@ -757,7 +761,7 @@ static void virnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
 	struct virtnet_info *vi = netdev_priv(dev);
 	struct scatterlist sg;
 
-	sg_set_buf(&sg, &vid, sizeof(vid));
+	sg_init_one(&sg, &vid, sizeof(vid));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
 				  VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0))
author maintainer
#11 lore raw

Re: [PATCH] virtio_net: Cleanup command queue scatterlist usage

From: Alex Williamson <[email protected]>
Date: Mon, 27 Apr 2009 09:50:03 -0600

Quoted 6 lines

We were avoiding calling sg_init* on scatterlists passed into virtnet_send_command to prevent extraneous end markers. This caused build warnings for uninitialized variables. Cleanup the code to create proper scatterlists.

Looks good to me, what say you Rusty?

author maintainer
#12 lore raw

Re: [PATCH] virtio_net: Cleanup command queue scatterlist usage

In reply to Alex Williamson

From: Alex Williamson <[email protected]>
Date: Mon, 27 Apr 2009 09:50:03 -0600

Quoted 6 lines

We were avoiding calling sg_init* on scatterlists passed into virtnet_send_command to prevent extraneous end markers. This caused build warnings for uninitialized variables. Cleanup the code to create proper scatterlists.

This patch does not apply even to Linus's current tree.

#13 lore raw

Re: [PATCH] virtio_net: Cleanup command queue scatterlist usage

Quoted 11 lines · David Miller

From: Alex Williamson <[email protected]>
Date: Mon, 27 Apr 2009 09:50:03 -0600

Quoted 6 lines

We were avoiding calling sg_init* on scatterlists passed into virtnet_send_command to prevent extraneous end markers. This caused build warnings for uninitialized variables. Cleanup the code to create proper scatterlists.

This patch does not apply even to Linus's current tree.

It was against net-next-2.6.git, I'll update it for linux-2.6.git. IIRC, it applied with some fuzz.

Alex

author maintainer
#14 lore raw

Re: [PATCH] virtio_net: Cleanup command queue scatterlist usage

From: Alex Williamson <[email protected]>
Date: Fri, 01 May 2009 16:43:14 -0600

Quoted 9 lines · David Miller
Quoted 8 lines

From: Alex Williamson <[email protected]>
Date: Mon, 27 Apr 2009 09:50:03 -0600

Quoted 5 lines

We were avoiding calling sg_init* on scatterlists passed into virtnet_send_command to prevent extraneous end markers. This caused build warnings for uninitialized variables. Cleanup the code to create proper scatterlists.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

This patch does not apply even to Linus's current tree.

It was against net-next-2.6.git, I'll update it for linux-2.6.git. IIRC, it applied with some fuzz.

Thanks. I want to apply this to net-2.6 to fix those uninitialed scatterlist structure issues.

#15 lore raw

PATCH 1/1 virtio_net: Cleanup command queue scatterlist usage

In reply to David Miller

We were avoiding calling sg_init* on scatterlists passed into virtnet_send_command to prevent extraneous end markers. This caused build warnings for uninitialized variables. Cleanup the code to create proper scatterlists.

---

Patch against net-2.6.git 7a67e56fd362d3edfde1f19170893508c3940d3a

 drivers/net/virtio_net.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/virtio_net.c +10 -6
index 9c82a39..23eb282 100644
@@ -616,10 +616,11 @@ static int virtnet_open(struct net_device *dev)
 static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
 				 struct scatterlist *data, int out, int in)
 {
-	struct scatterlist sg[VIRTNET_SEND_COMMAND_SG_MAX + 2];
+	struct scatterlist *s, sg[VIRTNET_SEND_COMMAND_SG_MAX + 2];
 	struct virtio_net_ctrl_hdr ctrl;
 	virtio_net_ctrl_ack status = ~0;
 	unsigned int tmp;
+	int i;
 
 	if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
 		BUG();  /* Caller should know better */
@@ -637,7 +638,8 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
 	sg_init_table(sg, out + in);
 
 	sg_set_buf(&sg[0], &ctrl, sizeof(ctrl));
-	memcpy(&sg[1], data, sizeof(struct scatterlist) * (out + in - 2));
+	for_each_sg(data, s, out + in - 2, i)
+		sg_set_buf(&sg[i + 1], sg_virt(s), s->length);
 	sg_set_buf(&sg[out + in - 1], &status, sizeof(status));
 
 	if (vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi) != 0)
@@ -692,7 +694,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 	promisc = ((dev->flags & IFF_PROMISC) != 0);
 	allmulti = ((dev->flags & IFF_ALLMULTI) != 0);
 
-	sg_set_buf(sg, &promisc, sizeof(promisc));
+	sg_init_one(sg, &promisc, sizeof(promisc));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
 				  VIRTIO_NET_CTRL_RX_PROMISC,
@@ -700,7 +702,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 		dev_warn(&dev->dev, "Failed to %sable promisc mode.\n",
 			 promisc ? "en" : "dis");
 
-	sg_set_buf(sg, &allmulti, sizeof(allmulti));
+	sg_init_one(sg, &allmulti, sizeof(allmulti));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
 				  VIRTIO_NET_CTRL_RX_ALLMULTI,
@@ -716,6 +718,8 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 		return;
 	}
 
+	sg_init_table(sg, 2);
+
 	/* Store the unicast list and count in the front of the buffer */
 	mac_data->entries = dev->uc_count;
 	addr = dev->uc_list;
@@ -749,7 +753,7 @@ static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
 	struct virtnet_info *vi = netdev_priv(dev);
 	struct scatterlist sg;
 
-	sg_set_buf(&sg, &vid, sizeof(vid));
+	sg_init_one(&sg, &vid, sizeof(vid));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
 				  VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0))
@@ -761,7 +765,7 @@ static void virnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
 	struct virtnet_info *vi = netdev_priv(dev);
 	struct scatterlist sg;
 
-	sg_set_buf(&sg, &vid, sizeof(vid));
+	sg_init_one(&sg, &vid, sizeof(vid));
 
 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
 				  VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0))
author maintainer Applied
#16 lore raw

Re: [PATCH] virtio_net: Cleanup command queue scatterlist usage

From: Alex Williamson <[email protected]>
Date: Fri, 01 May 2009 21:27:56 -0600

Quoted 6 lines

We were avoiding calling sg_init* on scatterlists passed into virtnet_send_command to prevent extraneous end markers. This caused build warnings for uninitialized variables. Cleanup the code to create proper scatterlists.

Applied.

Acked-by on v1 1/1
#17 lore raw

Re: [PATCH] virtio_net: Cleanup command queue scatterlist usage

In reply to Alex Williamson
Quoted 6 lines · Alex Williamson

We were avoiding calling sg_init* on scatterlists passed into virtnet_send_command to prevent extraneous end markers. This caused build warnings for uninitialized variables. Cleanup the code to create proper scatterlists.

Thanks,
Rusty.