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

[Jens Axboe]

On 3/11/21 8:17 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the scsi-mkp tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> 
> drivers/scsi/sg.c: In function 'sg_mk_kern_bio':
> drivers/scsi/sg.c:2958:17: error: 'BIO_MAX_PAGES' undeclared (first use in 
> this function); did you mean 'BIO_MAX_VECS'?
>  2958 |  if (bvec_cnt > BIO_MAX_PAGES)
>   | ^
>   | BIO_MAX_VECS
> 
> Caused by commit
> 
>   b32ac463cb59 ("scsi: sg: NO_DXFER move to/from kernel buffers")
> 
> interacting with commit
> 
>   a8affc03a9b3 ("block: rename BIO_MAX_PAGES to BIO_MAX_VECS")
> 
> from the block tree.
> 
> I have applied the following merge fix patch:
> 
> From: Stephen Rothwell 
> Date: Fri, 12 Mar 2021 14:11:16 +1100
> Subject: [PATCH] scsi: sg: fix up for BIO_MAX_PAGES rename
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/scsi/sg.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
> index 2d4bbc1a1727..6b31b2bc8f9a 100644
> --- a/drivers/scsi/sg.c
> +++ b/drivers/scsi/sg.c
> @@ -2955,7 +2955,7 @@ sg_mk_kern_bio(int bvec_cnt)
>  {
>   struct bio *biop;
>  
> - if (bvec_cnt > BIO_MAX_PAGES)
> + if (bvec_cnt > BIO_MAX_VECS)
>   return NULL;
>   biop = bio_alloc(GFP_ATOMIC, bvec_cnt);
>   if (!biop)

Looks good - fwiw, the block change will go into 5.12-rc3 to avoid
having this issue over a merge window prep, so maybe SCSI can pull
in -rc3 and get this resolved locally in that tree.

I'll rebase the block-5.12 branch off -rc1 after this merge.

-- 
Jens Axboe

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi all,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:


drivers/scsi/sg.c: In function 'sg_mk_kern_bio':
drivers/scsi/sg.c:2958:17: error: 'BIO_MAX_PAGES' undeclared (first use in this 
function); did you mean 'BIO_MAX_VECS'?
 2958 |  if (bvec_cnt > BIO_MAX_PAGES)
  | ^
  | BIO_MAX_VECS

Caused by commit

  b32ac463cb59 ("scsi: sg: NO_DXFER move to/from kernel buffers")

interacting with commit

  a8affc03a9b3 ("block: rename BIO_MAX_PAGES to BIO_MAX_VECS")

from the block tree.

I have applied the following merge fix patch:

From: Stephen Rothwell 
Date: Fri, 12 Mar 2021 14:11:16 +1100
Subject: [PATCH] scsi: sg: fix up for BIO_MAX_PAGES rename

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/sg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 2d4bbc1a1727..6b31b2bc8f9a 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -2955,7 +2955,7 @@ sg_mk_kern_bio(int bvec_cnt)
 {
struct bio *biop;
 
-   if (bvec_cnt > BIO_MAX_PAGES)
+   if (bvec_cnt > BIO_MAX_VECS)
return NULL;
biop = bio_alloc(GFP_ATOMIC, bvec_cnt);
if (!biop)
-- 
2.30.0

Jens, maybe you could create a topic branch with that block tree change
in it (and any other necessary ones) for Martin to merge into his tree.
Of course, you should do that be rebasing it onto v5.12-rc2 first to
get rid of the swapfile booby trap.
-- 
Cheers,
Stephen Rothwell


pgpIzQpgNnjGD.pgp
Description: OpenPGP digital signature

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

[Douglas Gilbert]

On 2021-01-27 2:01 a.m., Stephen Rothwell wrote:

Hi all,

On Mon, 25 Jan 2021 00:53:59 -0500 Douglas Gilbert  
wrote:


On 2021-01-24 11:13 p.m., Stephen Rothwell wrote:


After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
drivers/scsi/sg.c:2908:4: error: expected '}' before 'else'
   2908 |else
|^~~~
drivers/scsi/sg.c:2902:16: warning: unused variable 'cptp' [-Wunused-variable]
   2902 |const char *cptp = "pack_id=";
|^~~~
drivers/scsi/sg.c:2896:5: error: label 'good' used but not defined
   2896 | goto good;
| ^~~~
drivers/scsi/sg.c: At top level:
drivers/scsi/sg.c:2913:2: error: expected identifier or '(' before 'return'
   2913 |  return NULL;
|  ^~
drivers/scsi/sg.c:2914:5: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before ':' token
   2914 | good:
| ^
drivers/scsi/sg.c:2917:2: error: expected identifier or '(' before 'return'
   2917 |  return srp;
|  ^~
drivers/scsi/sg.c:2918:1: error: expected identifier or '(' before '}' token
   2918 | }
| ^
drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
drivers/scsi/sg.c:2912:2: error: control reaches end of non-void function 
[-Werror=return-type]
   2912 |  }
|  ^

Caused by commit

7323ad3618b6 ("scsi: sg: Replace rq array with xarray")

SG_LOG() degenerates to "{}" in some configs ...

I have used the scsi-mkp tree from next-20210122 for today.


I sent a new patchset to the linux-scsi list about 4 hours ago to
fix that.

Doug Gilbert


I am still getting this build failure.


Hi,
I resent the original patch set, with fixes, against the linux-scsi
list yesterday but that was not the form that Martin Petersen needs
it in. That was against his 5.12/scsi-queue branch which is roughly
lk 5.11.0-rc2. He has referred me to his 5.12/scsi-staging branch
which looks half applied from the 45 patch set that I have been
sending to the linux-scsi list. Trying to find out if that was the
intention or a mistake.

The other issue is a large patchset that removes the first function
argument from blk_execute_rq_nowait() which is used by the sg driver.

Doug Gilbert

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

[Stephen Rothwell]

Hi all,

On Mon, 25 Jan 2021 00:53:59 -0500 Douglas Gilbert  
wrote:
>
> On 2021-01-24 11:13 p.m., Stephen Rothwell wrote:
> > 
> > After merging the scsi-mkp tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
> > drivers/scsi/sg.c:2908:4: error: expected '}' before 'else'
> >   2908 |else
> >|^~~~
> > drivers/scsi/sg.c:2902:16: warning: unused variable 'cptp' 
> > [-Wunused-variable]
> >   2902 |const char *cptp = "pack_id=";
> >|^~~~
> > drivers/scsi/sg.c:2896:5: error: label 'good' used but not defined
> >   2896 | goto good;
> >| ^~~~
> > drivers/scsi/sg.c: At top level:
> > drivers/scsi/sg.c:2913:2: error: expected identifier or '(' before 'return'
> >   2913 |  return NULL;
> >|  ^~
> > drivers/scsi/sg.c:2914:5: error: expected '=', ',', ';', 'asm' or 
> > '__attribute__' before ':' token
> >   2914 | good:
> >| ^
> > drivers/scsi/sg.c:2917:2: error: expected identifier or '(' before 'return'
> >   2917 |  return srp;
> >|  ^~
> > drivers/scsi/sg.c:2918:1: error: expected identifier or '(' before '}' token
> >   2918 | }
> >| ^
> > drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
> > drivers/scsi/sg.c:2912:2: error: control reaches end of non-void function 
> > [-Werror=return-type]
> >   2912 |  }
> >|  ^
> > 
> > Caused by commit
> > 
> >7323ad3618b6 ("scsi: sg: Replace rq array with xarray")
> > 
> > SG_LOG() degenerates to "{}" in some configs ...
> > 
> > I have used the scsi-mkp tree from next-20210122 for today.
> 
> I sent a new patchset to the linux-scsi list about 4 hours ago to
> fix that.
> 
> Doug Gilbert

I am still getting this build failure.

-- 
Cheers,
Stephen Rothwell


pgpvMxxBAph6M.pgp
Description: OpenPGP digital signature

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

[Douglas Gilbert]

On 2021-01-24 11:13 p.m., Stephen Rothwell wrote:

Hi all,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
drivers/scsi/sg.c:2908:4: error: expected '}' before 'else'
  2908 |else
   |^~~~
drivers/scsi/sg.c:2902:16: warning: unused variable 'cptp' [-Wunused-variable]
  2902 |const char *cptp = "pack_id=";
   |^~~~
drivers/scsi/sg.c:2896:5: error: label 'good' used but not defined
  2896 | goto good;
   | ^~~~
drivers/scsi/sg.c: At top level:
drivers/scsi/sg.c:2913:2: error: expected identifier or '(' before 'return'
  2913 |  return NULL;
   |  ^~
drivers/scsi/sg.c:2914:5: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before ':' token
  2914 | good:
   | ^
drivers/scsi/sg.c:2917:2: error: expected identifier or '(' before 'return'
  2917 |  return srp;
   |  ^~
drivers/scsi/sg.c:2918:1: error: expected identifier or '(' before '}' token
  2918 | }
   | ^
drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
drivers/scsi/sg.c:2912:2: error: control reaches end of non-void function 
[-Werror=return-type]
  2912 |  }
   |  ^

Caused by commit

   7323ad3618b6 ("scsi: sg: Replace rq array with xarray")

SG_LOG() degenerates to "{}" in some configs ...

I have used the scsi-mkp tree from next-20210122 for today.



Hi,
I sent a new patchset to the linux-scsi list about 4 hours ago to
fix that.

Doug Gilbert

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi all,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
drivers/scsi/sg.c:2908:4: error: expected '}' before 'else'
 2908 |else
  |^~~~
drivers/scsi/sg.c:2902:16: warning: unused variable 'cptp' [-Wunused-variable]
 2902 |const char *cptp = "pack_id=";
  |^~~~
drivers/scsi/sg.c:2896:5: error: label 'good' used but not defined
 2896 | goto good;
  | ^~~~
drivers/scsi/sg.c: At top level:
drivers/scsi/sg.c:2913:2: error: expected identifier or '(' before 'return'
 2913 |  return NULL;
  |  ^~
drivers/scsi/sg.c:2914:5: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before ':' token
 2914 | good:
  | ^
drivers/scsi/sg.c:2917:2: error: expected identifier or '(' before 'return'
 2917 |  return srp;
  |  ^~
drivers/scsi/sg.c:2918:1: error: expected identifier or '(' before '}' token
 2918 | }
  | ^
drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
drivers/scsi/sg.c:2912:2: error: control reaches end of non-void function 
[-Werror=return-type]
 2912 |  }
  |  ^

Caused by commit

  7323ad3618b6 ("scsi: sg: Replace rq array with xarray")

SG_LOG() degenerates to "{}" in some configs ...

I have used the scsi-mkp tree from next-20210122 for today.

-- 
Cheers,
Stephen Rothwell


pgpAH3M5fwTRQ.pgp
Description: OpenPGP digital signature

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

[Bart Van Assche]

On 12/8/20 9:55 AM, Alan Stern wrote:

Yes, that certainly is the proper fix.  It's all to easy to miss these
issues that depend on your kernel configuration.

Bart, can you fold it into a new version of the patch?


Sure, I will do that.

Thanks,

Bart.

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

[Alan Stern]

On Tue, Dec 08, 2020 at 08:38:59PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 8 Dec 2020 20:28:53 +1100 Stephen Rothwell  
> wrote:
> >
> > Hi all,
> > 
> > After merging the scsi-mkp tree, today's linux-next build (sparc64
> > defconfig) failed like this:
> > 
> > drivers/mtd/nand/raw/intel-nand-controller.c:17:10: fatal error: 
> > linux/mtd/nand_ecc.h: No such file or directory
> >17 | #include 
> >   |  ^~
> 
> Clearly, it did not fail like that :-)
> 
> block/blk-core.c: In function 'blk_queue_enter':
> block/blk-core.c:443:18: error: 'struct request_queue' has no member named 
> 'rpm_status'; did you mean 'stats'?
> if ((pm && q->rpm_status != RPM_SUSPENDED) ||
>   ^~
>   stats
> 
> > Caused by commit
> > 
> >   81a395cdc176 ("scsi: block: Do not accept any requests while suspended")
> > 
> > # CONFIG_PM is not set
> > 
> > I have applied the following patch:
> > 
> > From: Stephen Rothwell 
> > Date: Tue, 8 Dec 2020 20:12:33 +1100
> > Subject: [PATCH] scsi: block: fix for "scsi: block: Do not accept any 
> > requests while suspended"
> > 
> > Fixes: 81a395cdc176 ("scsi: block: Do not accept any requests while 
> > suspended")
> > Signed-off-by: Stephen Rothwell 
> > ---
> >  block/blk-core.c | 18 ++
> >  1 file changed, 14 insertions(+), 4 deletions(-)
> > 
> > diff --git a/block/blk-core.c b/block/blk-core.c
> > index a71a5c9429d6..9c9aec1382be 100644
> > --- a/block/blk-core.c
> > +++ b/block/blk-core.c
> > @@ -421,6 +421,18 @@ void blk_cleanup_queue(struct request_queue *q)
> >  }
> >  EXPORT_SYMBOL(blk_cleanup_queue);
> >  
> > +#ifdef CONFIG_PM
> > +static bool rq_suspended(struct request_queue *q)
> > +{
> > +   return q->rpm_status == RPM_SUSPENDED;
> > +}
> > +#else
> > +static bool rq_suspended(struct request_queue *q)
> > +{
> > +   return false;
> > +}
> > +#endif
> > +
> >  /**
> >   * blk_queue_enter() - try to increase q->q_usage_counter
> >   * @q: request queue pointer
> > @@ -440,12 +452,10 @@ int blk_queue_enter(struct request_queue *q, 
> > blk_mq_req_flags_t flags)
> >  * responsible for ensuring that that counter is
> >  * globally visible before the queue is unfrozen.
> >  */
> > -   if ((pm && q->rpm_status != RPM_SUSPENDED) ||
> > -   !blk_queue_pm_only(q)) {
> > +   if ((pm && !rq_suspended(q)) || !blk_queue_pm_only(q))
> > success = true;
> > -   } else {
> > +   else
> > percpu_ref_put(>q_usage_counter);
> > -   }
> > }
> > rcu_read_unlock();

Yes, that certainly is the proper fix.  It's all to easy to miss these 
issues that depend on your kernel configuration.

Bart, can you fold it into a new version of the patch?

Alan Stern

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

[Stephen Rothwell]

Hi Christoph,

On Tue, 8 Dec 2020 10:30:39 +0100 Christoph Hellwig  wrote:
>
> On Tue, Dec 08, 2020 at 08:28:53PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the scsi-mkp tree, today's linux-next build (sparc64
> > defconfig) failed like this:
> > 
> > drivers/mtd/nand/raw/intel-nand-controller.c:17:10: fatal error: 
> > linux/mtd/nand_ecc.h: No such file or directory
> >17 | #include   
> 
> The error message doesn't match up with your proposed solution.

Yeah, semi automation gone wrong :-)

-- 
Cheers,
Stephen Rothwell


pgp2AvTYeLOSW.pgp
Description: OpenPGP digital signature

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

[Stephen Rothwell]

Hi all,

On Tue, 8 Dec 2020 20:28:53 +1100 Stephen Rothwell  
wrote:
>
> Hi all,
> 
> After merging the scsi-mkp tree, today's linux-next build (sparc64
> defconfig) failed like this:
> 
> drivers/mtd/nand/raw/intel-nand-controller.c:17:10: fatal error: 
> linux/mtd/nand_ecc.h: No such file or directory
>17 | #include 
>   |  ^~

Clearly, it did not fail like that :-)

block/blk-core.c: In function 'blk_queue_enter':
block/blk-core.c:443:18: error: 'struct request_queue' has no member named 
'rpm_status'; did you mean 'stats'?
if ((pm && q->rpm_status != RPM_SUSPENDED) ||
  ^~
  stats

> Caused by commit
> 
>   81a395cdc176 ("scsi: block: Do not accept any requests while suspended")
> 
> # CONFIG_PM is not set
> 
> I have applied the following patch:
> 
> From: Stephen Rothwell 
> Date: Tue, 8 Dec 2020 20:12:33 +1100
> Subject: [PATCH] scsi: block: fix for "scsi: block: Do not accept any 
> requests while suspended"
> 
> Fixes: 81a395cdc176 ("scsi: block: Do not accept any requests while 
> suspended")
> Signed-off-by: Stephen Rothwell 
> ---
>  block/blk-core.c | 18 ++
>  1 file changed, 14 insertions(+), 4 deletions(-)
> 
> diff --git a/block/blk-core.c b/block/blk-core.c
> index a71a5c9429d6..9c9aec1382be 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -421,6 +421,18 @@ void blk_cleanup_queue(struct request_queue *q)
>  }
>  EXPORT_SYMBOL(blk_cleanup_queue);
>  
> +#ifdef CONFIG_PM
> +static bool rq_suspended(struct request_queue *q)
> +{
> + return q->rpm_status == RPM_SUSPENDED;
> +}
> +#else
> +static bool rq_suspended(struct request_queue *q)
> +{
> + return false;
> +}
> +#endif
> +
>  /**
>   * blk_queue_enter() - try to increase q->q_usage_counter
>   * @q: request queue pointer
> @@ -440,12 +452,10 @@ int blk_queue_enter(struct request_queue *q, 
> blk_mq_req_flags_t flags)
>* responsible for ensuring that that counter is
>* globally visible before the queue is unfrozen.
>*/
> - if ((pm && q->rpm_status != RPM_SUSPENDED) ||
> - !blk_queue_pm_only(q)) {
> + if ((pm && !rq_suspended(q)) || !blk_queue_pm_only(q))
>   success = true;
> - } else {
> + else
>   percpu_ref_put(>q_usage_counter);
> - }
>   }
>   rcu_read_unlock();
>  
> -- 
> 2.29.2

-- 
Cheers,
Stephen Rothwell


pgpDRUfMXSjr5.pgp
Description: OpenPGP digital signature

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

[Christoph Hellwig]

On Tue, Dec 08, 2020 at 08:28:53PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the scsi-mkp tree, today's linux-next build (sparc64
> defconfig) failed like this:
> 
> drivers/mtd/nand/raw/intel-nand-controller.c:17:10: fatal error: 
> linux/mtd/nand_ecc.h: No such file or directory
>17 | #include 

The error message doesn't match up with your proposed solution.

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi all,

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

drivers/mtd/nand/raw/intel-nand-controller.c:17:10: fatal error: 
linux/mtd/nand_ecc.h: No such file or directory
   17 | #include 
  |  ^~

Caused by commit

  81a395cdc176 ("scsi: block: Do not accept any requests while suspended")

# CONFIG_PM is not set

I have applied the following patch:

From: Stephen Rothwell 
Date: Tue, 8 Dec 2020 20:12:33 +1100
Subject: [PATCH] scsi: block: fix for "scsi: block: Do not accept any requests 
while suspended"

Fixes: 81a395cdc176 ("scsi: block: Do not accept any requests while suspended")
Signed-off-by: Stephen Rothwell 
---
 block/blk-core.c | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index a71a5c9429d6..9c9aec1382be 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -421,6 +421,18 @@ void blk_cleanup_queue(struct request_queue *q)
 }
 EXPORT_SYMBOL(blk_cleanup_queue);
 
+#ifdef CONFIG_PM
+static bool rq_suspended(struct request_queue *q)
+{
+   return q->rpm_status == RPM_SUSPENDED;
+}
+#else
+static bool rq_suspended(struct request_queue *q)
+{
+   return false;
+}
+#endif
+
 /**
  * blk_queue_enter() - try to increase q->q_usage_counter
  * @q: request queue pointer
@@ -440,12 +452,10 @@ int blk_queue_enter(struct request_queue *q, 
blk_mq_req_flags_t flags)
 * responsible for ensuring that that counter is
 * globally visible before the queue is unfrozen.
 */
-   if ((pm && q->rpm_status != RPM_SUSPENDED) ||
-   !blk_queue_pm_only(q)) {
+   if ((pm && !rq_suspended(q)) || !blk_queue_pm_only(q))
success = true;
-   } else {
+   else
percpu_ref_put(>q_usage_counter);
-   }
}
rcu_read_unlock();
 
-- 
2.29.2



-- 
Cheers,
Stephen Rothwell


pgppQpA6jGX3o.pgp
Description: OpenPGP digital signature

RE: linux-next: build failure after merge of the scsi-mkp tree

[Kiwoong Kim]

> >> ERROR: modpost: "exynos_ufs_dump_info" [drivers/scsi/ufs/ufs-exynos.ko]
> undefined!
> >> ERROR: modpost: "exynos_ufs_init_dbg" [drivers/scsi/ufs/ufs-exynos.ko]
> undefined!
> >> ERROR: modpost: "exynos_ufs_cmd_log_start" [drivers/scsi/ufs/ufs-
> exynos.ko] undefined!
> 
> *sigh* sorry about that. I did verify yesterday's exynos build fix with
> COMPILE_TEST but it looks like I didn't have the new driver debugging
> option enabled.
> 
> Kiwoong/Alim: Please fix!
> 
> --
> Martin K. PetersenOracle Linux Engineering
Hi, Martin.

Sorry for responding lately. I'll post a patch to fix soon. 


Thanks.
Kiwoong Kim

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

[Martin K. Petersen]

Stephen,

>> ERROR: modpost: "exynos_ufs_dump_info" [drivers/scsi/ufs/ufs-exynos.ko] 
>> undefined!
>> ERROR: modpost: "exynos_ufs_init_dbg" [drivers/scsi/ufs/ufs-exynos.ko] 
>> undefined!
>> ERROR: modpost: "exynos_ufs_cmd_log_start" [drivers/scsi/ufs/ufs-exynos.ko] 
>> undefined!

*sigh* sorry about that. I did verify yesterday's exynos build fix with
COMPILE_TEST but it looks like I didn't have the new driver debugging
option enabled.

Kiwoong/Alim: Please fix!

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Stephen Rothwell]

Hi all,

On Tue, 21 Jul 2020 16:30:45 +1000 Stephen Rothwell  
wrote:
>
> After merging the scsi-mkp tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: modpost: "exynos_ufs_dump_info" [drivers/scsi/ufs/ufs-exynos.ko] 
> undefined!
> ERROR: modpost: "exynos_ufs_init_dbg" [drivers/scsi/ufs/ufs-exynos.ko] 
> undefined!
> ERROR: modpost: "exynos_ufs_cmd_log_start" [drivers/scsi/ufs/ufs-exynos.ko] 
> undefined!
> 
> Caused by commits
> 
>   c3b5e96ef515 ("scsi: ufs: exynos: Introduce command history")
>   957ee40d413b ("scsi: ufs: exynos: Implement dbg_register_dump")
> 
> I applied the following patch for now.
> 
> From 6535b25fb253c7f25bf924655edb2b22fdaeb545 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell 
> Date: Tue, 21 Jul 2020 16:26:05 +1000
> Subject: [PATCH] scsi: ufs: exynos: mark debugging as broken
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/scsi/ufs/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig
> index 2c31b33f0adc..925f8de62f6d 100644
> --- a/drivers/scsi/ufs/Kconfig
> +++ b/drivers/scsi/ufs/Kconfig
> @@ -178,6 +178,7 @@ config SCSI_UFS_EXYNOS_DBG
>   bool "EXYNOS specific debug functions"
>   default n
>   depends on SCSI_UFS_EXYNOS
> + depends on BROKEN
>   help
> This selects EXYNOS specific functions to get and even print
> debug information to see what's happening at both command
> -- 
> 2.27.0

This build failure now applies to the scsi tree.
-- 
Cheers,
Stephen Rothwell


pgpVpM1shbijD.pgp
Description: OpenPGP digital signature

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi all,

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

ERROR: modpost: "exynos_ufs_dump_info" [drivers/scsi/ufs/ufs-exynos.ko] 
undefined!
ERROR: modpost: "exynos_ufs_init_dbg" [drivers/scsi/ufs/ufs-exynos.ko] 
undefined!
ERROR: modpost: "exynos_ufs_cmd_log_start" [drivers/scsi/ufs/ufs-exynos.ko] 
undefined!

Caused by commits

  c3b5e96ef515 ("scsi: ufs: exynos: Introduce command history")
  957ee40d413b ("scsi: ufs: exynos: Implement dbg_register_dump")

I applied the following patch for now.

From 6535b25fb253c7f25bf924655edb2b22fdaeb545 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell 
Date: Tue, 21 Jul 2020 16:26:05 +1000
Subject: [PATCH] scsi: ufs: exynos: mark debugging as broken

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/ufs/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig
index 2c31b33f0adc..925f8de62f6d 100644
--- a/drivers/scsi/ufs/Kconfig
+++ b/drivers/scsi/ufs/Kconfig
@@ -178,6 +178,7 @@ config SCSI_UFS_EXYNOS_DBG
bool "EXYNOS specific debug functions"
default n
depends on SCSI_UFS_EXYNOS
+   depends on BROKEN
help
  This selects EXYNOS specific functions to get and even print
  debug information to see what's happening at both command
-- 
2.27.0

-- 
Cheers,
Stephen Rothwell


pgpxogKIb86z6.pgp
Description: OpenPGP digital signature

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

[Stephen Rothwell]

Hi all,

On Wed, 10 Apr 2019 06:04:19 +0200 James Bottomley 
 wrote:
>
> On Tue, 2019-04-09 at 21:33 -0400, Martin K. Petersen wrote:
> >   
> > > > I have reverted that commit for today.  
> > > 
> > > This has now migrated to the scsi tree.  
> > 
> > I have a fix in my tree but I haven't pushed it yet.  
> 
> It's upstream in both trees now.

Thanks, it'll be in -next tomorrow.

-- 
Cheers,
Stephen Rothwell


pgpt8oplJ80Oi.pgp
Description: OpenPGP digital signature

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

[James Bottomley]

On Tue, 2019-04-09 at 21:33 -0400, Martin K. Petersen wrote:
> Stephen,
> 
> > > I have reverted that commit for today.
> > 
> > This has now migrated to the scsi tree.
> 
> I have a fix in my tree but I haven't pushed it yet.

It's upstream in both trees now.

James

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

[Martin K. Petersen]

Stephen,

>> I have reverted that commit for today.
>
> This has now migrated to the scsi tree.

I have a fix in my tree but I haven't pushed it yet.

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Stephen Rothwell]

Hi all,

On Tue, 9 Apr 2019 16:27:49 +1000 Stephen Rothwell  
wrote:
>
> After merging the scsi-mkp tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/scsi/qla2xxx/tcm_qla2xxx.c: In function 'tcm_qla2xxx_init_lport':
> drivers/scsi/qla2xxx/tcm_qla2xxx.c:1614:3: error: implicit declaration of 
> function 'vzalloc'; did you mean 'kvzalloc'? 
> [-Werror=implicit-function-declaration]
>vzalloc(array_size(65536,
>^~~
>kvzalloc
> drivers/scsi/qla2xxx/tcm_qla2xxx.c:1613:26: warning: assignment to 'struct 
> tcm_qla2xxx_fc_loopid *' from 'int' makes pointer from integer without a cast 
> [-Wint-conversion]
>   lport->lport_loopid_map =
>   ^
> drivers/scsi/qla2xxx/tcm_qla2xxx.c: In function 'tcm_qla2xxx_make_lport':
> drivers/scsi/qla2xxx/tcm_qla2xxx.c:1677:2: error: implicit declaration of 
> function 'vfree'; did you mean 'kvfree'? 
> [-Werror=implicit-function-declaration]
>   vfree(lport->lport_loopid_map);
>   ^
>   kvfree
> 
> Caused by commit
> 
>   523c106ad4b1 ("scsi: tcm_qla2xxx: Minimize #include directives")
> 
> I have reverted that commit for today.

This has now migrated to the scsi tree.

-- 
Cheers,
Stephen Rothwell


pgp0V5CWB4Mn2.pgp
Description: OpenPGP digital signature

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi all,

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

drivers/scsi/qla2xxx/tcm_qla2xxx.c: In function 'tcm_qla2xxx_init_lport':
drivers/scsi/qla2xxx/tcm_qla2xxx.c:1614:3: error: implicit declaration of 
function 'vzalloc'; did you mean 'kvzalloc'? 
[-Werror=implicit-function-declaration]
   vzalloc(array_size(65536,
   ^~~
   kvzalloc
drivers/scsi/qla2xxx/tcm_qla2xxx.c:1613:26: warning: assignment to 'struct 
tcm_qla2xxx_fc_loopid *' from 'int' makes pointer from integer without a cast 
[-Wint-conversion]
  lport->lport_loopid_map =
  ^
drivers/scsi/qla2xxx/tcm_qla2xxx.c: In function 'tcm_qla2xxx_make_lport':
drivers/scsi/qla2xxx/tcm_qla2xxx.c:1677:2: error: implicit declaration of 
function 'vfree'; did you mean 'kvfree'? [-Werror=implicit-function-declaration]
  vfree(lport->lport_loopid_map);
  ^
  kvfree

Caused by commit

  523c106ad4b1 ("scsi: tcm_qla2xxx: Minimize #include directives")

I have reverted that commit for today.



-- 
Cheers,
Stephen Rothwell


pgpOIw7NUxYvM.pgp
Description: OpenPGP digital signature

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

[Madhani, Himanshu]

Hi Stephen, 


> On Mar 21, 2018, at 11:25 PM, Stephen Rothwell  wrote:
> 
> Hi Martin,
> 
> After merging the scsi-mkp tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
> drivers/scsi/qla2xxx/qla_gs.c:3974:7: error: 'fc4type' undeclared (first use 
> in this function); did you mean 'fc4type_t'?
>  if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
>   ^~~
>   fc4type_t
> drivers/scsi/qla2xxx/qla_gs.c:3974:7: note: each undeclared identifier is 
> reported only once for each function it appears in
> drivers/scsi/qla2xxx/qla_gs.c:3975:3: error: too few arguments to function 
> 'qla24xx_async_gpnft'
>   qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
>   ^~~
> In file included from drivers/scsi/qla2xxx/qla_def.h:4633:0,
> from drivers/scsi/qla2xxx/qla_gs.c:7:
> drivers/scsi/qla2xxx/qla_gbl.h:661:5: note: declared here
> int qla24xx_async_gpnft(scsi_qla_host_t *, u8, srb_t *);
> ^~~
> 
> Caused by commit
> 
>  33b28357dd00 ("scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan")
> 
> interacting with commit
> 
>  2b5b96473efc ("scsi: qla2xxx: Fix FC-NVMe LUN discovery")
> 
> from Linus' tree.
> 
> I have added the following merge fix patch for today. Unfortunately it
> produces this warning, so a better merge resolution is needed ...
> 
> drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
> drivers/scsi/qla2xxx/qla_gs.c:3974:9: warning: 'rp' may be used uninitialized 
> in this function [-Wmaybe-uninitialized]
>  if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
>   ~~^
> 
> 
> From: Stephen Rothwell 
> Date: Thu, 22 Mar 2018 17:09:38 +1100
> Subject: [PATCH] scsi: qla2xxx: merge fix in qla_gs.c
> 
> Signed-off-by: Stephen Rothwell 
> ---
> drivers/scsi/qla2xxx/qla_gs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
> index f84807e850c3..d33f4619332e 100644
> --- a/drivers/scsi/qla2xxx/qla_gs.c
> +++ b/drivers/scsi/qla2xxx/qla_gs.c
> @@ -3971,8 +3971,8 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, 
> srb_t *sp)
>   vha->scan.scan_flags &= ~SF_SCANNING;
>   spin_unlock_irqrestore(>work_lock, flags);
> 
> - if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
> - qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
> + if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
> + qla24xx_async_gpnft(vha, FC4_TYPE_NVME, NULL);
> }
> 
> static void qla2x00_find_free_fcp_nvme_slot(struct scsi_qla_host *vha,
> -- 
> 2.16.1
> 
> -- 
> Cheers,
> Stephen Rothwell

Thanks so much to attempt to fix the build failure. I was aware of this issue 
and had 
send the diff yesterday with change that should be used for resolving merge 
conflict and
compile failure. 

Please use following to fix for the merge conflict and compile failure. 

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 403fa096f8c8..21eff2d30266 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3973,9 +3973,6 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t 
*sp)
   spin_lock_irqsave(>work_lock, flags);
   vha->scan.scan_flags &= ~SF_SCANNING;
   spin_unlock_irqrestore(>work_lock, flags);
-
-   if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
-   qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
}

static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 5c5dcca4d1da..dab847ba4bce 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -4822,9 +4822,10 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, 
struct qla_work_evt *e)
   fcport->d_id = e->u.new_sess.id;
   fcport->flags |= FCF_FABRIC_DEVICE;
   fcport->fw_login_state = DSC_LS_PLOGI_PEND;
-   if (e->u.new_sess.fc4_type == FC4_TYPE_FCP_SCSI) {
+   if (e->u.new_sess.fc4_type & FC4_TYPE_FCP_SCSI)
   fcport->fc4_type = FC4_TYPE_FCP_SCSI;
-   } else if (e->u.new_sess.fc4_type == FC4_TYPE_NVME) {
+
+   if (e->u.new_sess.fc4_type & FC4_TYPE_NVME) {
   fcport->fc4_type = FC4_TYPE_OTHER;
   fcport->fc4f_nvme = FC4_TYPE_NVME;
   }
(END)

Thanks,
- Himanshu

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

[Madhani, Himanshu]

Hi Stephen, 


> On Mar 21, 2018, at 11:25 PM, Stephen Rothwell  wrote:
> 
> Hi Martin,
> 
> After merging the scsi-mkp tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
> drivers/scsi/qla2xxx/qla_gs.c:3974:7: error: 'fc4type' undeclared (first use 
> in this function); did you mean 'fc4type_t'?
>  if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
>   ^~~
>   fc4type_t
> drivers/scsi/qla2xxx/qla_gs.c:3974:7: note: each undeclared identifier is 
> reported only once for each function it appears in
> drivers/scsi/qla2xxx/qla_gs.c:3975:3: error: too few arguments to function 
> 'qla24xx_async_gpnft'
>   qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
>   ^~~
> In file included from drivers/scsi/qla2xxx/qla_def.h:4633:0,
> from drivers/scsi/qla2xxx/qla_gs.c:7:
> drivers/scsi/qla2xxx/qla_gbl.h:661:5: note: declared here
> int qla24xx_async_gpnft(scsi_qla_host_t *, u8, srb_t *);
> ^~~
> 
> Caused by commit
> 
>  33b28357dd00 ("scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan")
> 
> interacting with commit
> 
>  2b5b96473efc ("scsi: qla2xxx: Fix FC-NVMe LUN discovery")
> 
> from Linus' tree.
> 
> I have added the following merge fix patch for today. Unfortunately it
> produces this warning, so a better merge resolution is needed ...
> 
> drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
> drivers/scsi/qla2xxx/qla_gs.c:3974:9: warning: 'rp' may be used uninitialized 
> in this function [-Wmaybe-uninitialized]
>  if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
>   ~~^
> 
> 
> From: Stephen Rothwell 
> Date: Thu, 22 Mar 2018 17:09:38 +1100
> Subject: [PATCH] scsi: qla2xxx: merge fix in qla_gs.c
> 
> Signed-off-by: Stephen Rothwell 
> ---
> drivers/scsi/qla2xxx/qla_gs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
> index f84807e850c3..d33f4619332e 100644
> --- a/drivers/scsi/qla2xxx/qla_gs.c
> +++ b/drivers/scsi/qla2xxx/qla_gs.c
> @@ -3971,8 +3971,8 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, 
> srb_t *sp)
>   vha->scan.scan_flags &= ~SF_SCANNING;
>   spin_unlock_irqrestore(>work_lock, flags);
> 
> - if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
> - qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
> + if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
> + qla24xx_async_gpnft(vha, FC4_TYPE_NVME, NULL);
> }
> 
> static void qla2x00_find_free_fcp_nvme_slot(struct scsi_qla_host *vha,
> -- 
> 2.16.1
> 
> -- 
> Cheers,
> Stephen Rothwell

Thanks so much to attempt to fix the build failure. I was aware of this issue 
and had 
send the diff yesterday with change that should be used for resolving merge 
conflict and
compile failure. 

Please use following to fix for the merge conflict and compile failure. 

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 403fa096f8c8..21eff2d30266 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3973,9 +3973,6 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t 
*sp)
   spin_lock_irqsave(>work_lock, flags);
   vha->scan.scan_flags &= ~SF_SCANNING;
   spin_unlock_irqrestore(>work_lock, flags);
-
-   if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
-   qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
}

static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 5c5dcca4d1da..dab847ba4bce 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -4822,9 +4822,10 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, 
struct qla_work_evt *e)
   fcport->d_id = e->u.new_sess.id;
   fcport->flags |= FCF_FABRIC_DEVICE;
   fcport->fw_login_state = DSC_LS_PLOGI_PEND;
-   if (e->u.new_sess.fc4_type == FC4_TYPE_FCP_SCSI) {
+   if (e->u.new_sess.fc4_type & FC4_TYPE_FCP_SCSI)
   fcport->fc4_type = FC4_TYPE_FCP_SCSI;
-   } else if (e->u.new_sess.fc4_type == FC4_TYPE_NVME) {
+
+   if (e->u.new_sess.fc4_type & FC4_TYPE_NVME) {
   fcport->fc4_type = FC4_TYPE_OTHER;
   fcport->fc4f_nvme = FC4_TYPE_NVME;
   }
(END)

Thanks,
- Himanshu

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
drivers/scsi/qla2xxx/qla_gs.c:3974:7: error: 'fc4type' undeclared (first use in 
this function); did you mean 'fc4type_t'?
  if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
   ^~~
   fc4type_t
drivers/scsi/qla2xxx/qla_gs.c:3974:7: note: each undeclared identifier is 
reported only once for each function it appears in
drivers/scsi/qla2xxx/qla_gs.c:3975:3: error: too few arguments to function 
'qla24xx_async_gpnft'
   qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
   ^~~
In file included from drivers/scsi/qla2xxx/qla_def.h:4633:0,
 from drivers/scsi/qla2xxx/qla_gs.c:7:
drivers/scsi/qla2xxx/qla_gbl.h:661:5: note: declared here
 int qla24xx_async_gpnft(scsi_qla_host_t *, u8, srb_t *);
 ^~~

Caused by commit

  33b28357dd00 ("scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan")

interacting with commit

  2b5b96473efc ("scsi: qla2xxx: Fix FC-NVMe LUN discovery")

from Linus' tree.

I have added the following merge fix patch for today. Unfortunately it
produces this warning, so a better merge resolution is needed ...

drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
drivers/scsi/qla2xxx/qla_gs.c:3974:9: warning: 'rp' may be used uninitialized 
in this function [-Wmaybe-uninitialized]
  if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
   ~~^


From: Stephen Rothwell 
Date: Thu, 22 Mar 2018 17:09:38 +1100
Subject: [PATCH] scsi: qla2xxx: merge fix in qla_gs.c

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/qla2xxx/qla_gs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index f84807e850c3..d33f4619332e 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3971,8 +3971,8 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t 
*sp)
vha->scan.scan_flags &= ~SF_SCANNING;
spin_unlock_irqrestore(>work_lock, flags);
 
-   if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
-   qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
+   if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
+   qla24xx_async_gpnft(vha, FC4_TYPE_NVME, NULL);
 }
 
 static void qla2x00_find_free_fcp_nvme_slot(struct scsi_qla_host *vha,
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell


pgp3Wir5_Nys7.pgp
Description: OpenPGP digital signature

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
drivers/scsi/qla2xxx/qla_gs.c:3974:7: error: 'fc4type' undeclared (first use in 
this function); did you mean 'fc4type_t'?
  if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
   ^~~
   fc4type_t
drivers/scsi/qla2xxx/qla_gs.c:3974:7: note: each undeclared identifier is 
reported only once for each function it appears in
drivers/scsi/qla2xxx/qla_gs.c:3975:3: error: too few arguments to function 
'qla24xx_async_gpnft'
   qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
   ^~~
In file included from drivers/scsi/qla2xxx/qla_def.h:4633:0,
 from drivers/scsi/qla2xxx/qla_gs.c:7:
drivers/scsi/qla2xxx/qla_gbl.h:661:5: note: declared here
 int qla24xx_async_gpnft(scsi_qla_host_t *, u8, srb_t *);
 ^~~

Caused by commit

  33b28357dd00 ("scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan")

interacting with commit

  2b5b96473efc ("scsi: qla2xxx: Fix FC-NVMe LUN discovery")

from Linus' tree.

I have added the following merge fix patch for today. Unfortunately it
produces this warning, so a better merge resolution is needed ...

drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
drivers/scsi/qla2xxx/qla_gs.c:3974:9: warning: 'rp' may be used uninitialized 
in this function [-Wmaybe-uninitialized]
  if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
   ~~^


From: Stephen Rothwell 
Date: Thu, 22 Mar 2018 17:09:38 +1100
Subject: [PATCH] scsi: qla2xxx: merge fix in qla_gs.c

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/qla2xxx/qla_gs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index f84807e850c3..d33f4619332e 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3971,8 +3971,8 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t 
*sp)
vha->scan.scan_flags &= ~SF_SCANNING;
spin_unlock_irqrestore(>work_lock, flags);
 
-   if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
-   qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
+   if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
+   qla24xx_async_gpnft(vha, FC4_TYPE_NVME, NULL);
 }
 
 static void qla2x00_find_free_fcp_nvme_slot(struct scsi_qla_host *vha,
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell


pgp3Wir5_Nys7.pgp
Description: OpenPGP digital signature

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

[Paul E. McKenney]

On Thu, Dec 07, 2017 at 08:00:50PM -0500, Martin K. Petersen wrote:
> 
> > I'm perfectly OK with taking it through the SCSI tree. Probably the
> > path of least resistance.
> 
> Applied to 4.16/scsi-queue and rebased so it sits before Bart's patch.

Thank you!  I have removed this patch from -rcu.

Thanx, Paul

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

[Paul E. McKenney]

On Thu, Dec 07, 2017 at 08:00:50PM -0500, Martin K. Petersen wrote:
> 
> > I'm perfectly OK with taking it through the SCSI tree. Probably the
> > path of least resistance.
> 
> Applied to 4.16/scsi-queue and rebased so it sits before Bart's patch.

Thank you!  I have removed this patch from -rcu.

Thanx, Paul

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

[Martin K. Petersen]

> I'm perfectly OK with taking it through the SCSI tree. Probably the
> path of least resistance.

Applied to 4.16/scsi-queue and rebased so it sits before Bart's patch.

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Martin K. Petersen]

> I'm perfectly OK with taking it through the SCSI tree. Probably the
> path of least resistance.

Applied to 4.16/scsi-queue and rebased so it sits before Bart's patch.

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Martin K. Petersen]

Stephen,

>> I have to defer to you guys on that one.  Left to myself, I will just
>> push it into the next merge window (as opposed to using my normal
>> process, which at this point would get it into the one following).
>> 
>> So please let me know how you would like to proceed.
>
> Clearly, it needs to go via Martin's tree as otherwise his tree will
> not build in some circumstances ... or if it going to cause problems
> for Paul, then it should be in a separate non-rebasing branch (probably
> of Paul's tree) that is merged into Pauls main branch and Marin's tree.

I'm perfectly OK with taking it through the SCSI tree. Probably the path
of least resistance.

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Martin K. Petersen]

Stephen,

>> I have to defer to you guys on that one.  Left to myself, I will just
>> push it into the next merge window (as opposed to using my normal
>> process, which at this point would get it into the one following).
>> 
>> So please let me know how you would like to proceed.
>
> Clearly, it needs to go via Martin's tree as otherwise his tree will
> not build in some circumstances ... or if it going to cause problems
> for Paul, then it should be in a separate non-rebasing branch (probably
> of Paul's tree) that is merged into Pauls main branch and Marin's tree.

I'm perfectly OK with taking it through the SCSI tree. Probably the path
of least resistance.

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Paul E. McKenney]

On Fri, Dec 08, 2017 at 07:34:39AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 7 Dec 2017 09:40:38 -0800 "Paul E. McKenney" 
>  wrote:
> >
> > On Thu, Dec 07, 2017 at 05:30:03PM +, Bart Van Assche wrote:
> > > However, what's not clear to me is through which tree this patch should be
> > > sent to Linus? Should the above patch be sent as a v4.15-rc fix or should
> > > Martin perhaps queue it in his tree for v4.16-rc1?  
> > 
> > I have to defer to you guys on that one.  Left to myself, I will just
> > push it into the next merge window (as opposed to using my normal process,
> > which at this point would get it into the one following).
> > 
> > So please let me know how you would like to proceed.
> 
> Clearly, it needs to go via Martin's tree as otherwise his tree will
> not build in some circumstances ... or if it going to cause problems
> for Paul, then it should be in a separate non-rebasing branch (probably
> of Paul's tree) that is merged into Pauls main branch and Marin's tree.

It is unlikely to cause problems, so please let it go up where convenient.

Just please let me know.

Thanx, Paul

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

[Paul E. McKenney]

On Fri, Dec 08, 2017 at 07:34:39AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 7 Dec 2017 09:40:38 -0800 "Paul E. McKenney" 
>  wrote:
> >
> > On Thu, Dec 07, 2017 at 05:30:03PM +, Bart Van Assche wrote:
> > > However, what's not clear to me is through which tree this patch should be
> > > sent to Linus? Should the above patch be sent as a v4.15-rc fix or should
> > > Martin perhaps queue it in his tree for v4.16-rc1?  
> > 
> > I have to defer to you guys on that one.  Left to myself, I will just
> > push it into the next merge window (as opposed to using my normal process,
> > which at this point would get it into the one following).
> > 
> > So please let me know how you would like to proceed.
> 
> Clearly, it needs to go via Martin's tree as otherwise his tree will
> not build in some circumstances ... or if it going to cause problems
> for Paul, then it should be in a separate non-rebasing branch (probably
> of Paul's tree) that is merged into Pauls main branch and Marin's tree.

It is unlikely to cause problems, so please let it go up where convenient.

Just please let me know.

Thanx, Paul

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

[Stephen Rothwell]

Hi all,

On Thu, 7 Dec 2017 09:40:38 -0800 "Paul E. McKenney" 
 wrote:
>
> On Thu, Dec 07, 2017 at 05:30:03PM +, Bart Van Assche wrote:
> > However, what's not clear to me is through which tree this patch should be
> > sent to Linus? Should the above patch be sent as a v4.15-rc fix or should
> > Martin perhaps queue it in his tree for v4.16-rc1?  
> 
> I have to defer to you guys on that one.  Left to myself, I will just
> push it into the next merge window (as opposed to using my normal process,
> which at this point would get it into the one following).
> 
> So please let me know how you would like to proceed.

Clearly, it needs to go via Martin's tree as otherwise his tree will
not build in some circumstances ... or if it going to cause problems
for Paul, then it should be in a separate non-rebasing branch (probably
of Paul's tree) that is merged into Pauls main branch and Marin's tree.
-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi all,

On Thu, 7 Dec 2017 09:40:38 -0800 "Paul E. McKenney" 
 wrote:
>
> On Thu, Dec 07, 2017 at 05:30:03PM +, Bart Van Assche wrote:
> > However, what's not clear to me is through which tree this patch should be
> > sent to Linus? Should the above patch be sent as a v4.15-rc fix or should
> > Martin perhaps queue it in his tree for v4.16-rc1?  
> 
> I have to defer to you guys on that one.  Left to myself, I will just
> push it into the next merge window (as opposed to using my normal process,
> which at this point would get it into the one following).
> 
> So please let me know how you would like to proceed.

Clearly, it needs to go via Martin's tree as otherwise his tree will
not build in some circumstances ... or if it going to cause problems
for Paul, then it should be in a separate non-rebasing branch (probably
of Paul's tree) that is merged into Pauls main branch and Marin's tree.
-- 
Cheers,
Stephen Rothwell

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

[Paul E. McKenney]

On Thu, Dec 07, 2017 at 05:30:03PM +, Bart Van Assche wrote:
> On Wed, 2017-12-06 at 20:42 -0800, Paul E. McKenney wrote:
> > On Thu, Dec 07, 2017 at 03:25:21PM +1100, Stephen Rothwell wrote:
> > > On Thu, 7 Dec 2017 03:59:30 + Bart Van Assche 
> > >  wrote:

[ . . . ]

> > commit cde4691a3a4591e7355295dd62610e3262159002
> > Author: Paul E. McKenney 
> > Date:   Wed Dec 6 20:39:38 2017 -0800
> > 
> > rcu: Export init_rcu_head() and destroy_rcu_head() to GPL modules
> > 
> > Use of init_rcu_head() and destroy_rcu_head() from modules results in
> > the following build-time error:
> > 
> > ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > 
> > This commit therefore adds EXPORT_SYMBOL_GPL() for each to allow them
> > to be used by GPL-licensed kernel modules.
> > 
> > Reported-by: Bart Van Assche 
> > Reported-by: Stephen Rothwell 
> > Signed-off-by: Paul E. McKenney 
> > 
> > diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
> > index 8d591d8411fe..4c4d26e9a67b 100644
> > --- a/kernel/rcu/update.c
> > +++ b/kernel/rcu/update.c
> > @@ -422,11 +422,13 @@ void init_rcu_head(struct rcu_head *head)
> >  {
> > debug_object_init(head, _debug_descr);
> >  }
> > +EXPORT_SYMBOL_GPL(init_rcu_head);
> >  
> >  void destroy_rcu_head(struct rcu_head *head)
> >  {
> > debug_object_free(head, _debug_descr);
> >  }
> > +EXPORT_SYMBOL_GPL(destroy_rcu_head);
> >  
> >  static bool rcuhead_is_static_object(void *addr)
> >  {
> 
> (+linux-scsi)
> 
> Hello Paul,
> 
> How about changing the commit message into "... fixes a build failure with
> CONFIG_DEBUG_OBJECTS_RCU_HEAD=y"? Otherwise the above patch looks fine to me
> and fixes the reported build failure on my setup.

I have updated it as shown below.

> However, what's not clear to me is through which tree this patch should be
> sent to Linus? Should the above patch be sent as a v4.15-rc fix or should
> Martin perhaps queue it in his tree for v4.16-rc1?

I have to defer to you guys on that one.  Left to myself, I will just
push it into the next merge window (as opposed to using my normal process,
which at this point would get it into the one following).

So please let me know how you would like to proceed.

Thanx, Paul



commit 193dffdf4354f14b4f3369a85128817e5ba74e58
Author: Paul E. McKenney 
Date:   Wed Dec 6 20:39:38 2017 -0800

rcu: Export init_rcu_head() and destroy_rcu_head() to GPL modules

Use of init_rcu_head() and destroy_rcu_head() from modules results in
the following build-time error with CONFIG_DEBUG_OBJECTS_RCU_HEAD=y:

ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!

This commit therefore adds EXPORT_SYMBOL_GPL() for each to allow them
to be used by GPL-licensed kernel modules.

Reported-by: Bart Van Assche 
Reported-by: Stephen Rothwell 
Signed-off-by: Paul E. McKenney 

diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
index 8d591d8411fe..4c4d26e9a67b 100644
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
@@ -422,11 +422,13 @@ void init_rcu_head(struct rcu_head *head)
 {
debug_object_init(head, _debug_descr);
 }
+EXPORT_SYMBOL_GPL(init_rcu_head);
 
 void destroy_rcu_head(struct rcu_head *head)
 {
debug_object_free(head, _debug_descr);
 }
+EXPORT_SYMBOL_GPL(destroy_rcu_head);
 
 static bool rcuhead_is_static_object(void *addr)
 {

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

[Paul E. McKenney]

On Thu, Dec 07, 2017 at 05:30:03PM +, Bart Van Assche wrote:
> On Wed, 2017-12-06 at 20:42 -0800, Paul E. McKenney wrote:
> > On Thu, Dec 07, 2017 at 03:25:21PM +1100, Stephen Rothwell wrote:
> > > On Thu, 7 Dec 2017 03:59:30 + Bart Van Assche 
> > >  wrote:

[ . . . ]

> > commit cde4691a3a4591e7355295dd62610e3262159002
> > Author: Paul E. McKenney 
> > Date:   Wed Dec 6 20:39:38 2017 -0800
> > 
> > rcu: Export init_rcu_head() and destroy_rcu_head() to GPL modules
> > 
> > Use of init_rcu_head() and destroy_rcu_head() from modules results in
> > the following build-time error:
> > 
> > ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > 
> > This commit therefore adds EXPORT_SYMBOL_GPL() for each to allow them
> > to be used by GPL-licensed kernel modules.
> > 
> > Reported-by: Bart Van Assche 
> > Reported-by: Stephen Rothwell 
> > Signed-off-by: Paul E. McKenney 
> > 
> > diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
> > index 8d591d8411fe..4c4d26e9a67b 100644
> > --- a/kernel/rcu/update.c
> > +++ b/kernel/rcu/update.c
> > @@ -422,11 +422,13 @@ void init_rcu_head(struct rcu_head *head)
> >  {
> > debug_object_init(head, _debug_descr);
> >  }
> > +EXPORT_SYMBOL_GPL(init_rcu_head);
> >  
> >  void destroy_rcu_head(struct rcu_head *head)
> >  {
> > debug_object_free(head, _debug_descr);
> >  }
> > +EXPORT_SYMBOL_GPL(destroy_rcu_head);
> >  
> >  static bool rcuhead_is_static_object(void *addr)
> >  {
> 
> (+linux-scsi)
> 
> Hello Paul,
> 
> How about changing the commit message into "... fixes a build failure with
> CONFIG_DEBUG_OBJECTS_RCU_HEAD=y"? Otherwise the above patch looks fine to me
> and fixes the reported build failure on my setup.

I have updated it as shown below.

> However, what's not clear to me is through which tree this patch should be
> sent to Linus? Should the above patch be sent as a v4.15-rc fix or should
> Martin perhaps queue it in his tree for v4.16-rc1?

I have to defer to you guys on that one.  Left to myself, I will just
push it into the next merge window (as opposed to using my normal process,
which at this point would get it into the one following).

So please let me know how you would like to proceed.

Thanx, Paul



commit 193dffdf4354f14b4f3369a85128817e5ba74e58
Author: Paul E. McKenney 
Date:   Wed Dec 6 20:39:38 2017 -0800

rcu: Export init_rcu_head() and destroy_rcu_head() to GPL modules

Use of init_rcu_head() and destroy_rcu_head() from modules results in
the following build-time error with CONFIG_DEBUG_OBJECTS_RCU_HEAD=y:

ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!

This commit therefore adds EXPORT_SYMBOL_GPL() for each to allow them
to be used by GPL-licensed kernel modules.

Reported-by: Bart Van Assche 
Reported-by: Stephen Rothwell 
Signed-off-by: Paul E. McKenney 

diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
index 8d591d8411fe..4c4d26e9a67b 100644
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
@@ -422,11 +422,13 @@ void init_rcu_head(struct rcu_head *head)
 {
debug_object_init(head, _debug_descr);
 }
+EXPORT_SYMBOL_GPL(init_rcu_head);
 
 void destroy_rcu_head(struct rcu_head *head)
 {
debug_object_free(head, _debug_descr);
 }
+EXPORT_SYMBOL_GPL(destroy_rcu_head);
 
 static bool rcuhead_is_static_object(void *addr)
 {

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

[Bart Van Assche]

On Wed, 2017-12-06 at 20:42 -0800, Paul E. McKenney wrote:
> On Thu, Dec 07, 2017 at 03:25:21PM +1100, Stephen Rothwell wrote:
> > On Thu, 7 Dec 2017 03:59:30 + Bart Van Assche  
> > wrote:
> > > On Thu, 2017-12-07 at 14:57 +1100, Stephen Rothwell wrote:
> > > > After merging the scsi-mkp tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > > 
> > > > ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > > > ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > > > 
> > > > Caused by commit
> > > > 
> > > >   ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets 
> > > > woken up")
> > > > 
> > > > I have used the scsi-mkp tree from next-20171206 for today.  
> > > 
> > > Does that mean I'm the first one who added RCU code to the SCSI core?
> > 
> > The only other uses of init_rcu_head() are in drivers/iommu/intel-svm.c
> > and kernel/irq/irqdesc.c.  destroy_rcu_head() appears to not be used
> > anywhere ...
> 
> The key point is that Bart appears to be the first to try using them in
> a module, for which exports are needed.  Does the patch below help?
> 
>   Thanx, Paul
> 
> 
> 
> commit cde4691a3a4591e7355295dd62610e3262159002
> Author: Paul E. McKenney 
> Date:   Wed Dec 6 20:39:38 2017 -0800
> 
> rcu: Export init_rcu_head() and destroy_rcu_head() to GPL modules
> 
> Use of init_rcu_head() and destroy_rcu_head() from modules results in
> the following build-time error:
> 
>   ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
>   ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> 
> This commit therefore adds EXPORT_SYMBOL_GPL() for each to allow them
> to be used by GPL-licensed kernel modules.
> 
> Reported-by: Bart Van Assche 
> Reported-by: Stephen Rothwell 
> Signed-off-by: Paul E. McKenney 
> 
> diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
> index 8d591d8411fe..4c4d26e9a67b 100644
> --- a/kernel/rcu/update.c
> +++ b/kernel/rcu/update.c
> @@ -422,11 +422,13 @@ void init_rcu_head(struct rcu_head *head)
>  {
>   debug_object_init(head, _debug_descr);
>  }
> +EXPORT_SYMBOL_GPL(init_rcu_head);
>  
>  void destroy_rcu_head(struct rcu_head *head)
>  {
>   debug_object_free(head, _debug_descr);
>  }
> +EXPORT_SYMBOL_GPL(destroy_rcu_head);
>  
>  static bool rcuhead_is_static_object(void *addr)
>  {

(+linux-scsi)

Hello Paul,

How about changing the commit message into "... fixes a build failure with
CONFIG_DEBUG_OBJECTS_RCU_HEAD=y"? Otherwise the above patch looks fine to me
and fixes the reported build failure on my setup.

However, what's not clear to me is through which tree this patch should be
sent to Linus? Should the above patch be sent as a v4.15-rc fix or should
Martin perhaps queue it in his tree for v4.16-rc1?

Thanks,

Bart.

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

[Bart Van Assche]

On Wed, 2017-12-06 at 20:42 -0800, Paul E. McKenney wrote:
> On Thu, Dec 07, 2017 at 03:25:21PM +1100, Stephen Rothwell wrote:
> > On Thu, 7 Dec 2017 03:59:30 + Bart Van Assche  
> > wrote:
> > > On Thu, 2017-12-07 at 14:57 +1100, Stephen Rothwell wrote:
> > > > After merging the scsi-mkp tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > > 
> > > > ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > > > ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > > > 
> > > > Caused by commit
> > > > 
> > > >   ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets 
> > > > woken up")
> > > > 
> > > > I have used the scsi-mkp tree from next-20171206 for today.  
> > > 
> > > Does that mean I'm the first one who added RCU code to the SCSI core?
> > 
> > The only other uses of init_rcu_head() are in drivers/iommu/intel-svm.c
> > and kernel/irq/irqdesc.c.  destroy_rcu_head() appears to not be used
> > anywhere ...
> 
> The key point is that Bart appears to be the first to try using them in
> a module, for which exports are needed.  Does the patch below help?
> 
>   Thanx, Paul
> 
> 
> 
> commit cde4691a3a4591e7355295dd62610e3262159002
> Author: Paul E. McKenney 
> Date:   Wed Dec 6 20:39:38 2017 -0800
> 
> rcu: Export init_rcu_head() and destroy_rcu_head() to GPL modules
> 
> Use of init_rcu_head() and destroy_rcu_head() from modules results in
> the following build-time error:
> 
>   ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
>   ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> 
> This commit therefore adds EXPORT_SYMBOL_GPL() for each to allow them
> to be used by GPL-licensed kernel modules.
> 
> Reported-by: Bart Van Assche 
> Reported-by: Stephen Rothwell 
> Signed-off-by: Paul E. McKenney 
> 
> diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
> index 8d591d8411fe..4c4d26e9a67b 100644
> --- a/kernel/rcu/update.c
> +++ b/kernel/rcu/update.c
> @@ -422,11 +422,13 @@ void init_rcu_head(struct rcu_head *head)
>  {
>   debug_object_init(head, _debug_descr);
>  }
> +EXPORT_SYMBOL_GPL(init_rcu_head);
>  
>  void destroy_rcu_head(struct rcu_head *head)
>  {
>   debug_object_free(head, _debug_descr);
>  }
> +EXPORT_SYMBOL_GPL(destroy_rcu_head);
>  
>  static bool rcuhead_is_static_object(void *addr)
>  {

(+linux-scsi)

Hello Paul,

How about changing the commit message into "... fixes a build failure with
CONFIG_DEBUG_OBJECTS_RCU_HEAD=y"? Otherwise the above patch looks fine to me
and fixes the reported build failure on my setup.

However, what's not clear to me is through which tree this patch should be
sent to Linus? Should the above patch be sent as a v4.15-rc fix or should
Martin perhaps queue it in his tree for v4.16-rc1?

Thanks,

Bart.

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

[Paul E. McKenney]

On Thu, Dec 07, 2017 at 03:25:21PM +1100, Stephen Rothwell wrote:
> Hi Bart,
> 
> [cc'ing some RCU people ...]
> 
> On Thu, 7 Dec 2017 03:59:30 + Bart Van Assche  
> wrote:
> >
> > On Thu, 2017-12-07 at 14:57 +1100, Stephen Rothwell wrote:
> > > After merging the scsi-mkp tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > > ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > > 
> > > Caused by commit
> > > 
> > >   ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets 
> > > woken up")
> > > 
> > > I have used the scsi-mkp tree from next-20171206 for today.  
> > 
> > Does that mean I'm the first one who added RCU code to the SCSI core?
> 
> The only other uses of init_rcu_head() are in drivers/iommu/intel-svm.c
> and kernel/irq/irqdesc.c.  destroy_rcu_head() appears to not be used
> anywhere ...

The key point is that Bart appears to be the first to try using them in
a module, for which exports are needed.  Does the patch below help?

Thanx, Paul



commit cde4691a3a4591e7355295dd62610e3262159002
Author: Paul E. McKenney 
Date:   Wed Dec 6 20:39:38 2017 -0800

rcu: Export init_rcu_head() and destroy_rcu_head() to GPL modules

Use of init_rcu_head() and destroy_rcu_head() from modules results in
the following build-time error:

ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!

This commit therefore adds EXPORT_SYMBOL_GPL() for each to allow them
to be used by GPL-licensed kernel modules.

Reported-by: Bart Van Assche 
Reported-by: Stephen Rothwell 
Signed-off-by: Paul E. McKenney 

diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
index 8d591d8411fe..4c4d26e9a67b 100644
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
@@ -422,11 +422,13 @@ void init_rcu_head(struct rcu_head *head)
 {
debug_object_init(head, _debug_descr);
 }
+EXPORT_SYMBOL_GPL(init_rcu_head);
 
 void destroy_rcu_head(struct rcu_head *head)
 {
debug_object_free(head, _debug_descr);
 }
+EXPORT_SYMBOL_GPL(destroy_rcu_head);
 
 static bool rcuhead_is_static_object(void *addr)
 {

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

[Paul E. McKenney]

On Thu, Dec 07, 2017 at 03:25:21PM +1100, Stephen Rothwell wrote:
> Hi Bart,
> 
> [cc'ing some RCU people ...]
> 
> On Thu, 7 Dec 2017 03:59:30 + Bart Van Assche  
> wrote:
> >
> > On Thu, 2017-12-07 at 14:57 +1100, Stephen Rothwell wrote:
> > > After merging the scsi-mkp tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > > ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > > 
> > > Caused by commit
> > > 
> > >   ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets 
> > > woken up")
> > > 
> > > I have used the scsi-mkp tree from next-20171206 for today.  
> > 
> > Does that mean I'm the first one who added RCU code to the SCSI core?
> 
> The only other uses of init_rcu_head() are in drivers/iommu/intel-svm.c
> and kernel/irq/irqdesc.c.  destroy_rcu_head() appears to not be used
> anywhere ...

The key point is that Bart appears to be the first to try using them in
a module, for which exports are needed.  Does the patch below help?

Thanx, Paul



commit cde4691a3a4591e7355295dd62610e3262159002
Author: Paul E. McKenney 
Date:   Wed Dec 6 20:39:38 2017 -0800

rcu: Export init_rcu_head() and destroy_rcu_head() to GPL modules

Use of init_rcu_head() and destroy_rcu_head() from modules results in
the following build-time error:

ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!

This commit therefore adds EXPORT_SYMBOL_GPL() for each to allow them
to be used by GPL-licensed kernel modules.

Reported-by: Bart Van Assche 
Reported-by: Stephen Rothwell 
Signed-off-by: Paul E. McKenney 

diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
index 8d591d8411fe..4c4d26e9a67b 100644
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
@@ -422,11 +422,13 @@ void init_rcu_head(struct rcu_head *head)
 {
debug_object_init(head, _debug_descr);
 }
+EXPORT_SYMBOL_GPL(init_rcu_head);
 
 void destroy_rcu_head(struct rcu_head *head)
 {
debug_object_free(head, _debug_descr);
 }
+EXPORT_SYMBOL_GPL(destroy_rcu_head);
 
 static bool rcuhead_is_static_object(void *addr)
 {

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

[Stephen Rothwell]

Hi Bart,

[cc'ing some RCU people ...]

On Thu, 7 Dec 2017 03:59:30 + Bart Van Assche  
wrote:
>
> On Thu, 2017-12-07 at 14:57 +1100, Stephen Rothwell wrote:
> > After merging the scsi-mkp tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > 
> > Caused by commit
> > 
> >   ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets woken 
> > up")
> > 
> > I have used the scsi-mkp tree from next-20171206 for today.  
> 
> Does that mean I'm the first one who added RCU code to the SCSI core?

The only other uses of init_rcu_head() are in drivers/iommu/intel-svm.c
and kernel/irq/irqdesc.c.  destroy_rcu_head() appears to not be used
anywhere ...

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Bart,

[cc'ing some RCU people ...]

On Thu, 7 Dec 2017 03:59:30 + Bart Van Assche  
wrote:
>
> On Thu, 2017-12-07 at 14:57 +1100, Stephen Rothwell wrote:
> > After merging the scsi-mkp tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> > 
> > Caused by commit
> > 
> >   ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets woken 
> > up")
> > 
> > I have used the scsi-mkp tree from next-20171206 for today.  
> 
> Does that mean I'm the first one who added RCU code to the SCSI core?

The only other uses of init_rcu_head() are in drivers/iommu/intel-svm.c
and kernel/irq/irqdesc.c.  destroy_rcu_head() appears to not be used
anywhere ...

-- 
Cheers,
Stephen Rothwell

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

[Bart Van Assche]

On Thu, 2017-12-07 at 14:57 +1100, Stephen Rothwell wrote:
> After merging the scsi-mkp tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> 
> Caused by commit
> 
>   ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets woken 
> up")
> 
> I have used the scsi-mkp tree from next-20171206 for today.

Does that mean I'm the first one who added RCU code to the SCSI core? Anyway,
I will fix this and repost the patch series that introduced this build failure.
Sorry for the inconvenience.

Bart.

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

[Bart Van Assche]

On Thu, 2017-12-07 at 14:57 +1100, Stephen Rothwell wrote:
> After merging the scsi-mkp tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
> 
> Caused by commit
> 
>   ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets woken 
> up")
> 
> I have used the scsi-mkp tree from next-20171206 for today.

Does that mean I'm the first one who added RCU code to the SCSI core? Anyway,
I will fix this and repost the patch series that introduced this build failure.
Sorry for the inconvenience.

Bart.

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

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

ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!

Caused by commit

  ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets woken up")

I have used the scsi-mkp tree from next-20171206 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

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

ERROR: "init_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!
ERROR: "destroy_rcu_head" [drivers/scsi/scsi_mod.ko] undefined!

Caused by commit

  ac90420f17c9 ("scsi: core: Ensure that the SCSI error handler gets woken up")

I have used the scsi-mkp tree from next-20171206 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko] undefined!

Caused by commit

  a8cf5dfeb4d8 ("scsi: lpfc: Added recovery logic for running out of NVMET IO 
context resources")

CONFIG_NVME_TARGET_FC is not set for this build.

I have used the scsi-mkp tree from next-20170516 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko] undefined!

Caused by commit

  a8cf5dfeb4d8 ("scsi: lpfc: Added recovery logic for running out of NVMET IO 
context resources")

CONFIG_NVME_TARGET_FC is not set for this build.

I have used the scsi-mkp tree from next-20170516 for today.

-- 
Cheers,
Stephen Rothwell

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

[James Bottomley]

On Mon, 2017-02-27 at 12:54 +1100, Stephen Rothwell wrote:
> Hi James,
> 
> On Thu, 23 Feb 2017 08:06:39 +1100 Stephen Rothwell <
> s...@canb.auug.org.au> wrote:
> > 
> > On Wed, 22 Feb 2017 13:41:19 +1100 Stephen Rothwell <
> > s...@canb.auug.org.au> wrote:
> > > 
> > > After merging the scsi-mkp tree, today's linux-next build
> > > (powerpc
> > > ppc64_defconfig) failed like this:
> > > 
> > > ERROR: ".nvme_fc_unregister_remoteport"
> > > [drivers/scsi/lpfc/lpfc.ko] undefined!
> > > ERROR: ".nvme_fc_unregister_localport"
> > > [drivers/scsi/lpfc/lpfc.ko] undefined!
> > > ERROR: ".nvmet_fc_rcv_ls_req" [drivers/scsi/lpfc/lpfc.ko]
> > > undefined!
> > > ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko]
> > > undefined!
> > > ERROR: ".nvme_fc_register_localport" [drivers/scsi/lpfc/lpfc.ko]
> > > undefined!
> > > ERROR: ".nvme_fc_register_remoteport" [drivers/scsi/lpfc/lpfc.ko]
> > > undefined!
> > > ERROR: ".nvmet_fc_register_targetport"
> > > [drivers/scsi/lpfc/lpfc.ko] undefined!
> > > ERROR: ".nvmet_fc_unregister_targetport"
> > > [drivers/scsi/lpfc/lpfc.ko] undefined!
> > > 
> > > Caused by commit
> > > 
> > >   462896e1808c ("scsi: lpfc: NVME Initiator: bind to nvme_fc
> > > api")
> > > 
> > > # CONFIG_NVME_FC is not set
> > > 
> > > Presumably a missing dependency.
> > > 
> > > I have used the scsi-mkp from next-20170221 for today.  
> > 
> > Unfortunately, you have just merged this build failure into the 
> > scsi tree :-(
> > 
> > James Smart has posted a fix:
> > 
> >   "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"
> 
> I am still getting this failure in the scsi tree even though a fix 
> has been merged into the scsi-mkp tree a few days ago.

Sorry, was in meeting hell for the last part of last week.  Everything
should be up to date now.  The final pull for all of this should go out
Wed/Thu to give 0day a good run at the tree.

James

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

[James Bottomley]

On Mon, 2017-02-27 at 12:54 +1100, Stephen Rothwell wrote:
> Hi James,
> 
> On Thu, 23 Feb 2017 08:06:39 +1100 Stephen Rothwell <
> s...@canb.auug.org.au> wrote:
> > 
> > On Wed, 22 Feb 2017 13:41:19 +1100 Stephen Rothwell <
> > s...@canb.auug.org.au> wrote:
> > > 
> > > After merging the scsi-mkp tree, today's linux-next build
> > > (powerpc
> > > ppc64_defconfig) failed like this:
> > > 
> > > ERROR: ".nvme_fc_unregister_remoteport"
> > > [drivers/scsi/lpfc/lpfc.ko] undefined!
> > > ERROR: ".nvme_fc_unregister_localport"
> > > [drivers/scsi/lpfc/lpfc.ko] undefined!
> > > ERROR: ".nvmet_fc_rcv_ls_req" [drivers/scsi/lpfc/lpfc.ko]
> > > undefined!
> > > ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko]
> > > undefined!
> > > ERROR: ".nvme_fc_register_localport" [drivers/scsi/lpfc/lpfc.ko]
> > > undefined!
> > > ERROR: ".nvme_fc_register_remoteport" [drivers/scsi/lpfc/lpfc.ko]
> > > undefined!
> > > ERROR: ".nvmet_fc_register_targetport"
> > > [drivers/scsi/lpfc/lpfc.ko] undefined!
> > > ERROR: ".nvmet_fc_unregister_targetport"
> > > [drivers/scsi/lpfc/lpfc.ko] undefined!
> > > 
> > > Caused by commit
> > > 
> > >   462896e1808c ("scsi: lpfc: NVME Initiator: bind to nvme_fc
> > > api")
> > > 
> > > # CONFIG_NVME_FC is not set
> > > 
> > > Presumably a missing dependency.
> > > 
> > > I have used the scsi-mkp from next-20170221 for today.  
> > 
> > Unfortunately, you have just merged this build failure into the 
> > scsi tree :-(
> > 
> > James Smart has posted a fix:
> > 
> >   "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"
> 
> I am still getting this failure in the scsi tree even though a fix 
> has been merged into the scsi-mkp tree a few days ago.

Sorry, was in meeting hell for the last part of last week.  Everything
should be up to date now.  The final pull for all of this should go out
Wed/Thu to give 0day a good run at the tree.

James

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

[Stephen Rothwell]

Hi James,

On Thu, 23 Feb 2017 08:06:39 +1100 Stephen Rothwell  
wrote:
>
> On Wed, 22 Feb 2017 13:41:19 +1100 Stephen Rothwell  
> wrote:
> >
> > After merging the scsi-mkp tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > ERROR: ".nvme_fc_unregister_remoteport" [drivers/scsi/lpfc/lpfc.ko] 
> > undefined!
> > ERROR: ".nvme_fc_unregister_localport" [drivers/scsi/lpfc/lpfc.ko] 
> > undefined!
> > ERROR: ".nvmet_fc_rcv_ls_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
> > ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
> > ERROR: ".nvme_fc_register_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> > ERROR: ".nvme_fc_register_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> > ERROR: ".nvmet_fc_register_targetport" [drivers/scsi/lpfc/lpfc.ko] 
> > undefined!
> > ERROR: ".nvmet_fc_unregister_targetport" [drivers/scsi/lpfc/lpfc.ko] 
> > undefined!
> > 
> > Caused by commit
> > 
> >   462896e1808c ("scsi: lpfc: NVME Initiator: bind to nvme_fc api")
> > 
> > # CONFIG_NVME_FC is not set
> > 
> > Presumably a missing dependency.
> > 
> > I have used the scsi-mkp from next-20170221 for today.  
> 
> Unfortunately, you have just merged this build failure into the scsi
> tree :-(
> 
> James Smart has posted a fix:
> 
>   "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"

I am still getting this failure in the scsi tree even though a fix has
been merged into the scsi-mkp tree a few days ago.

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi James,

On Thu, 23 Feb 2017 08:06:39 +1100 Stephen Rothwell  
wrote:
>
> On Wed, 22 Feb 2017 13:41:19 +1100 Stephen Rothwell  
> wrote:
> >
> > After merging the scsi-mkp tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > ERROR: ".nvme_fc_unregister_remoteport" [drivers/scsi/lpfc/lpfc.ko] 
> > undefined!
> > ERROR: ".nvme_fc_unregister_localport" [drivers/scsi/lpfc/lpfc.ko] 
> > undefined!
> > ERROR: ".nvmet_fc_rcv_ls_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
> > ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
> > ERROR: ".nvme_fc_register_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> > ERROR: ".nvme_fc_register_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> > ERROR: ".nvmet_fc_register_targetport" [drivers/scsi/lpfc/lpfc.ko] 
> > undefined!
> > ERROR: ".nvmet_fc_unregister_targetport" [drivers/scsi/lpfc/lpfc.ko] 
> > undefined!
> > 
> > Caused by commit
> > 
> >   462896e1808c ("scsi: lpfc: NVME Initiator: bind to nvme_fc api")
> > 
> > # CONFIG_NVME_FC is not set
> > 
> > Presumably a missing dependency.
> > 
> > I have used the scsi-mkp from next-20170221 for today.  
> 
> Unfortunately, you have just merged this build failure into the scsi
> tree :-(
> 
> James Smart has posted a fix:
> 
>   "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"

I am still getting this failure in the scsi tree even though a fix has
been merged into the scsi-mkp tree a few days ago.

-- 
Cheers,
Stephen Rothwell

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

[Chad Dupuis]

On Thu, 23 Feb 2017, 2:19pm -, Martin K. Petersen wrote:

> 
> *sigh*
> 
> Chad: Please fix these up ASAP.
> 
> 

Just submitted a patch to the list to fix this up.  I tested against the 
mainline which has the net-next merge and the kref refcount_t conversion 
to verify.

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

[Chad Dupuis]

On Thu, 23 Feb 2017, 2:19pm -, Martin K. Petersen wrote:

> 
> *sigh*
> 
> Chad: Please fix these up ASAP.
> 
> 

Just submitted a patch to the list to fix this up.  I tested against the 
mainline which has the net-next merge and the kref refcount_t conversion 
to verify.

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

[Martin K. Petersen]

> "Stephen" == Stephen Rothwell  writes:

Stephen,

Stephen> Caused by commit

Stephen>   61d8658b4a43 ("scsi: qedf: Add QLogic FastLinQ offload FCoE
Stephen>   driver framework")

Stephen> being rebased on top of commit

Stephen>   10383aea2f44 ("kref: Implement 'struct kref' using
Stephen>   refcount_t")

Stephen> and not using kref_read() to access the refcounts.

*sigh*

Chad: Please fix these up ASAP.


Stephen> I don't understand why you would rebase you work onto Linus'
Stephen> tree in the middle of the merge window in any case. :-(

I didn't rebase my existing patch queue. I started a new for-next based
on linus/master. Half of this new QLogic driver lives under net so I had
to wait for Linus to pull DaveM's tree before I could merge the SCSI
portion :(

We often have to do two-stage merge windows with SCSI because of
dependencies on changes in both block and net (the latter increasingly
so because of the popularity of converged adapters that do both networks
and storage).

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Martin K. Petersen]

> "Stephen" == Stephen Rothwell  writes:

Stephen,

Stephen> Caused by commit

Stephen>   61d8658b4a43 ("scsi: qedf: Add QLogic FastLinQ offload FCoE
Stephen>   driver framework")

Stephen> being rebased on top of commit

Stephen>   10383aea2f44 ("kref: Implement 'struct kref' using
Stephen>   refcount_t")

Stephen> and not using kref_read() to access the refcounts.

*sigh*

Chad: Please fix these up ASAP.


Stephen> I don't understand why you would rebase you work onto Linus'
Stephen> tree in the middle of the merge window in any case. :-(

I didn't rebase my existing patch queue. I started a new for-next based
on linus/master. Half of this new QLogic driver lives under net so I had
to wait for Linus to pull DaveM's tree before I could merge the SCSI
portion :(

We often have to do two-stage merge windows with SCSI because of
dependencies on changes in both block and net (the latter increasingly
so because of the popularity of converged adapters that do both networks
and storage).

-- 
Martin K. Petersen  Oracle Linux Engineering

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

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

drivers/scsi/qedf/qedf_io.c: In function 'qedf_trace_io':
drivers/scsi/qedf/qedf_io.c:1001:33: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
  io_log->refcount = atomic_read(_req->refcount.refcount);
 ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from arch/x86/include/asm/thread_info.h:52,
 from include/linux/thread_info.h:25,
 from arch/x86/include/asm/preempt.h:6,
 from include/linux/preempt.h:59,
 from include/linux/spinlock.h:50,
 from drivers/scsi/qedf/qedf_io.c:9:
arch/x86/include/asm/atomic.h:24:28: note: expected 'const atomic_t * {aka 
const struct  *}' but argument is of type 'refcount_t * {aka struct 
refcount_struct *}'
 static __always_inline int atomic_read(const atomic_t *v)
^
drivers/scsi/qedf/qedf_io.c: In function 'qedf_scsi_completion':
drivers/scsi/qedf/qedf_io.c:1343:27: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
refcount = atomic_read(_req->refcount.refcount);
   ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from arch/x86/include/asm/thread_info.h:52,
 from include/linux/thread_info.h:25,
 from arch/x86/include/asm/preempt.h:6,
 from include/linux/preempt.h:59,
 from include/linux/spinlock.h:50,
 from drivers/scsi/qedf/qedf_io.c:9:
arch/x86/include/asm/atomic.h:24:28: note: expected 'const atomic_t * {aka 
const struct  *}' but argument is of type 'refcount_t * {aka struct 
refcount_struct *}'
 static __always_inline int atomic_read(const atomic_t *v)
^
drivers/scsi/qedf/qedf_io.c: In function 'qedf_scsi_done':
drivers/scsi/qedf/qedf_io.c:1428:25: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
  refcount = atomic_read(_req->refcount.refcount);
 ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from arch/x86/include/asm/thread_info.h:52,
 from include/linux/thread_info.h:25,
 from arch/x86/include/asm/preempt.h:6,
 from include/linux/preempt.h:59,
 from include/linux/spinlock.h:50,
 from drivers/scsi/qedf/qedf_io.c:9:
arch/x86/include/asm/atomic.h:24:28: note: expected 'const atomic_t * {aka 
const struct  *}' but argument is of type 'refcount_t * {aka struct 
refcount_struct *}'
 static __always_inline int atomic_read(const atomic_t *v)
^
In file included from drivers/scsi/qedf/qedf.h:28:0,
 from drivers/scsi/qedf/qedf_io.c:11:
drivers/scsi/qedf/qedf_io.c: In function 'qedf_flush_els_req':
drivers/scsi/qedf/qedf_io.c:1559:18: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
  atomic_read(_req->refcount.refcount));
  ^
drivers/scsi/qedf/qedf_dbg.h:83:13: note: in definition of macro 'QEDF_INFO'
  ## __VA_ARGS__)
 ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from arch/x86/include/asm/thread_info.h:52,
 from include/linux/thread_info.h:25,
 from arch/x86/include/asm/preempt.h:6,
 from include/linux/preempt.h:59,
 from include/linux/spinlock.h:50,
 from drivers/scsi/qedf/qedf_io.c:9:
arch/x86/include/asm/atomic.h:24:28: note: expected 'const atomic_t * {aka 
const struct  *}' but argument is of type 'refcount_t * {aka struct 
refcount_struct *}'
 static __always_inline int atomic_read(const atomic_t *v)
^
drivers/scsi/qedf/qedf_els.c: In function 'qedf_rrq_compl':
drivers/scsi/qedf/qedf_els.c:186:25: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
  refcount = atomic_read(_io_req->refcount.refcount);
 ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from 

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

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

drivers/scsi/qedf/qedf_io.c: In function 'qedf_trace_io':
drivers/scsi/qedf/qedf_io.c:1001:33: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
  io_log->refcount = atomic_read(_req->refcount.refcount);
 ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from arch/x86/include/asm/thread_info.h:52,
 from include/linux/thread_info.h:25,
 from arch/x86/include/asm/preempt.h:6,
 from include/linux/preempt.h:59,
 from include/linux/spinlock.h:50,
 from drivers/scsi/qedf/qedf_io.c:9:
arch/x86/include/asm/atomic.h:24:28: note: expected 'const atomic_t * {aka 
const struct  *}' but argument is of type 'refcount_t * {aka struct 
refcount_struct *}'
 static __always_inline int atomic_read(const atomic_t *v)
^
drivers/scsi/qedf/qedf_io.c: In function 'qedf_scsi_completion':
drivers/scsi/qedf/qedf_io.c:1343:27: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
refcount = atomic_read(_req->refcount.refcount);
   ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from arch/x86/include/asm/thread_info.h:52,
 from include/linux/thread_info.h:25,
 from arch/x86/include/asm/preempt.h:6,
 from include/linux/preempt.h:59,
 from include/linux/spinlock.h:50,
 from drivers/scsi/qedf/qedf_io.c:9:
arch/x86/include/asm/atomic.h:24:28: note: expected 'const atomic_t * {aka 
const struct  *}' but argument is of type 'refcount_t * {aka struct 
refcount_struct *}'
 static __always_inline int atomic_read(const atomic_t *v)
^
drivers/scsi/qedf/qedf_io.c: In function 'qedf_scsi_done':
drivers/scsi/qedf/qedf_io.c:1428:25: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
  refcount = atomic_read(_req->refcount.refcount);
 ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from arch/x86/include/asm/thread_info.h:52,
 from include/linux/thread_info.h:25,
 from arch/x86/include/asm/preempt.h:6,
 from include/linux/preempt.h:59,
 from include/linux/spinlock.h:50,
 from drivers/scsi/qedf/qedf_io.c:9:
arch/x86/include/asm/atomic.h:24:28: note: expected 'const atomic_t * {aka 
const struct  *}' but argument is of type 'refcount_t * {aka struct 
refcount_struct *}'
 static __always_inline int atomic_read(const atomic_t *v)
^
In file included from drivers/scsi/qedf/qedf.h:28:0,
 from drivers/scsi/qedf/qedf_io.c:11:
drivers/scsi/qedf/qedf_io.c: In function 'qedf_flush_els_req':
drivers/scsi/qedf/qedf_io.c:1559:18: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
  atomic_read(_req->refcount.refcount));
  ^
drivers/scsi/qedf/qedf_dbg.h:83:13: note: in definition of macro 'QEDF_INFO'
  ## __VA_ARGS__)
 ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from arch/x86/include/asm/thread_info.h:52,
 from include/linux/thread_info.h:25,
 from arch/x86/include/asm/preempt.h:6,
 from include/linux/preempt.h:59,
 from include/linux/spinlock.h:50,
 from drivers/scsi/qedf/qedf_io.c:9:
arch/x86/include/asm/atomic.h:24:28: note: expected 'const atomic_t * {aka 
const struct  *}' but argument is of type 'refcount_t * {aka struct 
refcount_struct *}'
 static __always_inline int atomic_read(const atomic_t *v)
^
drivers/scsi/qedf/qedf_els.c: In function 'qedf_rrq_compl':
drivers/scsi/qedf/qedf_els.c:186:25: error: passing argument 1 of 'atomic_read' 
from incompatible pointer type [-Werror=incompatible-pointer-types]
  refcount = atomic_read(_io_req->refcount.refcount);
 ^
In file included from arch/x86/include/asm/msr.h:66:0,
 from arch/x86/include/asm/processor.h:20,
 from arch/x86/include/asm/cpufeature.h:4,
 from 

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

[James Bottomley]

On Wed, 2017-02-22 at 16:10 -0500, Martin K. Petersen wrote:
> > > > > > "Stephen" == Stephen Rothwell 
> > > > > > writes:
> 
> Stephen,
> 
> Stephen> Unfortunately, you have just merged this build failure into
> the
> Stephen> scsi tree :-(
> 
> Stephen> James Smart has posted a fix:
> 
> Stephen>   "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"
> 
> I'll get the queued up shortly.

Perhaps it would be nice to rebase so we don't get bisect into a build
failure.

James

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

[James Bottomley]

On Wed, 2017-02-22 at 16:10 -0500, Martin K. Petersen wrote:
> > > > > > "Stephen" == Stephen Rothwell 
> > > > > > writes:
> 
> Stephen,
> 
> Stephen> Unfortunately, you have just merged this build failure into
> the
> Stephen> scsi tree :-(
> 
> Stephen> James Smart has posted a fix:
> 
> Stephen>   "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"
> 
> I'll get the queued up shortly.

Perhaps it would be nice to rebase so we don't get bisect into a build
failure.

James

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

[Stephen Rothwell]

Hi James,

On Wed, 22 Feb 2017 13:41:19 +1100 Stephen Rothwell  
wrote:
>
> After merging the scsi-mkp tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: ".nvme_fc_unregister_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvme_fc_unregister_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvmet_fc_rcv_ls_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvme_fc_register_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvme_fc_register_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvmet_fc_register_targetport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvmet_fc_unregister_targetport" [drivers/scsi/lpfc/lpfc.ko] 
> undefined!
> 
> Caused by commit
> 
>   462896e1808c ("scsi: lpfc: NVME Initiator: bind to nvme_fc api")
> 
> # CONFIG_NVME_FC is not set
> 
> Presumably a missing dependency.
> 
> I have used the scsi-mkp from next-20170221 for today.

Unfortunately, you have just merged this build failure into the scsi
tree :-(

James Smart has posted a fix:

  "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi James,

On Wed, 22 Feb 2017 13:41:19 +1100 Stephen Rothwell  
wrote:
>
> After merging the scsi-mkp tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: ".nvme_fc_unregister_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvme_fc_unregister_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvmet_fc_rcv_ls_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvme_fc_register_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvme_fc_register_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvmet_fc_register_targetport" [drivers/scsi/lpfc/lpfc.ko] undefined!
> ERROR: ".nvmet_fc_unregister_targetport" [drivers/scsi/lpfc/lpfc.ko] 
> undefined!
> 
> Caused by commit
> 
>   462896e1808c ("scsi: lpfc: NVME Initiator: bind to nvme_fc api")
> 
> # CONFIG_NVME_FC is not set
> 
> Presumably a missing dependency.
> 
> I have used the scsi-mkp from next-20170221 for today.

Unfortunately, you have just merged this build failure into the scsi
tree :-(

James Smart has posted a fix:

  "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"

-- 
Cheers,
Stephen Rothwell

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

[Martin K. Petersen]

> "James" == James Bottomley  writes:

James> Perhaps it would be nice to rebase so we don't get bisect into a
James> build failure.

My plan was to start 4.11/scsi-fixes based on linus/master. I need block
and net to satisfy dependencies for the remaining patches in the queue.

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Martin K. Petersen]

> "James" == James Bottomley  writes:

James> Perhaps it would be nice to rebase so we don't get bisect into a
James> build failure.

My plan was to start 4.11/scsi-fixes based on linus/master. I need block
and net to satisfy dependencies for the remaining patches in the queue.

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Martin K. Petersen]

> "Stephen" == Stephen Rothwell  writes:

Stephen,

Stephen> Unfortunately, you have just merged this build failure into the
Stephen> scsi tree :-(

Stephen> James Smart has posted a fix:

Stephen>   "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"

I'll get the queued up shortly.

-- 
Martin K. Petersen  Oracle Linux Engineering

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

[Martin K. Petersen]

> "Stephen" == Stephen Rothwell  writes:

Stephen,

Stephen> Unfortunately, you have just merged this build failure into the
Stephen> scsi tree :-(

Stephen> James Smart has posted a fix:

Stephen>   "[PATCH v2] lpfc: add missing Kconfig NVME dependencies"

I'll get the queued up shortly.

-- 
Martin K. Petersen  Oracle Linux Engineering

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ERROR: ".nvme_fc_unregister_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvme_fc_unregister_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvmet_fc_rcv_ls_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvme_fc_register_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvme_fc_register_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvmet_fc_register_targetport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvmet_fc_unregister_targetport" [drivers/scsi/lpfc/lpfc.ko] undefined!

Caused by commit

  462896e1808c ("scsi: lpfc: NVME Initiator: bind to nvme_fc api")

# CONFIG_NVME_FC is not set

Presumably a missing dependency.

I have used the scsi-mkp from next-20170221 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the scsi-mkp tree

[Stephen Rothwell]

Hi Martin,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ERROR: ".nvme_fc_unregister_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvme_fc_unregister_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvmet_fc_rcv_ls_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvmet_fc_rcv_fcp_req" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvme_fc_register_localport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvme_fc_register_remoteport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvmet_fc_register_targetport" [drivers/scsi/lpfc/lpfc.ko] undefined!
ERROR: ".nvmet_fc_unregister_targetport" [drivers/scsi/lpfc/lpfc.ko] undefined!

Caused by commit

  462896e1808c ("scsi: lpfc: NVME Initiator: bind to nvme_fc api")

# CONFIG_NVME_FC is not set

Presumably a missing dependency.

I have used the scsi-mkp from next-20170221 for today.

-- 
Cheers,
Stephen Rothwell