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

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

[Stephen Rothwell]

Hi Kees,

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

drivers/acpi/apei/erst.c:943:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .read  = erst_reader,
           ^

Caused by commit

  d8aaf3511a13 ("pstore: add lzo/lz4 compression support")

I added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Jun 2016 10:20:27 +1000
Subject: [PATCH] pstore: update acpi/apei/erst.c for struct pstore_info change

Fixes: d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/acpi/apei/erst.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 006c3894c6ea..3024edf43a92 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -927,7 +927,8 @@ static int erst_open_pstore(struct pstore_info *psi);
 static int erst_close_pstore(struct pstore_info *psi);
 static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
 			   struct timespec *time, char **buf,
-			   bool *compressed, struct pstore_info *psi);
+			   bool *compressed, ssize_t *ecc_notice_size,
+			   struct pstore_info *psi);
 static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
 		       u64 *id, unsigned int part, int count, bool compressed,
 		       size_t size, struct pstore_info *psi);
@@ -987,7 +988,8 @@ static int erst_close_pstore(struct pstore_info *psi)
 
 static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
 			   struct timespec *time, char **buf,
-			   bool *compressed, struct pstore_info *psi)
+			   bool *compressed, ssize_t *ecc_notice_size,
+			   struct pstore_info *psi)
 {
 	int rc;
 	ssize_t len = 0;
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

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

[Kees Cook]

Thanks for the patch! Should I add this to my tree?

-Kees

On Wed, Jun 1, 2016 at 5:25 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kees,
>
> After merging the pstore tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/acpi/apei/erst.c:943:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .read  = erst_reader,
>            ^
>
> Caused by commit
>
>   d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
>
> I added this patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 2 Jun 2016 10:20:27 +1000
> Subject: [PATCH] pstore: update acpi/apei/erst.c for struct pstore_info change
>
> Fixes: d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/acpi/apei/erst.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
> index 006c3894c6ea..3024edf43a92 100644
> --- a/drivers/acpi/apei/erst.c
> +++ b/drivers/acpi/apei/erst.c
> @@ -927,7 +927,8 @@ static int erst_open_pstore(struct pstore_info *psi);
>  static int erst_close_pstore(struct pstore_info *psi);
>  static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
>                            struct timespec *time, char **buf,
> -                          bool *compressed, struct pstore_info *psi);
> +                          bool *compressed, ssize_t *ecc_notice_size,
> +                          struct pstore_info *psi);
>  static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
>                        u64 *id, unsigned int part, int count, bool compressed,
>                        size_t size, struct pstore_info *psi);
> @@ -987,7 +988,8 @@ static int erst_close_pstore(struct pstore_info *psi)
>
>  static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
>                            struct timespec *time, char **buf,
> -                          bool *compressed, struct pstore_info *psi)
> +                          bool *compressed, ssize_t *ecc_notice_size,
> +                          struct pstore_info *psi)
>  {
>         int rc;
>         ssize_t len = 0;
> --
> 2.8.1
>
> --
> Cheers,
> Stephen Rothwell



-- 
Kees Cook
Chrome OS & Brillo Security

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

[Stephen Rothwell]

Hi Kees,

On Wed, 1 Jun 2016 19:15:11 -0700 Kees Cook <keescook@chromium.org> wrote:
>
> Thanks for the patch! Should I add this to my tree?

Yes, since your tree is broken without it.  This patch should have been
part of the patch it fixes.  An x86_64 allmodconfig build of just your
tree should fail at the moment.

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Kees,

On Thu, 2 Jun 2016 10:25:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pstore tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/acpi/apei/erst.c:943:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .read  = erst_reader,
>            ^

This also affected arch/powerpc/kernel/nvram_64.c:

arch/powerpc/kernel/nvram_64.c:563:10: error: initialization
 from incompatible pointer type [-Werror=incompatible-pointer-types]
  .read = nvram_pstore_read,
          ^

So I added this patch as well:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Jun 2016 13:58:25 +1000
Subject: [PATCH] pstore: update arch/powerpc/kernel/nvram_64.c for struct pstore_info change

Fixes: d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/kernel/nvram_64.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 856f9a7944cd..5ad2579e2cdc 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -444,7 +444,8 @@ static int nvram_pstore_write(enum pstore_type_id type,
  */
 static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type,
 				int *count, struct timespec *time, char **buf,
-				bool *compressed, struct pstore_info *psi)
+				bool *compressed, ssize_t *ecc_notice_size,
+				struct pstore_info *psi)
 {
 	struct oops_log_info *oops_hdr;
 	unsigned int err_type, id_no, size = 0;
-- 
2.8.1

I guess I don't really know if there is further fixes necessary, these
patches just fix up the build.
-- 
Cheers,
Stephen Rothwell

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

[Kees Cook]

Thanks! All callers should be fixed now.

-Kees

On Wed, Jun 1, 2016 at 9:03 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kees,
>
> On Thu, 2 Jun 2016 10:25:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the pstore tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/acpi/apei/erst.c:943:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>>   .read  = erst_reader,
>>            ^
>
> This also affected arch/powerpc/kernel/nvram_64.c:
>
> arch/powerpc/kernel/nvram_64.c:563:10: error: initialization
>  from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .read = nvram_pstore_read,
>           ^
>
> So I added this patch as well:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 2 Jun 2016 13:58:25 +1000
> Subject: [PATCH] pstore: update arch/powerpc/kernel/nvram_64.c for struct pstore_info change
>
> Fixes: d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/powerpc/kernel/nvram_64.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
> index 856f9a7944cd..5ad2579e2cdc 100644
> --- a/arch/powerpc/kernel/nvram_64.c
> +++ b/arch/powerpc/kernel/nvram_64.c
> @@ -444,7 +444,8 @@ static int nvram_pstore_write(enum pstore_type_id type,
>   */
>  static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type,
>                                 int *count, struct timespec *time, char **buf,
> -                               bool *compressed, struct pstore_info *psi)
> +                               bool *compressed, ssize_t *ecc_notice_size,
> +                               struct pstore_info *psi)
>  {
>         struct oops_log_info *oops_hdr;
>         unsigned int err_type, id_no, size = 0;
> --
> 2.8.1
>
> I guess I don't really know if there is further fixes necessary, these
> patches just fix up the build.
> --
> Cheers,
> Stephen Rothwell



-- 
Kees Cook
Chrome OS & Brillo Security

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

[Kees Cook]

On Thu, Aug 2, 2018 at 6:00 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kees,
>
> After merging the pstore tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/pstore/platform.o: In function `zbufsize_zstd':
> platform.c:(.text+0x172): undefined reference to `ZSTD_compressBound'
>
> Caused by commit
>
>   48ed452ca6ad ("pstore: add zstd compression support")

Yikes. I have no idea how this slipped through. allmodconfig builds
are my standard sanity-check but I clearly made some kind of error in
my scripting.

I'll get it fixed. Thanks!

-Kees

-- 
Kees Cook
Pixel Security

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

[Stephen Rothwell]

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

Hi Kees,

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

fs/pstore/platform.o: In function `zbufsize_zstd':
platform.c:(.text+0x172): undefined reference to `ZSTD_compressBound'

Caused by commit

  48ed452ca6ad ("pstore: add zstd compression support")

I have used the pstore tree from next-20180802 for today.

-- 
Cheers,
Stephen Rothwell

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