linux-next: build failure after merge of the final tree (net-next tree related)

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 948 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:

net/packet/af_packet.c: In function 'packet_sendmsg_spkt':
net/packet/af_packet.c:1515:2: error: implicit declaration of function 'skb_probe_transport_header' [-Werror=implicit-function-declaration]
drivers/net/tun.c: In function 'tun_get_user':
drivers/net/tun.c:1206:2: error: implicit declaration of function 'skb_probe_transport_header' [-Werror=implicit-function-declaration]

Caused by commit 40893fd0fd4e ("net: switch to use
skb_probe_transport_header()").  This is a 32 bit build, so that
"BITS_PER_LONG > 32" is false and so NET_SKBUFF_DATA_USES_OFFSET is not
defined ... and skb_probe_transport_header() is only defined in an area of
skbuff.h protected by "#ifdef NET_SKBUFF_DATA_USES_OFFSET"  :-(

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Mar 2013 16:04:20 +1100

> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
> 
> net/packet/af_packet.c: In function 'packet_sendmsg_spkt':
> net/packet/af_packet.c:1515:2: error: implicit declaration of function 'skb_probe_transport_header' [-Werror=implicit-function-declaration]
> drivers/net/tun.c: In function 'tun_get_user':
> drivers/net/tun.c:1206:2: error: implicit declaration of function 'skb_probe_transport_header' [-Werror=implicit-function-declaration]
> 
> Caused by commit 40893fd0fd4e ("net: switch to use
> skb_probe_transport_header()").  This is a 32 bit build, so that
> "BITS_PER_LONG > 32" is false and so NET_SKBUFF_DATA_USES_OFFSET is not
> defined ... and skb_probe_transport_header() is only defined in an area of
> skbuff.h protected by "#ifdef NET_SKBUFF_DATA_USES_OFFSET"  :-(
> 
> I have reverted that commit for today.

This got fixed about an hour ago :-)

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 18 Mar 2014 18:27:52 +1100

> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> net/netfilter/nft_hash.c: In function 'nft_hash_tbl_free':
> net/netfilter/nft_hash.c:79:3: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]

I've applied the patch below to fix this, thanks.

> Caused by commit ce6eb0d7c8ec ("netfilter: nft_hash: bug fixes and
> resizing") from the net-next tree.  See Rule 1 in
> Documentation/SubmitChecklist.

This slips through a lot, and would happen less often if core x86
headers didn't bring in vmalloc.h :-)

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Mar 2014 21:21:00 +1100

> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/ethernet/intel/i40evf/built-in.o:(.data+0x1868): multiple definition of `i40e_ptype_lookup'
> drivers/net/ethernet/intel/i40e/built-in.o:(.data+0x3f58): first defined here
> 
> Caused by commit 206812b5fccb ("i40e/i40evf: i40e implementation for
> skb_set_hash") from the net-next tree.
> 
> I applied this patch for today (there is probably a better way):
> 
> From 6964d39f8436eade2cdb0c5236734c579b8b0897 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 17 Mar 2014 21:18:48 +1100
> Subject: [PATCH] i40e/i40evf: i40e implementation for skb_set_hash fix
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Jeff Kirsher gave me a patch today that fixes this, thanks Stephen.

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 944 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

net/netfilter/nft_hash.c: In function 'nft_hash_tbl_free':
net/netfilter/nft_hash.c:79:3: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
   vfree(tbl);
   ^
net/netfilter/nft_hash.c: In function 'nft_hash_tbl_alloc':
net/netfilter/nft_hash.c:92:3: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
   tbl = vzalloc(size);
   ^
net/netfilter/nft_hash.c:92:7: warning: assignment makes pointer from integer without a cast [enabled by default]
   tbl = vzalloc(size);
       ^

Caused by commit ce6eb0d7c8ec ("netfilter: nft_hash: bug fixes and
resizing") from the net-next tree.  See Rule 1 in
Documentation/SubmitChecklist.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3400 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/ethernet/intel/i40evf/built-in.o:(.data+0x1868): multiple definition of `i40e_ptype_lookup'
drivers/net/ethernet/intel/i40e/built-in.o:(.data+0x3f58): first defined here

Caused by commit 206812b5fccb ("i40e/i40evf: i40e implementation for
skb_set_hash") from the net-next tree.

I applied this patch for today (there is probably a better way):

From 6964d39f8436eade2cdb0c5236734c579b8b0897 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Mar 2014 21:18:48 +1100
Subject: [PATCH] i40e/i40evf: i40e implementation for skb_set_hash fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/intel/i40evf/i40e_common.c    | 8 ++++----
 drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c
index 78618af271cf..c688a0fc5c29 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c
@@ -160,7 +160,7 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
 }
 
 
-/* The i40e_ptype_lookup table is used to convert from the 8-bit ptype in the
+/* The i40evf_ptype_lookup table is used to convert from the 8-bit ptype in the
  * hardware to a bit-field that can be used by SW to more easily determine the
  * packet type.
  *
@@ -173,10 +173,10 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
  *
  * Typical work flow:
  *
- * IF NOT i40e_ptype_lookup[ptype].known
+ * IF NOT i40evf_ptype_lookup[ptype].known
  * THEN
  *      Packet is unknown
- * ELSE IF i40e_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP
+ * ELSE IF i40evf_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP
  *      Use the rest of the fields to look at the tunnels, inner protocols, etc
  * ELSE
  *      Use the enum i40e_rx_l2_ptype to decode the packet type
@@ -205,7 +205,7 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
 #define I40E_RX_PTYPE_INNER_PROT_TS	I40E_RX_PTYPE_INNER_PROT_TIMESYNC
 
 /* Lookup table mapping the HW PTYPE to the bit field for decoding */
-struct i40e_rx_ptype_decoded i40e_ptype_lookup[] = {
+struct i40e_rx_ptype_decoded i40evf_ptype_lookup[] = {
 	/* L2 Packet types */
 	I40E_PTT_UNUSED_ENTRY(0),
 	I40E_PTT(1,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_prototype.h b/drivers/net/ethernet/intel/i40evf/i40e_prototype.h
index 33c99051cc96..862fcdf52675 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_prototype.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_prototype.h
@@ -63,11 +63,11 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
 
 i40e_status i40e_set_mac_type(struct i40e_hw *hw);
 
-extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];
+extern struct i40e_rx_ptype_decoded i40evf_ptype_lookup[];
 
 static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)
 {
-	return  i40e_ptype_lookup[ptype];
+	return  i40evf_ptype_lookup[ptype];
 }
 
 /* prototype for functions used for SW locks */
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 748 bytes --]

Hi all,

After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:

drivers/net/ethernet/intel/e1000e/netdev.c:7079:13: error: 'e1000e_pm_suspend' undeclared here (not in a function)
drivers/net/ethernet/intel/e1000e/netdev.c:7080:13: error: 'e1000e_pm_resume' undeclared here (not in a function)
drivers/net/ethernet/intel/e1000e/netdev.c:7082:11: error: 'e1000e_pm_thaw' undeclared here (not in a function)

Caused by commit 2800209994f8 ("e1000e: Refactor PM flows") from the
net-next tree.

I reverted that commit for today (and 63eb48f151b5 "e1000e Refactor of
Runtime Power Management" that conflicts with the revert).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Cong Wang]

On Mon, 2013-09-02 at 19:11 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/vxlan.c: In function 'vxlan6_xmit_skb':
> drivers/net/vxlan.c:1441:3: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]
>    uh->check = csum_ipv6_magic(saddr, daddr, skb->len,
>    ^
> 
> Caused by commit e4c7ed415387 ("vxlan: add ipv6 support").
> 
> Please read Rule 1 in Documentation/SubmitChecklist.
> 
> I added the following patch for today:

Hi, Stephen

I sent a same patch this morning:
http://marc.info/?l=linux-netdev&m=137808763132336&w=2

Thanks!

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/vxlan.c: In function 'vxlan6_xmit_skb':
drivers/net/vxlan.c:1441:3: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]
   uh->check = csum_ipv6_magic(saddr, daddr, skb->len,
   ^

Caused by commit e4c7ed415387 ("vxlan: add ipv6 support").

Please read Rule 1 in Documentation/SubmitChecklist.

I added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Sep 2013 19:04:51 +1000
Subject: [PATCH] vxlan: include the file that declares csum_ipv6_magic

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/vxlan.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 3ffb22d..35c78b3 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -44,6 +44,7 @@
 #include <net/ipv6.h>
 #include <net/addrconf.h>
 #include <net/ip6_tunnel.h>
+#include <net/ip6_checksum.h>
 #endif
 
 #define VXLAN_VERSION	"0.1"
-- 
1.8.4.rc3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Jul 2013 17:48:22 +1000

> I cherry-picked the commit 419076f59fc5 ("net: lls fix build with
> allnoconfig") out of tomorrow's net-next tree.  (I am feeling generous
> and noticed that patch being applied :-))

Thank you :)

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Eliezer Tamir]

On 03/07/2013 10:48, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
>
> fs/select.c: In function 'do_select':
> fs/select.c:408:2: error: implicit declaration of function 'll_start_time' [-Werror=implicit-function-declaration]
>    u64 ll_start = ll_start_time(ll_flag);
[..]
> Caused by commit 1bc2774d8664 ("net: convert lls to use time_in_range()")
> from the net-next tree.
>
> I cherry-picked the commit 419076f59fc5 ("net: lls fix build with
> allnoconfig") out of tomorrow's net-next tree.  (I am feeling generous
> and noticed that patch being applied :-))

Yes, my bad.
Thank you.

I knew lots of people could get this so I sent out a fix ASAP (at 6AM
my time).

If it's not too much trouble we should add:
Reported-by: kbuild test robot <fengguang.wu@intel.com>

-Eliezer

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Sedat Dilek]

On Wed, Jul 3, 2013 at 9:48 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
[...]
> Caused by commit 1bc2774d8664 ("net: convert lls to use time_in_range()")
> from the net-next tree.
>
> I cherry-picked the commit 419076f59fc5 ("net: lls fix build with
> allnoconfig") out of tomorrow's net-next tree.  (I am feeling generous
> and noticed that patch being applied :-))
>

/me loves generous coders and shy girls.

- Sedat -

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allnoconfig) failed like this:

fs/select.c: In function 'do_select':
fs/select.c:408:2: error: implicit declaration of function 'll_start_time' [-Werror=implicit-function-declaration]
  u64 ll_start = ll_start_time(ll_flag);
  ^
fs/select.c:409:2: error: implicit declaration of function 'll_run_time' [-Werror=implicit-function-declaration]
  u64 ll_time = ll_run_time();
  ^
fs/select.c:504:3: error: too many arguments to function 'can_poll_ll'
   if (ll_flag && can_ll && can_poll_ll(ll_start, ll_time))
   ^
In file included from fs/select.c:31:0:
include/net/ll_poll.h:194:20: note: declared here
 static inline bool can_poll_ll(u64 end_time)
                    ^
fs/select.c: In function 'do_poll':
fs/select.c:826:3: error: too many arguments to function 'can_poll_ll'
   if (ll_flag && can_ll && can_poll_ll(ll_start, ll_time))
   ^
In file included from fs/select.c:31:0:
include/net/ll_poll.h:194:20: note: declared here
 static inline bool can_poll_ll(u64 end_time)
                    ^

Caused by commit 1bc2774d8664 ("net: convert lls to use time_in_range()")
from the net-next tree.

I cherry-picked the commit 419076f59fc5 ("net: lls fix build with
allnoconfig") out of tomorrow's net-next tree.  (I am feeling generous
and noticed that patch being applied :-))

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Date: Wed, 26 Jun 2013 08:07:37 +0000

> On 06/26/2013 11:56 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the final tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
> []
>> Caused by commit e4f2379db6c6 ("ethernet/arc/arc_emac - Add new driver")
>> from the net-next tree.
>>
>> I have reverted that commit for today.
> 
> I've just sent a patch that fixes reported issues (both errors and 
> warnings).

And I've just applied it.

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Alexey Brodkin]

On 06/26/2013 11:56 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
[]
> Caused by commit e4f2379db6c6 ("ethernet/arc/arc_emac - Add new driver")
> from the net-next tree.
>
> I have reverted that commit for today.

I've just sent a patch that fixes reported issues (both errors and 
warnings).
===
[PATCH] arc_emac: fix compile-time errors & warnings on PPC64
===
So it could be merged with initial patch.

Or I may send another cumulative re-spin.

What's the best way?

Regards,
Alexey

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 15670 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from arch/powerpc/include/asm/dma-mapping.h:123:0,
                 from include/linux/dma-mapping.h:76,
                 from include/linux/skbuff.h:33,
                 from include/linux/if_ether.h:23,
                 from include/linux/etherdevice.h:25,
                 from drivers/net/ethernet/arc/emac_main.c:16:
drivers/net/ethernet/arc/emac_main.c: In function 'arc_emac_tx_clean':
include/linux/dma-mapping.h:227:56: error: request for member 'addr' in something not a structure or union
 #define dma_unmap_addr(PTR, ADDR_NAME)           ((PTR)->ADDR_NAME)
                                                        ^
include/asm-generic/dma-mapping-common.h:175:64: note: in definition of macro 'dma_unmap_single'
 #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
                                                                ^
drivers/net/ethernet/arc/emac_main.c:174:32: note: in expansion of macro 'dma_unmap_addr'
   dma_unmap_single(&ndev->dev, dma_unmap_addr(&tx_buff, addr),
                                ^
include/linux/dma-mapping.h:229:56: error: request for member 'len' in something not a structure or union
 #define dma_unmap_len(PTR, LEN_NAME)             ((PTR)->LEN_NAME)
                                                        ^
include/asm-generic/dma-mapping-common.h:175:67: note: in definition of macro 'dma_unmap_single'
 #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
                                                                   ^
drivers/net/ethernet/arc/emac_main.c:175:6: note: in expansion of macro 'dma_unmap_len'
      dma_unmap_len(&tx_buff, len), DMA_TO_DEVICE);
      ^
drivers/net/ethernet/arc/emac_main.c: In function 'arc_emac_rx':
include/linux/dma-mapping.h:227:56: error: request for member 'addr' in something not a structure or union
 #define dma_unmap_addr(PTR, ADDR_NAME)           ((PTR)->ADDR_NAME)
                                                        ^
include/asm-generic/dma-mapping-common.h:175:64: note: in definition of macro 'dma_unmap_single'
 #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
                                                                ^
drivers/net/ethernet/arc/emac_main.c:243:32: note: in expansion of macro 'dma_unmap_addr'
   dma_unmap_single(&ndev->dev, dma_unmap_addr(&rx_buff, addr),
                                ^
include/linux/dma-mapping.h:229:56: error: request for member 'len' in something not a structure or union
 #define dma_unmap_len(PTR, LEN_NAME)             ((PTR)->LEN_NAME)
                                                        ^
include/asm-generic/dma-mapping-common.h:175:67: note: in definition of macro 'dma_unmap_single'
 #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
                                                                   ^
drivers/net/ethernet/arc/emac_main.c:244:6: note: in expansion of macro 'dma_unmap_len'
      dma_unmap_len(&rx_buff, len), DMA_FROM_DEVICE);
      ^
In file included from include/linux/skbuff.h:33:0,
                 from include/linux/if_ether.h:23,
                 from include/linux/etherdevice.h:25,
                 from drivers/net/ethernet/arc/emac_main.c:16:
include/linux/dma-mapping.h:228:57: error: request for member 'mapping' in something not a structure or union
 #define dma_unmap_addr_set(PTR, ADDR_NAME, VAL)  (((PTR)->ADDR_NAME) = (VAL))
                                                         ^
drivers/net/ethernet/arc/emac_main.c:267:3: note: in expansion of macro 'dma_unmap_addr_set'
   dma_unmap_addr_set(&rx_buff, mapping, addr);
   ^
include/linux/dma-mapping.h:230:57: error: request for member 'len' in something not a structure or union
 #define dma_unmap_len_set(PTR, LEN_NAME, VAL)    (((PTR)->LEN_NAME) = (VAL))
                                                         ^
drivers/net/ethernet/arc/emac_main.c:268:3: note: in expansion of macro 'dma_unmap_len_set'
   dma_unmap_len_set(&rx_buff, len, buflen);
   ^
In file included from include/linux/swab.h:4:0,
                 from include/uapi/linux/byteorder/big_endian.h:12,
                 from include/linux/byteorder/big_endian.h:4,
                 from arch/powerpc/include/uapi/asm/byteorder.h:10,
                 from include/asm-generic/bitops/le.h:5,
                 from arch/powerpc/include/asm/bitops.h:278,
                 from include/linux/bitops.h:22,
                 from include/linux/kernel.h:10,
                 from include/linux/skbuff.h:17,
                 from include/linux/if_ether.h:23,
                 from include/linux/etherdevice.h:25,
                 from drivers/net/ethernet/arc/emac_main.c:16:
include/uapi/linux/swab.h:115:24: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (__builtin_constant_p((__u32)(x)) ? \
                        ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:270:16: note: in expansion of macro 'cpu_to_le32'
   rxbd->data = cpu_to_le32(rx_buff->skb->data);
                ^
include/uapi/linux/swab.h:17:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (((__u32)(x) & (__u32)0x000000ffUL) << 24) |  \
    ^
include/uapi/linux/swab.h:116:2: note: in expansion of macro '___constant_swab32'
  ___constant_swab32(x) :   \
  ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:270:16: note: in expansion of macro 'cpu_to_le32'
   rxbd->data = cpu_to_le32(rx_buff->skb->data);
                ^
include/uapi/linux/swab.h:18:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (((__u32)(x) & (__u32)0x0000ff00UL) <<  8) |  \
    ^
include/uapi/linux/swab.h:116:2: note: in expansion of macro '___constant_swab32'
  ___constant_swab32(x) :   \
  ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:270:16: note: in expansion of macro 'cpu_to_le32'
   rxbd->data = cpu_to_le32(rx_buff->skb->data);
                ^
include/uapi/linux/swab.h:19:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (((__u32)(x) & (__u32)0x00ff0000UL) >>  8) |  \
    ^
include/uapi/linux/swab.h:116:2: note: in expansion of macro '___constant_swab32'
  ___constant_swab32(x) :   \
  ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:270:16: note: in expansion of macro 'cpu_to_le32'
   rxbd->data = cpu_to_le32(rx_buff->skb->data);
                ^
include/uapi/linux/swab.h:20:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (((__u32)(x) & (__u32)0xff000000UL) >> 24)))
    ^
include/uapi/linux/swab.h:116:2: note: in expansion of macro '___constant_swab32'
  ___constant_swab32(x) :   \
  ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:270:16: note: in expansion of macro 'cpu_to_le32'
   rxbd->data = cpu_to_le32(rx_buff->skb->data);
                ^
drivers/net/ethernet/arc/emac_main.c:270:3: warning: passing argument 1 of '__fswab32' makes integer from pointer without a cast [enabled by default]
   rxbd->data = cpu_to_le32(rx_buff->skb->data);
   ^
In file included from include/linux/swab.h:4:0,
                 from include/uapi/linux/byteorder/big_endian.h:12,
                 from include/linux/byteorder/big_endian.h:4,
                 from arch/powerpc/include/uapi/asm/byteorder.h:10,
                 from include/asm-generic/bitops/le.h:5,
                 from arch/powerpc/include/asm/bitops.h:278,
                 from include/linux/bitops.h:22,
                 from include/linux/kernel.h:10,
                 from include/linux/skbuff.h:17,
                 from include/linux/if_ether.h:23,
                 from include/linux/etherdevice.h:25,
                 from drivers/net/ethernet/arc/emac_main.c:16:
include/uapi/linux/swab.h:57:41: note: expected '__u32' but argument is of type 'unsigned char *'
 static inline __attribute_const__ __u32 __fswab32(__u32 val)
                                         ^
drivers/net/ethernet/arc/emac_main.c: In function 'arc_emac_open':
include/uapi/linux/swab.h:115:24: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (__builtin_constant_p((__u32)(x)) ? \
                        ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:406:14: note: in expansion of macro 'cpu_to_le32'
   bd->data = cpu_to_le32(skb->data);
              ^
include/uapi/linux/swab.h:17:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (((__u32)(x) & (__u32)0x000000ffUL) << 24) |  \
    ^
include/uapi/linux/swab.h:116:2: note: in expansion of macro '___constant_swab32'
  ___constant_swab32(x) :   \
  ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:406:14: note: in expansion of macro 'cpu_to_le32'
   bd->data = cpu_to_le32(skb->data);
              ^
include/uapi/linux/swab.h:18:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (((__u32)(x) & (__u32)0x0000ff00UL) <<  8) |  \
    ^
include/uapi/linux/swab.h:116:2: note: in expansion of macro '___constant_swab32'
  ___constant_swab32(x) :   \
  ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:406:14: note: in expansion of macro 'cpu_to_le32'
   bd->data = cpu_to_le32(skb->data);
              ^
include/uapi/linux/swab.h:19:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (((__u32)(x) & (__u32)0x00ff0000UL) >>  8) |  \
    ^
include/uapi/linux/swab.h:116:2: note: in expansion of macro '___constant_swab32'
  ___constant_swab32(x) :   \
  ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:406:14: note: in expansion of macro 'cpu_to_le32'
   bd->data = cpu_to_le32(skb->data);
              ^
include/uapi/linux/swab.h:20:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  (((__u32)(x) & (__u32)0xff000000UL) >> 24)))
    ^
include/uapi/linux/swab.h:116:2: note: in expansion of macro '___constant_swab32'
  ___constant_swab32(x) :   \
  ^
include/uapi/linux/byteorder/big_endian.h:32:43: note: in expansion of macro '__swab32'
 #define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
                                           ^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
 #define cpu_to_le32 __cpu_to_le32
                     ^
drivers/net/ethernet/arc/emac_main.c:406:14: note: in expansion of macro 'cpu_to_le32'
   bd->data = cpu_to_le32(skb->data);
              ^
drivers/net/ethernet/arc/emac_main.c:406:3: warning: passing argument 1 of '__fswab32' makes integer from pointer without a cast [enabled by default]
   bd->data = cpu_to_le32(skb->data);
   ^
In file included from include/linux/swab.h:4:0,
                 from include/uapi/linux/byteorder/big_endian.h:12,
                 from include/linux/byteorder/big_endian.h:4,
                 from arch/powerpc/include/uapi/asm/byteorder.h:10,
                 from include/asm-generic/bitops/le.h:5,
                 from arch/powerpc/include/asm/bitops.h:278,
                 from include/linux/bitops.h:22,
                 from include/linux/kernel.h:10,
                 from include/linux/skbuff.h:17,
                 from include/linux/if_ether.h:23,
                 from include/linux/etherdevice.h:25,
                 from drivers/net/ethernet/arc/emac_main.c:16:
include/uapi/linux/swab.h:57:41: note: expected '__u32' but argument is of type 'unsigned char *'
 static inline __attribute_const__ __u32 __fswab32(__u32 val)
                                         ^
In file included from include/linux/skbuff.h:33:0,
                 from include/linux/if_ether.h:23,
                 from include/linux/etherdevice.h:25,
                 from drivers/net/ethernet/arc/emac_main.c:16:
drivers/net/ethernet/arc/emac_main.c: In function 'arc_emac_tx':
include/linux/dma-mapping.h:228:57: error: 'struct buffer_state' has no member named 'mapping'
 #define dma_unmap_addr_set(PTR, ADDR_NAME, VAL)  (((PTR)->ADDR_NAME) = (VAL))
                                                         ^
drivers/net/ethernet/arc/emac_main.c:546:2: note: in expansion of macro 'dma_unmap_addr_set'
  dma_unmap_addr_set(&priv->tx_buff[*txbd_curr], mapping, addr);
  ^

Caused by commit e4f2379db6c6 ("ethernet/arc/arc_emac - Add new driver")
from the net-next tree.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Rientjes]

On Tue, 23 Apr 2013, Stephen Rothwell wrote:

> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> net/netlink/af_netlink.c: In function 'netlink_frame_flush_dcache':
> net/netlink/af_netlink.c:384:40: error: 'NL_MMAP_MSG_HDRLEN' undeclared (first use in this function)
> 
> Caused by commit 9652e931e73b ("netlink: add mmap'ed netlink helper
> functions").  This needed to be build tested on an architecture that has
> ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE set to 1 (like Sparc :-)).
> 

Hijacking this thread since I didn't see the causing patch to be posted to 
lkml.  From linux-next:

net/netlink/af_netlink.c: In function 'netlink_queue_mmaped_skb':
net/netlink/af_netlink.c:663:14: error: incompatible types when assigning to type '__u32' from type 'kuid_t'
net/netlink/af_netlink.c:664:14: error: incompatible types when assigning to type '__u32' from type 'kgid_t'
net/netlink/af_netlink.c: In function 'netlink_ring_set_copied':
net/netlink/af_netlink.c:693:14: error: incompatible types when assigning to type '__u32' from type 'kuid_t'
net/netlink/af_netlink.c:694:14: error: incompatible types when assigning to type '__u32' from type 'kgid_t'

for a config with CONFIG_UIDGID_STRICT_TYPE_CHECKS enabled.

Looks like it's coming from f9c2288837ba ("netlink: implement memory 
mapped recvmsg()").  Patrick?

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Apr 2013 17:46:18 +1000

> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> net/netlink/af_netlink.c: In function 'netlink_frame_flush_dcache':
> net/netlink/af_netlink.c:384:40: error: 'NL_MMAP_MSG_HDRLEN' undeclared (first use in this function)
> 
> Caused by commit 9652e931e73b ("netlink: add mmap'ed netlink helper
> functions").  This needed to be build tested on an architecture that has
> ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE set to 1 (like Sparc :-)).

Sorry, my Sparcs are busy debugging other things at the moment :-)
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 23 Apr 2013 17:40:35 +1000
> Subject: [PATCH] netlink: fix typo in net/netlink/af_netlink.c
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks!

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1513 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

net/netlink/af_netlink.c: In function 'netlink_frame_flush_dcache':
net/netlink/af_netlink.c:384:40: error: 'NL_MMAP_MSG_HDRLEN' undeclared (first use in this function)

Caused by commit 9652e931e73b ("netlink: add mmap'ed netlink helper
functions").  This needed to be build tested on an architecture that has
ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE set to 1 (like Sparc :-)).

I added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Apr 2013 17:40:35 +1000
Subject: [PATCH] netlink: fix typo in net/netlink/af_netlink.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/netlink/af_netlink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 2a3e9ba..da5601d 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -381,7 +381,7 @@ static void netlink_frame_flush_dcache(const struct nl_mmap_hdr *hdr)
 
 	/* First page is flushed through netlink_{get,set}_status */
 	p_start = pgvec_to_page(hdr + PAGE_SIZE);
-	p_end   = pgvec_to_page((void *)hdr + NL_MMAP_MSG_HDRLEN + hdr->nm_len - 1);
+	p_end   = pgvec_to_page((void *)hdr + NL_MMAP_HDRLEN + hdr->nm_len - 1);
 	while (p_start <= p_end) {
 		flush_dcache_page(p_start);
 		p_start++;
-- 
1.8.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 12 Apr 2013 16:00:18 +1000

> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> net/core/netprio_cgroup.c:250:29: error: static declaration of 'net_prio_subsys' follows non-static declaration
> include/linux/cgroup_subsys.h:71:1: note: previous declaration of 'net_prio_subsys' was here
> 
> Caused by commit 763eff57de89 ("netprio_cgroup: make local table static")
> from the net-next tree.
> 
> I have reverted that commit for today.

I've reverted it from net-next too, thanks Stephen.

> /me hates macros that construct symbols ...

/me hates automatic checkers that don't expand macros :-)

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

net/core/netprio_cgroup.c:250:29: error: static declaration of 'net_prio_subsys' follows non-static declaration
include/linux/cgroup_subsys.h:71:1: note: previous declaration of 'net_prio_subsys' was here

Caused by commit 763eff57de89 ("netprio_cgroup: make local table static")
from the net-next tree.

I have reverted that commit for today.

/me hates macros that construct symbols ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jan 2013 14:23:53 +1100

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 3 Jan 2013 14:19:16 +1100
> Subject: [PATCH] qlcnic: do not duplicate infrastructure functions
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied.

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jan 2013 14:23:53 +1100

> Caused by commit 13159183ec7a ("qlcnic: 83xx base driver") from the
> net-next tree.  Why is this commit adding a function that already exists
> globally?

And this is after I pushed back on this patch series 5 times or so.

You qlogic guys, can you see why I give you such a hard time with
your patch submissions?  Even after I ask you to correct all of the
most obvious problems, there is still garbage like this that shows
up in your changes.

What in the world do I have to do, other than push back on your
submissions even harder, to keep crap like this from happening
in the future?

Tell me.

You, as a group, are the absolute worst networking driver submitters.

This is a real problem because you submit large bodies of code that 1)
nobody wants to review and 2) has a very small user base.  So you
impart an extremely large burdon upon me, in particular, because I'm
the only person that actually reviews your code at all.

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2514 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/built-in.o: In function `pci_get_domain_bus_and_slot':
(.opd+0x449e8): multiple definition of `pci_get_domain_bus_and_slot'
drivers/pci/built-in.o:(.opd+0x1c98): first defined here

Caused by commit 13159183ec7a ("qlcnic: 83xx base driver") from the
net-next tree.  Why is this commit adding a function that already exists
globally?

I added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jan 2013 14:19:16 +1100
Subject: [PATCH] qlcnic: do not duplicate infrastructure functions

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c |   20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index e1a3625..3bdb1beae 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2,12 +2,6 @@
  * QLogic qlcnic NIC Driver
  * Copyright (c)  2009-2010 QLogic Corporation
  *
- * PCI searching functions pci_get_domain_bus_and_slot & pci_channel_offline
- * Copyright (C) 1993 -- 1997 Drew Eckhardt, Frederic Potter,
- *					David Mosberger-Tang
- * Copyright (C) 1997 -- 2000 Martin Mares <mj@ucw.cz>
- * Copyright (C) 2003 -- 2004 Greg Kroah-Hartman <greg@kroah.com>.
- *
  * See LICENSE.qlcnic for copyright and licensing details.
  */
 
@@ -25,6 +19,7 @@
 #include <linux/inetdevice.h>
 #include <linux/aer.h>
 #include <linux/log2.h>
+#include <linux/pci.h>
 
 MODULE_DESCRIPTION("QLogic 1/10 GbE Converged/Intelligent Ethernet Driver");
 MODULE_LICENSE("GPL");
@@ -2907,19 +2902,6 @@ reschedule:
 	qlcnic_schedule_work(adapter, qlcnic_fw_poll_work, FW_POLL_DELAY);
 }
 
-struct pci_dev *pci_get_domain_bus_and_slot(int domain, unsigned int bus,
-					    unsigned int devfn)
-{
-	struct pci_dev *dev = NULL;
-
-	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-		if (pci_domain_nr(dev->bus) == domain &&
-		    (dev->bus->number == bus && dev->devfn == devfn))
-			return dev;
-	}
-	return NULL;
-}
-
 static int qlcnic_is_first_func(struct pci_dev *pdev)
 {
 	struct pci_dev *oth_pdev;
-- 
1.7.10.280.gaa39

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Benjamin Herrenschmidt]

On Sat, 2012-09-22 at 16:00 -0400, David Miller wrote:
> 
> I think I'm going to just end up restricting this driver to X86
> as was originally suggested.

Probably the easiest fix indeed.

> There seems to be no real consistent Kconfig protection for users
> of isa_virt_to_bus() and friends.
> 
> We know that ISA_DMA_API doesn't do it, and ISA doesn't do it either
> as powerpc also allows that to bet set for CHRP and friends.

It's a old mess :-( And not an easy one to untangle...

Cheers,
Ben.

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sat, 22 Sep 2012 07:46:40 +1000

> Right, but on ppc, GFP_DMA is a nop (no separate ZONE_DMA, or rather all
> of memory is ZONE_DMA). It's always been like that afaik.
> 
> We could support ISA device limited addressability using the iommu but
> that would involve a map/unmap type API (which I remember we did support
> in the old days by passing NULL to pci_map_*, but we dropped that along
> the way).

I think I'm going to just end up restricting this driver to X86
as was originally suggested.

There seems to be no real consistent Kconfig protection for users
of isa_virt_to_bus() and friends.

We know that ISA_DMA_API doesn't do it, and ISA doesn't do it either
as powerpc also allows that to bet set for CHRP and friends.

Thanks.

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Benjamin Herrenschmidt]

On Thu, 2012-09-20 at 18:53 -0400, David Miller wrote:
> From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Date: Fri, 21 Sep 2012 08:22:44 +1000
> 
> > Hrm, that's ancient gunk, I'll have to dig. We potentially can support
> > ISA devices DMA'ing from an ISA bridge... but via the iommu, which means
> > isa_virt_to_bus is a non-starter.
> > 
> > But then, do we really care ? IE. Is there single device that actually
> > requires ISA_DMA_API and that is expected to work on any currently
> > supported powerpc hw ? :-)
> > 
> > We don't even support PReP anymore, so that leaves us with what ?
> 
> ISA_DMA_API implies a fixed window of addresses which are <= 32-bits
> on the bus, which is a hardware requirement of these devices.
>
> isa_virt_to_bus() goes to that physical address, and the expection is
> that you use GFP_DMA and thus the physical addresses fit inside of
> an unsigned int.

Right, but on ppc, GFP_DMA is a nop (no separate ZONE_DMA, or rather all
of memory is ZONE_DMA). It's always been like that afaik.

We could support ISA device limited addressability using the iommu but
that would involve a map/unmap type API (which I remember we did support
in the old days by passing NULL to pci_map_*, but we dropped that along
the way).

> isa_virt_to_bus() basically amounts to a virt-->phys plus a cast.
> 
> > Anybody has an objection to turning ISA_DMA_API off ?
> 
> Then you can remove all of the DMA api stuff in powerpc's asm/dma.h
> but some of it looks like it might be in use.

I will dig a bit. I think there might be some users of the ISA DMA
engine for legacy floppies and parport on some early pSeries and CHRP
machines (including Pegasos).

Cheers,
Ben.

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1814 bytes --]

Hi Dave,

On Thu, 20 Sep 2012 17:36:22 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/ethernet/i825xx/znet.c: In function 'hardware_init':
> drivers/net/ethernet/i825xx/znet.c:868:2: error: implicit declaration of function 'isa_virt_to_bus' [-Werror=implicit-function-declaration]
> 
> Caused by commit 1d3ff76759b7 ("i825xx: znet: fix compiler warnings when
> building a 64-bit kernel").  Is there some Kconfig dependency missing (CONFIG_ISA)?
> 
> I have reverted that commit for today.

Today, I have added the following merge fix patch instead of reverting the
above (just until PowerPC can be fixed one way or the other).  I don't
know if you want to put this into the net-next tree, but it may be a
reasonable temporary measure.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 21 Sep 2012 11:32:09 +1000
Subject: [PATCH] i825xx: znet: temporarily disable on PPC

due to build problems

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/i825xx/Kconfig |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index fed5080..9fce38b 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -151,6 +151,7 @@ config SUN3_82586
 config ZNET
 	tristate "Zenith Z-Note support (EXPERIMENTAL)"
 	depends on EXPERIMENTAL && ISA_DMA_API
+	depends on !PPC
 	---help---
 	  The Zenith Z-Note notebook computer has a built-in network
 	  (Ethernet) card, and this is the Linux driver for it. Note that the
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 21 Sep 2012 08:22:44 +1000

> Hrm, that's ancient gunk, I'll have to dig. We potentially can support
> ISA devices DMA'ing from an ISA bridge... but via the iommu, which means
> isa_virt_to_bus is a non-starter.
> 
> But then, do we really care ? IE. Is there single device that actually
> requires ISA_DMA_API and that is expected to work on any currently
> supported powerpc hw ? :-)
> 
> We don't even support PReP anymore, so that leaves us with what ?

ISA_DMA_API implies a fixed window of addresses which are <= 32-bits
on the bus, which is a hardware requirement of these devices.

isa_virt_to_bus() goes to that physical address, and the expection is
that you use GFP_DMA and thus the physical addresses fit inside of
an unsigned int.

isa_virt_to_bus() basically amounts to a virt-->phys plus a cast.

> Anybody has an objection to turning ISA_DMA_API off ?

Then you can remove all of the DMA api stuff in powerpc's asm/dma.h
but some of it looks like it might be in use.

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

Hi Dave,

On Thu, 20 Sep 2012 16:45:58 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> I think the powerpc port is at fault here.
> 
> Part of being able to advertise ISA_DMA_API is providing isa_virt_to_bus().

Not disagreeing, but it would be nice if this was documented somewhere
(maybe in Documentation/DMA-ISA-LPC.txt).  We have not had this problem
before because all the other uses of isa_virt_to_bus() are in drivers
that depend on X86 or ARM or ISA or EISA.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Benjamin Herrenschmidt]

> > I think the powerpc port is at fault here.
> > 
> > Part of being able to advertise ISA_DMA_API is providing isa_virt_to_bus().

Hrm, that's ancient gunk, I'll have to dig. We potentially can support
ISA devices DMA'ing from an ISA bridge... but via the iommu, which means
isa_virt_to_bus is a non-starter.

But then, do we really care ? IE. Is there single device that actually
requires ISA_DMA_API and that is expected to work on any currently
supported powerpc hw ? :-)

We don't even support PReP anymore, so that leaves us with what ?

Anybody has an objection to turning ISA_DMA_API off ?

Cheers,
Ben.

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]

[Just bring this to the attention of the PowerPC folks ...]

On Thu, 20 Sep 2012 16:45:58 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> From: Mika Westerberg <mika.westerberg@linux.intel.com>
> Date: Thu, 20 Sep 2012 12:10:14 +0300
> 
> > On Thu, Sep 20, 2012 at 05:36:22PM +1000, Stephen Rothwell wrote:
> >> Hi all,
> >> 
> >> After merging the final tree, today's linux-next build (powerpc
> >> allyesconfig) failed like this:
> >> 
> >> drivers/net/ethernet/i825xx/znet.c: In function 'hardware_init':
> >> drivers/net/ethernet/i825xx/znet.c:868:2: error: implicit declaration of function 'isa_virt_to_bus' [-Werror=implicit-function-declaration]
> >> 
> >> Caused by commit 1d3ff76759b7 ("i825xx: znet: fix compiler warnings when
> >> building a 64-bit kernel").  Is there some Kconfig dependency missing (CONFIG_ISA)?
> > 
> > If we make it dependent on CONFIG_ISA then the driver cannot be built with
> > 64-bit kernel. Then again is there someone running 64-bit kernel on Zenith
> > Z-note notebook? From the pictures it looks like very ancient "laptop".
> > 
> > An alternative is to make it depend on X86 like this:
> 
> I think the powerpc port is at fault here.
> 
> Part of being able to advertise ISA_DMA_API is providing isa_virt_to_bus().

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Thu, 20 Sep 2012 12:10:14 +0300

> On Thu, Sep 20, 2012 at 05:36:22PM +1000, Stephen Rothwell wrote:
>> Hi all,
>> 
>> After merging the final tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>> 
>> drivers/net/ethernet/i825xx/znet.c: In function 'hardware_init':
>> drivers/net/ethernet/i825xx/znet.c:868:2: error: implicit declaration of function 'isa_virt_to_bus' [-Werror=implicit-function-declaration]
>> 
>> Caused by commit 1d3ff76759b7 ("i825xx: znet: fix compiler warnings when
>> building a 64-bit kernel").  Is there some Kconfig dependency missing (CONFIG_ISA)?
> 
> If we make it dependent on CONFIG_ISA then the driver cannot be built with
> 64-bit kernel. Then again is there someone running 64-bit kernel on Zenith
> Z-note notebook? From the pictures it looks like very ancient "laptop".
> 
> An alternative is to make it depend on X86 like this:

I think the powerpc port is at fault here.

Part of being able to advertise ISA_DMA_API is providing isa_virt_to_bus().

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Mika Westerberg]

On Thu, Sep 20, 2012 at 05:36:22PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/ethernet/i825xx/znet.c: In function 'hardware_init':
> drivers/net/ethernet/i825xx/znet.c:868:2: error: implicit declaration of function 'isa_virt_to_bus' [-Werror=implicit-function-declaration]
> 
> Caused by commit 1d3ff76759b7 ("i825xx: znet: fix compiler warnings when
> building a 64-bit kernel").  Is there some Kconfig dependency missing (CONFIG_ISA)?

If we make it dependent on CONFIG_ISA then the driver cannot be built with
64-bit kernel. Then again is there someone running 64-bit kernel on Zenith
Z-note notebook? From the pictures it looks like very ancient "laptop".

An alternative is to make it depend on X86 like this:

diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index fed5080..959faf7 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -150,7 +150,7 @@ config SUN3_82586
 
 config ZNET
 	tristate "Zenith Z-Note support (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && ISA_DMA_API
+	depends on EXPERIMENTAL && ISA_DMA_API && X86
 	---help---
 	  The Zenith Z-Note notebook computer has a built-in network
 	  (Ethernet) card, and this is the Linux driver for it. Note that the

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/ethernet/i825xx/znet.c: In function 'hardware_init':
drivers/net/ethernet/i825xx/znet.c:868:2: error: implicit declaration of function 'isa_virt_to_bus' [-Werror=implicit-function-declaration]

Caused by commit 1d3ff76759b7 ("i825xx: znet: fix compiler warnings when
building a 64-bit kernel").  Is there some Kconfig dependency missing (CONFIG_ISA)?

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 5 Sep 2012 15:39:32 +1000

> (I always thought IPv6 NAT was a bad idea ;-))

ROFL :)

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 5 Sep 2012 15:34:58 +1000
> Subject: [PATCH] netfilter: ipv6: using csum_ipv6_magic requires
>  net/ip6_checksum.h
> 
> Fixes this build error:
> 
> net/ipv6/netfilter/nf_nat_l3proto_ipv6.c: In function 'nf_nat_ipv6_csum_recalc':
> net/ipv6/netfilter/nf_nat_l3proto_ipv6.c:144:4: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

net/ipv6/netfilter/nf_nat_l3proto_ipv6.c: In function 'nf_nat_ipv6_csum_recalc':
net/ipv6/netfilter/nf_nat_l3proto_ipv6.c:144:4: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]

Caused by commit 58a317f1061c ("netfilter: ipv6: add IPv6 NAT support").

(I always thought IPv6 NAT was a bad idea ;-))

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 5 Sep 2012 15:34:58 +1000
Subject: [PATCH] netfilter: ipv6: using csum_ipv6_magic requires
 net/ip6_checksum.h

Fixes this build error:

net/ipv6/netfilter/nf_nat_l3proto_ipv6.c: In function 'nf_nat_ipv6_csum_recalc':
net/ipv6/netfilter/nf_nat_l3proto_ipv6.c:144:4: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
index 81a2d1c..abfe75a 100644
--- a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
@@ -15,6 +15,7 @@
 #include <linux/netfilter_ipv6.h>
 #include <net/secure_seq.h>
 #include <net/checksum.h>
+#include <net/ip6_checksum.h>
 #include <net/ip6_route.h>
 #include <net/ipv6.h>
 
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Jerry Chu]

On Tue, Sep 4, 2012 at 11:20 AM, David Miller <davem@davemloft.net> wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 4 Sep 2012 16:58:53 +1000
>
>> net/built-in.o: In function `tcp_fastopen_ctx_free':
>> tcp_fastopen.c:(.text+0x5cc5c): undefined reference to `crypto_destroy_tfm'
>> net/built-in.o: In function `tcp_fastopen_reset_cipher':
>> (.text+0x5cccc): undefined reference to `crypto_alloc_base'
>> net/built-in.o: In function `tcp_fastopen_reset_cipher':
>> (.text+0x5cd6c): undefined reference to `crypto_destroy_tfm'
>>
>> Presumably caused by commit 104671636897 ("tcp: TCP Fast Open Server -
>> header & support functions") from the net-next tree.  I assume that some
>> dependency on the CRYPTO infrastructure is missing.
>
> Thanks for the report, I've pushed the following change to net-next
> which should address this:
>
> --------------------
> [PATCH] net: Add INET dependency on aes crypto for the sake of TCP fastopen.
>
> Stephen Rothwell says:
>
> ====================
> After merging the final tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
>
> net/built-in.o: In function `tcp_fastopen_ctx_free':
> tcp_fastopen.c:(.text+0x5cc5c): undefined reference to `crypto_destroy_tfm'
> net/built-in.o: In function `tcp_fastopen_reset_cipher':
> (.text+0x5cccc): undefined reference to `crypto_alloc_base'
> net/built-in.o: In function `tcp_fastopen_reset_cipher':
> (.text+0x5cd6c): undefined reference to `crypto_destroy_tfm'
>
> Presumably caused by commit 104671636897 ("tcp: TCP Fast Open Server -
> header & support functions") from the net-next tree.  I assume that some
> dependency on the CRYPTO infrastructure is missing.
>
> I have reverted commit 1bed966cc3bd ("Merge branch
> 'tcp_fastopen_server'") for today.
> ====================
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  net/Kconfig |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/net/Kconfig b/net/Kconfig
> index 245831b..30b48f5 100644
> --- a/net/Kconfig
> +++ b/net/Kconfig
> @@ -52,6 +52,8 @@ source "net/iucv/Kconfig"
>
>  config INET
>         bool "TCP/IP networking"
> +       select CRYPTO
> +       select CRYPTO_AES
>         ---help---
>           These are the protocols used on the Internet and on most local
>           Ethernets. It is highly recommended to say Y here (this will enlarge
> --
> 1.7.7.6
>

Thanks for fixing this, David. (Sorry for missing the dependency.)

Jerry

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Sep 2012 16:58:53 +1000

> net/built-in.o: In function `tcp_fastopen_ctx_free':
> tcp_fastopen.c:(.text+0x5cc5c): undefined reference to `crypto_destroy_tfm'
> net/built-in.o: In function `tcp_fastopen_reset_cipher':
> (.text+0x5cccc): undefined reference to `crypto_alloc_base'
> net/built-in.o: In function `tcp_fastopen_reset_cipher':
> (.text+0x5cd6c): undefined reference to `crypto_destroy_tfm'
> 
> Presumably caused by commit 104671636897 ("tcp: TCP Fast Open Server -
> header & support functions") from the net-next tree.  I assume that some
> dependency on the CRYPTO infrastructure is missing.

Thanks for the report, I've pushed the following change to net-next
which should address this:

--------------------
[PATCH] net: Add INET dependency on aes crypto for the sake of TCP fastopen.

Stephen Rothwell says:

====================
After merging the final tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:

net/built-in.o: In function `tcp_fastopen_ctx_free':
tcp_fastopen.c:(.text+0x5cc5c): undefined reference to `crypto_destroy_tfm'
net/built-in.o: In function `tcp_fastopen_reset_cipher':
(.text+0x5cccc): undefined reference to `crypto_alloc_base'
net/built-in.o: In function `tcp_fastopen_reset_cipher':
(.text+0x5cd6c): undefined reference to `crypto_destroy_tfm'

Presumably caused by commit 104671636897 ("tcp: TCP Fast Open Server -
header & support functions") from the net-next tree.  I assume that some
dependency on the CRYPTO infrastructure is missing.

I have reverted commit 1bed966cc3bd ("Merge branch
'tcp_fastopen_server'") for today.
====================

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/Kconfig |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/Kconfig b/net/Kconfig
index 245831b..30b48f5 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -52,6 +52,8 @@ source "net/iucv/Kconfig"
 
 config INET
 	bool "TCP/IP networking"
+	select CRYPTO
+	select CRYPTO_AES
 	---help---
 	  These are the protocols used on the Internet and on most local
 	  Ethernets. It is highly recommended to say Y here (this will enlarge
-- 
1.7.7.6

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 845 bytes --]

Hi ,

After merging the final tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:

net/built-in.o: In function `tcp_fastopen_ctx_free':
tcp_fastopen.c:(.text+0x5cc5c): undefined reference to `crypto_destroy_tfm'
net/built-in.o: In function `tcp_fastopen_reset_cipher':
(.text+0x5cccc): undefined reference to `crypto_alloc_base'
net/built-in.o: In function `tcp_fastopen_reset_cipher':
(.text+0x5cd6c): undefined reference to `crypto_destroy_tfm'

Presumably caused by commit 104671636897 ("tcp: TCP Fast Open Server -
header & support functions") from the net-next tree.  I assume that some
dependency on the CRYPTO infrastructure is missing.

I have reverted commit 1bed966cc3bd ("Merge branch
'tcp_fastopen_server'") for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Jiri Pirko]

Sun, Jul 22, 2012 at 08:34:08AM CEST, sfr@canb.auug.org.au wrote:
>Hi Dave,
>
>After merging the final tree, today's linux-next build (powerpc
>ppc44x_defconfig) failed like this:
>
>net/core/rtnetlink.c: In function 'rtnl_fill_ifinfo':
>net/core/rtnetlink.c:895:46: error: 'struct net_device' has no member named 'num_rx_queues'
>
>Caused by commit 76ff5cc91935 ("rtnl: allow to specify number of rx and
>tx queues on device creation").  This build does not have CONFIG_RPS set.
>
>I have reverted that commit for today.


I just sent a fix ccing you, Stephen.

Apologies, Jirka

>-- 
>Cheers,
>Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

Hi Dave,

After merging the final tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:

net/core/rtnetlink.c: In function 'rtnl_fill_ifinfo':
net/core/rtnetlink.c:895:46: error: 'struct net_device' has no member named 'num_rx_queues'

Caused by commit 76ff5cc91935 ("rtnl: allow to specify number of rx and
tx queues on device creation").  This build does not have CONFIG_RPS set.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 May 2012 16:16:23 +1000

> After merging the final tree, today's linux-next build (sparc32 defconfig)
> failed like this:
> 
> net/core/sock.c: In function '__release_sock':
> net/core/sock.c:1703:4: error: implicit declaration of function 'prefetch' [-Werror=implicit-function-declaration]
> 
> Caused by commit e4cbb02a1070 ("net: add a prefetch in socket backlog
> processing").
> 
> I have reverted that commit for today.

Fixed as follows:

--------------------
net: Add missing linux/prefetch.h include to net/core/sock.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/core/sock.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/net/core/sock.c b/net/core/sock.c
index 1a88351..b8c818e 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -113,6 +113,7 @@
 #include <linux/user_namespace.h>
 #include <linux/static_key.h>
 #include <linux/memcontrol.h>
+#include <linux/prefetch.h>
 
 #include <asm/uaccess.h>
 
-- 
1.7.10

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

Hi all,

After merging the final tree, today's linux-next build (sparc32 defconfig)
failed like this:

net/core/sock.c: In function '__release_sock':
net/core/sock.c:1703:4: error: implicit declaration of function 'prefetch' [-Werror=implicit-function-declaration]

Caused by commit e4cbb02a1070 ("net: add a prefetch in socket backlog
processing").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 15:58:36 +1000

> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> net/l2tp/l2tp_core.c: In function 'l2tp_verify_udp_checksum':
> net/l2tp/l2tp_core.c:464:7: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]
> 
> Caused by commit d2cf3361677e ("net/l2tp: add support for L2TP over IPv6
> UDP").  Include file missing.
> 
> I have reverted that commit for today.

The fix is less work than the revert on this one isn't it? :-)

Pushed to net-next, thanks Stephen:

--------------------
l2tp: Add missing net/net/ip6_checksum.h include.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/l2tp/l2tp_core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index e91d559..0ca9bc3 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -56,6 +56,7 @@
 #include <net/inet6_connection_sock.h>
 #include <net/inet_ecn.h>
 #include <net/ip6_route.h>
+#include <net/ip6_checksum.h>
 
 #include <asm/byteorder.h>
 #include <linux/atomic.h>
-- 
1.7.7.6

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

net/l2tp/l2tp_core.c: In function 'l2tp_verify_udp_checksum':
net/l2tp/l2tp_core.c:464:7: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]

Caused by commit d2cf3361677e ("net/l2tp: add support for L2TP over IPv6
UDP").  Include file missing.

I have reverted that commit for today.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Apr 2012 16:28:59 +1000

> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
> 
> net/ipv4/route.c: In function 'ip_static_sysctl_init':
> net/ipv4/route.c:3517:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
...
> net/core/sysctl_net_core.c: In function 'sysctl_core_init':
> net/core/sysctl_net_core.c:259:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
...

I already checked in a fix for this, thanks Stephen.

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2243 bytes --]

Hi all,

After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:

net/ipv4/route.c: In function 'ip_static_sysctl_init':
net/ipv4/route.c:3517:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]

Caused by commit 7f5938810890 ("net/ipv4:Remove two memleak reports by
kmemleak_not_leak").

net/core/sysctl_net_core.c: In function 'sysctl_core_init':
net/core/sysctl_net_core.c:259:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]

Caused by commit 798ec84d4575 ("net/core:Remove memleak reports by
kmemleak_not_leak").

I added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Apr 2012 16:25:16 +1000
Subject: [PATCH] net: using kmemleak_not_leak requires including kmemleak.h

fixes these build errors:

net/ipv4/route.c: In function 'ip_static_sysctl_init':
net/ipv4/route.c:3517:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
net/core/sysctl_net_core.c: In function 'sysctl_core_init':
net/core/sysctl_net_core.c:259:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/core/sysctl_net_core.c |    1 +
 net/ipv4/route.c           |    1 +
 2 files changed, 2 insertions(+)

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index cee5991..247c69b 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -14,6 +14,7 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/kmemleak.h>
 
 #include <net/ip.h>
 #include <net/sock.h>
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index bcd4744..dcb4205 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -93,6 +93,7 @@
 #include <linux/times.h>
 #include <linux/slab.h>
 #include <linux/prefetch.h>
+#include <linux/kmemleak.h>
 #include <net/dst.h>
 #include <net/net_namespace.h>
 #include <net/protocol.h>
-- 
1.7.10.rc3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Apr 2012 15:29:23 +1000

> After merging the final tree, today's linux-next build (s390 allmodconfig)
> failed like this:

I just checked in the following which will hopefully cure this,
thanks:

--------------------
wiznet: Fix Kconfig dependencies.

Both drivers need to depend upon HAS_IOMEM, otherwise we
get a build failure on platforms like S390.

All the driver specific config options need to depend upon
the drivers themselves.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/ethernet/wiznet/Kconfig |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/wiznet/Kconfig b/drivers/net/ethernet/wiznet/Kconfig
index 2bb383c..c8291bf 100644
--- a/drivers/net/ethernet/wiznet/Kconfig
+++ b/drivers/net/ethernet/wiznet/Kconfig
@@ -19,6 +19,7 @@ if NET_VENDOR_WIZNET
 
 config WIZNET_W5100
 	tristate "WIZnet W5100 Ethernet support"
+	depends on HAS_IOMEM
 	---help---
 	  Support for WIZnet W5100 chips.
 
@@ -31,6 +32,7 @@ config WIZNET_W5100
 
 config WIZNET_W5300
 	tristate "WIZnet W5300 Ethernet support"
+	depends on HAS_IOMEM
 	---help---
 	  Support for WIZnet W5300 chips.
 
@@ -43,6 +45,7 @@ config WIZNET_W5300
 
 choice
 	prompt "WIZnet interface mode"
+	depends on WIZNET_W5100 || WIZNET_W5300
 	default WIZNET_BUS_ANY
 
 config WIZNET_BUS_DIRECT
@@ -69,6 +72,7 @@ endchoice
 
 config WIZNET_TX_FLOW
 	bool "Use transmit flow control"
+	depends on WIZNET_W5100 || WIZNET_W5300
 	default y
 	help
 	  This enables transmit flow control for WIZnet chips.
-- 
1.7.7.6

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]

Hi all,

After merging the final tree, today's linux-next build (s390 allmodconfig)
failed like this:

drivers/net/ethernet/wiznet/w5100.c: In function 'w5100_read_direct':
drivers/net/ethernet/wiznet/w5100.c:121:2: error: implicit declaration of function 'ioread8' [-Werror=implicit-function-declaration]
drivers/net/ethernet/wiznet/w5100.c: In function 'w5100_write_direct':
drivers/net/ethernet/wiznet/w5100.c:127:2: error: implicit declaration of function 'iowrite8' [-Werror=implicit-function-declaration]
drivers/net/ethernet/wiznet/w5100.c: In function 'w5100_read_indirect':
drivers/net/ethernet/wiznet/w5100.c:188:2: error: implicit declaration of function 'mmiowb' [-Werror=implicit-function-declaration]
drivers/net/ethernet/wiznet/w5100.c: In function 'w5100_hw_probe':
drivers/net/ethernet/wiznet/w5100.c:680:6: error: 'IRQ_TYPE_LEVEL_LOW' undeclared (first use in this function)

Caused by commit 8b1467a31343 ("Ethernet driver for the WIZnet W5100 chip").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Giuseppe CAVALLARO]

On 4/6/2012 9:09 AM, Giuseppe CAVALLARO wrote:
> On 4/5/2012 5:59 AM, David Miller wrote:
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Thu, 5 Apr 2012 13:25:15 +1000
>>
>>> After merging the final tree, today's linux-next build (powerpc
>>> allyesconfig) failed like this:
>>>
>>> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: In function 'stmmac_probe_config_dt':
>>> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:53:7: error: 'struct plat_stmmacenet_data' has no member named 'pbl'
>>>
>>> Caused by commit 8327eb65e795 ("stmmac: re-work the internal GMAC DMA
>>> platf parameters").  Clearly I am missing something, because I can't see
>>> how that patch is correct since nothing ever assigns to the new dma_cfg
>>> pointer but it is dereferenced.
>>>
>>> I have added this patch to make it build today, but it is obviously not
>>> correct.
>>
>> Sorry Stephen.
>>
>> Giuseppe don't submit patches to me that don't even compile.
>>
>> Please submit a proper fix to me for this _now_.
> 
> Sorry Dave!
> I don't know what happened (I believed to test all).
> I'm sending you the patches soon!!!

Please Stephen,
can you test it on your kernel. I didn't build when CONFIG_OF is enable.
I tested on ARM/SH/x86 but never with CONFIG_OF on.
The problem was due to the hard-coded values adding with devicetree support.

Sorry for this problem, next time I'll build also on OF.

I had also done a grep in all the arch to verify the ARCH that used the
pbl/fixed_burst/burst_len fields :-(. These have been moved in a
separate structure.

Let me know if the patch is ok.
Peppe

> 
> Peppe
> 
>> --
>> 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
>>
> 
> --
> 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
> 

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Giuseppe CAVALLARO]

On 4/5/2012 5:59 AM, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 5 Apr 2012 13:25:15 +1000
> 
>> After merging the final tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: In function 'stmmac_probe_config_dt':
>> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:53:7: error: 'struct plat_stmmacenet_data' has no member named 'pbl'
>>
>> Caused by commit 8327eb65e795 ("stmmac: re-work the internal GMAC DMA
>> platf parameters").  Clearly I am missing something, because I can't see
>> how that patch is correct since nothing ever assigns to the new dma_cfg
>> pointer but it is dereferenced.
>>
>> I have added this patch to make it build today, but it is obviously not
>> correct.
> 
> Sorry Stephen.
> 
> Giuseppe don't submit patches to me that don't even compile.
> 
> Please submit a proper fix to me for this _now_.

Sorry Dave!
I don't know what happened (I believed to test all).
I'm sending you the patches soon!!!

Peppe

> --
> 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
> 

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Apr 2012 13:25:15 +1000

> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: In function 'stmmac_probe_config_dt':
> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:53:7: error: 'struct plat_stmmacenet_data' has no member named 'pbl'
> 
> Caused by commit 8327eb65e795 ("stmmac: re-work the internal GMAC DMA
> platf parameters").  Clearly I am missing something, because I can't see
> how that patch is correct since nothing ever assigns to the new dma_cfg
> pointer but it is dereferenced.
> 
> I have added this patch to make it build today, but it is obviously not
> correct.

Sorry Stephen.

Giuseppe don't submit patches to me that don't even compile.

Please submit a proper fix to me for this _now_.

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: In function 'stmmac_probe_config_dt':
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:53:7: error: 'struct plat_stmmacenet_data' has no member named 'pbl'

Caused by commit 8327eb65e795 ("stmmac: re-work the internal GMAC DMA
platf parameters").  Clearly I am missing something, because I can't see
how that patch is correct since nothing ever assigns to the new dma_cfg
pointer but it is dereferenced.

I have added this patch to make it build today, but it is obviously not
correct.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Apr 2012 13:19:21 +1000
Subject: [PATCH] stmmac: hack to make it build

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 116529a..1e4d12d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -50,7 +50,7 @@ static int __devinit stmmac_probe_config_dt(struct platform_device *pdev,
 	 * once needed on other platforms.
 	 */
 	if (of_device_is_compatible(np, "st,spear600-gmac")) {
-		plat->pbl = 8;
+/*		plat->pbl = 8; */
 		plat->has_gmac = 1;
 		plat->pmt = 1;
 	}
-- 
1.7.10.rc3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Feb 2012 16:15:45 +1100

> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_set_mac_address':
> drivers/net/ethernet/xilinx/ll_temac_main.c:332:3: error: 'dev' undeclared (first use in this function)
> 
> Caused by commit 5a5e7c364486 ("xilinx ll_temac: use eth_hw_addr_random()
> instead of random_ether_addr()").
> 
> I have reverted that commit for today.

I've fixed it as follows:

--------------------
ll_temac: Fix build.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/ethernet/xilinx/ll_temac_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index eb28541..d21591a 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -329,7 +329,7 @@ static int temac_set_mac_address(struct net_device *ndev, void *address)
 	if (!is_valid_ether_addr(ndev->dev_addr))
 		eth_hw_addr_random(ndev);
 	else
-		dev->addr_assign_type &= ~NET_ADDR_RANDOM;
+		ndev->addr_assign_type &= ~NET_ADDR_RANDOM;
 
 	/* set up unicast MAC address filter set its mac address */
 	mutex_lock(&lp->indirect_mutex);
-- 
1.7.7.6

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_set_mac_address':
drivers/net/ethernet/xilinx/ll_temac_main.c:332:3: error: 'dev' undeclared (first use in this function)

Caused by commit 5a5e7c364486 ("xilinx ll_temac: use eth_hw_addr_random()
instead of random_ether_addr()").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 18:07:52 +1100

> After merging the final tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
> 
> In file included from include/linux/tcp.h:211:0,
>                  from include/linux/ipv6.h:221,
>                  from include/net/ipv6.h:16,
>                  from include/linux/sunrpc/clnt.h:26,
>                  from include/linux/nfs_fs.h:50,
>                  from init/do_mounts.c:20:
> include/net/sock.h: In function 'memcg_memory_allocated_add':
> include/net/sock.h:1000:20: error: 'OVER_LIMIT' undeclared (first use in this function)
> 
> And several other similar ones.
> 
> Caused by commit e1aab161e013 ("socket: initial cgroup code") from the
> net-next tree. OVER_LIMIT is only defined it CONFIG_INET is set.
> 
> I applied the following (stupid) patch for today (just because reverting
> the above commit would probably be too hard - we have cgroup stuff all
> over the place :-( ):

Glauber, please fix this properly.

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2910 bytes --]

Hi ,

After merging the final tree, today's linux-next build (powerpc
allnoconfig) failed like this:

In file included from include/linux/tcp.h:211:0,
                 from include/linux/ipv6.h:221,
                 from include/net/ipv6.h:16,
                 from include/linux/sunrpc/clnt.h:26,
                 from include/linux/nfs_fs.h:50,
                 from init/do_mounts.c:20:
include/net/sock.h: In function 'memcg_memory_allocated_add':
include/net/sock.h:1000:20: error: 'OVER_LIMIT' undeclared (first use in this function)

And several other similar ones.

Caused by commit e1aab161e013 ("socket: initial cgroup code") from the
net-next tree. OVER_LIMIT is only defined it CONFIG_INET is set.

I applied the following (stupid) patch for today (just because reverting
the above commit would probably be too hard - we have cgroup stuff all
over the place :-( ):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 18:01:12 +1100
Subject: [PATCH] socket: bad fix for cgroup code breakage

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/net/sock.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/net/sock.h b/include/net/sock.h
index 6fe0dae..0603973 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -986,6 +986,7 @@ static inline long sk_prot_mem_limits(const struct sock *sk, int index)
 	return prot[index];
 }
 
+#ifdef CONFIG_INET
 static inline void memcg_memory_allocated_add(struct cg_proto *prot,
 					      unsigned long amt,
 					      int *parent_status)
@@ -999,6 +1000,7 @@ static inline void memcg_memory_allocated_add(struct cg_proto *prot,
 	if (ret < 0)
 		*parent_status = OVER_LIMIT;
 }
+#endif
 
 static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
 					      unsigned long amt)
@@ -1028,12 +1030,14 @@ sk_memory_allocated_add(struct sock *sk, int amt, int *parent_status)
 {
 	struct proto *prot = sk->sk_prot;
 
+#ifdef CONFIG_INET
 	if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
 		memcg_memory_allocated_add(sk->sk_cgrp, amt, parent_status);
 		/* update the root cgroup regardless */
 		atomic_long_add_return(amt, prot->memory_allocated);
 		return memcg_memory_allocated_read(sk->sk_cgrp);
 	}
+#endif
 
 	return atomic_long_add_return(amt, prot->memory_allocated);
 }
@@ -1043,9 +1047,11 @@ sk_memory_allocated_sub(struct sock *sk, int amt, int parent_status)
 {
 	struct proto *prot = sk->sk_prot;
 
+#ifdef CONFIG_INET
 	if (mem_cgroup_sockets_enabled && sk->sk_cgrp &&
 	    parent_status != OVER_LIMIT) /* Otherwise was uncharged already */
 		memcg_memory_allocated_sub(sk->sk_cgrp, amt);
+#endif
 
 	atomic_long_sub(amt, prot->memory_allocated);
 }
-- 
1.7.7.3

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[David Miller]

From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 23 Nov 2011 15:02:13 -0800

> Needs a thorough redo.  Please take a look at the other cgroup
> subsystem headers.  The basic pattern is
> 
> #ifdef CONFIG_FOO_CGROUP
> <definitions and declarations>
> #else
> <any needed stubs go here>
> #endif
> 
> And that's it.

I told Neil to put the stub in net/core/dev.c since that's the one and
only call site.

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Andrew Morton]

On Wed, 23 Nov 2011 07:09:37 -0500
Neil Horman <nhorman@tuxdriver.com> wrote:

> On Wed, Nov 23, 2011 at 03:00:04PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the final tree, today's linux-next build (powerpc allnoconfig)
> > failed like this:
> > 
> > In file included from include/linux/netdevice.h:53:0,
> >                  from include/linux/icmpv6.h:173,
> >                  from include/linux/ipv6.h:220,
> >                  from include/net/ipv6.h:16,
> >                  from include/linux/sunrpc/clnt.h:26,
> >                  from include/linux/nfs_fs.h:50,
> >                  from init/do_mounts.c:20:
> > include/net/netprio_cgroup.h:23:29: error: field 'css' has incomplete type
>
> ...
>
> FYI, I've got a more appropriate fix building right now getting posted for the
> net-next tree.  I'll cc you on it.

This header looks to be pretty screwed up:

- Extraneous newline after "struct cgroup_netprio_state"

- Weird special-casing of the CONFIG_CGROUPS &&
  !CONFIG_NETPRIO_CGROUP case looks suspicious.

- Unnecessary use of IS_ENABLED - jsut use #ifdef CONFIG_NETPRIO_CGROUP

- Adds code stubs specifically for the CONFIG_CGROUPS &&
  !CONFIG_NETPRIO_CGROUP case.  Doesn't add any for the !CONFIG_CGROUPS
  case.  Seems wrong.

- Uses empty macros for the sock_update_netprioidx() and
  skb_update_prio() which can cause build errors.  Should be changed to
  plain old typechecked inline C functions.  If that causes build
  errors then something else is screwed up.

- Adds a stub for skb_update_prio() but there's no non-stub version
  of it.

also

- doesn't compile


Needs a thorough redo.  Please take a look at the other cgroup
subsystem headers.  The basic pattern is

#ifdef CONFIG_FOO_CGROUP
<definitions and declarations>
#else
<any needed stubs go here>
#endif

And that's it.

Re: linux-next: build failure after merge of the final tree (net-next tree related)

[Neil Horman]

On Wed, Nov 23, 2011 at 03:00:04PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc allnoconfig)
> failed like this:
> 
> In file included from include/linux/netdevice.h:53:0,
>                  from include/linux/icmpv6.h:173,
>                  from include/linux/ipv6.h:220,
>                  from include/net/ipv6.h:16,
>                  from include/linux/sunrpc/clnt.h:26,
>                  from include/linux/nfs_fs.h:50,
>                  from init/do_mounts.c:20:
> include/net/netprio_cgroup.h:23:29: error: field 'css' has incomplete type
> 
> And several more similar.
> 
> Caused by commit 5bc1421e34ec ("net: add network priority cgroup
> infrastructure (v4)").
> 
> I have added the following (minimal, but probably not optimal) patch for
> today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 23 Nov 2011 14:49:49 +1100
> Subject: [PATCH] net: fix build error in network priority cgroup
>  infrastructure
> 
> Fixes this error:
> 
> In file included from include/linux/netdevice.h:53:0,
>                  from include/linux/icmpv6.h:173,
>                  from include/linux/ipv6.h:220,
>                  from include/net/ipv6.h:16,
>                  from include/linux/sunrpc/clnt.h:26,
>                  from include/linux/nfs_fs.h:50,
>                  from init/do_mounts.c:20:
> include/net/netprio_cgroup.h:23:29: error: field 'css' has incomplete type
> 
> When CONFIG_CGROUPS is not set.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/net/netprio_cgroup.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
> index c432e99..da71b91 100644
> --- a/include/net/netprio_cgroup.h
> +++ b/include/net/netprio_cgroup.h
> @@ -20,7 +20,9 @@
>  
>  struct cgroup_netprio_state
>  {
> +#ifdef CONFIG_CGROUPS
>  	struct cgroup_subsys_state css;
> +#endif
>  	u32 prioidx;
>  };
>  
> -- 
> 1.7.7.3
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
FYI, I've got a more appropriate fix building right now getting posted for the
net-next tree.  I'll cc you on it.

Neil

linux-next: build failure after merge of the final tree (net-next tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1966 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc allnoconfig)
failed like this:

In file included from include/linux/netdevice.h:53:0,
                 from include/linux/icmpv6.h:173,
                 from include/linux/ipv6.h:220,
                 from include/net/ipv6.h:16,
                 from include/linux/sunrpc/clnt.h:26,
                 from include/linux/nfs_fs.h:50,
                 from init/do_mounts.c:20:
include/net/netprio_cgroup.h:23:29: error: field 'css' has incomplete type

And several more similar.

Caused by commit 5bc1421e34ec ("net: add network priority cgroup
infrastructure (v4)").

I have added the following (minimal, but probably not optimal) patch for
today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Nov 2011 14:49:49 +1100
Subject: [PATCH] net: fix build error in network priority cgroup
 infrastructure

Fixes this error:

In file included from include/linux/netdevice.h:53:0,
                 from include/linux/icmpv6.h:173,
                 from include/linux/ipv6.h:220,
                 from include/net/ipv6.h:16,
                 from include/linux/sunrpc/clnt.h:26,
                 from include/linux/nfs_fs.h:50,
                 from init/do_mounts.c:20:
include/net/netprio_cgroup.h:23:29: error: field 'css' has incomplete type

When CONFIG_CGROUPS is not set.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/net/netprio_cgroup.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
index c432e99..da71b91 100644
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
@@ -20,7 +20,9 @@
 
 struct cgroup_netprio_state
 {
+#ifdef CONFIG_CGROUPS
 	struct cgroup_subsys_state css;
+#endif
 	u32 prioidx;
 };
 
-- 
1.7.7.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]