Skip to contentSkip to conversation

Fix vde network backend in user mode linux

PATCH In review Luca Bigliardi 3 participants 8 messages Feb 2, 2009 – Feb 17, 2009 User-mode Linux (UML)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix vde network backend in user mode linux

* Replace kmalloc() with uml_kmalloc()
(fix build failure)
* Remove unnecessary UM_KERN_INFO in printk()
(don't display '<6>' while printing info)

---
 arch/um/drivers/vde_user.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/um/drivers/vde_user.c +3 -3
index 56533db..c5c4325 100644
@@ -78,7 +78,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
 {
 	struct vde_open_args *args;
 
-	vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
+	vpri->args = uml_kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
 	if (vpri->args == NULL) {
 		printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args "
 		       "allocation failed");
@@ -91,8 +91,8 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
 	args->group = init->group;
 	args->mode = init->mode ? init->mode : 0700;
 
-	args->port ?  printk(UM_KERN_INFO "port %d", args->port) :
-		printk(UM_KERN_INFO "undefined port");
+	args->port ?  printk("port %d", args->port) :
+		printk("undefined port");
 }
 
 int vde_user_read(void *conn, void *buf, int len)
Signature · 1 line
1.5.6.5
#1 lore raw
Quoted 24 lines · Luca Bigliardi

* Replace kmalloc() with uml_kmalloc()
(fix build failure)
* Remove unnecessary UM_KERN_INFO in printk()
(don't display '<6>' while printing info)

---
 arch/um/drivers/vde_user.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/um/drivers/vde_user.c +1 -1
index 56533db..c5c4325 100644
@@ -78,7 +78,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
 {
 	struct vde_open_args *args;
 
-	vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
+	vpri->args = uml_kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
 	if (vpri->args == NULL) {
 		printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args "
 		       "allocation failed");

arch/um/drivers/vde_user.c void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init) · line 98

Quoted 10 lines
arch/um/drivers/vde_user.c +2 -2
@@ -91,8 +91,8 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
 	args->group = init->group;
 	args->mode = init->mode ? init->mode : 0700;
 
-	args->port ?  printk(UM_KERN_INFO "port %d", args->port) :
-		printk(UM_KERN_INFO "undefined port");
+	args->port ?  printk("port %d", args->port) :
+		printk("undefined port");
 }
 
 int vde_user_read(void *conn, void *buf, int len)

Jeff, I don't see this in linux-next as of today. Are you going to take it through your tree?

Signature · 2 lines
Jiri Kosina
SUSE Labs
#2 lore raw
In reply to Luca Bigliardi

[ doesn't seem to be picked up by anyone into current -next nor -mmotm,
but isn't appropriate for trivial; adding akpm to cc ]

Quoted 38 lines · Luca Bigliardi

* Replace kmalloc() with uml_kmalloc()
(fix build failure)
* Remove unnecessary UM_KERN_INFO in printk()
(don't display '<6>' while printing info)

---
 arch/um/drivers/vde_user.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/um/drivers/vde_user.c +3 -3
index 56533db..c5c4325 100644
@@ -78,7 +78,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
 {
 	struct vde_open_args *args;
 
-	vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
+	vpri->args = uml_kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
 	if (vpri->args == NULL) {
 		printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args "
 		       "allocation failed");
@@ -91,8 +91,8 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
 	args->group = init->group;
 	args->mode = init->mode ? init->mode : 0700;
 
-	args->port ?  printk(UM_KERN_INFO "port %d", args->port) :
-		printk(UM_KERN_INFO "undefined port");
+	args->port ?  printk("port %d", args->port) :
+		printk("undefined port");
 }
 
 int vde_user_read(void *conn, void *buf, int len)
Signature · 1 line
1.5.6.5
Signature · 2 lines
Jiri Kosina
SUSE Labs
#3 lore raw
Quoted 8 lines · Jiri Kosina

[ doesn't seem to be picked up by anyone into current -next nor -mmotm,
but isn't appropriate for trivial; adding akpm to cc ]

Quoted 2 lines · Luca Bigliardi

* Replace kmalloc() with uml_kmalloc()
(fix build failure)

Weird... I sent a patch for this several months ago! I thought Jeff had already taken it... No?

Quoted 2 lines
Quoted 2 lines

* Remove unnecessary UM_KERN_INFO in printk()
(don't display '<6>' while printing info)

But why only this one, not other UM_KERN_INFO in the same file?

Signature · 1 line
"Against stupidity, the gods themselves, contend in vain."
#4 lore raw
Quoted 6 lines · Américo Wang
Quoted 4 lines

[ doesn't seem to be picked up by anyone into current -next nor -mmotm,
but isn't appropriate for trivial; adding akpm to cc ]

Quoted 2 lines

* Replace kmalloc() with uml_kmalloc()
(fix build failure)

Weird... I sent a patch for this several months ago! I thought Jeff had already taken it... No?

I am not sure whether this has been fixed in another way, but current linux-next still has

	void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
	{
	        struct vde_open_args *args;
	
	        vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);

so the patch hasn't been at least applied in the form it has been submitted.

Signature · 2 lines
Jiri Kosina
SUSE Labs
#5 lore raw
Quoted 12 lines · Jiri Kosina
Quoted 6 lines · Américo Wang
Quoted 4 lines

[ doesn't seem to be picked up by anyone into current -next nor -mmotm,
but isn't appropriate for trivial; adding akpm to cc ]

Quoted 2 lines

* Replace kmalloc() with uml_kmalloc()
(fix build failure)

Weird... I sent a patch for this several months ago! I thought Jeff had already taken it... No?

I am not sure whether this has been fixed in another way, but current linux-next still has

Quoted 8 lines
	void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
	{
	        struct vde_open_args *args;
	
	        vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);

so the patch hasn't been at least applied in the form it has been submitted.

Hmmm, no, I just checked, but more than half a year ago, we already did this: http://lkml.org/lkml/2008/7/23/142

It looks like Jeff is too busy to maintain UML patches recently...

Andrew, could you please take UML patches for us? Recently I also saw some uml patches but no one took them (at least I don't know).

If Andrew can't do this, I would like to take those patches to send to Linus, if others don't have objections. Andrew?

Signature · 1 line
"Against stupidity, the gods themselves, contend in vain."
#6 lore raw
In reply to Américo Wang
Quoted 5 lines · Américo Wang
Quoted 4 lines · Jiri Kosina

[ doesn't seem to be picked up by anyone into current -next nor -mmotm,
but isn't appropriate for trivial; adding akpm to cc ]

Quoted 8 lines
Quoted 4 lines · Luca Bigliardi
Quoted 3 lines

* Replace kmalloc() with uml_kmalloc()
(fix build failure)

Weird... I sent a patch for this several months ago! I thought Jeff had already taken it... No?

I did as well (in June/July 08 IIRC) through usermodelinux-devel mailing list but the patch didn't hit, so this time I've tried this way.

Quoted 4 lines
Quoted 2 lines
Quoted 2 lines

* Remove unnecessary UM_KERN_INFO in printk()
(don't display '<6>' while printing info)

But why only this one, not other UM_KERN_INFO in the same file?

Other lines are preceded by a 'new_text_line' so vprintk 'eats' the token.

Thank you,

luca

Signature · 4 lines
Beware of programmers who carry screwdrivers.
                        -- Leonard Brandwein

http://shammash.homelinux.org/ - http://www.artha.org/ - http://www.yue.it/
Reviewed-by WANG Cong
#7 lore raw
Quoted 13 lines · Luca Bigliardi
Quoted 11 lines · Américo Wang
Quoted 8 lines · Jiri Kosina

[ doesn't seem to be picked up by anyone into current -next nor -mmotm,
but isn't appropriate for trivial; adding akpm to cc ]

Quoted 2 lines · Luca Bigliardi

* Replace kmalloc() with uml_kmalloc()
(fix build failure)

Quoted 5 lines
Quoted 2 lines

Weird... I sent a patch for this several months ago! I thought Jeff had already taken it... No?

I did as well (in June/July 08 IIRC) through usermodelinux-devel mailing list but the patch didn't hit, so this time I've tried this way.

The problem is _not_ that I don't like you to fix it again, it _is_ that Jeff said he queued a same patch[1] but he didn't push it. :)

1. http://lkml.org/lkml/2008/7/23/142

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 3 lines

* Remove unnecessary UM_KERN_INFO in printk()
(don't display '<6>' while printing info)

But why only this one, not other UM_KERN_INFO in the same file?

Other lines are preceded by a 'new_text_line' so vprintk 'eats' the token.

Ok then, thank you!

Signature · 1 line
"Against stupidity, the gods themselves, contend in vain."