From patchwork Sat Jul 29 00:36:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 127987 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp818217vqg; Fri, 28 Jul 2023 20:08:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlH/HwohX/LR/6PKTVjX7Lt8irR/VDAOuxN/5FZkbP3Xw082QcGEFPGzcFqmJ7i7+pgVujTk X-Received: by 2002:a17:903:54a:b0:1b8:ae12:5610 with SMTP id jo10-20020a170903054a00b001b8ae125610mr3205747plb.7.1690600084353; Fri, 28 Jul 2023 20:08:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690600084; cv=none; d=google.com; s=arc-20160816; b=SbgLWNOM8pABygyDpedKbSeU/tvjV+150+/BMPfpRjZWJMStYjJr+pHvNyBWTwoh7n xQVMzAU01ZLgX4mlBlkc8t9fQ2zRP+Jfg4SjncYlYAD61wELv0rddEXcneL4IkXqbsMI uAVdBeybpeDb/jtwPtRBOEr1x2aJEg9zee5Nfe4RBM68/ftHcDO0S7/ejNzMvZ/bC8Zk +mdxjGSexq/YYw65SUkWsaKJldVnbTpoqm9s4N63rfxeIoUZOiS+nI6cVw5M9/KEiqC4 LYD+/G2WoS6WtUd0Snupb7boHrwEpY8fvg6WbjuzIDxSP6VkeI4gMWHZARNsA0k0GHN0 v1Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=KD9spraMrgRbnmBjQZZWWeob8eAugC00F4y37YTJw8E=; fh=Ctt0ydInMKwei8YFBFbw7rU4p8H0G/T51ZI/KkO6Md4=; b=q7u27PoPmNGWKHTUkTTKsUa9OLJm/FAeSL1/ArN0UH1zW9zr2Pr7JTD1ULw0j+hb2R 6NpBDG0hNFoIVqm7vx9SKDflN/PjNTMEkSZI9ELfkqseSGCAjJQPjNnPkQnNBz+ja3Sx d/GPCZIaly9NQLvPHypHtLvdh8be7ZRaNr2R9wHEaANdq11LAr+zIoGG2pk+Lr8iW8nU TxU8Uup7ksiCVkGT2taw2izHdXI4jlRR8H8tu4K15TEthJqhA4jk1lcDasAZZYwRznWE M69Cvm5/diVHA2kvRWjycRGXIs8wtKecxjnTas2nBEQ3kRR1Ijnpdn2PKpK3Cec61I9a bu9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="UUiGz//H"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m6-20020a632606000000b0053fbb36fc65si4070399pgm.382.2023.07.28.20.07.51; Fri, 28 Jul 2023 20:08:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="UUiGz//H"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236408AbjG2Aio (ORCPT + 99 others); Fri, 28 Jul 2023 20:38:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236395AbjG2AiV (ORCPT ); Fri, 28 Jul 2023 20:38:21 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 403E25277 for ; Fri, 28 Jul 2023 17:37:30 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1bbbc4ae328so20187865ad.1 for ; Fri, 28 Jul 2023 17:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690591031; x=1691195831; 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=KD9spraMrgRbnmBjQZZWWeob8eAugC00F4y37YTJw8E=; b=UUiGz//H+qc2VwnDcG3ap61DCiEkgcxxTwTq2PlVRzkYDYvNYeUh70lnLWpXCBXw1y ENjvzo412y0u8RsVpXc3xycSaaXoHpRTF5UONPFZsGShWgI3pIRhTRunNJJuTQ1A9uhm mnqIecy31B8Hjk0rRk237/9BlpMmLswr75hM4zTSsGCta9eHugEBieSA56LlrpFKmd6W Q7Mgfwj67nXcEUg6f552ziM8vdP6tqceVJ6jlczrAq7yuwAswE/dDCGV67Oc/x9uOuhf HdMr387q9wwaQ/lM9O6Fz189JQIUM7qwFKdn09iNwVvjAI88wPw698F9vdkbtGf62tCA svIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591031; x=1691195831; 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=KD9spraMrgRbnmBjQZZWWeob8eAugC00F4y37YTJw8E=; b=Cu/hEm8XdoPUX1QqEbAJlQg6jRzRYLhOsxUxDPaOwwBtxGrpSPVlsRgNeTZ9vNakPV nNJkQ+WHmWmUaFXxIly6BSgXR3ke4heLt+MWhG+iPjl5+a99w0tbx18o3SfFFAzrholQ tNwVUOy44ZCKLq4q2G2U7fjKhSE253c3WIXiDN9WxGog6CT3MacrFM3hSq8+zCiDATaG mG9FwdFYGLrqKxOLR0rTW35K3FYAvTGpPEIJefnOLFt63AlnAmddellJ5h078pTaSFWG 7Qvixw3gvrQNlK8AwjuLsZQfVkJleWQ7+HmJTJ1smX5ufLnMWO3e0L6NROLYOjRuvQ66 bIYQ== X-Gm-Message-State: ABy/qLaAkPVvNCMctoW3xLIBCpQ6BsKOy4K+Lg1vtqElyzWK1VdPoj24 hEPfSdTn7bEySaM2BmANaZY4ParG9iM= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:e5c1:b0:1b8:8c7:31e6 with SMTP id u1-20020a170902e5c100b001b808c731e6mr14017plf.1.1690591030967; Fri, 28 Jul 2023 17:37:10 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 17:36:22 -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-14-seanjc@google.com> Subject: [PATCH v4 13/34] KVM: selftests: Convert ARM's page fault test 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_Mathieu-Daud=C3=A9?= " , Aaron Lewis X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772722674053101618 X-GMAIL-MSGID: 1772722674053101618 Use GUEST_FAIL() in ARM's page fault test to report unexpected faults. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/aarch64/page_fault_test.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/page_fault_test.c b/tools/testing/selftests/kvm/aarch64/page_fault_test.c index e5bb8767d2cb..0b0dd90feae5 100644 --- a/tools/testing/selftests/kvm/aarch64/page_fault_test.c +++ b/tools/testing/selftests/kvm/aarch64/page_fault_test.c @@ -7,6 +7,7 @@ * hugetlbfs with a hole). It checks that the expected handling method is * called (e.g., uffd faults with the right address and write/read flag). */ +#define USE_GUEST_ASSERT_PRINTF 1 #define _GNU_SOURCE #include @@ -293,12 +294,12 @@ static void guest_code(struct test_desc *test) static void no_dabt_handler(struct ex_regs *regs) { - GUEST_ASSERT_1(false, read_sysreg(far_el1)); + GUEST_FAIL("Unexpected dabt, far_el1 = 0x%llx", read_sysreg(far_el1)); } static void no_iabt_handler(struct ex_regs *regs) { - GUEST_ASSERT_1(false, regs->pc); + GUEST_FAIL("Unexpected iabt, pc = 0x%lx", regs->pc); } static struct uffd_args { @@ -679,7 +680,7 @@ static void vcpu_run_loop(struct kvm_vm *vm, struct kvm_vcpu *vcpu, } break; case UCALL_ABORT: - REPORT_GUEST_ASSERT_2(uc, "values: %#lx, %#lx"); + REPORT_GUEST_ASSERT(uc); break; case UCALL_DONE: goto done;