From nobody Tue Dec 16 03:10:45 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 162FFEB64DD for ; Sat, 29 Jul 2023 00:38:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235960AbjG2AiZ (ORCPT ); Fri, 28 Jul 2023 20:38:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236525AbjG2Ahw (ORCPT ); Fri, 28 Jul 2023 20:37:52 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7C704EC0 for ; Fri, 28 Jul 2023 17:37:06 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5840614b107so28129797b3.1 for ; Fri, 28 Jul 2023 17:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690591025; x=1691195825; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=MTnhp9X0lvYUZIL9WzwgJz1fC/FCDEfshbcoz/56eco=; b=lx0KZzEtIsU0AdZ9qnXZlqbpjsDtaC9HcUC6zEB5z+kgdFIehygXDlCxd/jAA0wTwd 4gRgNK3LibVhKtGBS+OwiXCm8B21jgDt2+6DxZvJ76oM47lhWAHJHFB0tKxpVNtgeF+B RMIjaJHwQQvB52Sgbeem3LaxJb7s8wsgeNOUhXWjnrzAyjFTAF0QPmYoh9DFE9SHjp9N WYQ7gSBDcpm+zTFhDttDC7VO88WNVZrNOtJn/gyTAZoWDTKtnoLkUSHxC6+D3Ctlvpda PH1Z199C1u+Cu7YlHc7/jYTzKlazFn0t0RJr3GmJfdmakqJtYgm5QBnYq03xGWhI10A8 DNdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591025; x=1691195825; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MTnhp9X0lvYUZIL9WzwgJz1fC/FCDEfshbcoz/56eco=; b=WRAIlQh0Uz0MsIZ+ng5VtORJ/hJh92Poyy5Ix5fgA8psx5EMefQ7i3DO+O5Pevs4BV 4d9yOgNwTkYWbUxGUBAA35/9L5gXn+BIqh6VozBi3UxUKy0R0l6lWDIkIBhCKxnJ0OLz l9nCbddHjsSIi+zHado4EwKfOuYkySFj6SVKQK1UsNB2yDDL0uKVgr8uZ6FVAa/V7rt+ 8Yap499y1XgDPBcW7D0suU6OIY+PGZwOCmXQjgKQsuswN3nBSyFrwoolukjGeXSmOUBl gnYs2zXSrscDFlZ1nnHl+BY0FjClexHS2MH+HvXNuZ7XZp4Pp4/I5CHIhF1bFwo3kKEh 0C3Q== X-Gm-Message-State: ABy/qLYzh1IpC99Vik8f0mDA4Z5gzVCbWJZbuv+v3anPn7hhIexnIxG8 13keurAom/tyMA8eDcdeo4EeNSCLmjs= X-Google-Smtp-Source: APBJJlGkPJLpvMgBhZQZngegrJd5H8lH0SpYQU1t+gpMp8O4I9K80z10fyRXj9c+AjJBWPrkzcKXkpDJEd0= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:ad42:0:b0:56f:f62b:7a11 with SMTP id l2-20020a81ad42000000b0056ff62b7a11mr22723ywk.8.1690591025745; Fri, 28 Jul 2023 17:37:05 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 17:36:19 -0700 In-Reply-To: <20230729003643.1053367-1-seanjc@google.com> Mime-Version: 1.0 References: <20230729003643.1053367-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230729003643.1053367-11-seanjc@google.com> Subject: [PATCH v4 10/34] KVM: selftests: Convert aarch_timer to printf style GUEST_ASSERT From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Christian Borntraeger , Janosch Frank , Claudio Imbrenda Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Sean Christopherson , Thomas Huth , "=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?=" , Aaron Lewis Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert ARM's aarch_timer test to use printf-based GUEST_ASSERT(). To maintain existing functionality, manually print the host information, e.g. stage and iteration, to stderr prior to reporting the guest assert. Signed-off-by: Sean Christopherson --- .../selftests/kvm/aarch64/arch_timer.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testi= ng/selftests/kvm/aarch64/arch_timer.c index 8ef370924a02..b53bcf126e6a 100644 --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c @@ -19,6 +19,7 @@ * * Copyright (c) 2021, Google LLC. */ +#define USE_GUEST_ASSERT_PRINTF 1 =20 #define _GNU_SOURCE =20 @@ -155,11 +156,13 @@ static void guest_validate_irq(unsigned int intid, xcnt_diff_us =3D cycles_to_usec(xcnt - shared_data->xcnt); =20 /* Make sure we are dealing with the correct timer IRQ */ - GUEST_ASSERT_2(intid =3D=3D timer_irq, intid, timer_irq); + GUEST_ASSERT_EQ(intid, timer_irq); =20 /* Basic 'timer condition met' check */ - GUEST_ASSERT_3(xcnt >=3D cval, xcnt, cval, xcnt_diff_us); - GUEST_ASSERT_1(xctl & CTL_ISTATUS, xctl); + __GUEST_ASSERT(xcnt >=3D cval, + "xcnt =3D 0x%llx, cval =3D 0x%llx, xcnt_diff_us =3D 0x%llx", + xcnt, cval, xcnt_diff_us); + __GUEST_ASSERT(xctl & CTL_ISTATUS, "xcnt =3D 0x%llx", xcnt); =20 WRITE_ONCE(shared_data->nr_iter, shared_data->nr_iter + 1); } @@ -192,8 +195,7 @@ static void guest_run_stage(struct test_vcpu_shared_dat= a *shared_data, TIMER_TEST_ERR_MARGIN_US); =20 irq_iter =3D READ_ONCE(shared_data->nr_iter); - GUEST_ASSERT_2(config_iter + 1 =3D=3D irq_iter, - config_iter + 1, irq_iter); + GUEST_ASSERT_EQ(config_iter + 1, irq_iter); } } =20 @@ -243,13 +245,9 @@ static void *test_vcpu_run(void *arg) break; case UCALL_ABORT: sync_global_from_guest(vm, *shared_data); - REPORT_GUEST_ASSERT_N(uc, "values: %lu, %lu; %lu, vcpu %u; stage; %u; it= er: %u", - GUEST_ASSERT_ARG(uc, 0), - GUEST_ASSERT_ARG(uc, 1), - GUEST_ASSERT_ARG(uc, 2), - vcpu_idx, - shared_data->guest_stage, - shared_data->nr_iter); + fprintf(stderr, "Guest assert failed, vcpu %u; stage; %u; iter: %u\n", + vcpu_idx, shared_data->guest_stage, shared_data->nr_iter); + REPORT_GUEST_ASSERT(uc); break; default: TEST_FAIL("Unexpected guest exit\n"); --=20 2.41.0.487.g6d72f3e995-goog