From: Kees Cook <keescook@chromium.org>
To: WeiXiong Liao <liaoweixiong@allwinnertech.com>
Cc: Kees Cook <keescook@chromium.org>,
Anton Vorontsov <anton@enomsg.org>,
Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>,
Jonathan Corbet <corbet@lwn.net>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>,
Petr Mladek <pmladek@suse.com>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Rob Herring <robh@kernel.org>,
Pavel Tatashin <pasha.tatashin@soleen.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mtd@lists.infradead.org
Subject: [PATCH v6 15/18] pstore/blk: Provide way to query pstore configuration
Date: Sat, 9 May 2020 16:41:00 -0700 [thread overview]
Message-ID: <20200509234103.46544-16-keescook@chromium.org> (raw)
In-Reply-To: <20200509234103.46544-1-keescook@chromium.org>
From: WeiXiong Liao <liaoweixiong@allwinnertech.com>
In order to configure itself, the MTD backend needs to be able to query
the current pstore configuration. Introduce pstore_blk_usr_info() for
this purpose.
Signed-off-by: WeiXiong Liao <liaoweixiong@allwinnertech.com>
Link: https://lore.kernel.org/r/1585126506-18635-10-git-send-email-liaoweixiong@allwinnertech.com
Signed-off-by: Kees Cook <keescook@chromium.org>
---
fs/pstore/blk.c | 37 ++++++++++++++++++++++++++++++-------
include/linux/pstore_blk.h | 10 ++++++++++
2 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c
index 884b51e5879f..134c5e0c67c1 100644
--- a/fs/pstore/blk.c
+++ b/fs/pstore/blk.c
@@ -93,6 +93,17 @@ static struct bdev_info {
sector_t start_sect;
} g_bdev_info;
+#define check_size(name, alignsize) ({ \
+ long _##name_ = (name); \
+ _##name_ = _##name_ <= 0 ? 0 : (_##name_ * 1024); \
+ if (_##name_ & ((alignsize) - 1)) { \
+ pr_info(#name " must align to %d\n", \
+ (alignsize)); \
+ _##name_ = ALIGN(name, (alignsize)); \
+ } \
+ _##name_; \
+})
+
/**
* struct psblk_device - back-end pstore/blk driver structure.
*
@@ -148,13 +159,11 @@ static int psblk_register_do(struct psblk_device *dev)
dev->flags = UINT_MAX;
#define verify_size(name, alignsize, enabled) { \
- long _##name_ = (enabled) ? (name) : 0; \
- _##name_ = _##name_ <= 0 ? 0 : (_##name_ * 1024); \
- if (_##name_ & ((alignsize) - 1)) { \
- pr_info(#name " must align to %d\n", \
- (alignsize)); \
- _##name_ = ALIGN(name, (alignsize)); \
- } \
+ long _##name_; \
+ if (enabled) \
+ _##name_ = check_size(name, alignsize); \
+ else \
+ _##name_ = 0; \
name = _##name_ / 1024; \
pstore_zone_info->name = _##name_; \
}
@@ -508,6 +517,20 @@ int psblk_blkdev_info(dev_t *devt, sector_t *nr_sects, sector_t *start_sect)
}
EXPORT_SYMBOL_GPL(psblk_blkdev_info);
+/* get information of pstore/blk */
+int pstore_blk_usr_info(struct pstore_blk_info *info)
+{
+ strncpy(info->device, blkdev, 80);
+ info->max_reason = max_reason;
+ info->kmsg_size = check_size(kmsg_size, 4096);
+ info->pmsg_size = check_size(pmsg_size, 4096);
+ info->ftrace_size = check_size(ftrace_size, 4096);
+ info->console_size = check_size(console_size, 4096);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(pstore_blk_usr_info);
+
static void __exit pstore_blk_exit(void)
{
mutex_lock(&pstore_blk_lock);
diff --git a/include/linux/pstore_blk.h b/include/linux/pstore_blk.h
index 121b70e314a8..8aae922caa27 100644
--- a/include/linux/pstore_blk.h
+++ b/include/linux/pstore_blk.h
@@ -27,4 +27,14 @@ int register_pstore_blk(unsigned int major, unsigned int flags,
void unregister_pstore_blk(unsigned int major);
int psblk_blkdev_info(dev_t *devt, sector_t *nr_sects, sector_t *start_sect);
+struct pstore_blk_info {
+ char device[80];
+ enum kmsg_dump_reason max_reason;
+ unsigned long kmsg_size;
+ unsigned long pmsg_size;
+ unsigned long console_size;
+ unsigned long ftrace_size;
+};
+int pstore_blk_usr_info(struct pstore_blk_info *info);
+
#endif
--
2.20.1
next prev parent reply other threads:[~2020-05-09 23:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 23:40 [PATCH v6 00/18] pstore: mtd: support crash log to block and mtd device Kees Cook
2020-05-09 23:40 ` [PATCH v6 01/18] pstore/ram: Move dump_oops to end of module_param list Kees Cook
2020-05-09 23:40 ` [PATCH v6 02/18] pstore/platform: Switch pstore_info::name to const Kees Cook
2020-05-09 23:40 ` [PATCH v6 03/18] pstore/platform: Move module params after declarations Kees Cook
2020-05-09 23:40 ` [PATCH v6 04/18] pstore/platform: Use backend name for console registration Kees Cook
2020-05-09 23:40 ` [PATCH v6 05/18] pstore/ram: Refactor ftrace buffer merging Kees Cook
2020-05-09 23:40 ` [PATCH v6 06/18] pstore/ftrace: Provide ftrace log merging routine Kees Cook
2020-05-09 23:40 ` [PATCH v6 07/18] printk: Introduce kmsg_dump_reason_str() Kees Cook
2020-05-09 23:40 ` [PATCH v6 08/18] pstore/zone: Introduce common layer to manage storage zones Kees Cook
2020-05-09 23:40 ` [PATCH v6 09/18] pstore/blk: Introduce backend for block devices Kees Cook
2020-05-09 23:40 ` [PATCH v6 10/18] pstore/zone,blk: Add support for pmsg frontend Kees Cook
2020-05-09 23:40 ` [PATCH v6 11/18] pstore/zone,blk: Add console frontend support Kees Cook
2020-05-09 23:40 ` [PATCH v6 12/18] pstore/zone,blk: Add ftrace " Kees Cook
2020-05-09 23:40 ` [PATCH v6 13/18] Documentation: Add details for pstore/blk Kees Cook
2020-05-09 23:40 ` [PATCH v6 14/18] pstore/zone: Provide way to skip "broken" zone for MTD devices Kees Cook
2020-05-09 23:41 ` Kees Cook [this message]
2020-05-09 23:41 ` [PATCH v6 16/18] pstore/blk: Support non-block storage devices Kees Cook
2020-05-09 23:41 ` [PATCH v6 17/18] mtd: Support kmsg dumper based on pstore/blk Kees Cook
2020-05-09 23:41 ` [PATCH v6 18/18] pstore/blk: Introduce "best_effort" mode Kees Cook
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=20200509234103.46544-16-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=anton@enomsg.org \
--cc=ccross@android.com \
--cc=corbet@lwn.net \
--cc=liaoweixiong@allwinnertech.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=pasha.tatashin@soleen.com \
--cc=pmladek@suse.com \
--cc=richard@nod.at \
--cc=robh@kernel.org \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=tony.luck@intel.com \
--cc=vigneshr@ti.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).