From nobody Wed May 15 03:44:36 2024 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=1590790599; cv=pass; d=zohomail.com; s=zohoarc; b=Q9B73ql4AjIh/5QC/VsGFm5XUv0g18uijcOPiK1WyreSSuAE2GTzaKBJrEjZAdRkDH13SzXAF1eN67emN2KiVIgAjwMYTybyIFBCDgqt71nfvbHuVpSAn/Yj0SUBQv54+yEX0P3JPAsmJv2DJN53xNkHTsU43Ac1HunqXnicU9A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590790599; 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=I4hFALcT9DX2+u7EWUbCO3UGzmXN5xi9jM/OWF8o2Qk=; b=gkVszYYL3TDqujG9JuxOPmIPKspjgL4iZ4GSkUH5lPeVitanWgrS0zBif2dUlli7piprGxx+iGYLDk0u048AYXH/z8DSFLM34szfHGipmqlvG1bu9GYYaNzL8aKuj/cyE3y90IpdM6S0a+rjeVr/cO5wSaMdmOsEGzsnapf3Wwk= 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 1590790599760947.8190560351604; Fri, 29 May 2020 15:16:39 -0700 (PDT) Received: from localhost ([::1]:54342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jenIs-0002SL-Gm for importer@patchew.org; Fri, 29 May 2020 18:16:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jenHS-0000y1-9M for qemu-devel@nongnu.org; Fri, 29 May 2020 18:15:10 -0400 Received: from mail-eopbgr760094.outbound.protection.outlook.com ([40.107.76.94]:12454 helo=NAM02-CY1-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 1jenHQ-0000fW-Ct for qemu-devel@nongnu.org; Fri, 29 May 2020 18:15:09 -0400 Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SN6PR03MB3455.namprd03.prod.outlook.com (2603:10b6:805:3f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.19; Fri, 29 May 2020 22:15:05 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::640a:1123:37c1:42db]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::640a:1123:37c1:42db%3]) with mapi id 15.20.3045.018; Fri, 29 May 2020 22:15:05 +0000 Received: from mozz.bu.edu (128.197.127.33) by MN2PR19CA0031.namprd19.prod.outlook.com (2603:10b6:208:178::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.21 via Frontend Transport; Fri, 29 May 2020 22:15:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dQxbe5bHpOLGiZxyPvWvpYNJmurIfxIrn6C7+PGPvvJOh/YfZNEbWpVxF0Mkj4s/XfST+CxSmcxWgQFxCIvZJDixRnBfjJNH8Ytoytb7oFe5CawxjM20BlqmwssIAMkERh/3EgD/3y58KqVG8bJT7S/lq27pRNKDjkqjPOng3MvAQW/OkCf+fyeSNXyiTmjyj8O1vAVy1pjKMMeWPXTH/wNfV7vYYzBbVqv5KC4ThlxGktJBLY1yTbN4XOTmv9DQezomh1UQzGlP9ZB8SryBPd4Mx8oQGPtCBQvRXUvEO/550j6fy/HYfiJjQ9tcEJLXkOBrRRgpJX7J2kDXIsLpag== 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=I4hFALcT9DX2+u7EWUbCO3UGzmXN5xi9jM/OWF8o2Qk=; b=WR5xNhYdkskF5zvL7raMwDmvwcYoiO6qgfICrnLtN4dN6tSspoAXKEg9EnRYutsWbQ3g4jD+KpruH5qBRpHmuu1Xx9hr8pxSymKbvyAGsHhzZptScby/CFQZAJbKgrJVg/tWvKffyu3j0G0YWMgFLQDiHRvaEXGRhmXaxUPKl9zXtRZEzkDHzAMT/l8UAexNE3jknYjROQ/FLPni9blF9DCQRAYoMzAbHexQ1vCmkveD5cOVdFCnUaGn57Mooy0oKFp1KcqlQTqF64TwYaepktWf64xPLj8zo2KA/wgD+oegB7HuqGS6lZ1KQkksw144FmWMFVDPQ0k7o+yTb9LOgA== 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=I4hFALcT9DX2+u7EWUbCO3UGzmXN5xi9jM/OWF8o2Qk=; b=YWz62eLtctoU0y7sSu0KBbXHLFteDArncwr9YEjT+x1FU7rzW/J/vJsvjazs/a8LdMYJ0CH7hqS+uzn0FAYd5Su26hWEPYPOuCit24lUwlsyE7NE2gwQEMjyU52KmMMaJMoidoRFvbU5jSTDX+J8hySuGw3iskjIl7TR571tWkw= 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 v3 1/2] fuzz: skip QTest serialization Date: Fri, 29 May 2020 18:14:49 -0400 Message-Id: <20200529221450.26673-2-alxndr@bu.edu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200529221450.26673-1-alxndr@bu.edu> References: <20200529221450.26673-1-alxndr@bu.edu> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR19CA0031.namprd19.prod.outlook.com (2603:10b6:208:178::44) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [128.197.127.33] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1729e91f-d27e-4b13-0b69-08d8041dbd0d X-MS-TrafficTypeDiagnostic: SN6PR03MB3455: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2399; X-Forefront-PRVS: 04180B6720 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u6z4TJIVqRCq9EztJo8HyzKGBaFI9wsmmEDuU8fHk0V9sgnomvDJGjd7oajvpSql/cFVJmcC34nLejCeo0vmt6c5CTK+0+erJVncGUk7R3HoJrdUZnm/AixPoG6O0hV3LzaujzERKPO1Ej9Pr5eGZGaOI1skbcXKPuytzpmjQyido7jlkwAqrfwv+ZDoL5J3u9/KTFMM9aZZLAEHeR7NHN7WJdizAzDkPWSunurI+SfZIhdXSQsAesXGWzmuPSa20JK4uujlA2N70fYTLroorFq/pJnqBGuc6oOXmHzVrn9RjM+uLtXFEuF05Taj5Vw0AaAlOE5Smmd76e1wapBIdw== 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; SFTY:; SFS:(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(86362001)(6666004)(6916009)(478600001)(956004)(36756003)(26005)(75432002)(16526019)(186003)(30864003)(7696005)(5660300002)(66556008)(54906003)(1076003)(8936002)(8676002)(2906002)(316002)(2616005)(4326008)(6486002)(83380400001)(66946007)(52116002)(786003)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: jLr4Hm2+PFZQGS7y9l1NIbo/xdm/bUFfmExKzKhxeBivtEwjBRzoedDx9bVNHYIh6Wpqz4FaCuX7MlSROzBZAOc+9ZMuMSG7rMUhlmiuabPMMFznFpxCn/OGub6cQMBIBUm8Hgi7GnSvk5Sh9vXojAcP96jxEZXoNtfCuSTfpszSPD7Y1W/4z2yQ/HXtMud8QglUErLFwg7XLXLIof8yT+PbwZDiRB2YsNXix6XiZRPrfbuRruXdWv05shkeP1wWWVo6nS0cmi7vNG9LzlK2USGTNdr7Hq/fSor2V/NKSsDnQc1z/kDfOQkosr7um4o1aDQPjUnZ9EGH8FmGVThhrPck2qSzwg5UNX1gThYYzaLcVyAtLV5C/zeIeFUVT6HINbP3g1hdR/J/YaESXbMoN8EkOktXMlM923jNgpOzQeTAr3XbZVqXUu1ouFvFNWG+y1v2F85D7kfH9glwE7NXQZMRvo++5+t2UwSQC0Wj6jg= X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 1729e91f-d27e-4b13-0b69-08d8041dbd0d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2020 22:15:04.8734 (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: TwWF1YbSQOawhfC5K02RgLqPt29Gwu8xuro64EeHNeNOgRZ0VW5Elq0+uY6k5Cy7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB3455 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.76.94; envelope-from=alxndr@bu.edu; helo=NAM02-CY1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/29 18:15:05 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HK_RANDOM_ENVFROM=0.001, 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @bushare.onmicrosoft.com) The QTest server usually parses ASCII commands from clients. Since we fuzz within the QEMU process, skip the QTest serialization and server for most QTest commands. Leave the option to use the ASCII protocol, to generate readable traces for crash reproducers. Inspired-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alexander Bulekov Reviewed-by: Darren Kenny --- tests/qtest/fuzz/Makefile.include | 21 +++ tests/qtest/fuzz/fuzz.c | 13 +- tests/qtest/fuzz/fuzz.h | 3 + tests/qtest/fuzz/qtest_wrappers.c | 252 ++++++++++++++++++++++++++++++ 4 files changed, 288 insertions(+), 1 deletion(-) create mode 100644 tests/qtest/fuzz/qtest_wrappers.c diff --git a/tests/qtest/fuzz/Makefile.include b/tests/qtest/fuzz/Makefile.= include index f259d866c9..5bde793bf2 100644 --- a/tests/qtest/fuzz/Makefile.include +++ b/tests/qtest/fuzz/Makefile.include @@ -5,6 +5,7 @@ fuzz-obj-y +=3D $(libqos-obj-y) fuzz-obj-y +=3D tests/qtest/fuzz/fuzz.o # Fuzzer skeleton fuzz-obj-y +=3D tests/qtest/fuzz/fork_fuzz.o fuzz-obj-y +=3D tests/qtest/fuzz/qos_fuzz.o +fuzz-obj-y +=3D tests/qtest/fuzz/qtest_wrappers.o =20 # Targets fuzz-obj-$(CONFIG_PCI_I440FX) +=3D tests/qtest/fuzz/i440fx_fuzz.o @@ -16,3 +17,23 @@ FUZZ_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests= /qtest # Linker Script to force coverage-counters into known regions which we can= mark # shared FUZZ_LDFLAGS +=3D -Xlinker -T$(SRC_PATH)/tests/qtest/fuzz/fork_fuzz.ld + +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_inb +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_inw +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_inl +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_outb +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_outw +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_outl +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_readb +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_readw +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_readl +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_readq +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_writeb +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_writew +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_writel +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_writeq +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_memread +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_bufread +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_memwrite +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_bufwrite +FUZZ_LDFLAGS +=3D -Wl,-wrap,qtest_memset diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index f5c923852e..88ac88bca9 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -91,7 +91,10 @@ static void usage(char *path) printf(" * %s : %s\n", tmp->target->name, tmp->target->description); } - printf("Alternatively, add -target-FUZZ_TARGET to the executable name\= n"); + printf("Alternatively, add -target-FUZZ_TARGET to the executable name\= n\n" + "Set the environment variable FUZZ_SERIALIZE_QTEST=3D1 to seria= lize\n" + "QTest commands into an ASCII protocol. Useful for building cra= sh\n" + "reproducers, but slows down execution.\n"); exit(0); } =20 @@ -137,6 +140,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char = ***envp) { =20 char *target_name; + bool serialize =3D false; =20 /* Initialize qgraph and modules */ qos_graph_init(); @@ -157,6 +161,13 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char= ***envp) usage(**argv); } =20 + /* Should we always serialize qtest commands? */ + if (getenv("FUZZ_SERIALIZE_QTEST")) { + serialize =3D true; + } + + fuzz_qtest_set_serialize(serialize); + /* Identify the fuzz target */ fuzz_target =3D fuzz_get_target(target_name); if (!fuzz_target) { diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h index 03901d414e..72d5710f6c 100644 --- a/tests/qtest/fuzz/fuzz.h +++ b/tests/qtest/fuzz/fuzz.h @@ -82,6 +82,9 @@ typedef struct FuzzTarget { void flush_events(QTestState *); void reboot(QTestState *); =20 +/* Use the QTest ASCII protocol or call address_space API directly?*/ +void fuzz_qtest_set_serialize(bool option); + /* * makes a copy of *target and adds it to the target-list. * i.e. fine to set up target on the caller's stack diff --git a/tests/qtest/fuzz/qtest_wrappers.c b/tests/qtest/fuzz/qtest_wra= ppers.c new file mode 100644 index 0000000000..713c830cdb --- /dev/null +++ b/tests/qtest/fuzz/qtest_wrappers.c @@ -0,0 +1,252 @@ +/* + * qtest function wrappers + * + * Copyright Red Hat Inc., 2019 + * + * Authors: + * Alexander Bulekov + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "exec/ioport.h" + +#include "fuzz.h" + +static bool serialize =3D true; + +#define WRAP(RET_TYPE, NAME_AND_ARGS)\ + RET_TYPE __wrap_##NAME_AND_ARGS;\ + RET_TYPE __real_##NAME_AND_ARGS; + +WRAP(uint8_t , qtest_inb(QTestState *s, uint16_t addr)) +WRAP(uint16_t , qtest_inw(QTestState *s, uint16_t addr)) +WRAP(uint32_t , qtest_inl(QTestState *s, uint16_t addr)) +WRAP(void , qtest_outb(QTestState *s, uint16_t addr, uint8_t value)) +WRAP(void , qtest_outw(QTestState *s, uint16_t addr, uint16_t value)) +WRAP(void , qtest_outl(QTestState *s, uint16_t addr, uint32_t value)) +WRAP(uint8_t , qtest_readb(QTestState *s, uint64_t addr)) +WRAP(uint16_t , qtest_readw(QTestState *s, uint64_t addr)) +WRAP(uint32_t , qtest_readl(QTestState *s, uint64_t addr)) +WRAP(uint64_t , qtest_readq(QTestState *s, uint64_t addr)) +WRAP(void , qtest_writeb(QTestState *s, uint64_t addr, uint8_t value)) +WRAP(void , qtest_writew(QTestState *s, uint64_t addr, uint16_t value)) +WRAP(void , qtest_writel(QTestState *s, uint64_t addr, uint32_t value)) +WRAP(void , qtest_writeq(QTestState *s, uint64_t addr, uint64_t value)) +WRAP(void , qtest_memread(QTestState *s, uint64_t addr, + void *data, size_t size)) +WRAP(void , qtest_bufread(QTestState *s, uint64_t addr, void *data, + size_t size)) +WRAP(void , qtest_memwrite(QTestState *s, uint64_t addr, const void *d= ata, + size_t size)) +WRAP(void, qtest_bufwrite(QTestState *s, uint64_t addr, + const void *data, size_t size)) +WRAP(void, qtest_memset(QTestState *s, uint64_t addr, + uint8_t patt, size_t size)) + + +uint8_t __wrap_qtest_inb(QTestState *s, uint16_t addr) +{ + if (!serialize) { + return cpu_inb(addr); + } else { + return __real_qtest_inb(s, addr); + } +} + +uint16_t __wrap_qtest_inw(QTestState *s, uint16_t addr) +{ + if (!serialize) { + return cpu_inw(addr); + } else { + return __real_qtest_inw(s, addr); + } +} + +uint32_t __wrap_qtest_inl(QTestState *s, uint16_t addr) +{ + if (!serialize) { + return cpu_inl(addr); + } else { + return __real_qtest_inl(s, addr); + } +} + +void __wrap_qtest_outb(QTestState *s, uint16_t addr, uint8_t value) +{ + if (!serialize) { + cpu_outb(addr, value); + } else { + __real_qtest_outb(s, addr, value); + } +} + +void __wrap_qtest_outw(QTestState *s, uint16_t addr, uint16_t value) +{ + if (!serialize) { + cpu_outw(addr, value); + } else { + __real_qtest_outw(s, addr, value); + } +} + +void __wrap_qtest_outl(QTestState *s, uint16_t addr, uint32_t value) +{ + if (!serialize) { + cpu_outl(addr, value); + } else { + __real_qtest_outl(s, addr, value); + } +} + +uint8_t __wrap_qtest_readb(QTestState *s, uint64_t addr) +{ + uint8_t value; + if (!serialize) { + address_space_read(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + &value, 1); + return value; + } else { + return __real_qtest_readb(s, addr); + } +} + +uint16_t __wrap_qtest_readw(QTestState *s, uint64_t addr) +{ + uint16_t value; + if (!serialize) { + address_space_read(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + &value, 2); + return value; + } else { + return __real_qtest_readw(s, addr); + } +} + +uint32_t __wrap_qtest_readl(QTestState *s, uint64_t addr) +{ + uint32_t value; + if (!serialize) { + address_space_read(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + &value, 4); + return value; + } else { + return __real_qtest_readl(s, addr); + } +} + +uint64_t __wrap_qtest_readq(QTestState *s, uint64_t addr) +{ + uint64_t value; + if (!serialize) { + address_space_read(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + &value, 8); + return value; + } else { + return __real_qtest_readq(s, addr); + } +} + +void __wrap_qtest_writeb(QTestState *s, uint64_t addr, uint8_t value) +{ + if (!serialize) { + address_space_write(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + &value, 1); + } else { + __real_qtest_writeb(s, addr, value); + } +} + +void __wrap_qtest_writew(QTestState *s, uint64_t addr, uint16_t value) +{ + if (!serialize) { + address_space_write(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + &value, 2); + } else { + __real_qtest_writew(s, addr, value); + } +} + +void __wrap_qtest_writel(QTestState *s, uint64_t addr, uint32_t value) +{ + if (!serialize) { + address_space_write(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + &value, 4); + } else { + __real_qtest_writel(s, addr, value); + } +} + +void __wrap_qtest_writeq(QTestState *s, uint64_t addr, uint64_t value) +{ + if (!serialize) { + address_space_write(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + &value, 8); + } else { + __real_qtest_writeq(s, addr, value); + } +} + +void __wrap_qtest_memread(QTestState *s, uint64_t addr, void *data, size_t= size) +{ + if (!serialize) { + address_space_read(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, da= ta, + size); + } else { + __real_qtest_memread(s, addr, data, size); + } +} + +void __wrap_qtest_bufread(QTestState *s, uint64_t addr, void *data, size_t= size) +{ + if (!serialize) { + address_space_read(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, da= ta, + size); + } else { + __real_qtest_bufread(s, addr, data, size); + } +} + +void __wrap_qtest_memwrite(QTestState *s, uint64_t addr, const void *data, + size_t size) +{ + if (!serialize) { + address_space_write(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + data, size); + } else { + __real_qtest_memwrite(s, addr, data, size); + } +} + +void __wrap_qtest_bufwrite(QTestState *s, uint64_t addr, + const void *data, size_t size) +{ + if (!serialize) { + address_space_write(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + data, size); + } else { + __real_qtest_bufwrite(s, addr, data, size); + } +} +void __wrap_qtest_memset(QTestState *s, uint64_t addr, + uint8_t patt, size_t size) +{ + void *data; + if (!serialize) { + data =3D malloc(size); + memset(data, patt, size); + address_space_write(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, + data, size); + } else { + __real_qtest_memset(s, addr, patt, size); + } +} + +void fuzz_qtest_set_serialize(bool option) +{ + serialize =3D option; +} --=20 2.26.2 From nobody Wed May 15 03:44:36 2024 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=1590790598; cv=pass; d=zohomail.com; s=zohoarc; b=kNZjQc55I2lGGT0/F3NO66BiGlus29PKkHResvYMJ5Mr/wIGpmbdkhP1QdcrSvqjsYPS9W1SMezSJIvRUag/lOM6d7gKtV8R/KP/rL8hrfkvIuGu3lYXHSrepjo3Y9fRw8oLBBKHkl9E6T2FxGy2EHtWGl6Sd2hmDZglkT+TfPI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590790598; 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=LkYmuz8kDA7F2Kn8uptN2fW/fXl5fFurvL1F+hSxfkg=; b=ErRLq8BYG6WlqyuWDpZU5BqCWkwOSAXh06NXngYv8Tg1rGPyx3HYk9gQSbjVslD6QkbmgVunYJFqZuBo6SIQfnuSYEau3qf4dFP0Qocp5lQM/SkuMv0LDNtPh9FWH3lcx5XtLE7Er4YHD5CzkGVOk8S0KUTppcex0CjcPcJmmjw= 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 1590790598133949.9569450660197; Fri, 29 May 2020 15:16:38 -0700 (PDT) Received: from localhost ([::1]:54222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jenIq-0002Pb-PU for importer@patchew.org; Fri, 29 May 2020 18:16:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jenHT-0000yP-3t for qemu-devel@nongnu.org; Fri, 29 May 2020 18:15:11 -0400 Received: from mail-eopbgr760094.outbound.protection.outlook.com ([40.107.76.94]:12454 helo=NAM02-CY1-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 1jenHS-0000fW-ER for qemu-devel@nongnu.org; Fri, 29 May 2020 18:15:10 -0400 Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SN6PR03MB3455.namprd03.prod.outlook.com (2603:10b6:805:3f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.19; Fri, 29 May 2020 22:15:06 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::640a:1123:37c1:42db]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::640a:1123:37c1:42db%3]) with mapi id 15.20.3045.018; Fri, 29 May 2020 22:15:06 +0000 Received: from mozz.bu.edu (128.197.127.33) by MN2PR19CA0031.namprd19.prod.outlook.com (2603:10b6:208:178::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.21 via Frontend Transport; Fri, 29 May 2020 22:15:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tp1+uHuCq2sIfsqM/weMjNpe0zA6xMq3n2WA9VCuI2KwsLafLVMyQN+B9LJhaw8Oa3SXN9P4iWzWc+Vs+Cthl4kJuoTG1kNAzE0vSIw8UodJEPvi1zOIdSWsBov7uz0T3jG5XnjWqPv7KksZU15T9th0WXVN7PFxDksnKFkdh/xzKS/GYHGA8VLlTnwUMBnKZHzTe9m6Mmw1nkYJ7OooesLgi7TQ14/mw5njQStXdDc3F4k8xGmM+ZlaF5Qdju/9AOqqnGomm3rppNc6hg2pPOfdf6/kVYcr2HSHC+M9Dvkr2NZYTDY1hZ9kRk0vyZ8O93ueXxppQV9KMMJw/sG0Xw== 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=LkYmuz8kDA7F2Kn8uptN2fW/fXl5fFurvL1F+hSxfkg=; b=Sobk6A1F4QpVq1iGkGIWqv12OSKVb82tAPFGKxaolvavNbFR1vwnZtRNsYmSGucQ1k9kwH0EaP+4fMNZ5YdjF3lkG31IiVDR+bo8LUO0eXD7LF6HON0ZiPNpUbq12JmYOuYHrC97BGKISL2W+/tJ29FpZjE2j1YsoDgJ1Qwi3QA7wJVI5T1vkBBWIzu1GU8uzt7VWK5j31og4SgMumih8AhQN0i7lqkPtRkDYl5Ed/Brd5lNqOdYdI46A8XZkddwQUG6gotUo8iKiaxP2ifCWLBw12jfInCoOVlFn1twCA6IvV6hpupLT0IXYxOyD4cAnQC5iWnC7jruxGEKViH2kQ== 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=LkYmuz8kDA7F2Kn8uptN2fW/fXl5fFurvL1F+hSxfkg=; b=Zhptw4j/QTKuep7DS2ybMPoIC3WkElicOpcNFsNVPBXYZX5yi+6MnIZYJRiGD4BfE6PNpIZneT9N5tjDbPhQduvCYesIr7gWSddL3jvQqERAFIABKCyEXs5p6/ckd3EeAyEoCSubEGGBSebC46zox6f8C97rKpSZ7IPw1CK6BSM= 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 v3 2/2] fuzz: Add support for logging QTest commands Date: Fri, 29 May 2020 18:14:50 -0400 Message-Id: <20200529221450.26673-3-alxndr@bu.edu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200529221450.26673-1-alxndr@bu.edu> References: <20200529221450.26673-1-alxndr@bu.edu> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR19CA0031.namprd19.prod.outlook.com (2603:10b6:208:178::44) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [128.197.127.33] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16e46e3b-fd8a-4087-f75b-08d8041dbdb2 X-MS-TrafficTypeDiagnostic: SN6PR03MB3455: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:747; X-Forefront-PRVS: 04180B6720 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JJ/cH55hrUvoeh/jTqb154hRecwnffw57m5/AacVkKEWXXm4jt8P5Ua0ZZfyKGSTVrTGd74OipWStjIrltANAZYlhNRrRTxlgwA23ouITcOkLzR7NDHWs4Qt8Qa6Es2VmVuT5XM8LcIXYPjQ6vp/igDOKhAeaMFyzWyNMi973CqzO4Lo2MlVGE1KVg2yaUBzLojT03Yj8fKV0mNI2YSO496duWuFbrjUqSCG1f3ZjrTbcny2GY/31SIUX0bDhQHs5ov31wsSR0Hsn+whYXVIB8WvXVQvLKZLz231+lgZOfa9EPdagEbQ6nofcRXKb7l2dbp3cezJd5yLtRPZ8OVLFw== 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; SFTY:; SFS:(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(86362001)(6666004)(6916009)(478600001)(956004)(36756003)(26005)(75432002)(16526019)(186003)(7696005)(5660300002)(66556008)(54906003)(1076003)(8936002)(8676002)(2906002)(316002)(2616005)(4326008)(6486002)(83380400001)(66946007)(52116002)(786003)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: vPdyHKJGF7xN9LDZIeK/DDDXXiI3ptckT2UGnv/DcO4rNZ0QXa4jZJy+Cacibuqb4ZqHV/biWPQXkXzLp2TEGX6RQIEMotxm0av6iyv5YmNB3e5E5H3qDrQp75025TQwkuwHE8ikVUON/UAV5xo1AoVm7U8TqTGgEVpcx9CVkKJuVrEQMKVgz7kRqaZdbrZdtDat8JTA8++CQW8PeFe69b6EshoZVUqTnA5F1K9y3Au1D85oK1gHqYGx1Fbrixn2KrCnAjGeBryvYv6x9+o5a88qNcDwXOgDQ4t4UIZ799W7ik3rjDkDqESJ5Ei/gKGAMWFjwVW+GNsxgAOfLYBPP7JdO4OH303WlGZOlZbv5SkGVDGzACCQy6Kw/6QMxcmSZ8sFVpZaq1B5cysNYTOB9Qtz8286xtwji3N/DNZietN/ASw8+WT+y/+Du1Wfgqs6CGnmGu/xsH99EIOtf2hHaBeu+206ECoVZf1A2k8KCtw= X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 16e46e3b-fd8a-4087-f75b-08d8041dbdb2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2020 22:15:05.8728 (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: +aUZBriaIdJFbF5+3AhMkZGPtWo39cwDsbwj2Nkl2hG+E13/QYzWZV2iueXULfep X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB3455 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.76.94; envelope-from=alxndr@bu.edu; helo=NAM02-CY1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/29 18:15:05 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HK_RANDOM_ENVFROM=0.001, 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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, Paolo Bonzini 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" Signed-off-by: Alexander Bulekov Reviewed-by: Darren Kenny --- tests/qtest/fuzz/fuzz.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index 88ac88bca9..21cdee53db 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -94,7 +94,9 @@ static void usage(char *path) printf("Alternatively, add -target-FUZZ_TARGET to the executable name\= n\n" "Set the environment variable FUZZ_SERIALIZE_QTEST=3D1 to seria= lize\n" "QTest commands into an ASCII protocol. Useful for building cra= sh\n" - "reproducers, but slows down execution.\n"); + "reproducers, but slows down execution.\n\n" + "Set the environment variable QTEST_LOG=3D1 to log all qtest co= mmands" + "\n"); exit(0); } =20 @@ -182,6 +184,11 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char= ***envp) =20 /* Run QEMU's softmmu main with the fuzz-target dependent arguments */ const char *init_cmdline =3D fuzz_target->get_init_cmdline(fuzz_target= ); + init_cmdline =3D g_strdup_printf("%s -qtest /dev/null -qtest-log %s", + init_cmdline, + getenv("QTEST_LOG") ? "/dev/fd/2" + : "/dev/null"); + =20 /* Split the runcmd into an argv and argc */ wordexp_t result; --=20 2.26.2