From patchwork Wed Nov 29 22:49:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 171649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp20844vqy; Wed, 29 Nov 2023 14:49:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IFv6uLu4nm4qF9gL/lc2ix7F7ViBCQTfgMWQblsMVvMUqeJVM8qeLv6IUpWuajzyqUJF6j0 X-Received: by 2002:a17:902:c211:b0:1cf:c9ca:501e with SMTP id 17-20020a170902c21100b001cfc9ca501emr11592238pll.4.1701298173172; 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=uZVTShxOrSwX07NwF89DJHPN6NIUlm7l5RBvS3ZEfTduFKnAruhXg6wPtejTerS9Cs XZoQoRBRCkSv4JuwnHIZvRw6bG+mdPVvg18c7Af4SW8YLZd8reRVh3EFGMY0w0IpiAuz CQMr9U9gjDCXHE2vrBUacAp6H3BUPAHmQTTyI62jIIZCktR9j+7ygdvpjyp+zyEs5hQV hXlZmLd/Dlw36BiV6iN2DxYEXieLIuvLRyA8kPld/odme8rsk5Vg0zW74MbQS8pxHwwZ GC/21Xg42jkIvjM0ZYybsn3bWDdyv4QqPeittjmzSS0OuQ6W0EHoyXOb+Lf8xgYT5KQ1 4TZg== 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=jcB+0ufG8RNDzGznsHxIgoB+eIgiTMrBs/Lse4iREj8=; fh=v5DnXn8ZvKtLm17peZQF8IXOElQlZGRJrsSqfD4bA9o=; b=PelhRAtYGU/jjO8LuOzM4niQLbZBSuHN0ZNG8GBSD3C5/TAfHtDH4oIICw3nFWjmwz yblHkAi0w/qKIIyz1JO0/bO5LmY7y5h4AHp/NJewBO1iBIsX/7GxSe/qLeMnPif61fUk 950ge+Z/2jy/XsQnb1RkBc0bwXAydRnZw7YkuqPAg/Rl++1hwXI15goVeJqMKsdcABsK SaiuRNs98QXB8EISEXu2DVpsr5teuEBVmAAaoKweWngl5ct131WX96vaD5IhjhvPRBPn FHy7h7Ar74L0FV3OM325Osu7kc/InZEDpiIkd6Xc+jjH6j2Kg+NXp4YeO6C9UxVgY2e5 DprQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=SunDNM5+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id z11-20020a170903018b00b001cfee3a6708si5425690plg.150.2023.11.29.14.49.31 (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:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=SunDNM5+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 4425080BD519; Wed, 29 Nov 2023 14:49:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233055AbjK2WtQ (ORCPT + 99 others); Wed, 29 Nov 2023 17:49:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231575AbjK2WtP (ORCPT ); Wed, 29 Nov 2023 17:49:15 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB12B131 for ; Wed, 29 Nov 2023 14:49:21 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-6cb9dd2ab9cso326338b3a.3 for ; Wed, 29 Nov 2023 14:49:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701298161; x=1701902961; 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=jcB+0ufG8RNDzGznsHxIgoB+eIgiTMrBs/Lse4iREj8=; b=SunDNM5+HWKgI2Dw6O6zLkHFzNp81SfN6D8k9EE84c+NY1ZS5HjuXZtaPFvZz2lXuw wZZuNYc57zBjtx/iht6V13qU4sjzldsOIMBWaFlNAdOZorjGo64oxGaojZETQH4zBT9u w6vyWR7Jl6rzdrl/FOTjCn16aYZPvduNZ4pgRfgMzJYjGMZu/Hd5BuBuL8NJWu4msnhK jiz2FJpMcZ8+wmzwliDsp52VzW9dHvLz9QekyZwCGJ33DeL31SD36Pygv2MhkUZfPW6a kZPtgfW+RD8jkPRQNxNbuHI1hZ+yC28pigQe9r4ra4hSUiSlNlR97wAsMCm/wQ6Z/O3K wZkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701298161; x=1701902961; 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=jcB+0ufG8RNDzGznsHxIgoB+eIgiTMrBs/Lse4iREj8=; b=r156yOuFaO3lnU8OlKlVVlKxZpz81BS57fKuyn2P8QgJd8qhfl8zZxnd4ydTLOezjf bnfO7711fNXErOrAIOqz4Bs+effb6CA25E3tDfKCDxcjzY/VuTrz5/1HObBhp4WT3GUx mc/s69vLm8OyOrxo7jDTHnu+CfPN196SEblwW7eO46ev8GvgBlpsbE3SWkkxew7eaU5o K4vMcx5wCy25Cdh7N1oQNpUnlsgJ59ZGddsFRlvafMExHZXUXlDOEzxTSymGg+7Ly5VG uG1gMriMSSHL+mVgGuCAO5n4dzj4wuaVFeLXAIeLV/+vlrBAM84eq01VH6Fa6+zlR048 77eQ== X-Gm-Message-State: AOJu0YyYPM4h5yLOLlAAPZSvmr5HmEQioldLnA4KMWY6ttV6K+NqDN7z 3Tc9U7YaKNw5kpcy46Vz2zjbYo6pq3I= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:1389:b0:6cb:95ab:cf8d with SMTP id t9-20020a056a00138900b006cb95abcf8dmr5297305pfg.6.1701298161246; Wed, 29 Nov 2023 14:49:21 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 29 Nov 2023 14:49:13 -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-2-seanjc@google.com> Subject: [PATCH v2 1/4] KVM: selftests: Fix MWAIT error message when guest assertion fails 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=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Wed, 29 Nov 2023 14:49:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783940433279419682 X-GMAIL-MSGID: 1783940433279419682 Print out the test and vector as intended when a guest assert fails an assertion regarding MONITOR/MWAIT faulting. Unfortunately, the guest printf support doesn't detect such issues at compile-time, so the bug manifests as a confusing error message, e.g. in the most confusing case, the test complains that it got vector "0" instead of expected vector "0". Fixes: 0f52e4aaa614 ("KVM: selftests: Convert the MONITOR/MWAIT test to use printf guest asserts") Reviewed-by: Maxim Levitsky Link: https://lore.kernel.org/r/20231107182159.404770-1-seanjc@google.com Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c b/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c index 80aa3d8b18f8..853802641e1e 100644 --- a/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c +++ b/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c @@ -27,10 +27,12 @@ do { \ \ if (fault_wanted) \ __GUEST_ASSERT((vector) == UD_VECTOR, \ - "Expected #UD on " insn " for testcase '0x%x', got '0x%x'", vector); \ + "Expected #UD on " insn " for testcase '0x%x', got '0x%x'", \ + testcase, vector); \ else \ __GUEST_ASSERT(!(vector), \ - "Expected success on " insn " for testcase '0x%x', got '0x%x'", vector); \ + "Expected success on " insn " for testcase '0x%x', got '0x%x'", \ + testcase, vector); \ } while (0) static void guest_monitor_wait(int testcase)