From patchwork Sat Jul 29 00:36:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 127949 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp793474vqg; Fri, 28 Jul 2023 18:44:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlFdzHRwWd/ZcWzmsRDzmbdT4usce4LFa7HXG/giDHprzCw7eoViG5MGSgbdQMJrmf165Qvk X-Received: by 2002:a17:902:820c:b0:1b8:4b87:20dc with SMTP id x12-20020a170902820c00b001b84b8720dcmr3127121pln.37.1690595070260; Fri, 28 Jul 2023 18:44:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690595070; cv=none; d=google.com; s=arc-20160816; b=zrkcheEcCDt0NLHiSL4TM+SECmw0KZpWLePToh9WzcfdAUqupRTr4+IfxxzptUGri+ ta6UmUMzRBUQsrGRnEv9UP4nmnj/KCrAfE5Aw/pBXB9j+1a8UFniFl3lSDuwI7f2grVQ JIX4p70dwadRVCJF6A75XdEwt3MynaFKVLBfoMs6m1igunnbevJflEGtedJeHio9Ie84 ncl28Hn8s3x1tz6M9iyKdBLE4MrjPaQrelUDQVGvcWcmjHVIHth32qLiHeIOtsFaVDFr r1OUwzkqnRnxZQleIlROw2g7D42t0k7NYYTbt0Z9lpkeX6tzqf7qnko+YJKjVVr1LI6n wC3A== 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=wu4FIC3h9waVlshrR9u15d0CHMaQIDGVSbYx3EG04CA=; fh=Ctt0ydInMKwei8YFBFbw7rU4p8H0G/T51ZI/KkO6Md4=; b=TeZh9eyiC8BdywiUati1ntowrtU0sauXe4BdxYGMw01q3np1+R/R+211hYrD9uJAAm 1nkIME1cy0Q6vrQ6BcBdu+zjX5GPxJ3ZCwUn68ts+IVj2a4cwAFlQsI3TANqjwjFEHyu V15g8FHA8FGoKT1Dn/t44cZr7V2UC++xh3FojFehgtCo0sXikjzChZIrPTGNfKcmdZ/j LK48O7dv5M+CfF8h+EbUFbNDmfPULAyY9n2b58+WRmKIHc7Zfesa86w+Rb1iOTVA4OVs r5W7pgNCcikYdNOLk/uo6bUAno3VXG2Pvo64SBGy5G2IxfVxwRd65k77uFSlN6kXYKU4 nDZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=Q04Mf0el; 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 f11-20020a170902ce8b00b001bbf89feae3si533304plg.600.2023.07.28.18.44.17; Fri, 28 Jul 2023 18:44:30 -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=Q04Mf0el; 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 S236545AbjG2Aik (ORCPT + 99 others); Fri, 28 Jul 2023 20:38:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236301AbjG2AiR (ORCPT ); Fri, 28 Jul 2023 20:38:17 -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 4877E4497 for ; Fri, 28 Jul 2023 17:37:23 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-58440eb872aso28996867b3.3 for ; Fri, 28 Jul 2023 17:37:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690591029; x=1691195829; 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=wu4FIC3h9waVlshrR9u15d0CHMaQIDGVSbYx3EG04CA=; b=Q04Mf0el0lj42W5CyQit+deYtJ8QhAiSTuhlHtHpss5X9mHsFREv9pAjkA8Umzzpec z2MZTBlNwMlYWVVc7jlHkM0CgDBhYSqKk80RWVzksAIdRWMzevbW1mKyru4oBtXSj5H4 m6Y/c47W8GxbL3qevPjkSSP7Fvl4k1vbdy6jI1X6Mu6B/+sTNRMI9LsAHW+sZ3/Cjtna KYEmzp1hmEEjPQVxCmUas0BEGE4lj8arVq+7r3PN0H6HoRmfvsyDiXkfqpnkvZEIMNS8 xc0Ohhn24LAbCMmrkVsDurMlVKgVNxcSVlsTO0MATuz98mHcaBk17CNAUEHGB1MtfxGX D+BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591029; x=1691195829; 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=wu4FIC3h9waVlshrR9u15d0CHMaQIDGVSbYx3EG04CA=; b=lUSlx/yVIXbgqZa8MkaMW6QCNUaU5TTNr13KXESaHz4GNDf4Q/BunSMR1G6+ZJa803 AFtuaSjNulUMQz98LTaCxlGmD/0cCZhXXX29mGY50i4BGWOA45yatN5Wv9oNTeVy8TJt zScuVkn134u/zPgsoojoPXYMqPPHFYIQGMelUzDbI7xdvzwzLrGgRapmtVLQiRkm4Uas JnkvGOG0xDF0BcSLL7/e9BnJLATxKlDiYGL6l9j981AhSEovcy/am4zOJviVarh4+x3x udWuDFzSWvXwKCT/0liPx4JoG9r2iviIVAfRTtFdbi+thD8fjhviX/87Lw8PNY/6jhRE 1Nog== X-Gm-Message-State: ABy/qLbqxkvWLPflQnBrOotjoWCnpOPMRlQfE5iRwUYZdvxjJDFiy4ed 6dDZMmOa3PJAOGj6EaRfLV5d3niUMbE= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:b645:0:b0:577:4540:905a with SMTP id h5-20020a81b645000000b005774540905amr24915ywk.7.1690591029333; Fri, 28 Jul 2023 17:37:09 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 17:36:21 -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-13-seanjc@google.com> Subject: [PATCH v4 12/34] KVM: selftests: Convert ARM's hypercalls 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=unavailable 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: 1772717416265725686 X-GMAIL-MSGID: 1772717416265725686 Convert ARM's hypercalls test to use printf-based GUEST_ASSERT(). Opportunistically use GUEST_FAIL() to complain about an unexpected stage. Signed-off-by: Sean Christopherson --- .../selftests/kvm/aarch64/hypercalls.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/hypercalls.c b/tools/testing/selftests/kvm/aarch64/hypercalls.c index bef1499fb465..94555a7d3c7e 100644 --- a/tools/testing/selftests/kvm/aarch64/hypercalls.c +++ b/tools/testing/selftests/kvm/aarch64/hypercalls.c @@ -8,6 +8,7 @@ * hypercalls are properly masked or unmasked to the guest when disabled or * enabled from the KVM userspace, respectively. */ +#define USE_GUEST_ASSERT_PRINTF 1 #include #include @@ -105,15 +106,17 @@ static void guest_test_hvc(const struct test_hvc_info *hc_info) switch (stage) { case TEST_STAGE_HVC_IFACE_FEAT_DISABLED: case TEST_STAGE_HVC_IFACE_FALSE_INFO: - GUEST_ASSERT_3(res.a0 == SMCCC_RET_NOT_SUPPORTED, - res.a0, hc_info->func_id, hc_info->arg1); + __GUEST_ASSERT(res.a0 == SMCCC_RET_NOT_SUPPORTED, + "a0 = 0x%lx, func_id = 0x%x, arg1 = 0x%llx, stage = %u", + res.a0, hc_info->func_id, hc_info->arg1, stage); break; case TEST_STAGE_HVC_IFACE_FEAT_ENABLED: - GUEST_ASSERT_3(res.a0 != SMCCC_RET_NOT_SUPPORTED, - res.a0, hc_info->func_id, hc_info->arg1); + __GUEST_ASSERT(res.a0 != SMCCC_RET_NOT_SUPPORTED, + "a0 = 0x%lx, func_id = 0x%x, arg1 = 0x%llx, stage = %u", + res.a0, hc_info->func_id, hc_info->arg1, stage); break; default: - GUEST_ASSERT_1(0, stage); + GUEST_FAIL("Unexpected stage = %u", stage); } } } @@ -132,7 +135,7 @@ static void guest_code(void) guest_test_hvc(false_hvc_info); break; default: - GUEST_ASSERT_1(0, stage); + GUEST_FAIL("Unexpected stage = %u", stage); } GUEST_SYNC(stage); @@ -290,10 +293,7 @@ static void test_run(void) guest_done = true; break; case UCALL_ABORT: - REPORT_GUEST_ASSERT_N(uc, "values: 0x%lx, 0x%lx; 0x%lx, stage: %u", - GUEST_ASSERT_ARG(uc, 0), - GUEST_ASSERT_ARG(uc, 1), - GUEST_ASSERT_ARG(uc, 2), stage); + REPORT_GUEST_ASSERT(uc); break; default: TEST_FAIL("Unexpected guest exit\n");