From: Gioh Kim <gi-oh.kim@ionos.com>
To: linux-block@vger.kernel.org
Cc: axboe@kernel.dk, hch@infradead.org, sagi@grimberg.me,
bvanassche@acm.org, haris.iqbal@ionos.com, jinpu.wang@ionos.com,
Gioh Kim <gi-oh.kim@cloud.ionos.com>,
Jack Wang <jinpu.wang@cloud.ionos.com>
Subject: [PATCH for-rc 04/24] block/rnbd-srv: Inject a fault at bio processing
Date: Thu, 25 Mar 2021 16:28:51 +0100 [thread overview]
Message-ID: <20210325152911.1213627-5-gi-oh.kim@ionos.com> (raw)
In-Reply-To: <20210325152911.1213627-1-gi-oh.kim@ionos.com>
From: Gioh Kim <gi-oh.kim@cloud.ionos.com>
If the fault is enabled, it sends an error to the client
so that the client thinks the target device on the server has failed.
Signed-off-by: Gioh Kim <gi-oh.kim@cloud.ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@cloud.ionos.com>
---
drivers/block/rnbd/rnbd-srv-sysfs.c | 36 +++++++++++++++++++++++++++++
drivers/block/rnbd/rnbd-srv.c | 7 ++++++
drivers/block/rnbd/rnbd-srv.h | 13 +++++++++++
3 files changed, 56 insertions(+)
diff --git a/drivers/block/rnbd/rnbd-srv-sysfs.c b/drivers/block/rnbd/rnbd-srv-sysfs.c
index 05ffe488ddc6..278a981302b9 100644
--- a/drivers/block/rnbd/rnbd-srv-sysfs.c
+++ b/drivers/block/rnbd/rnbd-srv-sysfs.c
@@ -253,3 +253,39 @@ void rnbd_srv_destroy_sysfs_files(void)
device_destroy(rnbd_dev_class, MKDEV(0, 0));
class_destroy(rnbd_dev_class);
}
+
+#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
+void rnbd_srv_fault_inject_init(struct rnbd_srv_fault_inject *fault_inject,
+ const char *dev_name)
+{
+ rnbd_fault_inject_init(&fault_inject->fj, dev_name, -EBUSY);
+ /* injection points */
+ rnbd_fault_inject_add(fault_inject->fj.dir,
+ "fail-bio", &fault_inject->fail_bio);
+}
+
+void rnbd_srv_fault_inject_fini(struct rnbd_srv_fault_inject *fault_inject)
+{
+ rnbd_fault_inject_final(&fault_inject->fj);
+}
+
+int rnbd_should_fail_bio(struct rnbd_srv_sess_dev *sess_dev)
+{
+ struct rnbd_srv_fault_inject *fault_inject = &sess_dev->fault_inject;
+ if (fault_inject->fail_bio && should_fail(&fault_inject->fj.attr, 1))
+ return fault_inject->fj.status;
+ return 0;
+}
+#else
+void rnbd_srv_fault_inject_init(struct rnbd_srv_fault_inject *fault_inj,
+ const char *dev_name)
+{
+}
+void rnbd_srv_fault_inject_fini(struct rnbd_srv_fault_inject *fault_inject)
+{
+}
+int rnbd_should_fail_bio(struct rnbd_srv_sess_dev *sess_dev)
+{
+ return 0;
+}
+#endif
diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index a6a68d44f517..447fb0718525 100644
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -88,9 +88,14 @@ void rnbd_endio(void *priv, int error)
{
struct rnbd_io_private *rnbd_priv = priv;
struct rnbd_srv_sess_dev *sess_dev = rnbd_priv->sess_dev;
+ int fail_err = 0;
rnbd_put_sess_dev(sess_dev);
+ fail_err = rnbd_should_fail_bio(sess_dev);
+ if (unlikely(fail_err)) /* over-write error which will be sent to client */
+ error = fail_err;
+
rtrs_srv_resp_rdma(rnbd_priv->id, error);
kfree(priv);
@@ -230,6 +235,7 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id)
rnbd_put_sess_dev(sess_dev);
wait_for_completion(&dc); /* wait for inflights to drop to zero */
+ rnbd_srv_fault_inject_fini(&sess_dev->fault_inject);
rnbd_dev_close(sess_dev->rnbd_dev);
list_del(&sess_dev->sess_list);
mutex_lock(&sess_dev->dev->lock);
@@ -811,6 +817,7 @@ static int process_msg_open(struct rtrs_srv *rtrs,
rnbd_srv_info(srv_sess_dev, "Opened device '%s'\n", srv_dev->id);
kfree(full_path);
+ rnbd_srv_fault_inject_init(&srv_sess_dev->fault_inject, kbasename(srv_sess_dev->pathname));
fill_response:
rnbd_srv_fill_msg_open_rsp(rsp, srv_sess_dev);
diff --git a/drivers/block/rnbd/rnbd-srv.h b/drivers/block/rnbd/rnbd-srv.h
index b157371c25ed..120e6d64cb82 100644
--- a/drivers/block/rnbd/rnbd-srv.h
+++ b/drivers/block/rnbd/rnbd-srv.h
@@ -45,6 +45,13 @@ struct rnbd_srv_dev {
int open_write_cnt;
};
+struct rnbd_srv_fault_inject {
+#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
+ struct rnbd_fault_inject fj;
+ bool fail_bio;
+#endif
+};
+
/* Structure which binds N devices and N sessions */
struct rnbd_srv_sess_dev {
/* Entry inside rnbd_srv_dev struct */
@@ -62,6 +69,7 @@ struct rnbd_srv_sess_dev {
struct completion *destroy_comp;
char pathname[NAME_MAX];
enum rnbd_access_mode access_mode;
+ struct rnbd_srv_fault_inject fault_inject;
};
void rnbd_srv_sess_dev_force_close(struct rnbd_srv_sess_dev *sess_dev);
@@ -77,4 +85,9 @@ int rnbd_srv_create_sysfs_files(void);
void rnbd_srv_destroy_sysfs_files(void);
void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id);
+void rnbd_srv_fault_inject_init(struct rnbd_srv_fault_inject *fault_inj,
+ const char *dev_name);
+void rnbd_srv_fault_inject_fini(struct rnbd_srv_fault_inject *fault_inject);
+int rnbd_should_fail_bio(struct rnbd_srv_sess_dev *sess_dev);
+
#endif /* RNBD_SRV_H */
--
2.25.1
next prev parent reply other threads:[~2021-03-25 15:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 15:28 [PATCH for-rc 00/24] Misc update for rnbd Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 01/24] MAINTAINERS: Change maintainer for rnbd module Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 02/24] Documentation/sysfs-block-rnbd: Add descriptions for remap_device and resize Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 03/24] block/rnbd: Enable the fault-injection Gioh Kim
2021-03-25 15:28 ` Gioh Kim [this message]
2021-03-25 15:28 ` [PATCH for-rc 05/24] block/rnbd-clt: Inject some fault points Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 06/24] docs: fault-injection: Add fault-injection manual of RNBD Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 07/24] docs: Add RTRS/RNBD to the index of fault-injection Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 08/24] block/rnbd-clt: Remove some arguments from insert_dev_if_not_exists_devpath Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 09/24] block/rnbd-clt: Remove some arguments from rnbd_client_setup_device Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 10/24] block/rnbd-clt: Move add_disk(dev->gd) to rnbd_clt_setup_gen_disk Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 11/24] block/rnbd: Kill rnbd_clt_destroy_default_group Gioh Kim
2021-03-25 15:28 ` [PATCH for-rc 12/24] block/rnbd: Kill destroy_device_cb Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 13/24] block/rnbd-clt: Replace {NO_WAIT,WAIT} with RTRS_PERMIT_{WAIT,NOWAIT} Gioh Kim
2021-03-25 16:12 ` Leon Romanovsky
2021-03-25 16:23 ` Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 14/24] block/rnbd-srv: Prevent a deadlock generated by accessing sysfs in parallel Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 15/24] block/rnbd-srv: Remove force_close file after holding a lock Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 16/24] block/rnbd-clt: Improve find_or_create_sess() return check Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 17/24] block/rnbd-clt: Fix missing a memory free when unloading the module Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 18/24] block/rnbd-clt: Support polling mode for IO latency optimization Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 19/24] Documentation/ABI/rnbd-clt: Add description for nr_poll_queues Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 20/24] block/rnbd-srv: Remove unused arguments of rnbd_srv_rdma_ev Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 21/24] block/rnbd-clt: Generate kobject_uevent when the rnbd device state changes Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 22/24] block/rnbd-clt: Remove max_segment_size Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 23/24] block/rnbd-clt-sysfs: Remove copy buffer overlap in rnbd_clt_get_path_name Gioh Kim
2021-03-25 15:29 ` [PATCH for-rc 24/24] block/rnbd: Use strscpy instead of strlcpy Gioh Kim
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=20210325152911.1213627-5-gi-oh.kim@ionos.com \
--to=gi-oh.kim@ionos.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=gi-oh.kim@cloud.ionos.com \
--cc=haris.iqbal@ionos.com \
--cc=hch@infradead.org \
--cc=jinpu.wang@cloud.ionos.com \
--cc=jinpu.wang@ionos.com \
--cc=linux-block@vger.kernel.org \
--cc=sagi@grimberg.me \
/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).