linux-next: build failure after merge of the bluetooth tree

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Gustavo,

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

drivers/bluetooth/btusb.c:100:2: error: expected '}' before '{' token

Caused by commit 493969cf4728 ("Bluetooth: Add support for BCM20702A0
[04ca, 2003]").  That wasn't really well tested, now was it? :-(

I have used the bluetooth tree from next-20120918 for today.

BTW, why is that commit not signed off by its author?
-- 
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 bluetooth tree

[Stephen Rothwell]

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

Hi Jakub,

On Thu, 20 Jul 2023 16:27:56 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Fri, 21 Jul 2023 08:12:58 +1000 Stephen Rothwell wrote:
> > > I kicked it off and forgot about it.
> > > allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S    
> > 
> > Of course it does, as commit
> > 
> > 817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> > 
> > is reverted in linux-next.  The question is "Does the bluetooth tree
> > build?" or "Does the net-next tree build *if* you merge the bluetooth
> > tree into it?"  
> 
> Sorry for being slow, yes. I just did a test build with net-next and
> bluetooth-next combined and allmodconfig is okay, so you should be good
> to drop the revert. Fingers crossed.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[Jakub Kicinski]

On Fri, 21 Jul 2023 08:12:58 +1000 Stephen Rothwell wrote:
> > I kicked it off and forgot about it.
> > allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S  
> 
> Of course it does, as commit
> 
> 817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> 
> is reverted in linux-next.  The question is "Does the bluetooth tree
> build?" or "Does the net-next tree build *if* you merge the bluetooth
> tree into it?"

Sorry for being slow, yes. I just did a test build with net-next and
bluetooth-next combined and allmodconfig is okay, so you should be good
to drop the revert. Fingers crossed.

Re: linux-next: build failure after merge of the bluetooth tree

[Iwashima, Kuniyuki]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 21 Jul 2023 08:12:58 +1000
> Hi Jakub,
> 
> On Thu, 20 Jul 2023 08:14:30 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
> >
> > On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:
> > > On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:  
> > > > Sorry for not replying inline, outlook on android, we use scm_recv
> > > > not scm_recv_unix, so Id assume that change would return the initial
> > > > behavior, if it did not then it is not fixing anything.    
> > >
> > > Ack, that's what it seems like to me as well.
> > >
> > > I fired up an allmodconfig build of linux-next. I should be able
> > > to get to the bottom of this in ~20min :)  
> >
> > I kicked it off and forgot about it.
> > allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S
> 
> Of course it does, as commit
> 
> 817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> 
> is reverted in linux-next.  The question is "Does the bluetooth tree
> build?" or "Does the net-next tree build *if* you merge the bluetooth
> tree into it?"

FWIW, I was able to built net-next with the commit yesterday.

---8<---
$ grep CONFIG_BT .config
CONFIG_BT=m
CONFIG_BT_BREDR=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_LE_L2CAP_ECRED=y
CONFIG_BT_LEDS=y
CONFIG_BT_MSFTEXT=y
CONFIG_BT_AOSPEXT=y
CONFIG_BT_DEBUGFS=y
CONFIG_BT_SELFTEST=y
CONFIG_BT_SELFTEST_ECDH=y
CONFIG_BT_SELFTEST_SMP=y
CONFIG_BT_FEATURE_DEBUG=y
CONFIG_BT_INTEL=m
CONFIG_BT_BCM=m
CONFIG_BT_RTL=m
CONFIG_BT_MTK=m
CONFIG_BT_HCIBTUSB=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_POLL_SYNC=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB_MTK=y
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_AG6XX=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBCM4377=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIBT3C=m
CONFIG_BT_HCIBLUECARD=m
CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_ATH3K=m
CONFIG_BT_VIRTIO=m
---8<---

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Alexander,

On Thu, 20 Jul 2023 17:21:54 +0200 Alexander Mikhalitsyn <alexander@mihalicyn.com> wrote:
>
> On Thu, Jul 20, 2023 at 5:14 PM Jakub Kicinski <kuba@kernel.org> wrote:
> >
> > On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:  
> > > On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:  
> > > > Sorry for not replying inline, outlook on android, we use scm_recv
> > > > not scm_recv_unix, so Id assume that change would return the initial
> > > > behavior, if it did not then it is not fixing anything.  
> > >
> > > Ack, that's what it seems like to me as well.
> > >
> > > I fired up an allmodconfig build of linux-next. I should be able
> > > to get to the bottom of this in ~20min :)  
> >
> > I kicked it off and forgot about it.
> > allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S  
> 
> Thanks for checking!
> 
> As I can see linux-next tree contains both patches:
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/?h=next-20230719&qt=grep&q=Forward+credentials+to+monitor
> 
> So, the fix is working, right?

I will remove the revert today.

Thanks.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Jakub,

On Thu, 20 Jul 2023 08:14:30 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:
> > On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:  
> > > Sorry for not replying inline, outlook on android, we use scm_recv
> > > not scm_recv_unix, so Id assume that change would return the initial
> > > behavior, if it did not then it is not fixing anything.    
> > 
> > Ack, that's what it seems like to me as well.
> > 
> > I fired up an allmodconfig build of linux-next. I should be able 
> > to get to the bottom of this in ~20min :)  
> 
> I kicked it off and forgot about it.
> allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S

Of course it does, as commit

817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")

is reverted in linux-next.  The question is "Does the bluetooth tree
build?" or "Does the net-next tree build *if* you merge the bluetooth
tree into it?"

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[Alexander Mikhalitsyn]

On Thu, Jul 20, 2023 at 5:14 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:
> > On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:
> > > Sorry for not replying inline, outlook on android, we use scm_recv
> > > not scm_recv_unix, so Id assume that change would return the initial
> > > behavior, if it did not then it is not fixing anything.
> >
> > Ack, that's what it seems like to me as well.
> >
> > I fired up an allmodconfig build of linux-next. I should be able
> > to get to the bottom of this in ~20min :)
>
> I kicked it off and forgot about it.
> allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S

Dear Jakub,

Thanks for checking!

As I can see linux-next tree contains both patches:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/?h=next-20230719&qt=grep&q=Forward+credentials+to+monitor

So, the fix is working, right?

Kind regards,
Alex

Re: linux-next: build failure after merge of the bluetooth tree

[Jakub Kicinski]

On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:
> On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:
> > Sorry for not replying inline, outlook on android, we use scm_recv
> > not scm_recv_unix, so Id assume that change would return the initial
> > behavior, if it did not then it is not fixing anything.  
> 
> Ack, that's what it seems like to me as well.
> 
> I fired up an allmodconfig build of linux-next. I should be able 
> to get to the bottom of this in ~20min :)

I kicked it off and forgot about it.
allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S

Re: linux-next: build failure after merge of the bluetooth tree

[Alexander Mikhalitsyn]

On Thu, Jul 20, 2023 at 5:24 AM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:
> > Sorry for not replying inline, outlook on android, we use scm_recv
> > not scm_recv_unix, so Id assume that change would return the initial
> > behavior, if it did not then it is not fixing anything.
>
> Ack, that's what it seems like to me as well.
>
> I fired up an allmodconfig build of linux-next. I should be able
> to get to the bottom of this in ~20min :)

Dear friends,

I'm here and ready to help with fixing this. As far as I understand
everything should work,
because in 817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
we have a call to scm_recv(sock, msg, &scm, flags). And scm_recv does
not use scm_pidfd_recv (and pidfd_prepare).

Please tell me if something is not working and which tree I should
take to reproduce it. I'm ready to dive into it.

Kind regards,
Alex

Re: linux-next: build failure after merge of the bluetooth tree

[Jakub Kicinski]

On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:
> Sorry for not replying inline, outlook on android, we use scm_recv
> not scm_recv_unix, so Id assume that change would return the initial
> behavior, if it did not then it is not fixing anything.

Ack, that's what it seems like to me as well.

I fired up an allmodconfig build of linux-next. I should be able 
to get to the bottom of this in ~20min :)

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Jakub,

On Wed, 19 Jul 2023 18:24:39 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>
> Something weird. We did merge it, there was a sort-of-v2-called-v1:
> 
> https://lore.kernel.org/all/20230627174314.67688-1-kuniyu@amazon.com/
> 
> Merged as https://git.kernel.org/netdev/net-next/c/a9c49cc2f5b5

That is not the net-next tree in linux-next.  I have always used
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main.

And the above commit is not in linux-next (yet?)

> Dunno how it's supposed to fix this particular issue, tho, on a closer
> look, as it still calls:
> 
>   scm_recv_unix() -> scm_pidfd_recv() -> pidfd_prepare()

Yeah, the bluetooth tree will need to change that after the above patch
is available to it.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[Jakub Kicinski]

On Thu, 20 Jul 2023 10:50:42 +1000 Stephen Rothwell wrote:
> Hi all,
> 
> On Sat, 8 Jul 2023 00:17:15 +0000 "Von Dentz, Luiz" <luiz.von.dentz@intel.com> wrote:
> >
> > There was a patch sent to net-next that was supposed to fix this:
> > 
> > [PATCH v1 net-next 2/2] net: scm: introduce and use scm_recv_unix helper
> > 
> > I am waiting for it to be merged.
> > 
> > 
> > ________________________________
> > From: Stephen Rothwell
> > Sent: Thursday, July 6, 2023 4:41 PM
> > To: Marcel Holtmann; Johan Hedberg
> > Cc: Von Dentz, Luiz; Linux Kernel Mailing List; Linux Next Mailing List
> > Subject: Re: linux-next: build failure after merge of the bluetooth tree
> > 
> > Hi all,
> > 
> > On Fri, 16 Jun 2023 08:32:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >
> > > On Tue, 13 Jun 2023 13:02:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:    
> > > >    
> > >  After merging the bluetooth tree, today's linux-next build (arm    
> > > > multi_v7_defconfig) failed like this:
> > > >
> > > > ERROR: modpost: "pidfd_prepare" [net/bluetooth/bluetooth.ko] undefined!
> > > >
> > > > Caused by commit
> > > >
> > > >   817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> > > >
> > > > I have reverted that commit for today.    
> > >
> > > I am still reverting that commit.    
> > 
> > Ditto  
> 
> This is getting a bit ridiculous ... a build failure reported over a
> month ago with a fix
> (https://lore.kernel.org/netdev/20230626215951.563715-1-aleksandr.mikhalitsyn@canonical.com)
> posted 3 weeks ago, has not yet been fixed :-(
> 
> What is stopping that fix (with the appropriate followup) being added
> to the bluetooth tree?  Or just the fix being added to the net-next tree?
> 
> Yes, I know that the time period includes the merge window, but it has
> been more that a week since then.

Something weird. We did merge it, there was a sort-of-v2-called-v1:

https://lore.kernel.org/all/20230627174314.67688-1-kuniyu@amazon.com/

Merged as https://git.kernel.org/netdev/net-next/c/a9c49cc2f5b5

Dunno how it's supposed to fix this particular issue, tho, on a closer
look, as it still calls:

  scm_recv_unix() -> scm_pidfd_recv() -> pidfd_prepare()

:S

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

On Sat, 8 Jul 2023 00:17:15 +0000 "Von Dentz, Luiz" <luiz.von.dentz@intel.com> wrote:
>
> There was a patch sent to net-next that was supposed to fix this:
> 
> [PATCH v1 net-next 2/2] net: scm: introduce and use scm_recv_unix helper
> 
> I am waiting for it to be merged.
> 
> 
> ________________________________
> From: Stephen Rothwell
> Sent: Thursday, July 6, 2023 4:41 PM
> To: Marcel Holtmann; Johan Hedberg
> Cc: Von Dentz, Luiz; Linux Kernel Mailing List; Linux Next Mailing List
> Subject: Re: linux-next: build failure after merge of the bluetooth tree
> 
> Hi all,
> 
> On Fri, 16 Jun 2023 08:32:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Tue, 13 Jun 2023 13:02:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >  
> >  After merging the bluetooth tree, today's linux-next build (arm  
> > > multi_v7_defconfig) failed like this:
> > >
> > > ERROR: modpost: "pidfd_prepare" [net/bluetooth/bluetooth.ko] undefined!
> > >
> > > Caused by commit
> > >
> > >   817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> > >
> > > I have reverted that commit for today.  
> >
> > I am still reverting that commit.  
> 
> Ditto

This is getting a bit ridiculous ... a build failure reported over a
month ago with a fix
(https://lore.kernel.org/netdev/20230626215951.563715-1-aleksandr.mikhalitsyn@canonical.com)
posted 3 weeks ago, has not yet been fixed :-(

What is stopping that fix (with the appropriate followup) being added
to the bluetooth tree?  Or just the fix being added to the net-next tree?

Yes, I know that the time period includes the merge window, but it has
been more that a week since then.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

On Fri, 16 Jun 2023 08:32:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> On Tue, 13 Jun 2023 13:02:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >  
>  After merging the bluetooth tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > ERROR: modpost: "pidfd_prepare" [net/bluetooth/bluetooth.ko] undefined!
> > 
> > Caused by commit
> > 
> >   817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> > 
> > I have reverted that commit for today.  
> 
> I am still reverting that commit.

Ditto

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[Alexander Mikhalitsyn]

On Fri, Jun 23, 2023 at 5:09 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Fri, 23 Jun 2023 14:28:06 +0200 Alexander Mikhalitsyn wrote:
> > > Seems fine to me.
> >
> > Thanks, Christian!
> >
> > Let's wait for Jakub's comment then :) Then I'll prepare and send a patch.
>
>  👍️ sounds good to me as well

Dear colleagues,

I've sent a patch
https://lore.kernel.org/netdev/20230626215951.563715-1-aleksandr.mikhalitsyn@canonical.com

Kind regards,
Alex

Re: linux-next: build failure after merge of the bluetooth tree

[Jakub Kicinski]

On Fri, 23 Jun 2023 14:28:06 +0200 Alexander Mikhalitsyn wrote:
> > Seems fine to me.  
> 
> Thanks, Christian!
> 
> Let's wait for Jakub's comment then :) Then I'll prepare and send a patch.

 👍️ sounds good to me as well

Re: linux-next: build failure after merge of the bluetooth tree

[Alexander Mikhalitsyn]

On Fri, Jun 23, 2023 at 2:24 PM Christian Brauner <brauner@kernel.org> wrote:
>
> On Fri, Jun 23, 2023 at 11:23:57AM +0200, Alexander Mikhalitsyn wrote:
> > On Fri, Jun 23, 2023 at 10:34 AM Alexander Mikhalitsyn
> > <alexander@mihalicyn.com> wrote:
> > >
> > > On Fri, Jun 23, 2023 at 12:28 AM Von Dentz, Luiz
> > > <luiz.von.dentz@intel.com> wrote:
> > > >
> > > > Hi Stephen, Alexander,
> > >
> > > Dear friends,
> > >
> > > >
> > > > Looks like we have a similar problem as to:
> > > >
> > > > https://lore.kernel.org/lkml/20230524081933.44dc8bea@kernel.org/
> > > >
> > > > That said for unix socket it was decided to not allow it to be build as module, which is something I don't think we are willing to do for bluetooth, so we have to find a way to get around pidfd_prepare, which seems to be called due to the use of scm_recv (it is also used by netlink btw).
> > >
> > > Ugh, yep. That's bad and we can't workaround it like we did for unix sockets.
> > >
> > > Originally, Christian had objections against exporting the
> > > pidfd_prepare function [1]
> > >
> > > [1] https://lore.kernel.org/all/20230523-flechten-ortsschild-e5724ecc4ed0@brauner/
> > >
> > > +cc Christian
> >
> > Idea. (-: We can introduce a new function like "scm_recv_light" that
>
> Seems fine to me.

Thanks, Christian!

Let's wait for Jakub's comment then :) Then I'll prepare and send a patch.

Kind regards,
Alex

Re: linux-next: build failure after merge of the bluetooth tree

[Christian Brauner]

On Fri, Jun 23, 2023 at 11:23:57AM +0200, Alexander Mikhalitsyn wrote:
> On Fri, Jun 23, 2023 at 10:34 AM Alexander Mikhalitsyn
> <alexander@mihalicyn.com> wrote:
> >
> > On Fri, Jun 23, 2023 at 12:28 AM Von Dentz, Luiz
> > <luiz.von.dentz@intel.com> wrote:
> > >
> > > Hi Stephen, Alexander,
> >
> > Dear friends,
> >
> > >
> > > Looks like we have a similar problem as to:
> > >
> > > https://lore.kernel.org/lkml/20230524081933.44dc8bea@kernel.org/
> > >
> > > That said for unix socket it was decided to not allow it to be build as module, which is something I don't think we are willing to do for bluetooth, so we have to find a way to get around pidfd_prepare, which seems to be called due to the use of scm_recv (it is also used by netlink btw).
> >
> > Ugh, yep. That's bad and we can't workaround it like we did for unix sockets.
> >
> > Originally, Christian had objections against exporting the
> > pidfd_prepare function [1]
> >
> > [1] https://lore.kernel.org/all/20230523-flechten-ortsschild-e5724ecc4ed0@brauner/
> >
> > +cc Christian
> 
> Idea. (-: We can introduce a new function like "scm_recv_light" that

Seems fine to me.

Re: linux-next: build failure after merge of the bluetooth tree

[Alexander Mikhalitsyn]

On Fri, Jun 23, 2023 at 10:34 AM Alexander Mikhalitsyn
<alexander@mihalicyn.com> wrote:
>
> On Fri, Jun 23, 2023 at 12:28 AM Von Dentz, Luiz
> <luiz.von.dentz@intel.com> wrote:
> >
> > Hi Stephen, Alexander,
>
> Dear friends,
>
> >
> > Looks like we have a similar problem as to:
> >
> > https://lore.kernel.org/lkml/20230524081933.44dc8bea@kernel.org/
> >
> > That said for unix socket it was decided to not allow it to be build as module, which is something I don't think we are willing to do for bluetooth, so we have to find a way to get around pidfd_prepare, which seems to be called due to the use of scm_recv (it is also used by netlink btw).
>
> Ugh, yep. That's bad and we can't workaround it like we did for unix sockets.
>
> Originally, Christian had objections against exporting the
> pidfd_prepare function [1]
>
> [1] https://lore.kernel.org/all/20230523-flechten-ortsschild-e5724ecc4ed0@brauner/
>
> +cc Christian

Idea. (-: We can introduce a new function like "scm_recv_light" that
will be just an old version of "scm_recv" without using pidfd,
if this feature with SCM_PIDFD is not important for hci sockets.

Forgot to add Jakub to CC.
+cc Jakub

>
> Kind regards,
> Alex
>
> >
> >
> > ________________________________ From: Stephen Rothwell
> > Sent: Monday, June 12, 2023 8:02 PM
> > To: Marcel Holtmann; Johan Hedberg
> > Cc: Von Dentz, Luiz; Linux Kernel Mailing List; Linux Next Mailing List
> > Subject: linux-next: build failure after merge of the bluetooth tree
> >
> > Hi all,
> >
> > After merging the bluetooth tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > ERROR: modpost: "pidfd_prepare" [net/bluetooth/bluetooth.ko] undefined!
> >
> > Caused by commit
> >
> >   817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> >
> > I have reverted that commit for today.
> >
> > --
> > Cheers,
> > Stephen Rothwell

Re: linux-next: build failure after merge of the bluetooth tree

[Alexander Mikhalitsyn]

On Fri, Jun 23, 2023 at 12:28 AM Von Dentz, Luiz
<luiz.von.dentz@intel.com> wrote:
>
> Hi Stephen, Alexander,

Dear friends,

>
> Looks like we have a similar problem as to:
>
> https://lore.kernel.org/lkml/20230524081933.44dc8bea@kernel.org/
>
> That said for unix socket it was decided to not allow it to be build as module, which is something I don't think we are willing to do for bluetooth, so we have to find a way to get around pidfd_prepare, which seems to be called due to the use of scm_recv (it is also used by netlink btw).

Ugh, yep. That's bad and we can't workaround it like we did for unix sockets.

Originally, Christian had objections against exporting the
pidfd_prepare function [1]

[1] https://lore.kernel.org/all/20230523-flechten-ortsschild-e5724ecc4ed0@brauner/

+cc Christian

Kind regards,
Alex

>
>
> ________________________________ From: Stephen Rothwell
> Sent: Monday, June 12, 2023 8:02 PM
> To: Marcel Holtmann; Johan Hedberg
> Cc: Von Dentz, Luiz; Linux Kernel Mailing List; Linux Next Mailing List
> Subject: linux-next: build failure after merge of the bluetooth tree
>
> Hi all,
>
> After merging the bluetooth tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> ERROR: modpost: "pidfd_prepare" [net/bluetooth/bluetooth.ko] undefined!
>
> Caused by commit
>
>   817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
>
> I have reverted that commit for today.
>
> --
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Luiz,

On Thu, 15 Jun 2023 23:06:59 +0000 "Von Dentz, Luiz" <luiz.von.dentz@intel.com> wrote:
>
> Im on bussiness trip this week thus the delay, will be back next week
> so I hope this can wait until then.

No worries, just checking that it wasn't forgotten.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

On Tue, 13 Jun 2023 13:02:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
 After merging the bluetooth tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> ERROR: modpost: "pidfd_prepare" [net/bluetooth/bluetooth.ko] undefined!
> 
> Caused by commit
> 
>   817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> 
> I have reverted that commit for today.

I am still reverting that commit.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR: modpost: "pidfd_prepare" [net/bluetooth/bluetooth.ko] undefined!

Caused by commit

  817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR: modpost: "skb_pull_data" [net/bluetooth/bluetooth.ko] undefined!

Caused by commit

  54dda1e8cf3c ("skbuff: introduce skb_pull_data")

and following commits.

I have used the version of the bluetooth tree from next-20211203.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

net/bluetooth/hci_event.c:6776:24: error: initialization of 'void (*)(struct hci_dev *, void *, struct sk_buff *)' from incompatible pointer type 'void (*)(struct hci_dev *, struct sk_buff *)' [-Werror=incompatible-pointer-types]
 6776 |  HCI_EV(HCI_EV_VENDOR, msft_vendor_evt, 0),
      |                        ^~~~~~~~~~~~~~~
net/bluetooth/hci_event.c:6599:10: note: in definition of macro 'HCI_EV_VL'
 6599 |  .func = _func, \
      |          ^~~~~
net/bluetooth/hci_event.c:6776:2: note: in expansion of macro 'HCI_EV'
 6776 |  HCI_EV(HCI_EV_VENDOR, msft_vendor_evt, 0),
      |  ^~~~~~
net/bluetooth/hci_event.c:6776:24: note: (near initialization for 'hci_ev_table[255].<anonymous>.func')
 6776 |  HCI_EV(HCI_EV_VENDOR, msft_vendor_evt, 0),
      |                        ^~~~~~~~~~~~~~~
net/bluetooth/hci_event.c:6599:10: note: in definition of macro 'HCI_EV_VL'
 6599 |  .func = _func, \
      |          ^~~~~
net/bluetooth/hci_event.c:6776:2: note: in expansion of macro 'HCI_EV'
 6776 |  HCI_EV(HCI_EV_VENDOR, msft_vendor_evt, 0),
      |  ^~~~~~
cc1: some warnings being treated as errors

Caused by commit

  6b3d4c8fcf3f ("Bluetooth: hci_event: Use of a function table to handle HCI events")

There are 2 declarations of msft_vendor_evt() in net/bluetooth/msft.h ...

I have used the bluetooth tree from next-20211203 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arm-linux-gnueabi-ld: net/bluetooth/hci_event.o: in function `msft_suspend':
hci_event.c:(.text+0x6e60): multiple definition of `msft_suspend'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x36fc): first defined here
arm-linux-gnueabi-ld: net/bluetooth/hci_event.o: in function `msft_resume':
hci_event.c:(.text+0x6e64): multiple definition of `msft_resume'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x3700): first defined here
arm-linux-gnueabi-ld: net/bluetooth/mgmt.o: in function `msft_suspend':
mgmt.c:(.text+0xd188): multiple definition of `msft_suspend'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x36fc): first defined here
arm-linux-gnueabi-ld: net/bluetooth/mgmt.o: in function `msft_resume':
mgmt.c:(.text+0xd18c): multiple definition of `msft_resume'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x3700): first defined here
arm-linux-gnueabi-ld: net/bluetooth/hci_request.o: in function `msft_suspend':
hci_request.c:(.text+0x2d0): multiple definition of `msft_suspend'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x36fc): first defined here
arm-linux-gnueabi-ld: net/bluetooth/hci_request.o: in function `msft_resume':
hci_request.c:(.text+0x2d4): multiple definition of `msft_resume'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x3700): first defined here

Caused by commit

  47cb49448039 ("Bluetooth: Fix Advertisement Monitor Suspend/Resume")

# CONFIG_BT_MSFTEXT is not set

Forgot the "static inline"?

I have used the bluetooth tree from next-20210924 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Luiz,

On Thu, 8 Apr 2021 04:47:04 +0000 "Von Dentz, Luiz" <luiz.von.dentz@intel.com> wrote:
>
> I'd leave this for Marcel to comments, but there are quite many
> instances of // comment like that, so I wonder what is going on, or
> perhaps that is not allowed in include/uapi?

We only do these standalone compile checks on the uapi header files.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

In file included from <command-line>:32:
./usr/include/linux/virtio_bt.h:1:1: error: C++ style comments are not allowed in ISO C90
    1 | // SPDX-License-Identifier: BSD-3-Clause
      | ^
./usr/include/linux/virtio_bt.h:1:1: note: (this will be reported only once per input file)

Caused by commit

  148a48f61393 ("Bluetooth: Add support for virtio transport driver")

I have used the bluetooth tree from next-20210407 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[Alain Michaud]

Same here, thanks for the fix!


On Mon, Jul 27, 2020 at 1:22 AM Christoph Hellwig <hch@lst.de> wrote:
>
> The fixup looks good to me, thanks.

Re: linux-next: build failure after merge of the bluetooth tree

[Christoph Hellwig]

The fixup looks good to me, thanks.

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

net/bluetooth/sco.c: In function 'sco_sock_setsockopt':
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type
  862 |   if (get_user(opt, (u32 __user *)optval)) {
      |   ^~
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type

Caused by commit

  00398e1d5183 ("Bluetooth: Add support for BT_PKT_STATUS CMSG data for SCO connections")

interacting with commit

  a7b75c5a8c41 ("net: pass a sockptr_t into ->setsockopt")

from the net-next tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 Jul 2020 13:41:30 +1000
Subject: [PATCH] Bluetooth: fix for introduction of sockptr_t

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

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 6e6b03844a2a..dcf7f96ff417 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -859,7 +859,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
 		break;
 
 	case BT_PKT_STATUS:
-		if (get_user(opt, (u32 __user *)optval)) {
+		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
 			err = -EFAULT;
 			break;
 		}
-- 
2.27.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi all,

After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

In file included from drivers/bluetooth/hci_ldisc.c:34:
drivers/bluetooth/btintel.h: In function 'btintel_reset_to_bootloader':
drivers/bluetooth/btintel.h:188:9: warning: 'return' with a value, in function returning void [-Wreturn-type]
  188 |  return -EOPNOTSUPP;
      |         ^
drivers/bluetooth/btintel.h:186:20: note: declared here
  186 | static inline void btintel_reset_to_bootloader(struct hci_dev *hdev)
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  b9a2562f4918 ("Bluetooth: btusb: Trigger Intel FW download error recovery")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 22 Sep 2015 11:20:15 +1000

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Alexander Aring <alex.aring@gmail.com>
> Cc: Stefan Schmidt <stefan@osg.samsung.com>
> Cc: Marcel Holtmann <marcel@holtmann.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>

Applied, thanks.

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

Hi Gustavo,

On Mon, 14 Sep 2015 10:22:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 14 Sep 2015 10:14:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I applied the patches that Andrew has had in his post merge series
> > (but I think you were sent a rolled up version):
> 
> Actually it was sent by Alexander to Marcel:
> 
> From: Alexander Aring <alex.aring@gmail.com>
> To: marcel@holtmann.org
> Cc: Andrew Morton <akpm@linux-foundation.org>,
> 	Stephen Rothwell <sfr@canb.auug.org.au>,
> 	Alexander Aring <alex.aring@gmail.com>,
> 	Stefan Schmidt <stefan@osg.samsung.com>
> Subject: [PATCH bluetooth-next] drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL
> Date: Fri, 11 Sep 2015 11:23:30 +0200
> Message-Id: <1441963410-24844-1-git-send-email-alex.aring@gmail.com>
> X-Mailer: git-send-email 2.5.1
> 
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> I will shortly be sending
> http://ozlabs.org/~akpm/mmots/broken-out/fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void.patch
> to Linus.  This will cause the linux-next version of
> drivers/net/ieee802154/at86rf230.c to break at compilation time.
> 
> Below is the fix.  I suggest you apply this immediately.
> 
> Otherwise I'll try to remember to send this in after Alexander's
> 890acf8330cac is merged.  But there will be a window during which the
> build fails, and we'll get emails...
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL

OK, this is now a problem for the net-next tree since the bluetooth
tree was merged there :-(

Can someone please apply this patch?

Hi Dave,

An x64_64 allmodconfig build after merging the next-next tree breaks in
linux-next due to the patch below not being applied to the bluetooth
tree.  I have been applying the equivalent to the bluetooth tree merge
in linux-next for a while now.

[Patch repeated for Dave - this is from and email from Andrew via
Alexander to Marcel which I forwarded to Gustavo]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alexander Aring <alex.aring@gmail.com>
Cc: Stefan Schmidt <stefan@osg.samsung.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 drivers/net/ieee802154/at86rf230.c | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index b8b0628..9756e64 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -1645,32 +1645,17 @@ static struct dentry *at86rf230_debugfs_root;
 static int at86rf230_stats_show(struct seq_file *file, void *offset)
 {
 	struct at86rf230_local *lp = file->private;
-	int ret;
-
-	ret = seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
-			 lp->trac.success_data_pending);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
-			 lp->trac.success_wait_for_ack);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
-			 lp->trac.channel_access_failure);
-	if (ret < 0)
-		return ret;
 
-	ret = seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
-	if (ret < 0)
-		return ret;
-
-	return seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+	seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
+	seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
+		   lp->trac.success_data_pending);
+	seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
+		   lp->trac.success_wait_for_ack);
+	seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
+		   lp->trac.channel_access_failure);
+	seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
+	seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+	return 0;
 }
 
 static int at86rf230_stats_open(struct inode *inode, struct file *file)
-- 
2.5.1

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

Re: linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

Hi Gustavo,

On Mon, 14 Sep 2015 10:14:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I applied the patches that Andrew has had in his post merge series
> (but I think you were sent a rolled up version):

Actually it was sent by Alexander to Marcel:

From: Alexander Aring <alex.aring@gmail.com>
To: marcel@holtmann.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Alexander Aring <alex.aring@gmail.com>,
	Stefan Schmidt <stefan@osg.samsung.com>
Subject: [PATCH bluetooth-next] drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL
Date: Fri, 11 Sep 2015 11:23:30 +0200
Message-Id: <1441963410-24844-1-git-send-email-alex.aring@gmail.com>
X-Mailer: git-send-email 2.5.1

From: Andrew Morton <akpm@linux-foundation.org>

I will shortly be sending
http://ozlabs.org/~akpm/mmots/broken-out/fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void.patch
to Linus.  This will cause the linux-next version of
drivers/net/ieee802154/at86rf230.c to break at compilation time.

Below is the fix.  I suggest you apply this immediately.

Otherwise I'll try to remember to send this in after Alexander's
890acf8330cac is merged.  But there will be a window during which the
build fails, and we'll get emails...

From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alexander Aring <alex.aring@gmail.com>
Cc: Stefan Schmidt <stefan@osg.samsung.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 drivers/net/ieee802154/at86rf230.c | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index b8b0628..9756e64 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -1645,32 +1645,17 @@ static struct dentry *at86rf230_debugfs_root;
 static int at86rf230_stats_show(struct seq_file *file, void *offset)
 {
 	struct at86rf230_local *lp = file->private;
-	int ret;
-
-	ret = seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
-			 lp->trac.success_data_pending);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
-			 lp->trac.success_wait_for_ack);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
-			 lp->trac.channel_access_failure);
-	if (ret < 0)
-		return ret;
 
-	ret = seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
-	if (ret < 0)
-		return ret;
-
-	return seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+	seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
+	seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
+		   lp->trac.success_data_pending);
+	seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
+		   lp->trac.success_wait_for_ack);
+	seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
+		   lp->trac.channel_access_failure);
+	seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
+	seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+	return 0;
 }
 
 static int at86rf230_stats_open(struct inode *inode, struct file *file)
-- 
2.5.1

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

Hi Gustavo,

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

drivers/net/ieee802154/at86rf230.c: In function 'at86rf230_s
tats_show':
drivers/net/ieee802154/at86rf230.c:1650:6: error: void value not ignored as it ought to be
  ret = seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
      ^
drivers/net/ieee802154/at86rf230.c:1654:6: error: void value not ignored as it ought to be
  ret = seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
      ^
drivers/net/ieee802154/at86rf230.c:1659:6: error: void value not ignored as it ought to be
  ret = seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
      ^
drivers/net/ieee802154/at86rf230.c:1664:6: error: void value not ignored as it ought to be
  ret = seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
      ^
drivers/net/ieee802154/at86rf230.c:1669:6: error: void value not ignored as it ought to be
  ret = seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
      ^
drivers/net/ieee802154/at86rf230.c:1673:2: error: void value not ignored as it ought to be
  return seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
  ^
drivers/net/ieee802154/at86rf230.c:1674:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^

Caused by commit

  890acf8330ca ("at86rf230: add debugfs support")

interacting with commit

  6798a8caaf64 ("fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void")

from Linus' tree (as you were warned it would).

I applied the patches that Andrew has had in his post merge series
(but I think you were sent a rolled up version):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alexander Aring <alex.aring@gmail.com>
Cc: Stefan Schmidt <stefan@osg.samsung.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ieee802154/at86rf230.c |   28 ++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff -puN drivers/net/ieee802154/at86rf230.c~drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null drivers/net/ieee802154/at86rf230.c
--- a/drivers/net/ieee802154/at86rf230.c~drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null
+++ a/drivers/net/ieee802154/at86rf230.c
@@ -1647,30 +1647,16 @@ static int at86rf230_stats_show(struct s
 	struct at86rf230_local *lp = file->private;
 	int ret;
 
-	ret = seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
+	seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
+	seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
 			 lp->trac.success_data_pending);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
+	seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
 			 lp->trac.success_wait_for_ack);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
+	seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
 			 lp->trac.channel_access_failure);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
-	if (ret < 0)
-		return ret;
-
-	return seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+	seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
+	seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+	return 0;
 }
 
 static int at86rf230_stats_open(struct inode *inode, struct file *file)

From: Alexander Aring <alex.aring@gmail.com>
Subject: drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null-fix
Date: Fri, 11 Sep 2015 11:28:20 -0700

fix whitespace, unused var `ret'

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Stefan Schmidt <stefan@osg.samsung.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ieee802154/at86rf230.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff -puN drivers/net/ieee802154/at86rf230.c~drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null-fix drivers/net/ieee802154/at86rf230.c
--- a/drivers/net/ieee802154/at86rf230.c~drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null-fix
+++ a/drivers/net/ieee802154/at86rf230.c
@@ -1645,15 +1645,14 @@ static struct dentry *at86rf230_debugfs_
 static int at86rf230_stats_show(struct seq_file *file, void *offset)
 {
 	struct at86rf230_local *lp = file->private;
-	int ret;
 
 	seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
 	seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
-			 lp->trac.success_data_pending);
+		   lp->trac.success_data_pending);
 	seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
-			 lp->trac.success_wait_for_ack);
+		   lp->trac.success_wait_for_ack);
 	seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
-			 lp->trac.channel_access_failure);
+		   lp->trac.channel_access_failure);
 	seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
 	seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
 	return 0;

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

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

Hi Gustavo,

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

drivers/bluetooth/hci_bcm.c: In function 'bcm_acpi_probe':
drivers/bluetooth/hci_bcm.c:458:2: error: implicit declaration of function 'acpi_dev_get_resources' [-Werror=implicit-function-declaration]
  acpi_dev_get_resources(adev, &resources, bcm_resource, dev);
  ^

Caused by commit

  ae056908862b ("Bluetooth: hci_bcm: Retrieve UART speed from ACPI")

This build does not have ACPI enabled.

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Aug 2015 17:58:00 +1000
Subject: [PATCH] Bluetooth: hci_bcm: need to depend on CONFIG_ACPI

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

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 0bd88c942a52..affaecab4fa6 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -147,6 +147,7 @@ config BT_HCIUART_INTEL
 config BT_HCIUART_BCM
 	bool "Broadcom protocol support"
 	depends on BT_HCIUART
+	depends on ACPI
 	select BT_HCIUART_H4
 	select BT_BCM
 	help
-- 
2.5.0

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

Re: linux-next: build failure after merge of the bluetooth tree

[Johan Hedberg]

Hi Stephen,

On Mon, Oct 27, 2014, Stephen Rothwell wrote:
> After merging the bluetooth tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> net/bluetooth/smp.o: In function `test_smp':
> smp.c:(.init.text+0x0): multiple definition of `init_module'
> net/bluetooth/af_bluetooth.o:af_bluetooth.c:(.init.text+0x0): first defined here
> 
> Probably caused by commit 4cd3362da899 ("Bluetooth: Add skeleton for
> SMP self-tests").
> 
> I have used the bluetooth tree from next-20141023 for today.

We've applied a revert patch for the SMP self-tests to the
bluetooth-next tree until we figure out how to fix this properly.

Johan

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Gustavo,

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

net/bluetooth/smp.o: In function `test_smp':
smp.c:(.init.text+0x0): multiple definition of `init_module'
net/bluetooth/af_bluetooth.o:af_bluetooth.c:(.init.text+0x0): first defined here

Probably caused by commit 4cd3362da899 ("Bluetooth: Add skeleton for
SMP self-tests").

I have used the bluetooth tree from next-20141023 for today.

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the bluetooth tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Feb 2012 12:21:09 +1100

> Hi Gustavo,
> 
> After merging the bluetooth tree, today's linux-next build
> (x86_64_allmodconfig) failed like this:
> 
> net/bluetooth/hci_sock.c: In function 'hci_sock_cmsg':
> net/bluetooth/hci_sock.c:738:8: error: 'COMPAT_USE_64BIT_TIME' undeclared (first use in this function)
> 
> Caused by commit aebb77ca6ad1 ("compat: Use COMPAT_USE_64BIT_TIME in the
> Bluetooth subsystem").  That symbol doesn't exist anywhere in linux-next ...
> 
> I have used the bluetooth from next-20120221 for today.
> 
> P.S. that commit is supposedly authored by H. J. Lu but does not contain
> a Signed-off-by from him.

That patch series was meant to go in as a group, because all of the
subsequent patches depend upon patches earlier in the series.

There is zero reason you should have applied that patch into your
bluetooth subsystem tree.  The fact that it wasn't adequately build
tested either I find quite troubling.

Lots of red cards for the bluetooth maintainers today.

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Gustavo,

After merging the bluetooth tree, today's linux-next build
(x86_64_allmodconfig) failed like this:

net/bluetooth/hci_sock.c: In function 'hci_sock_cmsg':
net/bluetooth/hci_sock.c:738:8: error: 'COMPAT_USE_64BIT_TIME' undeclared (first use in this function)

Caused by commit aebb77ca6ad1 ("compat: Use COMPAT_USE_64BIT_TIME in the
Bluetooth subsystem").  That symbol doesn't exist anywhere in linux-next ...

I have used the bluetooth from next-20120221 for today.

P.S. that commit is supposedly authored by H. J. Lu but does not contain
a Signed-off-by from him.
-- 
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 bluetooth tree

[Stephen Rothwell]

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

Hi Gustavo,

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

drivers/net/wireless/ath/ath9k/dfs.c: In function 'ath9k_postprocess_radar_event':
drivers/net/wireless/ath/ath9k/dfs.c:73:1: error: 'ATH_DBG_ATH_DBG_DFS' undeclared (first use in this function)
drivers/net/wireless/ath/ath9k/dfs.c: In function 'ath9k_dfs_process_phyerr':
drivers/net/wireless/ath/ath9k/dfs.c:166:1: error: 'ATH_DBG_ATH_DBG_DFS' undeclared (first use in this function)

This has been inherited by the rebase onto the wireless-next tree.  I
have used the bluetooth tree from next-20111220 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 bluetooth tree

[Gustavo F. Padovan]

Hi Stephen,

* Stephen Rothwell <sfr@canb.auug.org.au> [2011-04-28 11:41:18 +1000]:

> Hi Gustavo,
> 
> After merging the bluetooth tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> net/bluetooth/cmtp/core.c: In function 'cmtp_add_connection':
> net/bluetooth/cmtp/core.c:349: error: 'struct l2cap_pinfo' has no member named 'omtu'
> net/bluetooth/cmtp/core.c:349: error: 'struct l2cap_pinfo' has no member named 'imtu'
> net/bluetooth/hidp/core.c: In function 'hidp_add_connection':
> net/bluetooth/hidp/core.c:982: error: 'struct l2cap_pinfo' has no member named 'omtu'
> net/bluetooth/hidp/core.c:982: error: 'struct l2cap_pinfo' has no member named 'imtu'
> net/bluetooth/hidp/core.c:983: error: 'struct l2cap_pinfo' has no member named 'omtu'
> net/bluetooth/hidp/core.c:983: error: 'struct l2cap_pinfo' has no member named 'imtu'
> 
> Caused by commit 6657e8f0cc05 ("Bluetooth: Move more channel info to
> struct l2cap_chan").

Thanks for spotting this, It's fixed now.

-- 
Gustavo F. Padovan
http://profusion.mobi

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Gustavo,

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

net/bluetooth/cmtp/core.c: In function 'cmtp_add_connection':
net/bluetooth/cmtp/core.c:349: error: 'struct l2cap_pinfo' has no member named 'omtu'
net/bluetooth/cmtp/core.c:349: error: 'struct l2cap_pinfo' has no member named 'imtu'
net/bluetooth/hidp/core.c: In function 'hidp_add_connection':
net/bluetooth/hidp/core.c:982: error: 'struct l2cap_pinfo' has no member named 'omtu'
net/bluetooth/hidp/core.c:982: error: 'struct l2cap_pinfo' has no member named 'imtu'
net/bluetooth/hidp/core.c:983: error: 'struct l2cap_pinfo' has no member named 'omtu'
net/bluetooth/hidp/core.c:983: error: 'struct l2cap_pinfo' has no member named 'imtu'

Caused by commit 6657e8f0cc05 ("Bluetooth: Move more channel info to
struct l2cap_chan").

I have used the bluetooth tree from next-20110427 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the bluetooth tree

[Gustavo F. Padovan]

Hi Stephen,

* Stephen Rothwell <sfr@canb.auug.org.au> [2011-02-15 13:16:15 +1100]:

> Hi Gustavo,
> 
> After merging the bluetooth tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "l2cap_load" [net/bluetooth/cmtp/cmtp.ko] undefined!
> 
> Caused by commit de5b38d18ca4f3f8b8e297211c3226c2a63226fe ("Bluetooth:
> remove l2cap_load() hack").

I fixed it. Thanks for finding this, CMTP was disabled by some reason in my
kernel. 

-- 
Gustavo F. Padovan
http://profusion.mobi

linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

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

Hi Gustavo,

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

ERROR: "l2cap_load" [net/bluetooth/cmtp/cmtp.ko] undefined!

Caused by commit de5b38d18ca4f3f8b8e297211c3226c2a63226fe ("Bluetooth:
remove l2cap_load() hack").

I havbe used the version of the bluetooth tree from next-20110214 for
today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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