From: WeiXiong Liao <liaoweixiong@allwinnertech.com>
To: 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>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Rob Herring <robh@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
WeiXiong Liao <liaoweixiong@allwinnertech.com>
Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org
Subject: [PATCH v1 09/11] pstore/blk: blkoops: support special removing jobs for dmesg.
Date: Mon, 20 Jan 2020 09:03:51 +0800 [thread overview]
Message-ID: <1579482233-2672-10-git-send-email-liaoweixiong@allwinnertech.com> (raw)
In-Reply-To: <1579482233-2672-1-git-send-email-liaoweixiong@allwinnertech.com>
It's one of a series of patches for adaptive to MTD device.
MTD device is not block device. To write to flash device on MTD, erase
must to be done before. However, pstore/blk just set datalen as 0 when
remove, which is not enough for mtd device. That's why this patch here,
to support special jobs when removing pstore/blk record.
Signed-off-by: WeiXiong Liao <liaoweixiong@allwinnertech.com>
---
Documentation/admin-guide/pstore-block.rst | 9 +++++++++
fs/pstore/blkoops.c | 4 +++-
fs/pstore/blkzone.c | 9 ++++++++-
include/linux/blkoops.h | 10 ++++++++++
include/linux/pstore_blk.h | 11 +++++++++++
5 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/Documentation/admin-guide/pstore-block.rst b/Documentation/admin-guide/pstore-block.rst
index f4fc205406aa..e351b0ebd8e5 100644
--- a/Documentation/admin-guide/pstore-block.rst
+++ b/Documentation/admin-guide/pstore-block.rst
@@ -197,6 +197,15 @@ negative number will be returned. The following return numbers mean more:
1. -EBUSY: pstore/blk should try again later.
#. -ENEXT: this zone is used or broken, pstore/blk should try next one.
+erase
+~~~~~
+
+It's generic erase API for pstore/blk, which is requested by non-block device.
+It will be called while pstore record is removing. It's required only when the
+device has special removing jobs. For example, MTD device tries to erase block.
+
+Normally zero should be returned, otherwise it indicates an error.
+
panic_write (for non-block device)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/fs/pstore/blkoops.c b/fs/pstore/blkoops.c
index d9b51880144b..6b74189e5820 100644
--- a/fs/pstore/blkoops.c
+++ b/fs/pstore/blkoops.c
@@ -179,6 +179,7 @@ int blkoops_register_device(struct blkoops_device *bo_dev)
bzinfo->dump_oops = dump_oops;
bzinfo->read = bo_dev->read;
bzinfo->write = bo_dev->write;
+ bzinfo->erase = bo_dev->erase;
bzinfo->panic_write = bo_dev->panic_write;
bzinfo->name = "blkoops";
bzinfo->owner = THIS_MODULE;
@@ -398,10 +399,11 @@ int blkoops_register_blkdev(unsigned int major, unsigned int flags,
bo_dev.total_size = blkoops_bdev_size(bdev);
if (bo_dev.total_size == 0)
goto err_put_bdev;
- bo_dev.panic_write = panic_write ? blkoops_blk_panic_write : NULL;
bo_dev.flags = flags;
bo_dev.read = blkoops_generic_blk_read;
bo_dev.write = blkoops_generic_blk_write;
+ bo_dev.erase = NULL;
+ bo_dev.panic_write = panic_write ? blkoops_blk_panic_write : NULL;
ret = blkoops_register_device(&bo_dev);
if (ret)
diff --git a/fs/pstore/blkzone.c b/fs/pstore/blkzone.c
index 3f58ff85f49c..a006a4a5b012 100644
--- a/fs/pstore/blkzone.c
+++ b/fs/pstore/blkzone.c
@@ -609,11 +609,18 @@ static inline bool blkz_ok(struct blkz_zone *zone)
static inline int blkz_dmesg_erase(struct blkz_context *cxt,
struct blkz_zone *zone)
{
+ size_t size;
+
if (unlikely(!blkz_ok(zone)))
return 0;
atomic_set(&zone->buffer->datalen, 0);
- return blkz_zone_write(zone, FLUSH_META, NULL, 0, 0);
+
+ size = buffer_datalen(zone) + sizeof(*zone->buffer);
+ if (cxt->bzinfo->erase)
+ return cxt->bzinfo->erase(size, zone->off);
+ else
+ return blkz_zone_write(zone, FLUSH_META, NULL, 0, 0);
}
static inline int blkz_record_erase(struct blkz_context *cxt,
diff --git a/include/linux/blkoops.h b/include/linux/blkoops.h
index bc7665d14a98..11cb3036ad5f 100644
--- a/include/linux/blkoops.h
+++ b/include/linux/blkoops.h
@@ -33,6 +33,15 @@
* number means more:
* -EBUSY: pstore/blk should try again later.
* -ENEXT: this zone is used or broken, pstore/blk should try next one.
+ * @erase:
+ * The general (not panic) erase operation. It will be call while pstore
+ * record is removing. It's required only when device have special
+ * removing jobs, for example, MTD device try to erase block.
+ *
+ * Both of the @size and @offset parameters on this interface are
+ * the relative size of the space provided, not the whole disk/flash.
+ *
+ * On success, 0 should be returned. Others mean error.
* @panic_write:
* The write operation only used for panic.
*
@@ -53,6 +62,7 @@ struct blkoops_device {
unsigned long total_size;
blkz_read_op read;
blkz_write_op write;
+ blkz_erase_op erase;
blkz_write_op panic_write;
};
diff --git a/include/linux/pstore_blk.h b/include/linux/pstore_blk.h
index bbbe4fe37f7c..9641969f888f 100644
--- a/include/linux/pstore_blk.h
+++ b/include/linux/pstore_blk.h
@@ -46,6 +46,15 @@
* number means more:
* -EBUSY: pstore/blk should try again later.
* -ENEXT: this zone is used or broken, pstore/blk should try next one.
+ * @erase:
+ * The general (not panic) erase operation. It will be call while pstore
+ * record is removing. It's required only when device have special
+ * removing jobs, for example, MTD device try to erase block.
+ *
+ * Both of the @size and @offset parameters on this interface are
+ * the relative size of the space provided, not the whole disk/flash.
+ *
+ * On success, 0 should be returned. Others mean error.
* @panic_write:
* The write operation only used for panic. It's optional if you do not
* care panic record. If panic occur but blkzone do not recover yet, the
@@ -59,6 +68,7 @@
*/
typedef ssize_t (*blkz_read_op)(char *, size_t, loff_t);
typedef ssize_t (*blkz_write_op)(const char *, size_t, loff_t);
+typedef ssize_t (*blkz_erase_op)(size_t, loff_t);
struct blkz_info {
struct module *owner;
const char *name;
@@ -71,6 +81,7 @@ struct blkz_info {
int dump_oops;
blkz_read_op read;
blkz_write_op write;
+ blkz_erase_op erase;
blkz_write_op panic_write;
};
--
1.9.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-01-20 1:06 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 1:03 [PATCH v1 00/11] pstore: support crash log to block and mtd device WeiXiong Liao
2020-01-20 1:03 ` [PATCH v1 01/11] pstore/blk: new support logger for block devices WeiXiong Liao
2020-01-20 1:03 ` [PATCH v1 02/11] blkoops: add blkoops, a warpper for pstore/blk WeiXiong Liao
2020-01-20 1:03 ` [PATCH v1 03/11] pstore/blk: support pmsg recorder WeiXiong Liao
2020-01-20 1:03 ` [PATCH v1 04/11] pstore/blk: blkoops: support console recorder WeiXiong Liao
2020-01-20 1:03 ` [PATCH v1 05/11] pstore/blk: blkoops: support ftrace recorder WeiXiong Liao
2020-01-20 1:03 ` [PATCH v1 06/11] Documentation: pstore/blk: blkoops: create document for pstore_blk WeiXiong Liao
2020-01-21 4:13 ` Randy Dunlap
2020-01-21 5:23 ` liaoweixiong
2020-01-21 6:36 ` Randy Dunlap
2020-01-21 8:19 ` liaoweixiong
2020-01-21 15:34 ` Randy Dunlap
2020-01-22 15:01 ` liaoweixiong
2020-01-22 16:08 ` Randy Dunlap
2020-01-20 1:03 ` [PATCH v1 07/11] pstore/blk: skip broken zone for mtd device WeiXiong Liao
2020-01-20 1:03 ` [PATCH v1 08/11] blkoops: respect for device to pick recorders WeiXiong Liao
2020-01-20 1:03 ` WeiXiong Liao [this message]
2020-01-20 1:03 ` [PATCH v1 10/11] blkoops: add interface for dirver to get information of blkoops WeiXiong Liao
2020-01-20 1:03 ` [PATCH v1 11/11] mtd: new support oops logger based on pstore/blk WeiXiong Liao
2020-01-20 10:03 ` Miquel Raynal
2020-01-21 3:36 ` liaoweixiong
2020-01-21 8:48 ` Miquel Raynal
2020-01-22 17:22 ` liaoweixiong
2020-01-22 17:41 ` Miquel Raynal
2020-02-06 13:10 ` liaoweixiong
2020-02-06 15:45 ` Miquel Raynal
2020-02-07 4:13 ` liaoweixiong
2020-02-07 8:41 ` Miquel Raynal
2020-02-07 10:30 ` liaoweixiong
2020-01-23 4:24 ` Vignesh Raghavendra
2020-01-23 7:03 ` liaoweixiong
2020-02-06 9:13 ` [PATCH v1 00/11] pstore: support crash log to block and mtd device 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=1579482233-2672-10-git-send-email-liaoweixiong@allwinnertech.com \
--to=liaoweixiong@allwinnertech.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=anton@enomsg.org \
--cc=ccross@android.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=mchehab+samsung@kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=robh@kernel.org \
--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).