From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 54D72CCF9EA for ; Mon, 27 Oct 2025 11:05:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDL22-00015s-1b; Mon, 27 Oct 2025 07:04:58 -0400 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 1vDL1Z-0000h2-6W for qemu-arm@nongnu.org; Mon, 27 Oct 2025 07:04:30 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDL1J-0005gC-U1 for qemu-arm@nongnu.org; Mon, 27 Oct 2025 07:04:28 -0400 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-b6d2f5c0e8eso926762566b.3 for ; Mon, 27 Oct 2025 04:03:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761563037; x=1762167837; 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=j5vD4GkqTlF8FRvajozZALqJDlWOq07fN98aFxxtZgc=; b=K/GmdzD7ZStq7ou5OJT3QoXiyXckHAYKwN3fr+M2+QJIc5wgiqdY8bcNpVO4B1RUlS DeibHylUMvwZ16cWvVhuiJ0jAXA9sKuAgktHCXyrb43WoGXSMZOGQbWqvQXwxigT9wx6 hdJmkMigR8PGvmG/yizWN+DtUukw05oc8XZ1Lu+t23q25pTUbzukJjBtn6OwoD+4pmmI ES3stXd9Hs1o3cTKx2gwJE2o1+YXK+z3ojQfVIq0IGu7pM4FIVyfREe2upSygO4DZfqG /tUqGO96Io8NbD/yohefvyzJJx421lOMII94ZZ24mwZECoBvH3LyU51/fpIBDUpu8C4l TN2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761563037; x=1762167837; 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=j5vD4GkqTlF8FRvajozZALqJDlWOq07fN98aFxxtZgc=; b=ZinRUZxY+kAwqtJUCWuJG7Dvl3FFOTXA5kKLZ+dLMsxK6SE/Sd4hVNlMNlKzZkdJeB kV9ukvK5eUOKTdiM6EYgwSO41POltePiA2Eu75bQ3mH8E4cIsXDeFRx4JDObTeYHMoi5 A3z2vfBoXy6tJrCT0b+qD07n5GGi6doalp7em8otDj8TAiaM/HPE9SQyqtw/WkQY9iER MO51mbNJntdwAcSFzT0mDwkwkwMAZfCKR0BXz9+kAvOZTn92FBwT3y5gxc+vSeV7N5rs 4+E6PMfe3ckTq/CLnvZM35j+PVxXM6f6z0IogQlceZl6W8gElytu+PeXx45vcVCleEZd q6hQ== X-Forwarded-Encrypted: i=1; AJvYcCWQbZwCsF8XsEiwfjiE9rO5nMk7SzgDTozkePjgcrfgifrfrXv3oRA64aSHro7WBKTosU5/wFgBWg==@nongnu.org X-Gm-Message-State: AOJu0Yy2nVN/tlpooU58snZY4y8503aseIdGbhUdzVa4dXLdUlSNY/bj 1/Od3qwrgN7vtvZjc086QEg51TrOK+di8Nb13We2pJOsMUBLg/BRS2O1YL7mqLx8JCA= X-Gm-Gg: ASbGnctwlRpKBUywISRd5Nyic/2NKvSlj2ew65VOigxJCrybnfaWFAo+Ft3cqQUxq1q fCOyWzFoxReFBnmFsbUEWjTSzIOqNUdDltucBtNwbtlRWqSoUlpyTsFSk8dcTwgN8K8ok2v6hRF BTZhKxn4dm8gmKiC5WCbMoz/hWXQD15uAyCfp0Wj2NRjFOPvNsBrW0X/yhU2OmeL4PwgTjCtsRt WX9Y2VrVSlz094YOGp11RHGmp116oks2YODZvCXECtDkUHYv4wWKTgAK5yOyz0plWnWDjNtgt1a zfZnu1GF7zjUGyOFiiJHR+t8hBg4zp4DdGGatD2nfDrHYt0tQ+LL5QVVU28ZxWKbJzm49J9o9HL IzS/0JZxqD6SV3mbQGmRBqFaosJqWXuANlWJ7Wp1o/OGBzjy3ZBRt22sU9y7C2oo0x/3Qu2RISe SZPlQHBsK9Ycc= X-Google-Smtp-Source: AGHT+IGRoCM8z0OckSwUEsiuPM8tj+gJRpyVjgRDBkyGR5ywxYyqMoWnrS4niHghCRH2WyFRnHheag== X-Received: by 2002:a17:907:2d9e:b0:b3a:7af8:c4a2 with SMTP id a640c23a62f3a-b6d51aefdb1mr1605117466b.10.1761563034209; Mon, 27 Oct 2025 04:03:54 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b6d8541fb2esm728692266b.59.2025.10.27.04.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 04:03:54 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EDD2061502; Mon, 27 Oct 2025 11:03:46 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Liu Zhiwei , Alexandre Iooss , Chinmay Rath , qemu-arm@nongnu.org, Peter Maydell , Nicholas Piggin , Ilya Leoshkevich , David Hildenbrand , qemu-ppc@nongnu.org, Paolo Bonzini , qemu-s390x@nongnu.org, Pierrick Bouvier , Bastian Koppelmann , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stafford Horne , Mahmoud Mandour , Artyom Tarasenko , Eduardo Habkost , Palmer Dabbelt , Alistair Francis , Laurent Vivier , Weiwei Li , Daniel Henrique Barboza , Mark Cave-Ayland , Yoshinori Sato , "Edgar E. Iglesias" , Aurelien Jarno , Richard Henderson , Thomas Huth , Max Filippov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Michael Rolnik , Song Gao , qemu-riscv@nongnu.org, Aleksandar Rikalo , Julian Ganz Subject: [PATCH 30/35] tests: add test for double-traps on rv64 Date: Mon, 27 Oct 2025 11:03:37 +0000 Message-ID: <20251027110344.2289945-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027110344.2289945-1-alex.bennee@linaro.org> References: <20251027110344.2289945-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x636.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org From: Julian Ganz We do have a number of test-case for various architectures exercising their interrupt/exception logic. However, for the recently introduced trap API we also want to exercise the logic for double traps on at least one architecture. Reviewed-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis Signed-off-by: Julian Ganz Signed-off-by: Alex Bennée --- tests/tcg/riscv64/Makefile.softmmu-target | 6 ++ tests/tcg/riscv64/doubletrap.S | 73 +++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 tests/tcg/riscv64/doubletrap.S diff --git a/tests/tcg/riscv64/Makefile.softmmu-target b/tests/tcg/riscv64/Makefile.softmmu-target index 3ca595335dd..d9c0036eb4b 100644 --- a/tests/tcg/riscv64/Makefile.softmmu-target +++ b/tests/tcg/riscv64/Makefile.softmmu-target @@ -24,5 +24,11 @@ EXTRA_RUNS += run-test-mepc-masking run-test-mepc-masking: test-mepc-masking $(call run-test, $<, $(QEMU) $(QEMU_OPTS)$<) +EXTRA_RUNS += run-plugin-doubletrap +run-plugin-doubletrap: doubletrap + $(call run-test, $<, \ + $(QEMU) -plugin ../plugins/libdiscons.so -d plugin -D $<.pout \ + $(QEMU_OPTS)$<) + # We don't currently support the multiarch system tests undefine MULTIARCH_TESTS diff --git a/tests/tcg/riscv64/doubletrap.S b/tests/tcg/riscv64/doubletrap.S new file mode 100644 index 00000000000..b61089c9c1c --- /dev/null +++ b/tests/tcg/riscv64/doubletrap.S @@ -0,0 +1,73 @@ + .option norvc + + .text + .global _start +_start: + # Set up vectored interrupts + lla t0, trap + add t0, t0, 1 + csrw mtvec, t0 + + # Enable sw interrupts + csrrsi zero, mie, 0x8 + csrrsi zero, mstatus, 0x8 + + # Engage the double trap: we trigger an machine-level software + # interrupt, which will trap to an illegal instruction + lui t1, 0x02000 + li t0, 1 + sw t0, 0(t1) + + # If we still not went out via the software interrupt route after a + # short while, we failed the test. + lui t0, 0x1 +0: + addi t0, t0, -1 + bnez t0, 0b + j fail + +trap: + j illegal_insn # Exceptions + j fail # Supervisor software interrupt + j fail + .insn i CUSTOM_0, 0, x0, x0, 0 # Machine software interrupt + j fail + j fail # Supervisor timer interrupt + j fail + j fail # Machine timer interrupt + j fail + j fail # Supervisor external interrupt + j fail + j fail # Machine external interrupt + j fail + j fail # Counter overflow interrupt + j fail + j fail + +illegal_insn: + # Check whether we really got an illegal instruction + csrr t0, mcause + li t1, 2 + bne t0, t1, fail + li a0, 0 + j _exit +fail: + li a0, 1 +_exit: + lla a1, semiargs + li t0, 0x20026 # ADP_Stopped_ApplicationExit + sd t0, 0(a1) + sd a0, 8(a1) + li a0, 0x20 # TARGET_SYS_EXIT_EXTENDED + + # Semihosting call sequence + .balign 16 + slli zero, zero, 0x1f + ebreak + srai zero, zero, 0x7 + j . + + .data + .balign 16 +semiargs: + .space 16 -- 2.47.3