linux-next: net/kbuild trees build failure

linux-next: net/kbuild trees build failure

[Stephen Rothwell]

Hi Dave,

Today's linux-next build (powerpc allyesconfig) failed like this:

In file included from drivers/net/wireless/iwlwifi/iwl3945-base.c:57:
drivers/net/wireless/iwlwifi/iwl-core.h:66:30: error: linux/utsrelease.h: No such file or directory

Caused by commit 250cce26d5d03337aec4ff8405121f026adb4a89 ("iwlwifi:
driver version track kernel version") from the net tree interacting with
commit 8e5c76aace9705b6983cfbf5eb2f2e869dab6738 ("kbuild: move
utsrelease.h to include/generated") from the kbuild tree.

I applied this patch for today (and will carry it as necessary):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Dec 2009 19:56:42 +1100
Subject: [PATCH] net: fix for utsrelease.h moving to generated

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/iwlwifi/iwl-core.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 675b7df..27ca859 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -63,7 +63,7 @@
 #ifndef __iwl_core_h__
 #define __iwl_core_h__
 
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 
 /************************
  * forward declarations *
-- 
1.6.5.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: net/kbuild trees build failure

[Sam Ravnborg]

On Mon, Dec 07, 2009 at 08:03:17PM +1100, Stephen Rothwell wrote:
> Hi Dave,
> 
> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> In file included from drivers/net/wireless/iwlwifi/iwl3945-base.c:57:
> drivers/net/wireless/iwlwifi/iwl-core.h:66:30: error: linux/utsrelease.h: No such file or directory
> 
> Caused by commit 250cce26d5d03337aec4ff8405121f026adb4a89 ("iwlwifi:
> driver version track kernel version") from the net tree interacting with
> commit 8e5c76aace9705b6983cfbf5eb2f2e869dab6738 ("kbuild: move
> utsrelease.h to include/generated") from the kbuild tree.
> 
> I applied this patch for today (and will carry it as necessary):

The right fix would be to use 'utsname()->sysname' (I think sysname
is the right member).

Then we should also be uts namespace aware.

	Sam

Re: linux-next: net/kbuild trees build failure

[Michal Marek]

On 7.12.2009 12:41, Sam Ravnborg wrote:
> On Mon, Dec 07, 2009 at 08:03:17PM +1100, Stephen Rothwell wrote:
>> Hi Dave,
>>
>> Today's linux-next build (powerpc allyesconfig) failed like this:
>>
>> In file included from drivers/net/wireless/iwlwifi/iwl3945-base.c:57:
>> drivers/net/wireless/iwlwifi/iwl-core.h:66:30: error: linux/utsrelease.h: No such file or directory
>>
>> Caused by commit 250cce26d5d03337aec4ff8405121f026adb4a89 ("iwlwifi:
>> driver version track kernel version") from the net tree interacting with
>> commit 8e5c76aace9705b6983cfbf5eb2f2e869dab6738 ("kbuild: move
>> utsrelease.h to include/generated") from the kbuild tree.
>>
>> I applied this patch for today (and will carry it as necessary):
> 
> The right fix would be to use 'utsname()->sysname' (I think sysname
> is the right member).

->release would be the right one. One could also question why iwlwifi
needs to repeat the kernel version it was built / is running against,
but I that's not the point here :). Dave, John, can we agree that
whichever tree gets merged first, the other tree applies the one-liner?

Thanks!
Michal

Re: linux-next: net/kbuild trees build failure

[John W. Linville]

On Mon, Dec 07, 2009 at 01:22:50PM +0100, Michal Marek wrote:
> On 7.12.2009 12:41, Sam Ravnborg wrote:
> > On Mon, Dec 07, 2009 at 08:03:17PM +1100, Stephen Rothwell wrote:
> >> Hi Dave,
> >>
> >> Today's linux-next build (powerpc allyesconfig) failed like this:
> >>
> >> In file included from drivers/net/wireless/iwlwifi/iwl3945-base.c:57:
> >> drivers/net/wireless/iwlwifi/iwl-core.h:66:30: error: linux/utsrelease.h: No such file or directory
> >>
> >> Caused by commit 250cce26d5d03337aec4ff8405121f026adb4a89 ("iwlwifi:
> >> driver version track kernel version") from the net tree interacting with
> >> commit 8e5c76aace9705b6983cfbf5eb2f2e869dab6738 ("kbuild: move
> >> utsrelease.h to include/generated") from the kbuild tree.
> >>
> >> I applied this patch for today (and will carry it as necessary):
> > 
> > The right fix would be to use 'utsname()->sysname' (I think sysname
> > is the right member).
> 
> ->release would be the right one. One could also question why iwlwifi
> needs to repeat the kernel version it was built / is running against,
> but I that's not the point here :). Dave, John, can we agree that
> whichever tree gets merged first, the other tree applies the one-liner?

Hmmm...well, the suggested fixes are fine for the printk (i.e. runtime)
usage.  But (other than Stephen's) they don't seem to help with the
MODULE_VERSION (i.e. compile time) usage.  Is there an approved
solution for that?

For some reason the Intel drivers encode some of their build options
into their MODULE_VERSION string.  Other than that, the vermagic
field from modinfo would seem to suffice for replacing this version
information.  Honestly, I'm not too fond of the "build options in
the version string" stuff...perhaps we could just get rid of it all?

From: John W. Linville <linville@tuxdriver.com>
Subject: [PATCH] iwlwifi: remove DRV_VERSION altogether

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 drivers/net/wireless/iwlwifi/iwl-agn.c      |   18 +-----------------
 drivers/net/wireless/iwlwifi/iwl-core.c     |    1 -
 drivers/net/wireless/iwlwifi/iwl-core.h     |    1 -
 drivers/net/wireless/iwlwifi/iwl3945-base.c |   16 +---------------
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index b8377ef..9d9dfef 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -67,23 +67,7 @@
  */
 #define DRV_DESCRIPTION	"Intel(R) Wireless WiFi Link AGN driver for Linux"
 
-#ifdef CONFIG_IWLWIFI_DEBUG
-#define VD "d"
-#else
-#define VD
-#endif
-
-#ifdef CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT
-#define VS "s"
-#else
-#define VS
-#endif
-
-#define DRV_VERSION     IWLWIFI_VERSION VD VS
-
-
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
-MODULE_VERSION(DRV_VERSION);
 MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("iwl4965");
@@ -3707,7 +3691,7 @@ static int __init iwl_init(void)
 {
 
 	int ret;
-	printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
+	printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION "\n");
 	printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
 
 	ret = iwlagn_rate_control_register();
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 574d366..1e79a57 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -43,7 +43,6 @@
 
 
 MODULE_DESCRIPTION("iwl core");
-MODULE_VERSION(IWLWIFI_VERSION);
 MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 675b7df..31594b2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -72,7 +72,6 @@ struct iwl_host_cmd;
 struct iwl_cmd;
 
 
-#define IWLWIFI_VERSION UTS_RELEASE "-k"
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2009 Intel Corporation"
 #define DRV_AUTHOR     "<ilw@linux.intel.com>"
 
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 2a28a1f..fb9e7c3 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -64,24 +64,10 @@
 #define DRV_DESCRIPTION	\
 "Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux"
 
-#ifdef CONFIG_IWLWIFI_DEBUG
-#define VD "d"
-#else
-#define VD
-#endif
-
-#ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT
-#define VS "s"
-#else
-#define VS
-#endif
-
-#define DRV_VERSION  IWLWIFI_VERSION VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2009 Intel Corporation"
 #define DRV_AUTHOR     "<ilw@linux.intel.com>"
 
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
-MODULE_VERSION(DRV_VERSION);
 MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
 MODULE_LICENSE("GPL");
 
@@ -4278,7 +4264,7 @@ static int __init iwl3945_init(void)
 {
 
 	int ret;
-	printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
+	printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION "\n");
 	printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
 
 	ret = iwl3945_rate_control_register();
-- 
1.6.2.5

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: linux-next: net/kbuild trees build failure

[reinette chatre]

Hi John,

On Mon, 2009-12-07 at 08:09 -0800, John W. Linville wrote:
> On Mon, Dec 07, 2009 at 01:22:50PM +0100, Michal Marek wrote:
> > On 7.12.2009 12:41, Sam Ravnborg wrote:
> > > On Mon, Dec 07, 2009 at 08:03:17PM +1100, Stephen Rothwell wrote:
> > >> Hi Dave,
> > >>
> > >> Today's linux-next build (powerpc allyesconfig) failed like this:
> > >>
> > >> In file included from drivers/net/wireless/iwlwifi/iwl3945-base.c:57:
> > >> drivers/net/wireless/iwlwifi/iwl-core.h:66:30: error: linux/utsrelease.h: No such file or directory
> > >>
> > >> Caused by commit 250cce26d5d03337aec4ff8405121f026adb4a89 ("iwlwifi:
> > >> driver version track kernel version") from the net tree interacting with
> > >> commit 8e5c76aace9705b6983cfbf5eb2f2e869dab6738 ("kbuild: move
> > >> utsrelease.h to include/generated") from the kbuild tree.
> > >>
> > >> I applied this patch for today (and will carry it as necessary):
> > > 
> > > The right fix would be to use 'utsname()->sysname' (I think sysname
> > > is the right member).
> > 
> > ->release would be the right one. One could also question why iwlwifi
> > needs to repeat the kernel version it was built / is running against,
> > but I that's not the point here :). Dave, John, can we agree that
> > whichever tree gets merged first, the other tree applies the one-liner?
> 
> Hmmm...well, the suggested fixes are fine for the printk (i.e. runtime)
> usage.  But (other than Stephen's) they don't seem to help with the
> MODULE_VERSION (i.e. compile time) usage.  Is there an approved
> solution for that?

Right - could we please use the solution that works at compile time? I
used UTS_RELEASE after learning about its use in init/version.c, would
that not make it an approved solution?

> For some reason the Intel drivers encode some of their build options
> into their MODULE_VERSION string.

This has been useful many times, especially to know if users compiled
with debug support so that we can immediately support users to
understand why the debug flags they are providing does not work.

>   Other than that, the vermagic
> field from modinfo would seem to suffice for replacing this version
> information.  Honestly, I'm not too fond of the "build options in
> the version string" stuff...perhaps we could just get rid of it all?

I would prefer not to since it has been useful on many occasions
already.

Reinette

Re: linux-next: net/kbuild trees build failure

[Michal Marek]

reinette chatre napsal(a):
> Hi John,
> 
> On Mon, 2009-12-07 at 08:09 -0800, John W. Linville wrote:
>> On Mon, Dec 07, 2009 at 01:22:50PM +0100, Michal Marek wrote:
>>> On 7.12.2009 12:41, Sam Ravnborg wrote:
>>>> On Mon, Dec 07, 2009 at 08:03:17PM +1100, Stephen Rothwell wrote:
>>>>> Hi Dave,
>>>>>
>>>>> Today's linux-next build (powerpc allyesconfig) failed like this:
>>>>>
>>>>> In file included from drivers/net/wireless/iwlwifi/iwl3945-base.c:57:
>>>>> drivers/net/wireless/iwlwifi/iwl-core.h:66:30: error: linux/utsrelease.h: No such file or directory
>>>>>
>>>>> Caused by commit 250cce26d5d03337aec4ff8405121f026adb4a89 ("iwlwifi:
>>>>> driver version track kernel version") from the net tree interacting with
>>>>> commit 8e5c76aace9705b6983cfbf5eb2f2e869dab6738 ("kbuild: move
>>>>> utsrelease.h to include/generated") from the kbuild tree.
>>>>>
>>>>> I applied this patch for today (and will carry it as necessary):
>>>> The right fix would be to use 'utsname()->sysname' (I think sysname
>>>> is the right member).
>>> ->release would be the right one. One could also question why iwlwifi
>>> needs to repeat the kernel version it was built / is running against,
>>> but I that's not the point here :). Dave, John, can we agree that
>>> whichever tree gets merged first, the other tree applies the one-liner?
>> Hmmm...well, the suggested fixes are fine for the printk (i.e. runtime)
>> usage.  But (other than Stephen's) they don't seem to help with the
>> MODULE_VERSION (i.e. compile time) usage.  Is there an approved
>> solution for that?
> 
> Right - could we please use the solution that works at compile time? I
> used UTS_RELEASE after learning about its use in init/version.c, would
> that not make it an approved solution?

It seems there is some misunderstanding.
The original problem reported by Stephen was that linux/utsrelease.h was
moved to generated/utsrelease.h in the kbuild tree (that commit also
patched init/version.c and all other users known at that time). This
change in kbuild broke the new iwlwifi in the net tree. Stephen attached
the most obvious fix, i.e. change linux/utsrelease.h to
generated/utsrelease.h in the iwlwifi source
(http://lkml.org/lkml/2009/12/7/121). My suggestion was to let Stephen
carry the fix in linux-next for now, and once one of the trees (kbuild
or net) hits mainline, the other tree would apply Stephen's patch. Would
that work for everyone?

Now if someone wants to remove the DRV_VERSION macro from iwlwifi or rip
the UTS_RELEASE part out of it, that would make this problem go away,
but I don't think it's necessary _just_ because of the kbuild change.

Michal

Re: linux-next: net/kbuild trees build failure

[reinette chatre]

On Mon, 2009-12-07 at 13:42 -0800, Michal Marek wrote:
> It seems there is some misunderstanding.
> The original problem reported by Stephen was that linux/utsrelease.h was
> moved to generated/utsrelease.h in the kbuild tree (that commit also
> patched init/version.c and all other users known at that time). This
> change in kbuild broke the new iwlwifi in the net tree. Stephen attached
> the most obvious fix, i.e. change linux/utsrelease.h to
> generated/utsrelease.h in the iwlwifi source
> (http://lkml.org/lkml/2009/12/7/121). My suggestion was to let Stephen
> carry the fix in linux-next for now, and once one of the trees (kbuild
> or net) hits mainline, the other tree would apply Stephen's patch. Would
> that work for everyone?

I am not involved in the merging part and would thus not be the one
applying Stephen's patch. I would like the iwlwifi patch that uses
UTS_RELEASE as well as Stephen's fix to find it in the right place to go
in though (end up in linux-2.6).

> Now if someone wants to remove the DRV_VERSION macro from iwlwifi or rip
> the UTS_RELEASE part out of it, that would make this problem go away,
> but I don't think it's necessary _just_ because of the kbuild change.

This is perhaps something John and I should discuss separately.

Thank you

Reinette

Re: linux-next: net/kbuild trees build failure

[John W. Linville]

On Mon, Dec 07, 2009 at 10:42:09PM +0100, Michal Marek wrote:
> reinette chatre napsal(a):

> > Right - could we please use the solution that works at compile time? I
> > used UTS_RELEASE after learning about its use in init/version.c, would
> > that not make it an approved solution?
> 
> It seems there is some misunderstanding.

Alright, if Stephen's fix is acceptable then your suggestion is fine.
Sam seemed to suggest that Stephen's fix was a stop-gap.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: linux-next: net/kbuild trees build failure

[Sam Ravnborg]

On Mon, Dec 07, 2009 at 05:28:53PM -0500, John W. Linville wrote:
> On Mon, Dec 07, 2009 at 10:42:09PM +0100, Michal Marek wrote:
> > reinette chatre napsal(a):
> 
> > > Right - could we please use the solution that works at compile time? I
> > > used UTS_RELEASE after learning about its use in init/version.c, would
> > > that not make it an approved solution?
> > 
> > It seems there is some misunderstanding.
> 
> Alright, if Stephen's fix is acceptable then your suggestion is fine.
> Sam seemed to suggest that Stephen's fix was a stop-gap.

The need to use utsrelease seems very prominent in external drivers.
But a quick grep turned up only a single staging driver in-tree that
include utsrelease.
So whatever problem this driver solves using utsrelease it is not shared
with the rest of the in-tree drivers.

So no - it is not a stop-gap. It is more a "is it really needed?".

	Sam

Re: linux-next: net/kbuild trees build failure

[John W. Linville]

On Tue, Dec 08, 2009 at 06:38:19AM +0100, Sam Ravnborg wrote:
> On Mon, Dec 07, 2009 at 05:28:53PM -0500, John W. Linville wrote:
> > On Mon, Dec 07, 2009 at 10:42:09PM +0100, Michal Marek wrote:
> > > reinette chatre napsal(a):
> > 
> > > > Right - could we please use the solution that works at compile time? I
> > > > used UTS_RELEASE after learning about its use in init/version.c, would
> > > > that not make it an approved solution?
> > > 
> > > It seems there is some misunderstanding.
> > 
> > Alright, if Stephen's fix is acceptable then your suggestion is fine.
> > Sam seemed to suggest that Stephen's fix was a stop-gap.
> 
> The need to use utsrelease seems very prominent in external drivers.
> But a quick grep turned up only a single staging driver in-tree that
> include utsrelease.
> So whatever problem this driver solves using utsrelease it is not shared
> with the rest of the in-tree drivers.
> 
> So no - it is not a stop-gap. It is more a "is it really needed?".

What problem are you trying to solve by eliminating it?

The iwlwifi team was trying to eliminate the nearly-useless version
number currently used in MODULE_VERSION.  As I said, I would prefer
to simply eliminate the MODULE_VERSION clause.  But the iwlwifi
team likes having something there, and UTS_RELEASE seems at least as
informative as what they had before.

So, the options are a) leave the useless version string as-is; b)
require the version string to get bumped on every update; c) use
UTS_RELEASE as a version string; or d) forcibly remove MODULE_VERSION
from the iwlwifi drivers.  Which would you advocate?

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: linux-next: net/kbuild trees build failure

[Stephen Rothwell]

Hi Michal,

On Mon, 7 Dec 2009 20:03:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> In file included from drivers/net/wireless/iwlwifi/iwl3945-base.c:57:
> drivers/net/wireless/iwlwifi/iwl-core.h:66:30: error: linux/utsrelease.h: No such file or directory
> 
> Caused by commit 250cce26d5d03337aec4ff8405121f026adb4a89 ("iwlwifi:
> driver version track kernel version") from the net tree interacting with
> commit 8e5c76aace9705b6983cfbf5eb2f2e869dab6738 ("kbuild: move
> utsrelease.h to include/generated") from the kbuild tree.
> 
> I applied this patch for today (and will carry it as necessary):

With the merge of the net tree into Linus' tree today, this patch (or
something else) is needed in the kbuild tree to avoid the above build
failure.  I have reproduced the patch below in case you want to use it.
I will be applying it as a merge fix to the merge of the kbuild tree
today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Dec 2009 19:56:42 +1100
Subject: [PATCH] net: fix for utsrelease.h moving to generated

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/iwlwifi/iwl-core.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 675b7df..27ca859 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -63,7 +63,7 @@
 #ifndef __iwl_core_h__
 #define __iwl_core_h__
 
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 
 /************************
  * forward declarations *
-- 
1.6.5.3


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/