{"id":806825,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806825/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1503965694-10794-40-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:14:14","name":"[39/79] blkdebug: Refactor error injection","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9f9381dc8e7a4c2fbfbf9a98604295b101cb49c7","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-40-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806825/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh8dZ6dwCz9s65\n\tfor ;\n\tTue, 29 Aug 2017 10:29:06 +1000 (AEST)","from localhost ([::1]:41952 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmUOu-0004F6-O1\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:29:04 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48056)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmUCT-0001Hn-IR\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmUCQ-0005Su-L8\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:13 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:34328\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmUCQ-0005Sh-F5\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:10 -0400","from pps.filterd (m0098413.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0E8S7017789\n\tfor ; Mon, 28 Aug 2017 20:16:10 -0400","from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmub2wvt6-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 20:16:09 -0400","from localhost\n\tby e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 28 Aug 2017 18:16:08 -0600","from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18)\n\tby e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:16:06 -0600","from b03ledav006.gho.boulder.ibm.com\n\t(b03ledav006.gho.boulder.ibm.com [9.17.130.237])\n\tby b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0G5dT62849094; Mon, 28 Aug 2017 17:16:05 -0700","from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id C6DE0C6059;\n\tMon, 28 Aug 2017 18:16:05 -0600 (MDT)","from localhost (unknown [9.80.85.217])\n\tby b03ledav006.gho.boulder.ibm.com (Postfix) with ESMTP id 914BBC604A;\n\tMon, 28 Aug 2017 18:16:05 -0600 (MDT)"],"From":"Michael Roth ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:14:14 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-0024-0000-0000-0000171CE4B9","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:16:08","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-0025-0000-0000-00004C7F052C","Message-Id":"<1503965694-10794-40-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.158.5","Subject":"[Qemu-devel] [PATCH 39/79] blkdebug: Refactor error injection","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-stable@nongnu.org, Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Eric Blake \n\nRather than repeat the logic at each caller of checking if a Rule\nexists that warrants an error injection, fold that logic into\ninject_error(); and rename it to rule_check() for legibility.\nThis will help the next patch, which adds two more callers that\nneed to check rules for the potential of injecting errors.\n\nSigned-off-by: Eric Blake \nReviewed-by: Max Reitz \nMessage-id: 20170429191419.30051-6-eblake@redhat.com\nSigned-off-by: Max Reitz \n(cherry picked from commit d157ed5f7235f3d2d5596a514ad7507b18e24b88)\n* prereq for 81c219a\nSigned-off-by: Michael Roth \n---\n block/blkdebug.c | 74 +++++++++++++++++++++++++-------------------------------\n 1 file changed, 33 insertions(+), 41 deletions(-)","diff":"diff --git a/block/blkdebug.c b/block/blkdebug.c\nindex b2cee0c..c5d2edb 100644\n--- a/block/blkdebug.c\n+++ b/block/blkdebug.c\n@@ -403,11 +403,30 @@ out:\n return ret;\n }\n \n-static int inject_error(BlockDriverState *bs, BlkdebugRule *rule)\n+static int rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes)\n {\n BDRVBlkdebugState *s = bs->opaque;\n- int error = rule->options.inject.error;\n- bool immediately = rule->options.inject.immediately;\n+ BlkdebugRule *rule = NULL;\n+ int error;\n+ bool immediately;\n+\n+ QSIMPLEQ_FOREACH(rule, &s->active_rules, active_next) {\n+ uint64_t inject_offset = rule->options.inject.offset;\n+\n+ if (inject_offset == -1 ||\n+ (bytes && inject_offset >= offset &&\n+ inject_offset < offset + bytes))\n+ {\n+ break;\n+ }\n+ }\n+\n+ if (!rule || !rule->options.inject.error) {\n+ return 0;\n+ }\n+\n+ immediately = rule->options.inject.immediately;\n+ error = rule->options.inject.error;\n \n if (rule->options.inject.once) {\n QSIMPLEQ_REMOVE(&s->active_rules, rule, BlkdebugRule, active_next);\n@@ -426,8 +445,7 @@ static int coroutine_fn\n blkdebug_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,\n QEMUIOVector *qiov, int flags)\n {\n- BDRVBlkdebugState *s = bs->opaque;\n- BlkdebugRule *rule = NULL;\n+ int err;\n \n /* Sanity check block layer guarantees */\n assert(QEMU_IS_ALIGNED(offset, bs->bl.request_alignment));\n@@ -436,18 +454,9 @@ blkdebug_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,\n assert(bytes <= bs->bl.max_transfer);\n }\n \n- QSIMPLEQ_FOREACH(rule, &s->active_rules, active_next) {\n- uint64_t inject_offset = rule->options.inject.offset;\n-\n- if (inject_offset == -1 ||\n- (inject_offset >= offset && inject_offset < offset + bytes))\n- {\n- break;\n- }\n- }\n-\n- if (rule && rule->options.inject.error) {\n- return inject_error(bs, rule);\n+ err = rule_check(bs, offset, bytes);\n+ if (err) {\n+ return err;\n }\n \n return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags);\n@@ -457,8 +466,7 @@ static int coroutine_fn\n blkdebug_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,\n QEMUIOVector *qiov, int flags)\n {\n- BDRVBlkdebugState *s = bs->opaque;\n- BlkdebugRule *rule = NULL;\n+ int err;\n \n /* Sanity check block layer guarantees */\n assert(QEMU_IS_ALIGNED(offset, bs->bl.request_alignment));\n@@ -467,18 +475,9 @@ blkdebug_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,\n assert(bytes <= bs->bl.max_transfer);\n }\n \n- QSIMPLEQ_FOREACH(rule, &s->active_rules, active_next) {\n- uint64_t inject_offset = rule->options.inject.offset;\n-\n- if (inject_offset == -1 ||\n- (inject_offset >= offset && inject_offset < offset + bytes))\n- {\n- break;\n- }\n- }\n-\n- if (rule && rule->options.inject.error) {\n- return inject_error(bs, rule);\n+ err = rule_check(bs, offset, bytes);\n+ if (err) {\n+ return err;\n }\n \n return bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags);\n@@ -486,17 +485,10 @@ blkdebug_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,\n \n static int blkdebug_co_flush(BlockDriverState *bs)\n {\n- BDRVBlkdebugState *s = bs->opaque;\n- BlkdebugRule *rule = NULL;\n-\n- QSIMPLEQ_FOREACH(rule, &s->active_rules, active_next) {\n- if (rule->options.inject.offset == -1) {\n- break;\n- }\n- }\n+ int err = rule_check(bs, 0, 0);\n \n- if (rule && rule->options.inject.error) {\n- return inject_error(bs, rule);\n+ if (err) {\n+ return err;\n }\n \n return bdrv_co_flush(bs->file->bs);\n","prefixes":["39/79"]}