From nobody Tue Feb 10 11:32:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=bu.edu) ARC-Seal: i=2; a=rsa-sha256; t=1603242687; cv=pass; d=zohomail.com; s=zohoarc; b=VNLGTAssXJn+kvexfuaXp0qc+YWGoJRFG+fYYJ9TgZeIAhnrSNnn45mMGsO+rNHVbkZZiHZokKdE49g0R+ouasIXLZwQfejXY4EO4Y7vAWkyrv7ZaJYiJ7+PQDRpZ+z1TTeheh6dDEOmaZQiaNtkkXfgcwHqv6a8L1udUGxRiKU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603242687; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KGrjvwJOI37RU+5qtwX8OWxNIpldct9l3CehaP007G0=; b=ENFG1ERg+r8H0eHj9FvViXsJD+MSO+J9JUVGByyH/Bz2Ml3TWeoXWiGTKC2pcIY0DMT5HLFd434kT/vd6xnmH3mabahDoLgTuWpxHEROvRZL7eVeAJGm+uYsJNtex0HnYAlJrHt9/E+pUqyDLtIMl8DD71PKAEbZflUJwSC3utM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=bu.edu) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603242687175177.11616184326044; Tue, 20 Oct 2020 18:11:27 -0700 (PDT) Received: from localhost ([::1]:46236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kV2f0-0003sJ-Aw for importer@patchew.org; Tue, 20 Oct 2020 21:11:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kV2c4-0000v9-VB for qemu-devel@nongnu.org; Tue, 20 Oct 2020 21:08:25 -0400 Received: from mail-co1nam11on2130.outbound.protection.outlook.com ([40.107.220.130]:28640 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kV2c2-0004s9-SH for qemu-devel@nongnu.org; Tue, 20 Oct 2020 21:08:24 -0400 Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SN2PR03MB2333.namprd03.prod.outlook.com (2603:10b6:804:c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.22; Wed, 21 Oct 2020 01:08:09 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::d520:4c19:8ce6:7db2]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::d520:4c19:8ce6:7db2%2]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 01:08:09 +0000 Received: from stormtrooper.vrmnet (72.93.72.163) by BL1PR13CA0119.namprd13.prod.outlook.com (2603:10b6:208:2b9::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.8 via Frontend Transport; Wed, 21 Oct 2020 01:08:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HITChfXyIlY7+beuRnkvwW9sCBX+140DhpEI7OIKBUMZEol2yIR6xCL7mGajtoeFmoEOSv2TyKYMJ+h0yD7qRAVKJwgf9sSbYfZ+YfsZEKgY24lGq2fMxJ9i5G1t5+qJTge+Do/ziwNDRoGK/LoXYdg4uveUHA7nk/+BkFreN/kC3r6OMEkci96C/Xm4IelJlW8EycJfR7BlyH9mCApWSZ9eJ3Y3/hXE9TV4p8X/cC/56EJHuQpIkWcRFKqOeQpKNf3XJfteEmgATKsi9GqdJAOkWT+H6LNljZ4F+3QKDB/E2mRb5WNpf+XuIIFy0X5GuL/hJbVcLCHfWImt2ZYgUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KGrjvwJOI37RU+5qtwX8OWxNIpldct9l3CehaP007G0=; b=Prt6gcSDVkMnUSGKYS31ftIo4CtUe3Z5E//3oUuilKX4Rz6E1PnTrE1yvUwVJ5p8g3rZlLtoPVX0S9+X+ZPWlnO4pExI4meyQv0K+VCtOVdrznZygVWuRaTXy12A804WuUelhi+bFb5GQQV8axr8+/5fEkk13sLQEPUCkHI5Gy7zphEtwAHH0lFGNlFWGo41U4/50YPcBRnUg+OrutvrmmHAUdB5kafbE7hxNIx+h6zUONB+TGVwoTDZ8bMXrIcTXZ/TlQSwo0WQIoq/RkItGEAO2tlkknYrNbzYrvAPaACCC1ekY62h6cwoHseGPlmmJOYzmmu2XIVowkfFP/uRrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bu.edu; dmarc=pass action=none header.from=bu.edu; dkim=pass header.d=bu.edu; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bushare.onmicrosoft.com; s=selector2-bushare-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KGrjvwJOI37RU+5qtwX8OWxNIpldct9l3CehaP007G0=; b=EyBUqopjWQAzPGy7SKK/9i0EvBIU2Fj1m0IJpCXOpYGxdIP9kS4osPOR7gQjfYbOzXVq5dZNt04KQtTXgRwBlOcGEAodYZUV8k/w6Ogct7nXKED7sEfTKxKmyQakequrE3ag5huEw0y+xqYTtdCNZJoMLlAOUb26K63VwYZAD0Y= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=bu.edu; From: Alexander Bulekov To: qemu-devel@nongnu.org Subject: [PATCH v5 04/16] fuzz: Add DMA support to the generic-fuzzer Date: Tue, 20 Oct 2020 21:07:40 -0400 Message-Id: <20201021010752.973230-5-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201021010752.973230-1-alxndr@bu.edu> References: <20201021010752.973230-1-alxndr@bu.edu> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [72.93.72.163] X-ClientProxiedBy: BL1PR13CA0119.namprd13.prod.outlook.com (2603:10b6:208:2b9::34) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 504756c0-ab87-4fbf-f584-08d8755dc64c X-MS-TrafficTypeDiagnostic: SN2PR03MB2333: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:34; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nwvOIabua3krjmfNfOFgzpLd7RyOjgaC8JsyYI4y9818K7ohllSpe55IUBtzj4UIg/l4CvI/BaVZ+fSEvZ8Ztc3ZMdS9MW5/PI3h/qwsiflZzjy2iH/YYo77spyteZmK92C2tgaJi7QsflakpcDfsr0QyTD9+FrpCvc+v9Ka6cJ1crECf4FZHEfcwBLMkeQHOTj1RADwGd6ljKMRChMhTlL2OFUROP1ShocNTGWINQv/TxRJ2ezx1HhedaN+IhDwIVW18NIBhwjgXy6QjL2sFes5jyueyI82rukxECKzbwEMxUZ+OsdstY5VPPThMUE1YcE4Npxiiv9DTUji4VT1bI7jpUqkIgpcgVRgyACiY4nXpAfGRvJFUdMT1z7JE7CP X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR03MB3871.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(396003)(376002)(346002)(366004)(136003)(52116002)(2616005)(8676002)(6512007)(6916009)(6506007)(36756003)(786003)(316002)(956004)(83380400001)(478600001)(1076003)(4326008)(6486002)(75432002)(8936002)(54906003)(30864003)(86362001)(5660300002)(26005)(16526019)(186003)(6666004)(66946007)(2906002)(66476007)(66556008)(41533002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: h6UByzmJnMuwp22M+ngxlLAZCIcbPj2rd2nqy97z7/4Rjzx3q5Ph+XIX/6vGiwCXGwGgXDauL+UoS4vKdqG2ctkE13bQcm7djn773TBfO0gxJEsYPM0i+0HR1r+JzFi+hSZXKssVZbC1zC6IWkJA1oKyJBuk/5rTrBez0CL6kMysGz1bBuaK6rMo5h+toOuQtbiD20KbOOIVqkWupzSQxbcAs6ZWHm4IYzMNcmxQ+Ban3sdSn5LRwbY4VXz/SO+vdmM9g8Ot95EeN/lL+BkakFmY6gKcG8e59nax16NJx8ELFXKMoFUbmsFwIkcTgJjdX3RE7MzgDtft3ZHe4N/KimCFpxrs/fTzju0HvfAnOfpehwyGAcyC1pVsLSo5okiQ7se2HAF8W4PI5j7nGe+w0+OPIoz93wHl8V/3UL8FdgIKLrI8eNboxQNfzBgH2Lk6xJ9W9uGXgqfDh+8197ftlyUDiG/nN3AcgJYDbT7aeJmVZ3AXXE813mEWz6fHAuxCeildNQnrHTQXC/jbdr22zwBvua7Cd9Uspsrxd6QIZuyxfPr0CSSxBUpAKlGBKD8e2hP/ZEVKns/ohXnDu832s5eE1INcTe38taRMM3kr60NggCgyJwokZwNwmpyoezuOVR1twSze+8kA0EActDdpBA== X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 504756c0-ab87-4fbf-f584-08d8755dc64c X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 01:08:09.7822 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d57d32cc-c121-488f-b07b-dfe705680c71 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: u2ZB5I/wxr37cFVFZfxdPPauTQIW3VTaKd7YN5sp0Hd65vo8P/7plka9KNCk20ui X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2333 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.220.130; envelope-from=alxndr@bu.edu; helo=NAM11-CO1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 21:08:14 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.441, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Alexander Bulekov , f4bug@amsat.org, darren.kenny@oracle.com, bsd@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, dimastep@yandex-team.ru Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @bushare.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" When a virtual-device tries to access some buffer in memory over DMA, we add call-backs into the fuzzer(next commit). The fuzzer checks verifies that the DMA request maps to a physical RAM address and fills the memory with fuzzer-provided data. The patterns that we use to fill this memory are specified using add_dma_pattern and clear_dma_patterns operations. Signed-off-by: Alexander Bulekov Reviewed-by: Darren Kenny --- include/exec/memory.h | 7 + tests/qtest/fuzz/generic_fuzz.c | 228 ++++++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+) diff --git a/include/exec/memory.h b/include/exec/memory.h index 233655b29a..61c2aac943 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -42,6 +42,13 @@ typedef struct IOMMUMemoryRegionClass IOMMUMemoryRegionC= lass; DECLARE_OBJ_CHECKERS(IOMMUMemoryRegion, IOMMUMemoryRegionClass, IOMMU_MEMORY_REGION, TYPE_IOMMU_MEMORY_REGION) =20 +#ifdef CONFIG_FUZZ +void fuzz_dma_read_cb(size_t addr, + size_t len, + MemoryRegion *mr, + bool is_write); +#endif + extern bool global_dirty_log; =20 typedef struct MemoryRegionOps MemoryRegionOps; diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuz= z.c index 2ba975aaae..a12dc634b3 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -25,6 +25,7 @@ #include "exec/address-spaces.h" #include "hw/qdev-core.h" #include "hw/pci/pci.h" +#include "hw/boards.h" =20 /* * SEPARATOR is used to separate "operations" in the fuzz input @@ -38,12 +39,16 @@ enum cmds { OP_WRITE, OP_PCI_READ, OP_PCI_WRITE, + OP_ADD_DMA_PATTERN, + OP_CLEAR_DMA_PATTERNS, OP_CLOCK_STEP, }; =20 #define DEFAULT_TIMEOUT_US 100000 #define USEC_IN_SEC 1000000000 =20 +#define MAX_DMA_FILL_SIZE 0x10000 + #define PCI_HOST_BRIDGE_CFG 0xcf8 #define PCI_HOST_BRIDGE_DATA 0xcfc =20 @@ -56,6 +61,24 @@ static useconds_t timeout =3D DEFAULT_TIMEOUT_US; =20 static bool qtest_log_enabled; =20 +/* + * A pattern used to populate a DMA region or perform a memwrite. This is + * useful for e.g. populating tables of unique addresses. + * Example {.index =3D 1; .stride =3D 2; .len =3D 3; .data =3D "\x00\x01\x= 02"} + * Renders as: 00 01 02 00 03 02 00 05 02 00 07 02 ... + */ +typedef struct { + uint8_t index; /* Index of a byte to increment by stride */ + uint8_t stride; /* Increment each index'th byte by this amount */ + size_t len; + const uint8_t *data; +} pattern; + +/* Avoid filling the same DMA region between MMIO/PIO commands ? */ +static bool avoid_double_fetches; + +static QTestState *qts_global; /* Need a global for the DMA callback */ + /* * List of memory regions that are children of QOM objects specified by the * user for fuzzing. @@ -84,6 +107,167 @@ static int get_io_address_cb(ram_addr_t start, ram_add= r_t size, return 0; } =20 +/* + * List of dma regions populated since the last fuzzing command. Used to e= nsure + * that we only write to each DMA address once, to avoid race conditions w= hen + * building reproducers. + */ +static GArray *dma_regions; + +static GArray *dma_patterns; +static int dma_pattern_index; + +/* + * Allocate a block of memory and populate it with a pattern. + */ +static void *pattern_alloc(pattern p, size_t len) +{ + int i; + uint8_t *buf =3D g_malloc(len); + uint8_t sum =3D 0; + + for (i =3D 0; i < len; ++i) { + buf[i] =3D p.data[i % p.len]; + if ((i % p.len) =3D=3D p.index) { + buf[i] +=3D sum; + sum +=3D p.stride; + } + } + return buf; +} + +static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr) +{ + unsigned access_size_max =3D mr->ops->valid.max_access_size; + + /* Regions are assumed to support 1-4 byte accesses unless + otherwise specified. */ + if (access_size_max =3D=3D 0) { + access_size_max =3D 4; + } + + /* Bound the maximum access by the alignment of the address. */ + if (!mr->ops->impl.unaligned) { + unsigned align_size_max =3D addr & -addr; + if (align_size_max !=3D 0 && align_size_max < access_size_max) { + access_size_max =3D align_size_max; + } + } + + /* Don't attempt accesses larger than the maximum. */ + if (l > access_size_max) { + l =3D access_size_max; + } + l =3D pow2floor(l); + + return l; +} + +/* + * Call-back for functions that perform DMA reads from guest memory. Confi= rm + * that the region has not already been populated since the last loop in + * generic_fuzz(), avoiding potential race-conditions, which we don't have + * a good way for reproducing right now. + */ +void fuzz_dma_read_cb(size_t addr, size_t len, MemoryRegion *mr, bool is_w= rite) +{ + /* Are we in the generic-fuzzer or are we using another fuzz-target? */ + if (!qts_global) { + return; + } + + /* + * Return immediately if: + * - We have no DMA patterns defined + * - The length of the DMA read request is zero + * - The DMA read is hitting an MR other than the machine's main RAM + * - The DMA request is not a read (what happens for a address_space_m= ap + * with is_write=3DTrue? Can the device use the same pointer to do r= eads?) + * - The DMA request hits past the bounds of our RAM + */ + if (dma_patterns->len =3D=3D 0 + || len =3D=3D 0 + /* || mr !=3D MACHINE(qdev_get_machine())->ram */ + || is_write + || addr > current_machine->ram_size) { + return; + } + + /* + * If we overlap with any existing dma_regions, split the range and on= ly + * populate the non-overlapping parts. + */ + address_range region; + bool double_fetch =3D false; + for (int i =3D 0; + i < dma_regions->len && (avoid_double_fetches || qtest_log_enable= d); + ++i) { + region =3D g_array_index(dma_regions, address_range, i); + if (addr < region.addr + region.size && addr + len > region.addr) { + double_fetch =3D true; + if (addr < region.addr + && avoid_double_fetches) { + fuzz_dma_read_cb(addr, region.addr - addr, mr, is_write); + } + if (addr + len > region.addr + region.size + && avoid_double_fetches) { + fuzz_dma_read_cb(region.addr + region.size, + addr + len - (region.addr + region.size), mr, is_w= rite); + } + return; + } + } + + /* Cap the length of the DMA access to something reasonable */ + len =3D MIN(len, MAX_DMA_FILL_SIZE); + + address_range ar =3D {addr, len}; + g_array_append_val(dma_regions, ar); + pattern p =3D g_array_index(dma_patterns, pattern, dma_pattern_index); + void *buf =3D pattern_alloc(p, ar.size); + hwaddr l, addr1; + MemoryRegion *mr1; + uint8_t *ram_ptr; + while (len > 0) { + l =3D len; + mr1 =3D address_space_translate(first_cpu->as, + addr, &addr1, &l, true, + MEMTXATTRS_UNSPECIFIED); + + if (!(memory_region_is_ram(mr1) || + memory_region_is_romd(mr1))) { + l =3D memory_access_size(mr1, l, addr1); + } else { + /* ROM/RAM case */ + ram_ptr =3D qemu_map_ram_ptr(mr1->ram_block, addr1); + memcpy(ram_ptr, buf, l); + break; + } + len -=3D l; + buf +=3D l; + addr +=3D l; + + } + if (qtest_log_enabled) { + /* + * With QTEST_LOG, use a normal, slow QTest memwrite. Prefix the l= og + * that will be written by qtest.c with a DMA tag, so we can reord= er + * the resulting QTest trace so the DMA fills precede the last PIO= /MMIO + * command. + */ + fprintf(stderr, "[DMA] "); + if (double_fetch) { + fprintf(stderr, "[DOUBLE-FETCH] "); + } + fflush(stderr); + } + qtest_memwrite(qts_global, ar.addr, buf, ar.size); + g_free(buf); + + /* Increment the index of the pattern for the next DMA access */ + dma_pattern_index =3D (dma_pattern_index + 1) % dma_patterns->len; +} + /* * Here we want to convert a fuzzer-provided [io-region-index, offset] to * a physical address. To do this, we iterate over all of the matched @@ -346,6 +530,35 @@ static void op_pci_write(QTestState *s, const unsigned= char * data, size_t len) } } =20 +static void op_add_dma_pattern(QTestState *s, + const unsigned char *data, size_t len) +{ + struct { + /* + * index and stride can be used to increment the index-th byte of = the + * pattern by the value stride, for each loop of the pattern. + */ + uint8_t index; + uint8_t stride; + } a; + + if (len < sizeof(a) + 1) { + return; + } + memcpy(&a, data, sizeof(a)); + pattern p =3D {a.index, a.stride, len - sizeof(a), data + sizeof(a)}; + p.index =3D a.index % p.len; + g_array_append_val(dma_patterns, p); + return; +} + +static void op_clear_dma_patterns(QTestState *s, + const unsigned char *data, size_t len) +{ + g_array_set_size(dma_patterns, 0); + dma_pattern_index =3D 0; +} + static void op_clock_step(QTestState *s, const unsigned char *data, size_t= len) { qtest_clock_step_next(s); @@ -406,6 +619,8 @@ static void generic_fuzz(QTestState *s, const unsigned = char *Data, size_t Size) [OP_WRITE] =3D op_write, [OP_PCI_READ] =3D op_pci_read, [OP_PCI_WRITE] =3D op_pci_write, + [OP_ADD_DMA_PATTERN] =3D op_add_dma_pattern, + [OP_CLEAR_DMA_PATTERNS] =3D op_clear_dma_patterns, [OP_CLOCK_STEP] =3D op_clock_step, }; const unsigned char *cmd =3D Data; @@ -435,6 +650,8 @@ static void generic_fuzz(QTestState *s, const unsigned = char *Data, size_t Size) setitimer(ITIMER_VIRTUAL, &timer, NULL); } =20 + op_clear_dma_patterns(s, NULL, 0); + while (cmd && Size) { /* Get the length until the next command or end of input */ nextcmd =3D memmem(cmd, Size, SEPARATOR, strlen(SEPARATOR)); @@ -451,6 +668,7 @@ static void generic_fuzz(QTestState *s, const unsigned = char *Data, size_t Size) /* Advance to the next command */ cmd =3D nextcmd ? nextcmd + sizeof(SEPARATOR) - 1 : nextcmd; Size =3D Size - (cmd_len + sizeof(SEPARATOR) - 1); + g_array_set_size(dma_regions, 0); } _Exit(0); } else { @@ -465,6 +683,9 @@ static void usage(void) printf("QEMU_FUZZ_ARGS=3D the command line arguments passed to qemu\n"= ); printf("QEMU_FUZZ_OBJECTS=3D " "a space separated list of QOM type names for objects to fuzz\= n"); + printf("Optionally: QEMU_AVOID_DOUBLE_FETCH=3D " + "Try to avoid racy DMA double fetch bugs? %d by default\n", + avoid_double_fetches); printf("Optionally: QEMU_FUZZ_TIMEOUT=3D Specify a custom timeout (us)= . " "0 to disable. %d by default\n", timeout); exit(0); @@ -535,9 +756,16 @@ static void generic_pre_fuzz(QTestState *s) if (getenv("QTEST_LOG")) { qtest_log_enabled =3D 1; } + if (getenv("QEMU_AVOID_DOUBLE_FETCH")) { + avoid_double_fetches =3D 1; + } if (getenv("QEMU_FUZZ_TIMEOUT")) { timeout =3D g_ascii_strtoll(getenv("QEMU_FUZZ_TIMEOUT"), NULL, 0); } + qts_global =3D s; + + dma_regions =3D g_array_new(false, false, sizeof(address_range)); + dma_patterns =3D g_array_new(false, false, sizeof(pattern)); =20 fuzzable_memoryregions =3D g_hash_table_new(NULL, NULL); fuzzable_pci_devices =3D g_ptr_array_new(); --=20 2.28.0