From patchwork Wed Nov 29 22:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 171650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp20848vqy; Wed, 29 Nov 2023 14:49:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IHq1mp695qk+8vCVuIPmIaYFJvjYPs9V0Z7vN1mn6Tt4J/Ukx8rFT1yLLwVsNbSR0Dkl1Pe X-Received: by 2002:a17:903:451:b0:1cf:59b7:b035 with SMTP id iw17-20020a170903045100b001cf59b7b035mr18935758plb.21.1701298173475; Wed, 29 Nov 2023 14:49:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701298173; cv=none; d=google.com; s=arc-20160816; b=GFq9wFZA8n9P+hh+lOfdXlSkBK1kJVX34bdVSLM5CTjtiuWOLtsh4kkX+lolEKop7D zLHQY4+Cqhku0G39ZSR2IlzUB9KEAaDHIrUWPE0JTgWp3/jmJhRttW0xf6g5Aifqn6lS 65sHM6A98p6AqVxUSMjTu4Me7vcd7GyC+ni4T34yg5AIcIrERJ+0dWjLQ5UdXWKtVQ8d fEDzbvzo0PhU6JJC4hmIe/haxv/TlwTbo13rCF5OeoD8HZlVrezudkUMxdz/yzmave2P 1IkFX1tedZzJevnU5OQrPhZ8z5Ob/oXsIrQ9mNzwPHGa7b4e/nr0ErglqQGB2cEhEAEg 9QWA== 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=obqRJwrAc0R30oE9DQOo5RZu0y3Es0pUF6guVfZd4RE=; fh=v5DnXn8ZvKtLm17peZQF8IXOElQlZGRJrsSqfD4bA9o=; b=DgL1soFobQ6l4pKfAYMZ5pwHVmW8Ri1P7ww/+y3wO+7pUa/aIB++Eua4Top5oNdAsl t58L2KLPpNlSt5e8X9yxWLc1KDUHZ3bXQ0pncigM32dlqoJaIKDNlVv21KUV+K/bT/04 G+QFOchUKzRkZ7rqbhpBeIrbYn752TzsVJ90KFkXWonMctugQRKfIy1W1oanOwqUkQyp Dd3akcPjFwdxJdMURjeZnjR40dR/mJEe5n4lrvrTPVl117Wd5JuJl+mTyQqrGJg4Rcue wv+E3bCz4u3WaYjmliGRZlOCBf2qPNTQnxPL4LpFzh3EIuNDArlFI/gb/i8kggzxvqcL OxwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=j01pUN2F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n1-20020a170902968100b001d0068a4a3dsi3535071plp.410.2023.11.29.14.49.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 14:49:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=j01pUN2F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 8B21A802C7E0; Wed, 29 Nov 2023 14:49:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343577AbjK2WtX (ORCPT + 99 others); Wed, 29 Nov 2023 17:49:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343567AbjK2WtU (ORCPT ); Wed, 29 Nov 2023 17:49:20 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9280194 for ; Wed, 29 Nov 2023 14:49:25 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5caf86963ecso4259417b3.3 for ; Wed, 29 Nov 2023 14:49:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701298165; x=1701902965; darn=vger.kernel.org; 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=obqRJwrAc0R30oE9DQOo5RZu0y3Es0pUF6guVfZd4RE=; b=j01pUN2FfrLsdIdVuWQONS6o2QYDAtPibP9zZIe4jIeN5cS2kUhvpbzr7BF3hZjSet 2ZkCXkWYDDb3LbvsCg6MNGp/uI3ZwWjvG3tB/NpKbth1cXF9xjFCY4IOkWXkyNsTMzdF cM44Fg6edusAbgN+/1twVIToLEu87QMLKubFhD3TyKwsu4VEiK9Be/rc25ZbGe7boCMG L7S3pTyB7sD3/nbhc26aKpXgbKsbslKIwSW3f69MdMyR/aGKMoK54MEgW+idjIXrMdv7 +DCabK675yKPbgf1InOA1Ocogyl1FPlGVwNWmlKBUtG/uY4NvG+dMkkd18VNkfQdQSlJ aPkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701298165; x=1701902965; 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=obqRJwrAc0R30oE9DQOo5RZu0y3Es0pUF6guVfZd4RE=; b=kpZywE8TP02S0SUTHr8qEnubd+xuvg4zjH311AdmA1f1HKqT+lG+YN6gMp+zVRod8d L3YwyMS/0L06E5ZWu22d6o7U+e7nGORZD6X4sMT6W1D7aI4/JhdBXJJzK6ae1BsUW7MQ 8cJaNRQVWJtWE4Hj+zjY6WVlwpC3VPDgYxhaDlG1u5k4LzzC2nt7jEw1B91RhJOr5hgT 2XXwftF603CyxBclfDuoeeL8W0FQ5eI5MGeIuMWVTv0dES9rb7mV+4Jo9kX4xeI6YRtR CDbrpwwR0/Psjr7IaWZxI+o1W9b8EGGLdlRY8rXlgQ7+SkiRSbPvLXjajXALTMY8/6xM 5GRw== X-Gm-Message-State: AOJu0YzjBr9GBUfdhEz7SQES7JG9ecAxtyIaOFjmqnU3qzDgDTgvPISE 3FrGfvmpeoLLax+0hl8V6ksDc4/0a5I= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:690c:e19:b0:5ca:724d:9256 with SMTP id cp25-20020a05690c0e1900b005ca724d9256mr709697ywb.7.1701298165115; Wed, 29 Nov 2023 14:49:25 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 29 Nov 2023 14:49:15 -0800 In-Reply-To: <20231129224916.532431-1-seanjc@google.com> Mime-Version: 1.0 References: <20231129224916.532431-1-seanjc@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129224916.532431-4-seanjc@google.com> Subject: [PATCH v2 3/4] KVM: selftests: Fix broken assert messages in Hyper-V features test From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Maxim Levitsky 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_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 29 Nov 2023 14:49:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783940433842117136 X-GMAIL-MSGID: 1783940433842117136 Swap the ordering of parameters to guest asserts related to {RD,WR}MSR success/failure in the Hyper-V features test. As is, the output will be mangled and broken due to passing an integer as a string and vice versa. Opportunistically fix a benign %u vs. %lu issue as well. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86_64/hyperv_features.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_features.c b/tools/testing/selftests/kvm/x86_64/hyperv_features.c index 4bb63b6ee4a0..29f6bdbce817 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_features.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_features.c @@ -55,11 +55,11 @@ static void guest_msr(struct msr_data *msr) if (msr->fault_expected) __GUEST_ASSERT(vector == GP_VECTOR, "Expected #GP on %sMSR(0x%x), got vector '0x%x'", - msr->idx, msr->write ? "WR" : "RD", vector); + msr->write ? "WR" : "RD", msr->idx, vector); else __GUEST_ASSERT(!vector, "Expected success on %sMSR(0x%x), got vector '0x%x'", - msr->idx, msr->write ? "WR" : "RD", vector); + msr->write ? "WR" : "RD", msr->idx, vector); if (vector || is_write_only_msr(msr->idx)) goto done; @@ -102,11 +102,11 @@ static void guest_hcall(vm_vaddr_t pgs_gpa, struct hcall_data *hcall) vector = __hyperv_hypercall(hcall->control, input, output, &res); if (hcall->ud_expected) { __GUEST_ASSERT(vector == UD_VECTOR, - "Expected #UD for control '%u', got vector '0x%x'", + "Expected #UD for control '%lu', got vector '0x%x'", hcall->control, vector); } else { __GUEST_ASSERT(!vector, - "Expected no exception for control '%u', got vector '0x%x'", + "Expected no exception for control '%lu', got vector '0x%x'", hcall->control, vector); GUEST_ASSERT_EQ(res, hcall->expect); }