From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:45018 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753043AbeBFVLZ (ORCPT ); Tue, 6 Feb 2018 16:11:25 -0500 From: Howard McLauchlan To: CC: Jens Axboe , , Omar Sandoval , Josef Bacik , Howard McLauchlan Subject: [PATCH v2] block: Add should_fail_bio() for bpf error injection Date: Tue, 6 Feb 2018 13:11:08 -0800 Message-ID: <20180206211108.3236-1-hmclauchlan@fb.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-block-owner@vger.kernel.org List-Id: linux-block@vger.kernel.org The classic error injection mechanism, should_fail_request() does not support use cases where more information is required (from the entire struct bio, for example). To that end, this patch introduces should_fail_bio(), which calls should_fail_request() under the hood but provides a convenient place for kprobes to hook into if they require the entire struct bio. This patch also replaces some existing calls to should_fail_request() with should_fail_bio() with no degradation in performance. Reviewed-by: Omar Sandoval Signed-off-by: Howard McLauchlan --- V2: rebased on master for 4.15 block/blk-core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/block/blk-core.c b/block/blk-core.c index d0d104268f1a..560a0260a8dc 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -34,6 +34,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include @@ -2083,6 +2084,12 @@ static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part) return false; } +static noinline bool should_fail_bio(struct bio *bio) +{ + return should_fail_request(&bio->bi_disk->part0, bio->bi_iter.bi_size); +} +BPF_ALLOW_ERROR_INJECTION(should_fail_bio); + /* * Remap block n of partition p to block n+start(p) of the disk. */ @@ -2174,7 +2181,7 @@ generic_make_request_checks(struct bio *bio) if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_rq_based(q)) goto not_supported; - if (should_fail_request(&bio->bi_disk->part0, bio->bi_iter.bi_size)) + if (should_fail_bio(bio)) goto end_io; if (!bio->bi_partno) { -- 2.14.1