[Skiboot] [PATCH v2 04/13] core/flash: Make opal_flash_op() actually asynchronous
Deb McLemore
debmc at linux.ibm.com
Tue Nov 5 00:29:40 AEDT 2019
From: Cyril Bur <cyril.bur at au1.ibm.com>
This patch provides a simple (although not particularly efficient)
asynchronous capability to the opal_flash interface. The advantage of
this approach is that it doesn't require any changing of blocklevel or
its backends to provide an asynchronous implementation. This is also the
disadvantage of this implementation as all it actually does is break the
work up in chunks that it can performed quickly, but still
synchronously. Only a backend could provide a more asynchronous
implementation.
This solves a problem we have right now with the opal_flash_erase call
where it can block in Skiboot for around three minutes. This causes a
variety of problems in Linux due to a processor being gone for a long
time.
For example:
[ 98.610043] INFO: rcu_sched detected stalls on CPUs/tasks:
[ 98.610050] 113-...: (1 GPs behind) idle=96f/140000000000000/0 softirq=527/528 fqs=1044
[ 98.610051] (detected by 112, t=2102 jiffies, g=223, c=222, q=123)
[ 98.610060] Task dump for CPU 113:
[ 98.610062] pflash R running task 0 3335 3333 0x00040004
[ 98.610066] Call Trace:
[ 98.610070] [c000001fdd847730] [0000000000000001] 0x1 (unreliable)
[ 98.610076] [c000001fdd847900] [c000000000013854] __switch_to+0x1e8/0x1f4
[ 98.610081] [c000001fdd847960] [c0000000006122c4] __schedule+0x32c/0x874
[ 98.610083] [c000001fdd847a30] [c000001fdd847b40] 0xc000001fdd847b40
It is for this reason that breaking the work up in smaller chunks solves
this problem as Skiboot can return the CPU to Linux between chunks to
avoid Linux getting upset.
Reported-By: Samuel Mendoza-Jonas <sam at mendozajonas.com>
Signed-off-by: Cyril Bur <cyril.bur at au1.ibm.com>
Signed-off-by: Stewart Smith <stewart at linux.ibm.com>
---
core/flash.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
core/timer.c | 8 ++++
2 files changed, 108 insertions(+), 17 deletions(-)
diff --git a/core/flash.c b/core/flash.c
index d97d88e..e98c8e0 100644
--- a/core/flash.c
+++ b/core/flash.c
@@ -25,8 +25,24 @@
#include <libstb/trustedboot.h>
#include <libxz/xz.h>
#include <elf.h>
+#include <timer.h>
#include <timebase.h>
+enum flash_op {
+ FLASH_OP_READ,
+ FLASH_OP_WRITE,
+ FLASH_OP_ERASE,
+};
+
+struct flash_async_info {
+ enum flash_op op;
+ struct timer poller;
+ uint64_t token;
+ uint64_t pos;
+ uint64_t len;
+ uint64_t buf;
+};
+
struct flash {
struct list_node list;
bool busy;
@@ -35,6 +51,7 @@ struct flash {
uint64_t size;
uint32_t block_size;
int id;
+ struct flash_async_info async;
};
static struct {
@@ -234,6 +251,54 @@ static int flash_nvram_probe(struct flash *flash, struct ffs_handle *ffs)
/* core flash support */
+/*
+ * Called with flash lock held, drop it on async completion
+ */
+static void flash_poll(struct timer *t __unused, void *data, uint64_t now __unused)
+{
+ struct flash *flash = data;
+ uint64_t offset, buf, len;
+ int rc;
+
+ offset = flash->async.pos;
+ buf = flash->async.buf;
+ len = MIN(flash->async.len, flash->block_size*10);
+ printf("Flash poll op %d len %llu\n", flash->async.op, len);
+
+ switch (flash->async.op) {
+ case FLASH_OP_READ:
+ rc = blocklevel_raw_read(flash->bl, offset, (void *)buf, len);
+ break;
+ case FLASH_OP_WRITE:
+ rc = blocklevel_raw_write(flash->bl, offset, (void *)buf, len);
+ break;
+ case FLASH_OP_ERASE:
+ rc = blocklevel_erase(flash->bl, offset, len);
+ break;
+ default:
+ assert(0);
+ }
+
+ if (rc)
+ rc = OPAL_HARDWARE;
+
+ flash->async.pos += len;
+ flash->async.buf += len;
+ flash->async.len -= len;
+ if (!rc && flash->async.len) {
+ /*
+ * We want to get called pretty much straight away, just have
+ * to be sure that we jump back out to Linux so that if this
+ * very long we don't cause RCU or the scheduler to freak
+ */
+ schedule_timer(&flash->async.poller, 0);
+ return;
+ }
+
+ opal_queue_msg(OPAL_MSG_ASYNC_COMP, NULL, NULL, flash->async.token, rc);
+ flash_release(flash);
+}
+
static struct dt_node *flash_add_dt_node(struct flash *flash, int id)
{
int i;
@@ -389,6 +454,7 @@ int flash_register(struct blocklevel_device *bl)
flash->size = size;
flash->block_size = block_size;
flash->id = num_flashes();
+ init_timer(&flash->async.poller, flash_poll, flash);
rc = ffs_init(0, flash->size, bl, &ffs, 1);
if (rc) {
@@ -417,16 +483,11 @@ int flash_register(struct blocklevel_device *bl)
return OPAL_SUCCESS;
}
-enum flash_op {
- FLASH_OP_READ,
- FLASH_OP_WRITE,
- FLASH_OP_ERASE,
-};
-
static int64_t opal_flash_op(enum flash_op op, uint64_t id, uint64_t offset,
uint64_t buf, uint64_t size, uint64_t token)
{
struct flash *flash = NULL;
+ uint64_t len;
int rc;
list_for_each(&flashes, flash, list)
@@ -445,9 +506,17 @@ static int64_t opal_flash_op(enum flash_op op, uint64_t id, uint64_t offset,
prlog(PR_DEBUG, "Requested flash op %d beyond flash size %" PRIu64 "\n",
op, flash->size);
rc = OPAL_PARAMETER;
- goto err;
+ goto out;
}
+ len = MIN(size, flash->block_size*10);
+ printf("Flash op %d len %llu\n", op, len);
+ flash->async.op = op;
+ flash->async.token = token;
+ flash->async.buf = buf + len;
+ flash->async.len = size - len;
+ flash->async.pos = offset + len;
+
/*
* These ops intentionally have no smarts (ecc correction or erase
* before write) to them.
@@ -457,29 +526,43 @@ static int64_t opal_flash_op(enum flash_op op, uint64_t id, uint64_t offset,
*/
switch (op) {
case FLASH_OP_READ:
- rc = blocklevel_raw_read(flash->bl, offset, (void *)buf, size);
+ rc = blocklevel_raw_read(flash->bl, offset, (void *)buf, len);
break;
case FLASH_OP_WRITE:
- rc = blocklevel_raw_write(flash->bl, offset, (void *)buf, size);
+ rc = blocklevel_raw_write(flash->bl, offset, (void *)buf, len);
break;
case FLASH_OP_ERASE:
- rc = blocklevel_erase(flash->bl, offset, size);
+ rc = blocklevel_erase(flash->bl, offset, len);
break;
default:
assert(0);
}
if (rc) {
+ prlog(PR_ERR, "%s: Op %d failed with rc %d\n", __func__, op, rc);
rc = OPAL_HARDWARE;
- goto err;
+ goto out;
}
- flash_release(flash);
-
- opal_queue_msg(OPAL_MSG_ASYNC_COMP, NULL, NULL, token, rc);
- return OPAL_ASYNC_COMPLETION;
-
-err:
+ if (size - len) {
+ /* Work remains */
+ schedule_timer(&flash->async.poller, 0);
+ /* Don't release the flash */
+ return OPAL_ASYNC_COMPLETION;
+ } else {
+ /*
+ * As tempting as it might be here to return OPAL_SUCCESS
+ * here, don't! As of 1/07/2017 the powernv_flash driver in
+ * Linux will handle OPAL_SUCCESS as an error, the only thing
+ * that makes it handle things as though they're working is
+ * receiving OPAL_ASYNC_COMPLETION.
+ *
+ * XXX TODO: Revisit this in a few years *sigh*
+ */
+ opal_queue_msg(OPAL_MSG_ASYNC_COMP, NULL, NULL, flash->async.token, rc);
+ }
+ rc = OPAL_ASYNC_COMPLETION;
+out:
flash_release(flash);
return rc;
}
diff --git a/core/timer.c b/core/timer.c
index 5cf9069..53b6616 100644
--- a/core/timer.c
+++ b/core/timer.c
@@ -210,6 +210,7 @@ static void __check_poll_timers(uint64_t now)
static void __check_timers(uint64_t now)
{
struct timer *t;
+ uint64_t stop = now + msecs_to_tb(50); /* Run timers for max 5ms */
for (;;) {
t = list_top(&timer_list, struct timer, link);
@@ -240,6 +241,13 @@ static void __check_timers(uint64_t now)
/* Update time stamp */
now = mftb();
+
+ /* Only run timers for a limited time to avoid jitter */
+ if (now > stop) {
+ prlog(PR_TRACE, "Run timers for > 50ms total elapsed time=%lu\n",
+ tb_to_msecs(now - stop)+50);
+ break;
+ }
}
}
--
2.7.4
More information about the Skiboot
mailing list