All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Tony Luck <tony.luck@intel.com>,
	Anton Vorontsov <anton@enomsg.org>,
	linux-kernel@vger.kernel.org,
	WeiXiong Liao <liaoweixiong@allwinnertech.com>,
	linux-mtd@lists.infradead.org, Colin Cross <ccross@android.com>
Subject: Re: [PATCH 9/9] pstore/blk: don't depend on CONFIG_BLOCK
Date: Tue, 1 Dec 2020 11:53:23 -0800	[thread overview]
Message-ID: <202012011152.5CD7EAD@keescook> (raw)
In-Reply-To: <20201016132047.3068029-10-hch@lst.de>

On Fri, Oct 16, 2020 at 03:20:47PM +0200, Christoph Hellwig wrote:
> pstore-blk contains of two different layers:
> 
>  a) a tiny layer of sugar coating ontop of pstore-zone.  This part has
>     no dependencies on the block layer, and can be used e.g. by mtd
>  b) an implementation of a default fallback pstore zone backend for
>     block devices
> 
> Add an ifdef for the latter so that pstore-blk itself does not have to
> depend on CONFIG_BLOCK.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

AFAIU, this can't be done until the read/write changes from patch 8 are
adopted, so, for now, I'm not taking this either.

-Kees

> ---
>  fs/pstore/Kconfig | 2 +-
>  fs/pstore/blk.c   | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig
> index e16a49ebfe546d..6eadb538316e52 100644
> --- a/fs/pstore/Kconfig
> +++ b/fs/pstore/Kconfig
> @@ -164,7 +164,7 @@ config PSTORE_ZONE
>  config PSTORE_BLK
>  	tristate "Log panic/oops to a block device"
>  	depends on PSTORE
> -	depends on BLOCK
> +	depends on BLOCK || !BLOCK
>  	select PSTORE_ZONE
>  	default n
>  	help
> diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c
> index bd4eadfc9bd795..d3d25edb943cdd 100644
> --- a/fs/pstore/blk.c
> +++ b/fs/pstore/blk.c
> @@ -182,6 +182,7 @@ void unregister_pstore_device(const struct pstore_zone_ops *ops)
>  }
>  EXPORT_SYMBOL_GPL(unregister_pstore_device);
>  
> +#ifdef CONFIG_BLOCK
>  static struct file *psblk_file;
>  
>  static ssize_t psblk_generic_blk_read(char *buf, size_t bytes, loff_t pos)
> @@ -269,6 +270,7 @@ void __init pstore_blk_early_init(void)
>  	__pstore_blk_init(devname);
>  }
>  #endif /* MODULE */
> +#endif /* CONFIG_BLOCK */
>  
>  /* get information of pstore/blk */
>  int pstore_blk_get_config(struct pstore_blk_config *info)
> -- 
> 2.28.0
> 

-- 
Kees Cook

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

WARNING: multiple messages have this Message-ID (diff)
From: Kees Cook <keescook@chromium.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Anton Vorontsov <anton@enomsg.org>,
	Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>,
	WeiXiong Liao <liaoweixiong@allwinnertech.com>,
	linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 9/9] pstore/blk: don't depend on CONFIG_BLOCK
Date: Tue, 1 Dec 2020 11:53:23 -0800	[thread overview]
Message-ID: <202012011152.5CD7EAD@keescook> (raw)
In-Reply-To: <20201016132047.3068029-10-hch@lst.de>

On Fri, Oct 16, 2020 at 03:20:47PM +0200, Christoph Hellwig wrote:
> pstore-blk contains of two different layers:
> 
>  a) a tiny layer of sugar coating ontop of pstore-zone.  This part has
>     no dependencies on the block layer, and can be used e.g. by mtd
>  b) an implementation of a default fallback pstore zone backend for
>     block devices
> 
> Add an ifdef for the latter so that pstore-blk itself does not have to
> depend on CONFIG_BLOCK.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

AFAIU, this can't be done until the read/write changes from patch 8 are
adopted, so, for now, I'm not taking this either.

-Kees

> ---
>  fs/pstore/Kconfig | 2 +-
>  fs/pstore/blk.c   | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig
> index e16a49ebfe546d..6eadb538316e52 100644
> --- a/fs/pstore/Kconfig
> +++ b/fs/pstore/Kconfig
> @@ -164,7 +164,7 @@ config PSTORE_ZONE
>  config PSTORE_BLK
>  	tristate "Log panic/oops to a block device"
>  	depends on PSTORE
> -	depends on BLOCK
> +	depends on BLOCK || !BLOCK
>  	select PSTORE_ZONE
>  	default n
>  	help
> diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c
> index bd4eadfc9bd795..d3d25edb943cdd 100644
> --- a/fs/pstore/blk.c
> +++ b/fs/pstore/blk.c
> @@ -182,6 +182,7 @@ void unregister_pstore_device(const struct pstore_zone_ops *ops)
>  }
>  EXPORT_SYMBOL_GPL(unregister_pstore_device);
>  
> +#ifdef CONFIG_BLOCK
>  static struct file *psblk_file;
>  
>  static ssize_t psblk_generic_blk_read(char *buf, size_t bytes, loff_t pos)
> @@ -269,6 +270,7 @@ void __init pstore_blk_early_init(void)
>  	__pstore_blk_init(devname);
>  }
>  #endif /* MODULE */
> +#endif /* CONFIG_BLOCK */
>  
>  /* get information of pstore/blk */
>  int pstore_blk_get_config(struct pstore_blk_config *info)
> -- 
> 2.28.0
> 

-- 
Kees Cook

  parent reply	other threads:[~2020-12-01 19:54 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-16 13:20 simplify pstore-blk Christoph Hellwig
2020-10-16 13:20 ` Christoph Hellwig
2020-10-16 13:20 ` [PATCH 1/9] pstore/zone: cap the maximum device size Christoph Hellwig
2020-10-16 13:20   ` Christoph Hellwig
2020-11-08 14:05   ` 廖威雄
2020-11-08 14:05     ` 廖威雄
2020-12-01 19:08   ` Kees Cook
2020-12-01 19:08     ` Kees Cook
2020-12-01 21:11   ` Kees Cook
2020-12-01 21:11     ` Kees Cook
2020-10-16 13:20 ` [PATCH 2/9] pstore/blk: update the command line example Christoph Hellwig
2020-10-16 13:20   ` Christoph Hellwig
2020-11-08 14:05   ` 廖威雄
2020-11-08 14:05     ` 廖威雄
2020-12-01 19:10   ` Kees Cook
2020-12-01 19:10     ` Kees Cook
2020-10-16 13:20 ` [PATCH 3/9] pstore/blk: remove {un,}register_pstore_blk Christoph Hellwig
2020-10-16 13:20   ` Christoph Hellwig
2020-12-01 19:29   ` Kees Cook
2020-12-01 19:29     ` Kees Cook
2020-10-16 13:20 ` [PATCH 4/9] pstore/blk: remove __unregister_pstore_blk Christoph Hellwig
2020-10-16 13:20   ` Christoph Hellwig
2020-12-01 19:20   ` Kees Cook
2020-12-01 19:20     ` Kees Cook
2020-10-16 13:20 ` [PATCH 5/9] pstore/blk: simplify the block device open / close path Christoph Hellwig
2020-10-16 13:20   ` Christoph Hellwig
2020-12-01 19:40   ` Kees Cook
2020-12-01 19:40     ` Kees Cook
2020-10-16 13:20 ` [PATCH 6/9] pstore/zone: split struct pstore_zone_info Christoph Hellwig
2020-10-16 13:20   ` Christoph Hellwig
2020-12-01 19:42   ` Kees Cook
2020-12-01 19:42     ` Kees Cook
2020-10-16 13:20 ` [PATCH 7/9] pstore/blk: remove struct pstore_device_info Christoph Hellwig
2020-10-16 13:20   ` Christoph Hellwig
2020-12-01 19:44   ` Kees Cook
2020-12-01 19:44     ` Kees Cook
2020-10-16 13:20 ` [PATCH 8/9] pstore/blk: use the normal block device I/O path Christoph Hellwig
2020-10-16 13:20   ` Christoph Hellwig
2020-11-08 14:43   ` 廖威雄
2020-11-08 14:43     ` 廖威雄
2020-11-23 14:49     ` Christoph Hellwig
2020-11-23 14:49       ` Christoph Hellwig
2020-12-01 19:52   ` Kees Cook
2020-12-01 19:52     ` Kees Cook
2020-10-16 13:20 ` [PATCH 9/9] pstore/blk: don't depend on CONFIG_BLOCK Christoph Hellwig
2020-10-16 13:20   ` Christoph Hellwig
2020-10-16 19:36   ` kernel test robot
2020-12-01 19:53   ` Kees Cook [this message]
2020-12-01 19:53     ` Kees Cook
2020-10-16 22:54 ` simplify pstore-blk Kees Cook
2020-10-16 22:54   ` Kees Cook
2020-11-23 14:53   ` Christoph Hellwig
2020-11-23 14:53     ` Christoph Hellwig
2020-11-24 22:53     ` Kees Cook
2020-11-24 22:53       ` Kees Cook
2020-11-08 14:34 ` 廖威雄
2020-11-08 14:34   ` 廖威雄

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=202012011152.5CD7EAD@keescook \
    --to=keescook@chromium.org \
    --cc=anton@enomsg.org \
    --cc=ccross@android.com \
    --cc=hch@lst.de \
    --cc=liaoweixiong@allwinnertech.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.