From patchwork Tue Dec 5 20:40:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750392 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1897035wrc; Tue, 5 Dec 2023 12:42:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IF3EII5tnIzGVLibDNQvnlfHZdLrfy1uyP+WTJFyaEIW47GMv6wdZhoJCdls4VNkNRdwSzZ X-Received: by 2002:ad4:45b2:0:b0:67a:a3dc:3f71 with SMTP id y18-20020ad445b2000000b0067aa3dc3f71mr1975871qvu.59.1701808975993; Tue, 05 Dec 2023 12:42:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701808975; cv=none; d=google.com; s=arc-20160816; b=cOmQgOnFkQcs3cVjD3WH4Ri2f2KsTrqlStljQEEjJKBEGQpmN17ToxEXWwOiIbFovj EHWkp/2eoFO4puDG9/b+NhDisgnvpN4GOW4NMQhk2MbMD+M4KAav4b+2SBNo7iOIl+g/ 1uh1us8CNVCBUaOr+JXB3I+Ea2L25jG+i2FWfbJ2ZceW5BXSCANyRpnezbtdpo1h9w6C 5Lcl3yMP57eTOkZTHwEXeFQ1SCldmNpM3ATtxcf5NQqpQ5F+pA1oHUZ9VBh4jWScsnRr blWox2nLtYVKQv+LwVGtPK/ekCDE7zGyUCNm5U9i3u+ORy3cctIqbP0h913of0XN+LY4 lQrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dc4DC6j7/1Sz+Ur/zdr+xWcs+c/Czka+caIepOUIoFE=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=gSBQD2XVhGJNj3hVF8cH3xIOY2Dz8NHpSwl8ZtguyDstEWexP8NlcZ6+7P0SLo2HVU vVpcWnAHb/ZACRElATTziUnXu4vDDOFG40njSPKMozJmPS2lNbpTpxiGG1sTDCuCXhP/ Cp+VrJTJcNKbq1K5S5aGr02CGbvRuQOlBQ0zq7iqKEDA4yvtL0qfAPAZPOPi5zK0yPh4 LasOVwdJNNCjGjHhWVkHcPgMWQuhJ0V+e5DNjyKEUwHnIis+E/7UhoAjXJsuJfQ43QHC Pi8N5eRF2jhCSc6CFFD4bfgPzOmZ1o7ObkCwBP7G/KLeHJVoPcWLZ0XqmlkP/UpSFM95 tO1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qoifM3vm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f4-20020a0562141d2400b0067aca07cf9csi5533300qvd.493.2023.12.05.12.42.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:42:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qoifM3vm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcEC-0007Nx-2B; Tue, 05 Dec 2023 15:41:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcEA-0007NF-5o for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:10 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcE8-0002E3-CL for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:09 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-33349b3f99aso76837f8f.0 for ; Tue, 05 Dec 2023 12:41:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808867; x=1702413667; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dc4DC6j7/1Sz+Ur/zdr+xWcs+c/Czka+caIepOUIoFE=; b=qoifM3vmWlx6eNJ0e5Ix//uFhEquDcc42gmLS+7MU4COBOVWT0fC2InFmOLTdbU+uq Iagmrd/i12vuBrWL+5kDYT1mSw/kRlU/Pm+8SW6etWvMFwDpvvSn2S4es9obCFw6wXIL 8F1VfVG9C3yaPEwvUyCQmlJS7qD0wKwONErSvnJQobN8wfUpTdVu4SooasboOL43QsX1 gxuZoeVA5vGxRL06uQ4ncggvYNjkcFPYg6Pyse2OZpmyoYrMKH9Kblk9J0aq8d8vX2ZX LuTBJeXgx1TIvikTwJqg6rUmgxL6OdtVFGCjHaKjb7lRoNHFA7aXOkzieOipcIap7sdo DOQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808867; x=1702413667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dc4DC6j7/1Sz+Ur/zdr+xWcs+c/Czka+caIepOUIoFE=; b=t9zU2Bja1dQok1HMOCNKSZv0qN8/8r6ncFuDL47PP8XhxuWnphju571YnjJ3qDrQFo UPQoqPv2rxLFw+e6UmyexZW2eEeNSyno20N0eapoI+3w7BMMSpF9qCTr9Nv1YOQ6ROag 8JjptMFw6SILSBSa9SFfj4T3YBXgunh4Ji9XwF/fre6uCpwXzTC8tb8g9QAu/e2RT81q nWl5ZOk3d4+qs2QTTajP09GYDS2VVNH/jzx4wOql1+FOvM6XjZzidfvHGFCi4xZ1YjRM SAiTqV9b0DrKr0DkLvePN33W92y0auvE+huJ78+KPfq7OCnweWIKKQ45Hk+VTT8EnaeR HzSg== X-Gm-Message-State: AOJu0YzFjMgSbloRv/rnyOWDu99XC4wB4kCPzPEtBB5nc+diV39ptgSu M3oZ/ec1UtNdBJPQswPhoJDBtg== X-Received: by 2002:a5d:67c6:0:b0:333:3cf1:cb84 with SMTP id n6-20020a5d67c6000000b003333cf1cb84mr3314839wrw.139.1701808866828; Tue, 05 Dec 2023 12:41:06 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j1-20020a5d5641000000b0033349de2622sm6333379wrw.94.2023.12.05.12.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:06 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2678D5FBB8; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 01/11] tests/avocado: add a simple i386 replay kernel test Date: Tue, 5 Dec 2023 20:40:56 +0000 Message-Id: <20231205204106.95531-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org There are a number of bugs against 32 bit x86 on the tracker. Lets at least establish a baseline pure kernel boot can do record/replay before we start looking at the devices. Signed-off-by: Alex Bennée Acked-by: Richard Henderson Acked-by: Pavel Dovgalyuk --- tests/avocado/replay_kernel.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py index c37afa662c..1eaa36444c 100644 --- a/tests/avocado/replay_kernel.py +++ b/tests/avocado/replay_kernel.py @@ -82,6 +82,22 @@ def run_rr(self, kernel_path, kernel_command_line, console_pattern, class ReplayKernelNormal(ReplayKernelBase): + def test_i386_pc(self): + """ + :avocado: tags=arch:i386 + :avocado: tags=machine:pc + """ + kernel_url = ('https://storage.tuxboot.com/20230331/i386/bzImage') + kernel_hash = 'a3e5b32a354729e65910f5a1ffcda7c14a6c12a55e8213fb86e277f1b76ed956' + kernel_path = self.fetch_asset(kernel_url, + asset_hash=kernel_hash, + algorithm = "sha256") + + kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0' + console_pattern = 'VFS: Cannot open root device' + + self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5) + # See https://gitlab.com/qemu-project/qemu/-/issues/2010 @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test sometimes gets stuck') def test_x86_64_pc(self): From patchwork Tue Dec 5 20:40:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750391 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1897019wrc; Tue, 5 Dec 2023 12:42:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IEyZy+ulCN99FLJgKTBkuPe0cvCIf9BNbERhdmw0ujIIMAm2rGTPfVCQEgnJP3nQePKuGpb X-Received: by 2002:ac8:5d54:0:b0:425:4a53:e5f4 with SMTP id g20-20020ac85d54000000b004254a53e5f4mr2495466qtx.30.1701808973520; Tue, 05 Dec 2023 12:42:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701808973; cv=none; d=google.com; s=arc-20160816; b=Zagy2Ayig/PLkh+nlUYcPGRsZUPJgSe8fJ45prF4+RriXFmsRt9worojXpo0ioQaCP YAc/HMuBYJjYlps83iVWIN2tgmlJU9JYxN5iLT1zwvWjrKA8lP2sDsem4RotOduVjFkj 8erIYT5pBYIk04SWhynYFNPwbASNte2flrbJD9ts3Y2vU30V6NvpkptnrShFuxuigG4i WHXuYIYJ5dbBK3wcmD6BV8YCk0wmScEJ2Bq0A3zapN25VFmD3xtfIhlcdUB2Arj4lhyY ElTi33SLh6OD6LkMlYYXY+1NmWc7NtGCbM6uiNJ/Iq2VevhmbA5KuSyi1CsgoFPaPYIE c3fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HnFX18BuXkPwEMWcuTq2Q3z2S7wJ2zXOceAR+u2p7TE=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=qNgVxyXZrJgR+r1hz8NtmZ0WCVsRPDsE0cJcUfLZL1dY4UNzdOLv9pqI+ujAl+/cxZ cFXcEB6H0VRuph94Hje/Ox7ZkjS4C94Jfn1Ta6FDNYeF8nEYlkeZsPfvfpc1cQrfzar3 pQzM6nHkh11fLPTk75Lk7qA86htHn2hlhIQS+l+WKlJMgXb5aSqNnh00b5vsfaVHus0V 37N2Lo9+3yQyQ0uPUlNrCARmUzJb0rDpMcpaLnrZjOdBumkttoht4oS+GW2R6WQ3cXkV ew6cpmbXT327CsFOFEeCPS5YScilnkuMS6kawATnyVMoa9Qh4Hb8RBJ+dXy8iH06zynw NyXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="C/zvzn2z"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q3-20020ac87343000000b004181bc4d5cfsi11656231qtp.642.2023.12.05.12.42.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:42:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="C/zvzn2z"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcED-0007P0-PA; Tue, 05 Dec 2023 15:41:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcEC-0007O7-6r for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:12 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcEA-0002EQ-K9 for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:11 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40c09dfa03cso31556255e9.2 for ; Tue, 05 Dec 2023 12:41:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808869; x=1702413669; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HnFX18BuXkPwEMWcuTq2Q3z2S7wJ2zXOceAR+u2p7TE=; b=C/zvzn2z68MiVokrTzVTcNKkYTYNW/laIB6VRsVmB5klgvMZGnr2UKyZ9KGxLME3ly 38SRMyU1WsRVQ/d+kODZJ4lqC/T++qFwBgFCw1LNelboQWnOLgC+U8WxuaWWPB/2JJfQ Ye9CQYZ2mo7fSHcZGN5qiLDr/by7/RJ3jAxiPwB6AWrZ9n7a4lyKbZRqmliGTXgx+geG Fy2oExp775UNMYwSevFpGWyzElvuyndSsjCqzEMnybz5Al2huwZb18Z5MfUM7EXGL/N7 13sHWYW8eY3UcG/GmfNL/5EWP6nCvtZAeS45t9NJJmE3gKRaGmMPbyPuXFZpoxgW/m/x ZTOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808869; x=1702413669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HnFX18BuXkPwEMWcuTq2Q3z2S7wJ2zXOceAR+u2p7TE=; b=f0J7b32a5DdzCp2fUDGPnACfHR8xTQ1HM2NiPfMXUxAoG3xoyDbBvWeEWUGx0AezY+ 22X0n8nBZXsgkxAIe2stjn8UQxyBiIB09991A1U9zIOUoKimuk/DvR36FoBqXfJlS5YV RptQLwrVHDiyUSUgdAiaWsevm7Ov61bp/Cn/FhgVH1TYSFRuB851dlXlf+DN6QbAC6oP xl5GVd4M+8d+izEgP/c5lAAlJ+PbMf2PUIW3drbKTLHhj30EAxzNN1w4p4+5Af5bKF+H qGlUAl9wczfAAhYBZKBR09g3iEoZELwdQ+tJpLXFC1xIv9Ssx5622shHlJQPCtmEmjku SKIQ== X-Gm-Message-State: AOJu0YyOHKGp9dLig0zV2lU+CVISF9y/nNT4LXtQ5ukRnGdYG0l6EG0/ 6dxI5dm+Bkyz4VwpX2LzylXEjQ== X-Received: by 2002:a05:600c:190d:b0:40c:ddd:5758 with SMTP id j13-20020a05600c190d00b0040c0ddd5758mr1018069wmq.12.1701808869333; Tue, 05 Dec 2023 12:41:09 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p11-20020a05600c358b00b0040b360cc65csm19806102wmq.0.2023.12.05.12.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:06 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 380EA5FBBA; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 02/11] tests/avocado: fix typo in replay_linux Date: Tue, 5 Dec 2023 20:40:57 +0000 Message-Id: <20231205204106.95531-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Pavel Dovgalyuk --- tests/avocado/replay_linux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py index 270ccc1eae..e95bff3299 100644 --- a/tests/avocado/replay_linux.py +++ b/tests/avocado/replay_linux.py @@ -94,7 +94,7 @@ def launch_and_wait(self, record, args, shift): else: vm.event_wait('SHUTDOWN', self.timeout) vm.wait() - logger.info('successfully fihished the replay') + logger.info('successfully finished the replay') elapsed = time.time() - start_time logger.info('elapsed time %.2f sec' % elapsed) return elapsed From patchwork Tue Dec 5 20:40:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750394 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1897083wrc; Tue, 5 Dec 2023 12:43:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IFAswqmC87h6hmX/2YDZSJqTRbXF7+ls1TlpoB05uAuiZ42KQvJJvRlNRbh8lYzysAQ7n0I X-Received: by 2002:ad4:4e52:0:b0:67a:9cd5:1178 with SMTP id eb18-20020ad44e52000000b0067a9cd51178mr1591569qvb.14.1701808985937; Tue, 05 Dec 2023 12:43:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701808985; cv=none; d=google.com; s=arc-20160816; b=GTBtp+OUL6/6nYgWd3ke8+ObE30zov85VBXk/7OBXz502aF4EHlmacwHnEghlA2WL4 FM2uJHVXP4MA39LZ+/pE7vnlAWsuYBFIa6P/N+C0NBaGi8qDqEfs60Zcc8N4YhMJbQnn C3IAVRvPo3ULjg+nQT1NnsXY6Qvr6/5Bc0LscxRASJqdOGa5fn2aAtyrsRAYaJyzWI65 PmRY7oK3b2m+y9qQwcmt1pMiw8fNhix6k+YZhRB3x7pfSP5Z4JMnYlaxbzeV0bfWIGuJ GQrETgCRFKDKclNg5rrAuk5f0CHNMRZvlbqck1BNrI+EiKwlbiz6GlaXZ6MBS+YZCIRE 9Dfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bOmchX4uNJ3czMjsDLMZ3je7KxzFjicIJgluCE6g86g=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=OQtR5RMChwvmLhpQgul6ZiKPle3PpvWJew8D7AZ4Q8WSacu+kVN3PcRNNqT4HAniTs /jfGNqkTCK2CoFL6jvUqtbSov/bGk8IbLwIKfX9TU8dWVHJ9KX0p3qci0rrGu1KBytO5 FaF3FCSZn+2vW4SJenEOpiKrk6/HK/hWjWd7btufSk1/04j87gEXMisjPdxrraQEt2ZR EQUzMXp7JPzB59dIQRK+OJ3Ynz0MZ4LkUNDu/c5+tQVnA894fDqdBr3EiJ1ORR6hKqDt 4DQPYcP8nEeIiEjcffB8bkVAjleYYihB0cUAU1QmEitbpU1yrn2cp89DtewIOH/UbyZZ KSRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=soLzwRrM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bs19-20020a05620a471300b0077dd2def9b5si13152817qkb.330.2023.12.05.12.43.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:43:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=soLzwRrM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcED-0007OT-I0; Tue, 05 Dec 2023 15:41:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcEB-0007Np-Ou for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:11 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcE8-0002E6-FJ for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:11 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40a4848c6e1so65989785e9.1 for ; Tue, 05 Dec 2023 12:41:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808867; x=1702413667; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bOmchX4uNJ3czMjsDLMZ3je7KxzFjicIJgluCE6g86g=; b=soLzwRrME1j0yKYKYsimtYQGAIBOzcwBVvflKgL6JW1VQ58/oy3aCxD38/mVSPG/sb sznfyRW8sYwT/xBhDH5Y5wRzT266iX8sdnRDJBURrnXYiglRKHPnOQnyLMHxz0SpLhy0 li2t+iEQ6Wx/9B0PrvBd6bcaUBLx3ghz+98DGBYxv3Tme5cnUYz3uugbG/dyKoREIOcB Azl6/N2n9Fp3+x7GI7XnPEpIr7wL/Q1WtZqdJ2P1cOgw5aziUis6SakF0aW8d4LkPu8X 2R/2e3iuRdwXWLag9dH1+pzdSqA4sKSYbVWhBjUSnl5WT46ODlPXvRZKg/WSlkOSEcsa rAsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808867; x=1702413667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bOmchX4uNJ3czMjsDLMZ3je7KxzFjicIJgluCE6g86g=; b=ITmrzzEFMwqQMt2mSFkGtqbEsbSCohM52lANtM+phqvPZfSD4+QPoZJc8pT+Fuy1LT wjAtdLsm6VL+qaWe9bP9HAtDE+xfqdUsor22x3vwZOmIm2kvfA3vFP05sCee/+yA/G3B vvVgt4A1C5mH+8kfNyViCexMpO8u7QRvGYqjxlvXjiK+o/cpyGp7HNIobLiLRJ6vOu4k ZibqLqpJjyp/NcWQRiivZz0KVHPAhFaX2VGimtD4MqliH5KnU//hQyzHoawBzCY4f9zX 7rnkBygbobCGcU+Ia48JWcMxHc5ujel1La6iR//UANw2J7Fs8rMxWD3pUg0ucKrSsrpL jQxg== X-Gm-Message-State: AOJu0YwmEE4PUU5QDyhu1Rs3MZdFg02mHsTYgUCDHNz2WEZNPNh5euhf 71fn4okONfnxnRRtFfhZyu//7A== X-Received: by 2002:a7b:cb98:0:b0:40b:5e21:bdd6 with SMTP id m24-20020a7bcb98000000b0040b5e21bdd6mr863698wmi.101.1701808867046; Tue, 05 Dec 2023 12:41:07 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d13-20020a05600c34cd00b0040b540ff0a5sm19913400wmq.19.2023.12.05.12.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:06 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 49C4B5FBBD; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 03/11] scripts/replay-dump: update to latest format Date: Tue, 5 Dec 2023 20:40:58 +0000 Message-Id: <20231205204106.95531-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org To help debugging replay logs I've implemented decode_plain and decode_char_write as well as put in a new table for the current format of log. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- scripts/replay-dump.py | 70 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 6 deletions(-) diff --git a/scripts/replay-dump.py b/scripts/replay-dump.py index b89dc29555..8b9f914534 100755 --- a/scripts/replay-dump.py +++ b/scripts/replay-dump.py @@ -115,6 +115,11 @@ def decode_unimp(eid, name, _unused_dumpfile): print("%s not handled - will now stop" % (name)) return False +def decode_plain(eid, name, _unused_dumpfile): + "Plain events without additional data" + print_event(eid, name, "no data") + return True + # Checkpoint decoder def swallow_async_qword(eid, name, dumpfile): "Swallow a qword of data without looking at it" @@ -151,6 +156,12 @@ def decode_instruction(eid, name, dumpfile): print_event(eid, name, "0x%x" % (ins_diff)) return True +def decode_char_write(eid, name, dumpfile): + res = read_dword(dumpfile) + offset = read_dword(dumpfile) + print_event(eid, name, "%d -> %d" % (offset, res)) + return True + def decode_audio_out(eid, name, dumpfile): audio_data = read_dword(dumpfile) print_event(eid, name, "%d" % (audio_data)) @@ -193,10 +204,10 @@ def decode_clock(eid, name, dumpfile): # pre-MTTCG merge v5_event_table = [Decoder(0, "EVENT_INSTRUCTION", decode_instruction), Decoder(1, "EVENT_INTERRUPT", decode_interrupt), - Decoder(2, "EVENT_EXCEPTION", decode_unimp), + Decoder(2, "EVENT_EXCEPTION", decode_plain), Decoder(3, "EVENT_ASYNC", decode_async), Decoder(4, "EVENT_SHUTDOWN", decode_unimp), - Decoder(5, "EVENT_CHAR_WRITE", decode_unimp), + Decoder(5, "EVENT_CHAR_WRITE", decode_char_write), Decoder(6, "EVENT_CHAR_READ_ALL", decode_unimp), Decoder(7, "EVENT_CHAR_READ_ALL_ERROR", decode_unimp), Decoder(8, "EVENT_CLOCK_HOST", decode_clock), @@ -215,10 +226,10 @@ def decode_clock(eid, name, dumpfile): # post-MTTCG merge, AUDIO support added v6_event_table = [Decoder(0, "EVENT_INSTRUCTION", decode_instruction), Decoder(1, "EVENT_INTERRUPT", decode_interrupt), - Decoder(2, "EVENT_EXCEPTION", decode_unimp), + Decoder(2, "EVENT_EXCEPTION", decode_plain), Decoder(3, "EVENT_ASYNC", decode_async), Decoder(4, "EVENT_SHUTDOWN", decode_unimp), - Decoder(5, "EVENT_CHAR_WRITE", decode_unimp), + Decoder(5, "EVENT_CHAR_WRITE", decode_char_write), Decoder(6, "EVENT_CHAR_READ_ALL", decode_unimp), Decoder(7, "EVENT_CHAR_READ_ALL_ERROR", decode_unimp), Decoder(8, "EVENT_AUDIO_OUT", decode_audio_out), @@ -250,7 +261,7 @@ def decode_clock(eid, name, dumpfile): Decoder(10, "EVENT_SHUTDOWN_GUEST_RESET", decode_unimp), Decoder(11, "EVENT_SHUTDOWN_GUEST_PANIC", decode_unimp), Decoder(12, "EVENT_SHUTDOWN___MAX", decode_unimp), - Decoder(13, "EVENT_CHAR_WRITE", decode_unimp), + Decoder(13, "EVENT_CHAR_WRITE", decode_char_write), Decoder(14, "EVENT_CHAR_READ_ALL", decode_unimp), Decoder(15, "EVENT_CHAR_READ_ALL_ERROR", decode_unimp), Decoder(16, "EVENT_AUDIO_OUT", decode_audio_out), @@ -268,6 +279,49 @@ def decode_clock(eid, name, dumpfile): Decoder(28, "EVENT_CP_RESET", decode_checkpoint), ] +# Shutdown cause added +v12_event_table = [Decoder(0, "EVENT_INSTRUCTION", decode_instruction), + Decoder(1, "EVENT_INTERRUPT", decode_interrupt), + Decoder(2, "EVENT_EXCEPTION", decode_plain), + Decoder(3, "EVENT_ASYNC", decode_async), + Decoder(4, "EVENT_ASYNC", decode_async), + Decoder(5, "EVENT_ASYNC", decode_async), + Decoder(6, "EVENT_ASYNC", decode_async), + Decoder(6, "EVENT_ASYNC", decode_async), + Decoder(8, "EVENT_ASYNC", decode_async), + Decoder(9, "EVENT_ASYNC", decode_async), + Decoder(10, "EVENT_ASYNC", decode_async), + Decoder(11, "EVENT_SHUTDOWN", decode_unimp), + Decoder(12, "EVENT_SHUTDOWN_HOST_ERR", decode_unimp), + Decoder(13, "EVENT_SHUTDOWN_HOST_QMP_QUIT", decode_unimp), + Decoder(14, "EVENT_SHUTDOWN_HOST_QMP_RESET", decode_unimp), + Decoder(14, "EVENT_SHUTDOWN_HOST_SIGNAL", decode_unimp), + Decoder(15, "EVENT_SHUTDOWN_HOST_UI", decode_unimp), + Decoder(16, "EVENT_SHUTDOWN_GUEST_SHUTDOWN", decode_unimp), + Decoder(17, "EVENT_SHUTDOWN_GUEST_RESET", decode_unimp), + Decoder(18, "EVENT_SHUTDOWN_GUEST_PANIC", decode_unimp), + Decoder(19, "EVENT_SHUTDOWN_GUEST_SUBSYSTEM_RESET", decode_unimp), + Decoder(20, "EVENT_SHUTDOWN_GUEST_SNAPSHOT_LOAD", decode_unimp), + Decoder(21, "EVENT_SHUTDOWN___MAX", decode_unimp), + Decoder(22, "EVENT_CHAR_WRITE", decode_char_write), + Decoder(23, "EVENT_CHAR_READ_ALL", decode_unimp), + Decoder(24, "EVENT_CHAR_READ_ALL_ERROR", decode_unimp), + Decoder(25, "EVENT_AUDIO_IN", decode_unimp), + Decoder(26, "EVENT_AUDIO_OUT", decode_audio_out), + Decoder(27, "EVENT_RANDOM", decode_unimp), + Decoder(28, "EVENT_CLOCK_HOST", decode_clock), + Decoder(29, "EVENT_CLOCK_VIRTUAL_RT", decode_clock), + Decoder(30, "EVENT_CP_CLOCK_WARP_START", decode_checkpoint), + Decoder(31, "EVENT_CP_CLOCK_WARP_ACCOUNT", decode_checkpoint), + Decoder(32, "EVENT_CP_RESET_REQUESTED", decode_checkpoint), + Decoder(33, "EVENT_CP_SUSPEND_REQUESTED", decode_checkpoint), + Decoder(34, "EVENT_CP_CLOCK_VIRTUAL", decode_checkpoint), + Decoder(35, "EVENT_CP_CLOCK_HOST", decode_checkpoint), + Decoder(36, "EVENT_CP_CLOCK_VIRTUAL_RT", decode_checkpoint), + Decoder(37, "EVENT_CP_INIT", decode_checkpoint_init), + Decoder(38, "EVENT_CP_RESET", decode_checkpoint), +] + def parse_arguments(): "Grab arguments for script" parser = argparse.ArgumentParser() @@ -283,9 +337,13 @@ def decode_file(filename): version = read_dword(dumpfile) junk = read_qword(dumpfile) + # see REPLAY_VERSION print("HEADER: version 0x%x" % (version)) - if version == 0xe02007: + if version == 0xe0200c: + event_decode_table = v12_event_table + replay_state.checkpoint_start = 30 + elif version == 0xe02007: event_decode_table = v7_event_table replay_state.checkpoint_start = 12 elif version == 0xe02006: From patchwork Tue Dec 5 20:40:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750397 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1897267wrc; Tue, 5 Dec 2023 12:43:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsqtTv+D7NhBMmFGxLhKRCRrEPtO6AgcKs+JLmT6HjTjrnCK2MH+2d136OT42T2nC7Cymh X-Received: by 2002:ac8:5d10:0:b0:401:e2b1:d28d with SMTP id f16-20020ac85d10000000b00401e2b1d28dmr2129444qtx.20.1701809014904; Tue, 05 Dec 2023 12:43:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701809014; cv=none; d=google.com; s=arc-20160816; b=qc4X1z5xOnIqejc2Q4MAYc0w1c4JXo+g9kVXhdY40N6w2pkH+EkubnXygWDGvSkY6R wNXA9Wdt/DA/2XGAnyVTQ78I1uPOu9JXwRvQPVJAysEukwzNNjUvklKNnNLAgA6dYzRW T1on/nmWUEcJgQmbYGLsypR/NQyBtXK2W81Yi4RSitFMFL1QqxZtmhVgQw69BhO5vJJ/ lsbjrGDTVA4SWr8Qj/nFq89w8CcNsGNf2hGizd2gmh0HXs5xxz/YOGepF5xV2+gnyAHi fq5iBXdGrCXC6InC0Ru4cDVEtYTgb43NPhPiF0/KA8GJXElXYO9s4PFjBmwWfOFyQJF5 RgTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=D71TFDBoZSdjXR+fUZGSwmpZbsB3q4P2AJtXODOh0vA=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=MhPmFbooDsC6nyGb1M8RPl4xvpkqTBDthwQo/xjNioLI4P/+tvxhylKDGwswlQqpKj /wX+JWOfHU39U61e3bIP2jjLDzokmrg2X8CFcWx31HW9OkidcB5XmC2Xmdl0TNDT5+s3 nvbqOxs2XbBvnRasq9UrKYlpjlbxGD+qkbFiMTLqOFJNRjAZuDn7IfZJym6nk+RfSKAm 1so8eFiOT/rrimiuojh31eLqxzMnMh9qBh6n90u0rxUvtOj8gUkqcwUc8s9JkcYubkeF kgUf5eg0MFdlSlcB4XzlwLPkRQWVv3jxwqrH1ksEU8V15mjt325HikGsv7789S90Wdqf +MHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CfhvIoLv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bs17-20020ac86f11000000b004254cb576f4si7469114qtb.792.2023.12.05.12.43.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:43:34 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CfhvIoLv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcED-0007OG-0B; Tue, 05 Dec 2023 15:41:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcEB-0007Nc-Gh for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:11 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcE8-0002EA-PZ for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:11 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40b595bf5d2so65698105e9.2 for ; Tue, 05 Dec 2023 12:41:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808867; x=1702413667; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D71TFDBoZSdjXR+fUZGSwmpZbsB3q4P2AJtXODOh0vA=; b=CfhvIoLvm6C4u8JYHJkEo9h8OZLpydaCw8nutPNe+2enYO/SVX1MyEdXXGIndiZo3D c60p5g5J3nJSkDaFkjTAoqxTogkIvYjmDBGCs6hdp0xBMACFTg3+LxUs5m0nBHJVI1CH 9QjDVC64ayw5lBIUNiO0piuC2sPMVsJTltSRkY3G7H+CVgP1eFgB5OySXbUHQI1tDu2F kcPhSkNi9UrC0w5J5NGNO/4axHJwOh0lSQtKbgriGmAfjqlq3XtbShHfJC02vPRSReKI i752FpP9OZIGom3GsTmKDft8lrKd2W1GdxkiYnimhroIZKRa0zFe917cTat0B5Khut/x pPKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808867; x=1702413667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D71TFDBoZSdjXR+fUZGSwmpZbsB3q4P2AJtXODOh0vA=; b=riLz9iOMF24sQIKKaNZFIojAQKaJXsBIz0e2EDhLVKqX3GIH2rIibAkWEnfi1FlbR5 AUwFENGC+68mou/FrxbtWwAS1bu8CNVyF7TSBM/WVTdhHMvEkGTIPgfOOWGRtcIZwguY hb53FmzycjN1g3ht476VwDesGy11QPckD7ffyWGZVeuWUwiH7hAjLY+4pa7793npNife zV1FImy5UC6QgntJACtlmoo07027oYAjZGV4UbXm5IfF/3ODm1xC75VrmZcj6GvlqlKb aCeK+MVFwjKdQx+SkYl5Fbg12Gy83MeDkdB8gbOhH4fQ1h9dqDZN/bpO8M0aopkXODXu Bktg== X-Gm-Message-State: AOJu0Yyc3qbDPpwE9R85Cp5aGvBrsK3b7wXvvNLw22UpPCh0ilmQb5jc imc0IRh9HWQXCwY/WW8dIklXJQ== X-Received: by 2002:a05:600c:d7:b0:40c:9d4:4bd9 with SMTP id u23-20020a05600c00d700b0040c09d44bd9mr615321wmm.237.1701808867219; Tue, 05 Dec 2023 12:41:07 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h15-20020a05600c314f00b004083a105f27sm23057211wmo.26.2023.12.05.12.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:06 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5BE1A5FBBF; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 04/11] scripts/replay_dump: track total number of instructions Date: Tue, 5 Dec 2023 20:40:59 +0000 Message-Id: <20231205204106.95531-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This will help in tracking where we are in the stream when debugging. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Pavel Dovgalyuk --- scripts/replay-dump.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/replay-dump.py b/scripts/replay-dump.py index 8b9f914534..2212b09322 100755 --- a/scripts/replay-dump.py +++ b/scripts/replay-dump.py @@ -150,10 +150,13 @@ def decode_async(eid, name, dumpfile): return call_decode(async_decode_table, async_event_kind, dumpfile) +total_insns = 0 def decode_instruction(eid, name, dumpfile): + global total_insns ins_diff = read_dword(dumpfile) - print_event(eid, name, "0x%x" % (ins_diff)) + total_insns += ins_diff + print_event(eid, name, "+ %d -> %d" % (ins_diff, total_insns)) return True def decode_char_write(eid, name, dumpfile): From patchwork Tue Dec 5 20:41:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750388 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1896623wrc; Tue, 5 Dec 2023 12:41:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHYhWD+9LyXneBy6Dp5be1tmfpbxA2GldRE/nvefsuehqGKZcABEOBU9/Z6ntNC+C1oRWvT X-Received: by 2002:a0c:f7d0:0:b0:67a:3506:afdf with SMTP id f16-20020a0cf7d0000000b0067a3506afdfmr1750067qvo.61.1701808909573; Tue, 05 Dec 2023 12:41:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701808909; cv=none; d=google.com; s=arc-20160816; b=ZzZzn7l0ltcL+xTWQtBBIOd5Ho+jMqwra8lwCwXydY3mKQmqLcWxIgWLv7PnKC05eM KfXxPsEgUkbtPsMctiHOAbBzXhSi9EnWA1GKcmadkuIsrKCE2J9bBcA7r+egzPnZOVPm /fSuL2HK5dCI6ozD51EOnE8TX+jxDUZDykQbDKT4cgn935bMZzK6ouVXjlAjaz90b5PI j7yN8osjhRitBTTVeH2EfbEX9t7ntLD3bO1WkZmqTE0qPkRBlJKMfGKjEXPgHUTA9Ji9 66Uhg58ukhco3gS2SbmjX8zj6+J/V7AWy1pPAnepTMj2I1AA5KdTk9p8KN5J3RO6h7hi iZ6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ly426yd4H2r3GnJOjRqFYA2jyI3ziXUndZx7DtQI9f8=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=FHFbn2BHG9rxzKhCK7qGdfyZlwpio2LCOBhJHagZh+Fu0/R1zigGHO8Z44FCOljhS/ 67IJCLP2ztZ5D5polOJtWw5xyH+FD1YPISMgfWeXde7sM9MNXNA4+hxWbvtMyRp6yEIw 4OCaaF/oXpP32vzqxG8DlcSp5MmQmZcjPzIOkd6S/iTFy7PHRiBN5PT+F12ctNFYVZlI kBBnDIwVkn14KnlVp3iRNII1bbe4kerW1/KyLSHt7k0pJnXjv8otqgjnK89+r/pLkIuJ wMH0+oGXWEpVTKQmG1miIjL6uR+iUmGSu3tGxDW58lazwy5Z1PJ9/6fCw0zm+ZTeUSwa gS4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jwLUOVKd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jt4-20020a05621427e400b0067ab8dbca4bsi7252917qvb.85.2023.12.05.12.41.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:41:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jwLUOVKd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcEF-0007QK-PT; Tue, 05 Dec 2023 15:41:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcED-0007OW-Hm for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:13 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcEB-0002Et-Ua for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:13 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40c0a0d068bso27203295e9.3 for ; Tue, 05 Dec 2023 12:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808870; x=1702413670; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ly426yd4H2r3GnJOjRqFYA2jyI3ziXUndZx7DtQI9f8=; b=jwLUOVKd8azZJGVlc4Z4x055hX4e0+JfOFbzdynqlF7DfdfIQzIdd7SFPaWoYtU/04 21NjXWzQhA7s3tXvq6DYlq/XrXTuVGRNhLfhgGdAsyb7KWwq5hUeePzlqBFJud8gvsTE o5ShI0cnBQByVy8LhbIbhOEgR4YBE9Fd76QLNgRVlmmc2lwM+mlW34ikQftyEWtuMjBp miTklKYX2TspXZw0UJ+hOI9e3piGc/B/FikitwoDYe4T8IQuirCGMVSnYkuXMCncEWSV VsDA7uz5F+UA6mRORI4MA3WutOddyfKlqERbGWkrO421HTHtxknZxqwWwt1Qju0YqfMZ kPaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808870; x=1702413670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ly426yd4H2r3GnJOjRqFYA2jyI3ziXUndZx7DtQI9f8=; b=m88Ej6GHR5Moxaa8RjNI6eDewv1jujVaE4jeAinpS5MHP8voroTW8vIDcLWnr2mdks Aw6ionX/OLySBPcl7Nk2BnwGtrO7Qd337D+1URNIDN5ATCcirAPPN1DsMV1fmVb2sBpo 2biHRfb6m+ssCG1h2kyBgLbrNOE4y2CZ8LLvBUKiDt/GfdQfCWKmeYguhYsJy2zqFUpA iaq104nzpec+j/Mvknch8A7fSagxEeOtu4HKkEDKqID5tPkeuaujwAbeRyx8wziB44ig 3A3SnD05Xc7+4JuUbaEJmeB1CLwxH0LF0DUhG0pWrELyf31EkUw/HsAmbUK+qIdYEzLs cFWQ== X-Gm-Message-State: AOJu0Yy9JuCRbJ7DztP781VVSfKQ4CG8wi8XoUFn23Yqzbfudr2/mIKS 8oARZx4OjueX+mj7TTWknUa1Ag== X-Received: by 2002:a05:600c:1382:b0:40b:5e22:956 with SMTP id u2-20020a05600c138200b0040b5e220956mr4563587wmf.69.1701808870402; Tue, 05 Dec 2023 12:41:10 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l10-20020a05600c1d0a00b00407460234f9sm19791658wms.21.2023.12.05.12.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:09 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6D6425FBC2; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 05/11] replay: remove host_clock_last Date: Tue, 5 Dec 2023 20:41:00 +0000 Message-Id: <20231205204106.95531-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Fixes: a02fe2ca70 (replay: Remove host_clock_last) Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Pavel Dovgalyuk --- replay/replay-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/replay/replay-internal.h b/replay/replay-internal.h index b6836354ac..516147ddbc 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -80,8 +80,6 @@ typedef struct ReplayState { This counter is global, because requests from different block devices should not get overlapping ids. */ uint64_t block_request_id; - /*! Prior value of the host clock */ - uint64_t host_clock_last; /*! Asynchronous event id read from the log */ uint64_t read_event_id; } ReplayState; From patchwork Tue Dec 5 20:41:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750393 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1897048wrc; Tue, 5 Dec 2023 12:42:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IGg0EsM9VRK2MrI4Z/W1XAQPOdru8mCA8miYDpNxdHSAl354CpQKVifq5F63hf2dj5g6QTu X-Received: by 2002:a05:620a:19a5:b0:77d:8999:100c with SMTP id bm37-20020a05620a19a500b0077d8999100cmr2275349qkb.56.1701808978933; Tue, 05 Dec 2023 12:42:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701808978; cv=none; d=google.com; s=arc-20160816; b=OwpcJIEbVrzo6kENZEmUQEA3kro7JlVTxSvPKUe5TYuPEiVxIJei0Ni6rjSrlP8GVC YhOgOLQBhm8YPhwMBCm0uJQLGHm93evgiJvSlwSSkfnvoeospqo22WMOpSaDWUIM79RN TXapiWZspIEOnkj7skXnS1LPsUxWvPNU+egBT3ZXLPMtcFyUydMHg45vxvLgCxTO6tOL rcRSytnIi2h7B5T2wyfC5I9Auh78Ddh6HrSQmKmhzZIQDJrutpIy2jZUYBik+RHyIaYK CcVqaZk5xbiLuT8OI1dIX46Q3BmUOMnjq/Zp5j3ktqJCZDYhpZSYhQEymU+/R5tNVsvz GsSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WUlXUbQdrj2zN2x2QSDq9TzSC9U/EAD4vSnBXQIoxM8=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=0KpZDdSP6yU/BZpd9boM2EoH/ZCHgmPin4ZCS6z1PLKwNEmjz91Gq4x1rQrCjdasNN 5J+3Yhp1kr14fnsQcGw6t2HiWUV5ekCXnJX7kr4VwmUfIzLrUvcNVIu87+qO4ZPeEXLQ uPfB8GBG3FYvI0w0UcIA4F8CfNDarNT2oKXl52bXoCaQQvWIGOSilGvyxazWpqbO83+f eRC8Y/CaaIXXiH3K/JtWlPQG21flfaZtsFk3QEE2d0IVZPHgRJbQRNKx6DLNYVCDi4cl pmJY5ttAH/4rTmnyR3CDxe+P9lNZ2C9wpw5XzcbJVUoT0uY5CPJ0YhwjIFnVZAg5CQmk qnVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r77Z25BZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bm13-20020a05620a198d00b0077dc67402easi13653385qkb.338.2023.12.05.12.42.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:42:58 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r77Z25BZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcEO-0007Sg-NB; Tue, 05 Dec 2023 15:41:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcEG-0007Qz-Sw for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:16 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcEF-0002Fg-4b for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:16 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40c0a11a914so28309695e9.2 for ; Tue, 05 Dec 2023 12:41:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808872; x=1702413672; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WUlXUbQdrj2zN2x2QSDq9TzSC9U/EAD4vSnBXQIoxM8=; b=r77Z25BZR/RG/lIOQIOMsUAymqpIYr6ziT1zA6OZEUrLkyiOYDPQ/QZgzoNXIEh/T6 6YdagoaDAabwxNBsxDzW4O37g4Q6Wew1PGOT5w61optK27JHr/jWPmgiXEXIANVL9oSA NGYHGpLE6x5BoBrmBZgrbgO6TC/RMR5GwZvYLeW3Heaq64+QYT/VY6sC68VNNQ2PvToR CXP9JsJnAubodX2eddVvDvL+30dbjJDlgN1ITSUKMA7wg6yvAs3Y+jKqgfVvIOnj7tHs TEfr3y9CcVAMOxiGdxkalU39Zi6aLOGb5bUwd0f2wwrjXcvTKtr80SKeoRy9yHhdOGxU I4JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808872; x=1702413672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WUlXUbQdrj2zN2x2QSDq9TzSC9U/EAD4vSnBXQIoxM8=; b=RrjivUoEpTxFjaedxKzx44pZcOFHBt3DBUTKJw6dnO4GCn2mCrY20d7qg2KqUW3v4l VDSMz0ugy0UPVqdd73Abhzm9yCJrFXiTNRG0NRnzcEXRKpClpld0L8Tg3muoQnNGRgUu BzNUqQdkN5qLeZODd6viuBzqkl3OKh3hirz0Q9Hb6OVGE6fKwvu70SLGdLLyjnIKGtgS clSmRlGVKsmQyfqx0l4tVET3bQD37cOVq1W4nLeE9qb72dsN3+YaZS3SO8+0zO9lPRGV O6L1VrfjQ5nDkLGSFVjsRz4dCJl6jf1xvRpLxDRO21YrBPLyUoUaqT5qMjzPmOIdK2WM 5kQw== X-Gm-Message-State: AOJu0YwxHKLF3Qg9Mm4OySJkqlpQcrj2i5X6AaBnTOQDfwbiEJPL74XL K/dS79QR674P6tz37lPhrgZXjw== X-Received: by 2002:a05:600c:3512:b0:40b:5e1e:b3b6 with SMTP id h18-20020a05600c351200b0040b5e1eb3b6mr975084wmq.52.1701808872704; Tue, 05 Dec 2023 12:41:12 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i1-20020a05600c354100b0040588d85b3asm23273563wmq.15.2023.12.05.12.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:09 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 81A585FBC4; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 06/11] replay: add proper kdoc for ReplayState Date: Tue, 5 Dec 2023 20:41:01 +0000 Message-Id: <20231205204106.95531-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Remove the non-standard comment formatting and move the descriptions into a proper kdoc comment. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Pavel Dovgalyuk --- replay/replay-internal.h | 27 ++++++++++++++++---------- roms/SLOF | 2 +- tests/tcg/i386/Makefile.softmmu-target | 19 ++++++++++++++++++ 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 516147ddbc..98ca3748ed 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -63,24 +63,31 @@ enum ReplayEvents { EVENT_COUNT }; +/** + * typedef ReplayState - global tracking Replay state + * + * This structure tracks where we are in the current ReplayState + * including the logged events from the recorded replay stream. Some + * of the data is also stored/restored from VMStateDescription when VM + * save/restore events take place. + * + * @cached_clock: Cached clocks values + * @current_icount: number of processed instructions + * @instruction_count: number of instructions until next event + * @data_kind: current event + * @has_unread_data: 1 if event not yet processed + * @file_offset: offset into replay log at replay snapshot + * @block_request_id: current serialised block request id + * @read_event_id: current async read event id + */ typedef struct ReplayState { - /*! Cached clock values. */ int64_t cached_clock[REPLAY_CLOCK_COUNT]; - /*! Current icount - number of processed instructions. */ uint64_t current_icount; - /*! Number of instructions to be executed before other events happen. */ int instruction_count; - /*! Type of the currently executed event. */ unsigned int data_kind; - /*! Flag which indicates that event is not processed yet. */ unsigned int has_unread_data; - /*! Temporary variable for saving current log offset. */ uint64_t file_offset; - /*! Next block operation id. - This counter is global, because requests from different - block devices should not get overlapping ids. */ uint64_t block_request_id; - /*! Asynchronous event id read from the log */ uint64_t read_event_id; } ReplayState; extern ReplayState replay_state; diff --git a/roms/SLOF b/roms/SLOF index 3a259df244..6b6c16b4b4 160000 --- a/roms/SLOF +++ b/roms/SLOF @@ -1 +1 @@ -Subproject commit 3a259df2449fc4a4e43ab5f33f0b2c66484b4bc3 +Subproject commit 6b6c16b4b40763507cf1f518096f3c3883c5cf2d diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target index 5266f2335a..b9bef72dcf 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -33,5 +33,24 @@ EXTRA_RUNS+=$(MULTIARCH_RUNS) memory: CFLAGS+=-DCHECK_UNALIGNED=1 +# Simple Record/Replay Test +.PHONY: memory-record +run-memory-record: memory-record memory + $(call run-test, $<, \ + $(QEMU) -monitor none -display none \ + -chardev file$(COMMA)path=$<.out$(COMMA)id=output \ + -icount shift=5$(COMMA)rr=record$(COMMA)rrfile=record.bin \ + $(QEMU_OPTS) memory) + +.PHONY: memory-replay +run-memory-replay: memory-replay run-memory-record + $(call run-test, $<, \ + $(QEMU) -monitor none -display none \ + -chardev file$(COMMA)path=$<.out$(COMMA)id=output \ + -icount shift=5$(COMMA)rr=replay$(COMMA)rrfile=record.bin \ + $(QEMU_OPTS) memory) + +EXTRA_RUNS+=run-memory-replay + # Running QEMU_OPTS+=-device isa-debugcon,chardev=output -device isa-debug-exit,iobase=0xf4,iosize=0x4 -kernel From patchwork Tue Dec 5 20:41:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750389 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1896752wrc; Tue, 5 Dec 2023 12:42:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IETdpfcnfdBcHuyS/xGjJ+RdoQfUfdfov+D3VLxD1DSWSAK+wNtwLdkLOa+oClnFrXD5WJs X-Received: by 2002:a05:622a:315:b0:425:4043:50ce with SMTP id q21-20020a05622a031500b00425404350cemr2157455qtw.93.1701808933288; Tue, 05 Dec 2023 12:42:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701808933; cv=none; d=google.com; s=arc-20160816; b=uMF7P4p8GSPKwCOH3Xp6Oykp+yh94SOUg88FBKidrFt0LOLVVwd3+6e2UgbLv+A+Pj bhb+LHTYbWWnD13SkgSzRwbRrf1GfiBg4JWffgAzMGKAVJFHojfslsc3Gk+ApEtqaMhm dGWFDrprUnVLZUvoXAv/67aAygXtcuQl0AXx8IlePjsKLRxP5DVZo61R+3xdRdXCJdus JbXpueVVbO2/yEX9DL4MEydZLXuk8LB9/O7nh41sU2rn6nIHw1SGrfKDokkq0Km+ZrIk /owURXDlDfwGeZrMO+hHyWLkqiCqwxfFufIBWOxsWf/oBmrtxB3AxuMXv7AoaU8TARpK wing== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Y+OK2n1Fz+j7PdxiFIWkIMZ0hIcv40Fig/K+AFS5+zk=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=SZIXffzLfsEZdYmKynOsaz7XdQO5PWXNSJL5lLxuCHx0UNouaJK+qGegV1QR4oakGh Ym5wSUEnzK5tIayn7nDfZPsxBZDj3VrmZPhThGwEh+5B0wylmEo9eYiAEk8mzf3Hy8Xu 6fwtydMSbyhLgiOx+6Bt7hHDo1Fsc0vkcOTE9zYtgLKj3Zxm3KEKzXN3HrQKprwkz+n9 qK+IqqylaywjP1zzXy9LkOzFKUw2HdJ/65MYm98rN4vCQINTXWaba6LjBF9L3XQryezE +rodrvvlaayb4RGc0o3DO2S5R9kc5ukViTYVfefSkY+/cmhfTBvld6a5h4XR8wcac2D2 zmQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="kE/hA+dX"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fg22-20020a05622a581600b00425407be093si9686888qtb.407.2023.12.05.12.42.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:42:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="kE/hA+dX"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcEF-0007PX-1j; Tue, 05 Dec 2023 15:41:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcED-0007OL-CR for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:13 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcEB-0002Ep-Ky for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:13 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40bda47c489so42985715e9.3 for ; Tue, 05 Dec 2023 12:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808870; x=1702413670; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y+OK2n1Fz+j7PdxiFIWkIMZ0hIcv40Fig/K+AFS5+zk=; b=kE/hA+dXIb7p05MtCkoAnZF3DyyT/4/p4qGWNDfDGouMaIBQ1S6vmIk3eJozbxbqDq xs5GLckf0/03g+1jM5L8Fw/3Mvhxc3SPXgwzmefoEus19LaNz84B5PAQR7fl9W9ZQ003 30InIVhtQOKbDkyGncrz5sYwOy1giI7JCZwPnJy8Mvp1mEj2l63x2UT4NFewUoOYJueB I8oz0ayeWY9IdBJGuwDuLRbOj6RUwGWzNu5riOaxaO1MBSbcVf987C6jDex1LI2G5hY8 qsDrawLIBdeV9dTRFAkYUNrHh9hvE+nn0nYFbqRDGSQVLN0FFleX3ntBCrU+4KRTjDhQ lMCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808870; x=1702413670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y+OK2n1Fz+j7PdxiFIWkIMZ0hIcv40Fig/K+AFS5+zk=; b=slGKLzKRDJ5XS/k1SKPKbwPI5l9/8MyeaCfIimTtvzO1yeQeIOZ5uO+yyFluTGMSMz Xskywz9py0khyRrwLVtF85zulvuNysbRqWK34S7EXkHJt7JWuYx+sTcVumvXlAvaXEOO ae4+QXdiS6I2Tpd6rBPZpQzzqmI4hRoWdbQX1k67YZPuwqKvKvJYPChkpONcw/fGqows rmHlU0zPAm/9qpbMEYIIrZKbE7V2N1V1oLr+ibCgqH+RMf3pYoyGcFwp1JzfuDQVMAvn 0kgANs1w9VSHvVxqMtMaYxZbBZPTaBNlc1/ggCeA157uY3yGEg0D+3alhkrL/5TmJ1L7 XMLw== X-Gm-Message-State: AOJu0Ywi4HMpOs0sM1T0XFVWU7h5FRIfgkozza31yIOGxG27cwbW+k/L tfNtNR1c5gZYK9SGR1TUGphgSw== X-Received: by 2002:a05:600c:2491:b0:40b:5e59:c565 with SMTP id 17-20020a05600c249100b0040b5e59c565mr928955wms.143.1701808870068; Tue, 05 Dec 2023 12:41:10 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id az33-20020a05600c602100b0040c03c3289bsm13514716wmb.37.2023.12.05.12.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:09 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9758C5FBC6; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 07/11] replay: make has_unread_data a bool Date: Tue, 5 Dec 2023 20:41:02 +0000 Message-Id: <20231205204106.95531-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org For clarity given it only has two states. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Pavel Dovgalyuk --- replay/replay-internal.h | 4 ++-- replay/replay-internal.c | 4 ++-- replay/replay-snapshot.c | 6 +++--- replay/replay.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 98ca3748ed..1bc8fd5086 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -75,7 +75,7 @@ enum ReplayEvents { * @current_icount: number of processed instructions * @instruction_count: number of instructions until next event * @data_kind: current event - * @has_unread_data: 1 if event not yet processed + * @has_unread_data: true if event not yet processed * @file_offset: offset into replay log at replay snapshot * @block_request_id: current serialised block request id * @read_event_id: current async read event id @@ -85,7 +85,7 @@ typedef struct ReplayState { uint64_t current_icount; int instruction_count; unsigned int data_kind; - unsigned int has_unread_data; + bool has_unread_data; uint64_t file_offset; uint64_t block_request_id; uint64_t read_event_id; diff --git a/replay/replay-internal.c b/replay/replay-internal.c index 77d0c82327..634025096e 100644 --- a/replay/replay-internal.c +++ b/replay/replay-internal.c @@ -179,7 +179,7 @@ void replay_fetch_data_kind(void) replay_state.instruction_count = replay_get_dword(); } replay_check_error(); - replay_state.has_unread_data = 1; + replay_state.has_unread_data = true; if (replay_state.data_kind >= EVENT_COUNT) { error_report("Replay: unknown event kind %d", replay_state.data_kind); @@ -191,7 +191,7 @@ void replay_fetch_data_kind(void) void replay_finish_event(void) { - replay_state.has_unread_data = 0; + replay_state.has_unread_data = false; replay_fetch_data_kind(); } diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index 10a7cf7992..bf75c2ed28 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -47,8 +47,8 @@ static int replay_post_load(void *opaque, int version_id) static const VMStateDescription vmstate_replay = { .name = "replay", - .version_id = 2, - .minimum_version_id = 2, + .version_id = 3, + .minimum_version_id = 3, .pre_save = replay_pre_save, .post_load = replay_post_load, .fields = (VMStateField[]) { @@ -56,7 +56,7 @@ static const VMStateDescription vmstate_replay = { VMSTATE_UINT64(current_icount, ReplayState), VMSTATE_INT32(instruction_count, ReplayState), VMSTATE_UINT32(data_kind, ReplayState), - VMSTATE_UINT32(has_unread_data, ReplayState), + VMSTATE_BOOL(has_unread_data, ReplayState), VMSTATE_UINT64(file_offset, ReplayState), VMSTATE_UINT64(block_request_id, ReplayState), VMSTATE_UINT64(read_event_id, ReplayState), diff --git a/replay/replay.c b/replay/replay.c index 0f7d766efe..d729214197 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -258,7 +258,7 @@ static void replay_enable(const char *fname, int mode) replay_state.data_kind = -1; replay_state.instruction_count = 0; replay_state.current_icount = 0; - replay_state.has_unread_data = 0; + replay_state.has_unread_data = false; /* skip file header for RECORD and check it for PLAY */ if (replay_mode == REPLAY_MODE_RECORD) { From patchwork Tue Dec 5 20:41:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750396 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1897166wrc; Tue, 5 Dec 2023 12:43:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IHjLsQqjG45II8TVgj5M+fhbqve/fb3hVRWsN6Uc/NMctQ8PzqfMkPT3abklLGPPlhkh0VP X-Received: by 2002:a05:6214:519d:b0:67a:5815:9996 with SMTP id kl29-20020a056214519d00b0067a58159996mr2536329qvb.6.1701808997490; Tue, 05 Dec 2023 12:43:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701808997; cv=none; d=google.com; s=arc-20160816; b=cZbUlRbzVYGn/uqVU+IoEZ1ck9wwE/PhiesLr3L61A6wUp73Ct9RMTJNqML8a/WVv1 v8HDxOE92axiuE1e/fP1naF8j5xM3r+QrgfLzsn0D/oJAmv6E6VnZ+Cc2iba/L84aO85 s9C7ut2UlIpeM3k0VsP3U2hChcUO/eAPANqPCZFD3wyv9AagFdxp5DrUafMjtTXCsXf7 0PlkjDGMRPnA+n6lGYK84uwA3jSDZp3jFqB81w+c7lA4WV6qBEV+ZNsTaTqqTqJxmHEQ ZR6VUYO/4U5hx7cFS32y1iEejR5JEKVZnX68ic2k6MP9i+iPZ0OudYROoTCfHVqFZD0D 5F1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Nlo6CezYV3r03v3L8dVzCnnygHyr+7WQt60cA9zru2s=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=i6VDH+Pju13Pg9qHnp2pQHOo5fvdPF/RsepEh1v2UGfmIOheDVLX/btluzbLamqV6D 0sVcu/5CCNlSCFE8BcUlLGMy7wGKg09Oamep9wGQXWsajHurTMjtoW5izCcGI1mxi0jG 8rtE/YHGxAb5wfwlb83Llp26ATQ1ilbUqC8HbD0j6DylZYIYRAVsXv88uDMPxWXxWpk2 D2m3mopEnzA1aw5AKOp3fXGCWbx4IbUO2Lj2t5q5KQtlG5T3i50LXQ17NYlYbMYF+nGH JfZHk15JxNi2hoEIiUDKSMpLgs+E2FlUUJtRuhjCoSrGp2eSgrz2sU4yAuzQkTC5yfd7 vSJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rz5ED1JF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y18-20020a0cec12000000b0067a9ef0ac5asi9657397qvo.253.2023.12.05.12.43.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:43:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rz5ED1JF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcEM-0007SH-2Z; Tue, 05 Dec 2023 15:41:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcEG-0007Qn-CB for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:16 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcEE-0002Fl-In for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:16 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40c09f4bea8so29022645e9.1 for ; Tue, 05 Dec 2023 12:41:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808873; x=1702413673; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nlo6CezYV3r03v3L8dVzCnnygHyr+7WQt60cA9zru2s=; b=Rz5ED1JFG/OHwJhRSuGcoTM00ALIt7PSBeSSE00vybgDWnjfDVgvH3qUAZiagXdpji p3Cu1AK9BOadylYWwqzMajL/y8mZEn663MHVoEZe3k9bP7y/tmBVNBNnxOHYtyP8UkLD 86Ikh0S9MM21/67AHzXnixYD6agtfNNQUL+gOE09kfRvzUgdZcQ5jaLdAToRyYXEbTnd 1hndvUkv8EDS77jgNljgrxjj7bzTJ9kfgqTQJRYYCRnMFTYtEsgs+DXjtzLIL/MK/v0R Gkk/50rt2dQy9BhCtB6RDwMldPqxH9Uooej4Gd/jt8Nr6ind60iAmNF1Qu5rWgGTyEO/ LzoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808873; x=1702413673; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nlo6CezYV3r03v3L8dVzCnnygHyr+7WQt60cA9zru2s=; b=PWJW+9joA90tNsHlrsRObtstIXTktur7m/0oVDbxD+rHwDYNChljEHYRP+Gj2zmMVu 5FOhObl1FLfCl5GTFkmmP1kG18WjsJSZtIfLTPvizstXno/Vu4Q9fdMiEbwW6X6+p7F6 sz+maTHfoSpRN8TrcZM/queoJsyGfISAZ+9VCj6IjpV8b+Yzx2jfduk8Ey28AehnZlW6 HEChJS04nTKHaPwbdMdZ9LkZ7FLIpU5Y4q5An5IMHo2c0/1JpB40lLACaNczX0lFRJ7t Zq5kLrtsVwX5x9DTsdNcYsIXCf2iws09v7StGNZZDHHeiqwhLL27nfMHtGTeDgcov5jz lHWw== X-Gm-Message-State: AOJu0YwGhEjgQ2bz4d51JpCx9AxCtABP1gMub74J+hTd3BZ7a3oLN64F yxMndl/llia/XUKGXvJYjye6Lg== X-Received: by 2002:a05:600c:1f90:b0:407:7ea1:e9a4 with SMTP id je16-20020a05600c1f9000b004077ea1e9a4mr1011296wmb.5.1701808872877; Tue, 05 Dec 2023 12:41:12 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id w18-20020a5d4b52000000b0033334df1259sm11421633wrs.20.2023.12.05.12.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:09 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id AC8F25FBC8; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 08/11] replay: introduce a central report point for sync errors Date: Tue, 5 Dec 2023 20:41:03 +0000 Message-Id: <20231205204106.95531-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Figuring out why replay has failed is tricky at the best of times. Lets centralise the reporting of a replay sync error and add a little bit of extra information to help with debugging. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- replay/replay-internal.h | 12 ++++++++++++ replay/replay-char.c | 6 ++---- replay/replay-internal.c | 1 + replay/replay.c | 9 +++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 1bc8fd5086..709e2eb4cb 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -74,6 +74,7 @@ enum ReplayEvents { * @cached_clock: Cached clocks values * @current_icount: number of processed instructions * @instruction_count: number of instructions until next event + * @current_event: current event index * @data_kind: current event * @has_unread_data: true if event not yet processed * @file_offset: offset into replay log at replay snapshot @@ -84,6 +85,7 @@ typedef struct ReplayState { int64_t cached_clock[REPLAY_CLOCK_COUNT]; uint64_t current_icount; int instruction_count; + unsigned int current_event; unsigned int data_kind; bool has_unread_data; uint64_t file_offset; @@ -188,6 +190,16 @@ void replay_event_net_save(void *opaque); /*! Reads network from the file. */ void *replay_event_net_load(void); +/* Diagnostics */ + +/** + * replay_sync_error(): report sync error and exit + * + * When we reach an error condition we want to report it centrally so + * we can also dump some useful information into the logs. + */ +G_NORETURN void replay_sync_error(const char *error); + /* VMState-related functions */ /* Registers replay VMState. diff --git a/replay/replay-char.c b/replay/replay-char.c index a31aded032..72b1f832dd 100644 --- a/replay/replay-char.c +++ b/replay/replay-char.c @@ -113,8 +113,7 @@ void replay_char_write_event_load(int *res, int *offset) *offset = replay_get_dword(); replay_finish_event(); } else { - error_report("Missing character write event in the replay log"); - exit(1); + replay_sync_error("Missing character write event in the replay log"); } } @@ -135,8 +134,7 @@ int replay_char_read_all_load(uint8_t *buf) replay_finish_event(); return res; } else { - error_report("Missing character read all event in the replay log"); - exit(1); + replay_sync_error("Missing character read all event in the replay log"); } } diff --git a/replay/replay-internal.c b/replay/replay-internal.c index 634025096e..654b99cfb5 100644 --- a/replay/replay-internal.c +++ b/replay/replay-internal.c @@ -175,6 +175,7 @@ void replay_fetch_data_kind(void) if (replay_file) { if (!replay_state.has_unread_data) { replay_state.data_kind = replay_get_byte(); + replay_state.current_event++; if (replay_state.data_kind == EVENT_INSTRUCTION) { replay_state.instruction_count = replay_get_dword(); } diff --git a/replay/replay.c b/replay/replay.c index d729214197..e83c01285c 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -226,6 +226,14 @@ bool replay_has_event(void) return res; } +G_NORETURN void replay_sync_error(const char *error) +{ + error_report("%s (insn total %"PRId64"/%d left, event %u/%u)", error, + replay_state.current_icount, replay_state.instruction_count, + replay_state.current_event, replay_state.data_kind); + abort(); +} + static void replay_enable(const char *fname, int mode) { const char *fmode = NULL; @@ -258,6 +266,7 @@ static void replay_enable(const char *fname, int mode) replay_state.data_kind = -1; replay_state.instruction_count = 0; replay_state.current_icount = 0; + replay_state.current_event = 0; replay_state.has_unread_data = false; /* skip file header for RECORD and check it for PLAY */ From patchwork Tue Dec 5 20:41:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750390 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1896956wrc; Tue, 5 Dec 2023 12:42:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkwmr5qbSRAj88PPToLM0wrupZHvkeYNacCUUPylZmKGDpWows4ydioRo60kUSHXbU3NDM X-Received: by 2002:a0c:d844:0:b0:67a:5457:77c9 with SMTP id i4-20020a0cd844000000b0067a545777c9mr2068969qvj.11.1701808963267; Tue, 05 Dec 2023 12:42:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701808963; cv=none; d=google.com; s=arc-20160816; b=eKHAWIuYc31RNiTtVex2Q9YUw21LwGTifxg9r1UNXYs9imS3c585FZX93bVZmPSTi+ jj1bTGlR93/pbFrCAfa88jZxhDwtNI2bot9qbnz5q21F5uDasuJnu9IWghRHBk6gQPm7 gJ5urczoOhtMdcd2W6qovpvRdkV5m7h1A/+6kpDeiqNupbwhEyC6Hln6cvfUp3XvhZGn SLWFhewpMIo4TwQ7ypGfS61Ka3p14PEglXCjmrz/s5t77wTPEMPtf9aTZp5W20pOhrZh jfGDDU+aMhT7f6cKqgNGVmXOgx0/xRL8hz9vc9ox5hbbNQDbvmvW6MbABJkPtPhIV1sD Reyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=d4GcixrJLz9YAIgU+u8MRbzGUgAv+ZLjiVh41JlVLC0=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=Douj4Rdh9xOYvhW7OVduBk5tZ+16vpI+TrkMrxUbmE17rs8pzN4yrgFX+aHUEDkqy7 HY8fVpwF/HYhqJkrzNXazXdZ/FltA+rcmnGoPyP5wZIuoxASp6KnHj3zKKmJPJAEYroA +dMQcFHvSt1YaBJyVOM+vW70gObEzmIGqA4+MIUPCj/KgEkqG/rjcRiG55sEbs9ts64z UJAzDX3ns2Unvye3a5RYvM8xe0jT0UA7jwCWgA7qRAJNJWIgsrrBEmbnDlRuhfLpeOv1 M4h/iWRZAnOG2Bdx5MvoLI/6W5lyiX5+gH8zDcfuzwyjSBnC4H5bNqSECCmeQf0SprD0 l4dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ArJAr8Cm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l9-20020ad44d09000000b0067aa9c6c7d8si8090723qvl.424.2023.12.05.12.42.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:42:43 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ArJAr8Cm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcEI-0007RK-Os; Tue, 05 Dec 2023 15:41:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcEF-0007QO-Mq for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:15 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcED-0002FY-TH for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:15 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3316c6e299eso75934f8f.1 for ; Tue, 05 Dec 2023 12:41:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808872; x=1702413672; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d4GcixrJLz9YAIgU+u8MRbzGUgAv+ZLjiVh41JlVLC0=; b=ArJAr8CmoGO6mRxH+TVptMJo8H9OPnmrFIB2WlVJN3fr6sESS2yliRHpjHxDRiW2lm lyICFBSJSMPhkHZySZxqUfuvG0D+Dm4i6t129CQ2Ad7mPs25CNr6W4MQhZh5hpI65Ebk jApWmAf0Ws7ybIG/Jc+QrxkH/T2SCZRB1T5Pp3IekMQoQiwm3/1+L5eh3MdSWYdh6OLa 5gnQkl9MLpTwm7lLbLzt1yw1cXLr/v+ShrtDoQ3O5yZlLbzgLRAitB6sd3KkMtHzz3cG XXqD5xSbgq33xTI2UshxywHzlUvEUxZ/wYm4bSrEE83rKqVYmDcGvl8aulspTQi9UCiR 7Emw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808872; x=1702413672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d4GcixrJLz9YAIgU+u8MRbzGUgAv+ZLjiVh41JlVLC0=; b=t4TXet0xhSevsEr/Lx2KKAexPnax4EY6Qi4PETyjZLNpI6OKcztUL0kH8biLJ8758y 57JPZ4jpg0ldkR5gZQuNcSBmhVljOrhq04z1XX1sG/5AghJihHuMqTxt3RnG9npl0Sn7 qvUZCjL404Be5y13Qfl1RyA7Lap1do9ZTH0mkyCZFIs49JcEhAKW6dxKaGoeXbDs4Lgp 62x0QH8Z2FwR91ndcNGXnkH9ialilK/TIUjyS8nUUgbXTWfs+1HDozgYJYlkOOWN2dPt SRPtDgIyk0mArgsJ31lZmYa0BBqZOgYrKy1M6ANUPpeLg+mBAU7Cg4GAdWR2kcnkqN80 PwjA== X-Gm-Message-State: AOJu0Yz+gBpDqa6uiQYwrEVwfMLIdLySYxqZQWeiiU6eBiw0hTI1VEgn NEPZCZ30MysbzNy/AY0V/DnrpA== X-Received: by 2002:a5d:480f:0:b0:333:2fd2:3c02 with SMTP id l15-20020a5d480f000000b003332fd23c02mr3241851wrq.187.1701808872500; Tue, 05 Dec 2023 12:41:12 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j6-20020a5d6046000000b0033326e90496sm14426972wrt.18.2023.12.05.12.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:09 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C12755FBB6; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 09/11] replay: stop us hanging in rr_wait_io_event Date: Tue, 5 Dec 2023 20:41:04 +0000 Message-Id: <20231205204106.95531-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org A lot of the hang I see are when we end up spinning in rr_wait_io_event for an event that will never come in playback. As a new check functions which can see if we are in PLAY mode and kick us us the wait function so the event can be processed. This fixes most of the failures in replay_kernel.py Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2013 Signed-off-by: Alex Bennée Cc: Pavel Dovgalyuk --- include/sysemu/replay.h | 5 +++++ accel/tcg/tcg-accel-ops-rr.c | 2 +- replay/replay.c | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index 08aae5869f..83995ae4bd 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -70,6 +70,11 @@ int replay_get_instructions(void); /*! Updates instructions counter in replay mode. */ void replay_account_executed_instructions(void); +/** + * replay_can_wait: check if we should pause for wait-io + */ +bool replay_can_wait(void); + /* Processing clocks and other time sources */ /*! Save the specified clock */ diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c index 611932f3c3..825e35b3dc 100644 --- a/accel/tcg/tcg-accel-ops-rr.c +++ b/accel/tcg/tcg-accel-ops-rr.c @@ -109,7 +109,7 @@ static void rr_wait_io_event(void) { CPUState *cpu; - while (all_cpu_threads_idle()) { + while (all_cpu_threads_idle() && replay_can_wait()) { rr_stop_kick_timer(); qemu_cond_wait_iothread(first_cpu->halt_cond); } diff --git a/replay/replay.c b/replay/replay.c index e83c01285c..042a6a9636 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -347,6 +347,30 @@ void replay_start(void) replay_enable_events(); } +/* + * For none/record the answer is yes. + */ +bool replay_can_wait(void) +{ + if (replay_mode == REPLAY_MODE_PLAY) { + /* + * For playback we shouldn't ever be at a point we wait. If + * the instruction count has reached zero and we have an + * unconsumed event we should go around again and consume it. + */ + if (replay_state.instruction_count == 0 && replay_state.has_unread_data) { + return false; + } else { + fprintf(stderr, "Error: Invalid replay state\n"); + fprintf(stderr,"instruction_count = %d, has = %d, event_kind = %d\n", + replay_state.instruction_count, replay_state.has_unread_data, replay_state.data_kind); + abort(); + } + } + return true; +} + + void replay_finish(void) { if (replay_mode == REPLAY_MODE_NONE) { From patchwork Tue Dec 5 20:41:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750398 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1897300wrc; Tue, 5 Dec 2023 12:43:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFN5+QZ3VubpIa6ncj9zdAw/wdcr5YxcKEDyRq1lg3j4929WakZsZFfuTgkjxRd30FDAzRe X-Received: by 2002:a05:620a:4090:b0:775:c2a1:1821 with SMTP id f16-20020a05620a409000b00775c2a11821mr2791643qko.26.1701809021286; Tue, 05 Dec 2023 12:43:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701809021; cv=none; d=google.com; s=arc-20160816; b=JtzMMIemCgwUM9PBuVt4EheTCwDirOUUCyARCJ3jiGqcr1jkdT4oZQUXXoo9psckpT 8gSpSMlp4sPM93nE3lHtP+rPXpSngP1foqhpZHEpWhUHCZFPt67j8KmEKt62uotGvW8h qFCCSpFgc98cPM+Ezu2qqiRfoBhJ5bZU+O6iEJZx1q2qCbfAncwjd20sTlYFFC4uL4CQ qbf8dLWo+RkqxvovAx4tmRdPuoyk1NIqbm3qJdUNVRUzYwUXNJ/M7hyFH5cq75T1R70e K2EhV69K7HOML78VBcIr7jI/OOZ3GCLOmLzQSqNEN5qG4eCjRc4+BYBMRQm/mL3giGSo Kn4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xzTR452wuPoh7u/eWoDkJGpRh65Bnf4qmyQcBOguNFQ=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=BJuY++pNsS3CzfSAsnswsVyj/lzo8RNkRTtEYgu18stJeHCb8ii5f8Snk2Te3Bz/yy xvnvGwFVsHA9u1LFaxMXp3yQbAoUZJ4phYjj9+qqt1JwwRz7FBBkgwbAdL+Lj6tn4li0 nD7bKU01GpByB4ewOrFloDBouf6BLDSIYIAdw/l7e4nslDHoW3qSFHSgg+hgeFZAs+wD C6C3h7z90YYMNBmybr+2SJeoE9Mgkxc6TtjeVtA1uAtjhCLyYg210KpY/gQkrJiyfrUV IOzK9ZscBplND/CL0m0JJ9Uyk9IGPB3+jFVZJy1CcN2DphOBQbh13C1RFN1dB9qgM4td 5aYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tawdAkP4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cd11-20020a05622a418b00b00423a1efdd71si12919407qtb.97.2023.12.05.12.43.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:43:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tawdAkP4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcEK-0007SD-Tp; Tue, 05 Dec 2023 15:41:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcEI-0007RM-Di for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:18 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcEG-0002GK-5m for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:17 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40bd5eaa66eso43531445e9.3 for ; Tue, 05 Dec 2023 12:41:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808874; x=1702413674; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xzTR452wuPoh7u/eWoDkJGpRh65Bnf4qmyQcBOguNFQ=; b=tawdAkP4wGZb6jY5J+FfTqmk5/+hwJKuk9oVf91ADpOdIN89tC72SBwD0QA5aZNIoT 7vU3/Ap8haNaHJyFKuRZ9ft99RT0tM+J9NCRRkSDhkCh01s55UcS4Opij64qR3BKpGFf 3ju9F3k0sjnhmLkTJv39W4lj1EyL5zqYAgiDWXXtkxZi/i28JrOpB3KDdGmuWmM+KTV1 vZzSFE3QBZ+XlQpFhn+vpuGCmQ/cUGAw1WVb1wAsB535nUJfEkgRI8ZCkyNfcb5TOXsR RBMed36HKuScm1E1EwZZtnB6wIBOfTF5tE9bmyx4u4wCPAidNlVak+Aoo/iXNcvj4ZFH Sngw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808874; x=1702413674; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xzTR452wuPoh7u/eWoDkJGpRh65Bnf4qmyQcBOguNFQ=; b=niqFmOT+SFq/9/GYSoJXlmGePNoO5InzC2OyLEYFGV81eBcEVM4yTxZfGrZ8hsfJwJ yCYrWIUZyuLjZHpUQIiPj+R8WFP4tBoD+Hy99M5lBl5IfbgfSoCC8Iq+kr+xmDab/7e9 +wQV7+QwtijX6nWKjzZjmow2uIZkJwKXnMj46btauhd0HxR8mgAFW9vDrXSWqjXpleL4 DTioZto8YIR/1px3yIef+CsWc0YI9MIpMR9ZhtPwmlY2KU+A0tx7PJ6deVqXoF6jkjB4 ERP0cEaI4Y5GSj6+wHcI2pqiu4lRMmRzzfC0GXg3Fa9ps0XLcpAmYut9mx5CzjoA6Bbi 8Rwg== X-Gm-Message-State: AOJu0YxDQSbYlEdx5J5E+Vrt9XdTeDHopbDJTY6QmkxaS/F2fnBdiPcx 2+AWCjFiL5a8X+VMxmr5yfDdYg== X-Received: by 2002:a05:600c:2d4c:b0:40b:5e59:e9ea with SMTP id a12-20020a05600c2d4c00b0040b5e59e9eamr988487wmg.137.1701808874602; Tue, 05 Dec 2023 12:41:14 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d22-20020adfa356000000b0033332df65absm12350639wrb.50.2023.12.05.12.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:09 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D2F715FBCC; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 10/11] chardev: force write all when recording replay logs Date: Tue, 5 Dec 2023 20:41:05 +0000 Message-Id: <20231205204106.95531-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is mostly a problem within avocado as serial generally isn't busy enough to overfill pipes. However the consequences of recording a failed write will haunt us on replay when causing the log to go out of sync. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2010 Signed-off-by: Alex Bennée Cc: Pavel Dovgalyuk Reviewed-by: Philippe Mathieu-Daudé Acked-by: Pavel Dovgalyuk --- chardev/char.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chardev/char.c b/chardev/char.c index 996a024c7a..6e5b4d7345 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -171,7 +171,8 @@ int qemu_chr_write(Chardev *s, const uint8_t *buf, int len, bool write_all) return res; } - res = qemu_chr_write_buffer(s, buf, len, &offset, write_all); + res = qemu_chr_write_buffer(s, buf, len, &offset, + replay_mode == REPLAY_MODE_RECORD ? true : write_all); if (qemu_chr_replay(s) && replay_mode == REPLAY_MODE_RECORD) { replay_char_write_event_save(res, offset); From patchwork Tue Dec 5 20:41:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 750395 Delivered-To: patch@linaro.org Received: by 2002:adf:9b9d:0:b0:333:3a04:f257 with SMTP id d29csp1897156wrc; Tue, 5 Dec 2023 12:43:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IFj5MKG6rsS8HZYUfKJSSE+kg4gfRqe2xxy2JvFj+NcjD+lEJiyrUVYJC6BK5vsjHakiAIf X-Received: by 2002:a05:6214:308:b0:67a:9821:b322 with SMTP id i8-20020a056214030800b0067a9821b322mr1665030qvu.64.1701808996181; Tue, 05 Dec 2023 12:43:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701808996; cv=none; d=google.com; s=arc-20160816; b=lxKMI5FThpg5oy+GlB8JT9MT/WC+lYFOiZDlWBN+1EszLZ8YEK3pz83aTbUatWQgYw D/Kxiqa0HHiFpo2fSIJ9WytlsyI337pVd6vdiP0FsWWEmLVRZ7TSXBFh8POLzRFwRB5s Hz1ALoZz0E8kbDJbtp7pg1fhkJN/hcSPsDOIZ9k4S3KUHzedaKfQSK9pWV5sfZwaFFIJ 1FXFkOcI4SWNhIFSUXpQLsqbfinc5J/OHhEsuUKQCuvZcgdTHEmJeLIjtLyOnRlYRtR6 6+kdA584iRxnHZ+Fpq1A4txQCKMpz/HXGABelSHFFkylLlXv+Q8WY+Nt0/2JycLvpRA6 YSjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZO+XHJPkvwBo8PTtuDhgEKDXcm5kj7GqMfllU0coabQ=; fh=WQskExECjOtS2oBrq9x2ue7OeVr6ye1r4N0aDOSz0G8=; b=GbTvQ3dFmDvDf55e0EyR2UkJIl5u+YKmew0RaTNQsU1Vat+0P2kVgFZuGx+eop81+j 7EB8pr3C+LySAXSwF+wMJDx7rmuzt/dVhMBXZdQw5DfW0koQe0rdPAbj5A5ZQ4DD64Vj W8RCgpnl2rtVnP2ODEj4VwIMOpfFu/wPuNRg/sxHyGtzr7yjzAW4+xiSJMNTaTkZHCzg vuC7gsO7MsjJ10D83/tAqgyMOnmF5tFFP+J3KeA0QPpY2UtfQfY/oSqd4r8mRcS5d/+H zceqlb+2GwKoW5kilyfW2/N15PyqC6MTd+ZpyKNpZfzbXDbIcgiC4rfF2uScKc3cCuYU s1NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tzm09t4A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cn14-20020a05622a248e00b0042557f0cb16si5074594qtb.739.2023.12.05.12.43.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Dec 2023 12:43:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tzm09t4A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAcEE-0007PV-FW; Tue, 05 Dec 2023 15:41:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAcED-0007OK-9a for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:13 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAcEB-0002Eq-H9 for qemu-devel@nongnu.org; Tue, 05 Dec 2023 15:41:13 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40c0a11a914so28309195e9.2 for ; Tue, 05 Dec 2023 12:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701808870; x=1702413670; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZO+XHJPkvwBo8PTtuDhgEKDXcm5kj7GqMfllU0coabQ=; b=Tzm09t4AZ0BK1ijJXrr4YwigdYfwRumLUAMLAnXdiMWANR8mNIT/LbU9hY51mngl03 neKSD1Ja6RdpuBggbWfC/SSTQ+3Rg0+kdTSDtZQfQS77OEIPvAKgayrNz5Iw0oEo12xH pv5OlIQ/rqNqoHiVRP4OFAo1Qx3muuYWJhKZ8dBAMLLCGvYbkPNfBRtkmNQ8aEsJ4nGq J+F3f1xih6O09RenbKN6To4l7icNRZE0VbLfKpUEsn2GTyltK6a6dRuGnP81ucT7AhzO wXAL2XNWWrhGf5jxCngDijPa/SEX7nBYm15yDGZy54ZZqj1uVHfEaFX9hKHLiI3eN4U7 aURA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701808870; x=1702413670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZO+XHJPkvwBo8PTtuDhgEKDXcm5kj7GqMfllU0coabQ=; b=tlbYbhBBAzVP0/Z1ucG/lJ2Irp6B4FyrzLKxJLUtX250WXzNyxdtufOZWWCzoCLRZu vO3wAKW2doionpBoQ8fpAzXTEEDpu19l2B7LZMEvmI20jyjpdw9B+ZpVWJwvcH0oSBvL KQaeBAF3inusT/6CS/cU0KtiFn2Wvq+5CKfoG8C40uaeLqN+sPGNW0+OQ+ZiWKoVECWv BLblX/143oLRJuW7gnoGmel9OLmlukZfE7wcSnrcQb4f3GjQSBuM688/hbC2r9VV1GOm yyrElSftWwozCjz9yi8r0rPR3HUG3oHUHDjt8AeU6MedTQg6UTp/p+s/X/2v6LwZI8Nu vlnw== X-Gm-Message-State: AOJu0YxIB+WWlgYqk7exEfA86+ciKNqBG8JpWspQnCOHFJJoLuEOVMLQ 9IiIdoPzUcRjHNXo5nqBANolWA== X-Received: by 2002:a05:600c:22d1:b0:40b:5e59:b7a8 with SMTP id 17-20020a05600c22d100b0040b5e59b7a8mr969692wmg.133.1701808870236; Tue, 05 Dec 2023 12:41:10 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n4-20020a05600c3b8400b0040b40468c98sm23481841wms.10.2023.12.05.12.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 12:41:09 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E47065FBCE; Tue, 5 Dec 2023 20:41:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Beraldo Leal , Eduardo Habkost , Richard Henderson , Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Pavel Dovgalyuk , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 11/11] tests/avocado: remove skips from replay_kernel Date: Tue, 5 Dec 2023 20:41:06 +0000 Message-Id: <20231205204106.95531-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org> References: <20231205204106.95531-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org With the latest fixes for #2010 and #2013 these tests look pretty stable now. Of course the only way to be really sure is to run it in the CI infrastructure and see what breaks. Signed-off-by: Alex Bennée Acked-by: Pavel Dovgalyuk --- tests/avocado/replay_kernel.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py index 1eaa36444c..c54e96c9ff 100644 --- a/tests/avocado/replay_kernel.py +++ b/tests/avocado/replay_kernel.py @@ -98,8 +98,6 @@ def test_i386_pc(self): self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5) - # See https://gitlab.com/qemu-project/qemu/-/issues/2010 - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test sometimes gets stuck') def test_x86_64_pc(self): """ :avocado: tags=arch:x86_64 @@ -135,8 +133,6 @@ def test_mips_malta(self): self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5) - # See https://gitlab.com/qemu-project/qemu/-/issues/2013 - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab') def test_mips64el_malta(self): """ This test requires the ar tool to extract "data.tar.gz" from @@ -152,7 +148,6 @@ def test_mips64el_malta(self): :avocado: tags=arch:mips64el :avocado: tags=machine:malta - :avocado: tags=flaky """ deb_url = ('http://snapshot.debian.org/archive/debian/' '20130217T032700Z/pool/main/l/linux-2.6/' @@ -200,8 +195,6 @@ def test_arm_virt(self): self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=1) - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab') - def test_arm_cubieboard_initrd(self): """ :avocado: tags=arch:arm @@ -354,7 +347,6 @@ def test_m68k_mcf5208evb(self): file_path = self.fetch_asset(tar_url, asset_hash=tar_hash) self.do_test_advcal_2018(file_path, 'sanity-clause.elf') - @skip("Test currently broken") # Console stuck as of 5.2-rc1 def test_microblaze_s3adsp1800(self): """ :avocado: tags=arch:microblaze @@ -389,7 +381,6 @@ def test_or1k_sim(self): file_path = self.fetch_asset(tar_url, asset_hash=tar_hash) self.do_test_advcal_2018(file_path, 'vmlinux') - @skip("nios2 emulation is buggy under record/replay") def test_nios2_10m50(self): """ :avocado: tags=arch:nios2