From patchwork Tue Feb 14 08:49:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Like Xu X-Patchwork-Id: 56771 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2848015wrn; Tue, 14 Feb 2023 00:50:38 -0800 (PST) X-Google-Smtp-Source: AK7set+NozarCVSYhW0YrxES0Lj65pMSeT87LUQi7y4Dp+DikpbNXbiQMDnfxxzigFJ84b7m1QJT X-Received: by 2002:a62:1857:0:b0:593:89ab:2ec4 with SMTP id 84-20020a621857000000b0059389ab2ec4mr1194310pfy.10.1676364637851; Tue, 14 Feb 2023 00:50:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676364637; cv=none; d=google.com; s=arc-20160816; b=XBForDqPi31miU+7zkO6d6Elc9bZ73V/D6V1zg74vlappD8Vvf2sBC7ev9gX3vR/W+ 5mWBujw6YpbrEp7u0qm8MM0boFjA2MznHH2JtShj2gkjYG2YBKJaPul7MM7Qw0cfAsVA c4/nRAPBTFzuDp6zgeOWhSuZ5LAuEnca5ZPv8GbjkpoP2zFecaI6W0VVKn+M2jxjWgW/ P+c5BB9lY4XLivU8k18yvmWKUGT5nXZOpfTej01BaEiqXQFdOJu9uSf2gB5/XpwtsH1a 2YMrcu+LUZOEctUjCFjlbPbojJUB30jLBQhr/x21+VDbreHfsVW1zN82gz9Ox9nbzpVi xWHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zLTX+3sdKbK2e53JHj/d2kK8+1oHfP8YLHN7YuBU+5U=; b=EqeVWBDx1n1tRYwLHxifxCtNxTB2ttIOxYQ64yCjj2eG0seqntk5GfhL6Y9YiMFtxP ko9RiNRIsbEhGg9Bs2uY48woZFuXESI4LA3qLpMIAoxzhT89ONAVv5tIZoc9Ecz6+ElB 3EBrCWgo6DZmf9QmpZWY4PdLKcfENnPf7C4++Qpo1kF62gqmypCdOS30FwmodwV4JDSK 6uORMuM7k31l9cA5RBNCBUl0/n5au9g/Tcwk9zySftLOT2ZgbkdAE9FaT8FIzrp8d9fd pfn8N++Cr+aOzsHr3MWAVUQN9fGZzUAWvydNAjmJTWe8HSEEOjXE0gxUuUHpqqg6Ah1X t7CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QDYVPk4Y; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z129-20020a626587000000b005a8e7bda4edsi27278pfb.280.2023.02.14.00.50.26; Tue, 14 Feb 2023 00:50:37 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=QDYVPk4Y; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231804AbjBNItq (ORCPT + 99 others); Tue, 14 Feb 2023 03:49:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbjBNItn (ORCPT ); Tue, 14 Feb 2023 03:49:43 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4979317CDF; Tue, 14 Feb 2023 00:49:42 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id b5so16345228plz.5; Tue, 14 Feb 2023 00:49:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zLTX+3sdKbK2e53JHj/d2kK8+1oHfP8YLHN7YuBU+5U=; b=QDYVPk4YVjz7RAoZTzUru4gcliZdjiSORTv0S71L+4oxdukZ3G3KwTOVN+EVBMMb+j GEGRuaZG/DR1L/ZxGAQxXYtMhWQddDe4ItMR0uUSESONsKzEJ+j/T3lLLUSAHcLxJBT2 v9AhrBb2O5tsol7yjkAma2QAkS43oo+ifLuaRyVb4C0+H7k106tHr1TVxXzQQhsWuvGZ b33B5gE5yGy6ICHsNiIEJ2tsVhw5ls4KBaOfwxHVhSSVtT7ymrikoOAbrPh8R3Yc/NKL bN3solXR6APMiCyvxxhg+BUiHnbFHKaqVjkUQfPYeG2tku0G1dQBvAjHdb9V0Ej62VrG liXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zLTX+3sdKbK2e53JHj/d2kK8+1oHfP8YLHN7YuBU+5U=; b=xhPq+jsp9KOZEPuC0FT1fk77FMTnvX14wHXf0pSJxy24REAz+qbo4dKaZtQNn6k4BC UEvjmfag5cp5DejtRJ0rFvfW48Zav0eWgMR/Fz2jSMpDbf0i6HVC3J02WTU44rbKgkGA PCrlhaHlmK+qRtIA3nJZQ1aFd8KqBIcQBjLf7CbgsFoMHo8Bi57OCzWM0v9OtUa2YDEG dWI0oYxBzgM0qYYc3FpWiFph2DmYWDVkPpT45ePLHdSWbglaUEK3ZAansWqZ592xp6aq CdTFjoegnGoEzZeELzXysfYF0shaP+qGYDAwIwpXtdysD7lVuzwvg/LjV8Bmiu+jzLSm 260A== X-Gm-Message-State: AO0yUKVxwir9+jTFntQcm6UC+1tOl3hKZ7ftTAjKgk9irpH3MPCn3eCb /R3+Qg7FoqJKvRI50Sh34Si0ir7zrVQ0WYcyGys= X-Received: by 2002:a17:90b:3904:b0:233:ee50:d26d with SMTP id ob4-20020a17090b390400b00233ee50d26dmr1692314pjb.4.1676364581858; Tue, 14 Feb 2023 00:49:41 -0800 (PST) Received: from localhost.localdomain ([103.7.29.32]) by smtp.gmail.com with ESMTPSA id o9-20020a17090a3d4900b00233b1da232csm6549475pjf.41.2023.02.14.00.49.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 00:49:41 -0800 (PST) From: Like Xu X-Google-Original-From: Like Xu To: Sean Christopherson Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] KVM: selftests: Add a helper to read kvm boolean module parameters Date: Tue, 14 Feb 2023 16:49:19 +0800 Message-Id: <20230214084920.59787-2-likexu@tencent.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214084920.59787-1-likexu@tencent.com> References: <20230214084920.59787-1-likexu@tencent.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757795726370701693?= X-GMAIL-MSGID: =?utf-8?q?1757795726370701693?= From: Like Xu Add a helper function for reading kvm boolean module parameters values. No functional change intended. Signed-off-by: Like Xu --- tools/testing/selftests/kvm/include/kvm_util_base.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index fbc2a79369b8..a089c356f354 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -213,6 +213,7 @@ extern const struct vm_guest_mode_params vm_guest_mode_params[]; int open_path_or_exit(const char *path, int flags); int open_kvm_dev_path_or_exit(void); +bool get_kvm_param_bool(const char *param); bool get_kvm_intel_param_bool(const char *param); bool get_kvm_amd_param_bool(const char *param); diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 403ea0ee77ac..fae0c76c344a 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -80,6 +80,11 @@ static bool get_module_param_bool(const char *module_name, const char *param) TEST_FAIL("Unrecognized value '%c' for boolean module param", value); } +bool get_kvm_param_bool(const char *param) +{ + return get_module_param_bool("kvm", param); +} + bool get_kvm_intel_param_bool(const char *param) { return get_module_param_bool("kvm_intel", param); From patchwork Tue Feb 14 08:49:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Like Xu X-Patchwork-Id: 56772 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2848178wrn; Tue, 14 Feb 2023 00:51:07 -0800 (PST) X-Google-Smtp-Source: AK7set8aHmloVrXIY23ec2LTzyOoAWiT+d4gJuiUdgR6teBFg4OyL6LIrjOrS2UKK1m2ACOzn7ZP X-Received: by 2002:a05:6a21:998e:b0:bc:ccea:a969 with SMTP id ve14-20020a056a21998e00b000bccceaa969mr1948000pzb.26.1676364666932; Tue, 14 Feb 2023 00:51:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676364666; cv=none; d=google.com; s=arc-20160816; b=TEZXFSu372p9+PUT0UwO9noL4RD8iPA39N4sBwRHkaPrQYq3VhmOLciD/PC0bA7cMj mwYdhD7au0x7Ani4kZ1BkC+7bWRi/pCNZ+iC8OX33nf0uCm3JBjzwbMn7Z3BVhDgdX4A SdrepmxG/C7qJBL68H7QXPAG1jvC5IyoCrv92NT7a74whIoo2McjxoIzW4zfiOzleE8s DrZ8trb4iVn6ArnlUVmXKwQWZs1e6aUCFz20svAZJyLVFiGouyu4mbpi6BdPYyxEMSMx BrjYJ2jQtuiKr9SHKOnT/OBiswT3m9lJpufvWpktYkSJ/f7ancnKHzYaUOXFKGN/1c76 dF6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vlEay2KekcluULkM2aY9GsNqvKMbxc6zn+AXy38vrsQ=; b=plM7bWbqV1nLNQs0MngHJxoD0m5PFPBu6H39H3xtH9MT3FQaFmJZpTknt9iKFqXIv3 gGEHqIKqxtGtZ2UI7ZuPMxlCGH9NdtWERerRsl/r2jQ3Nuqb/rpMFq4QZPfp6mhZHifW gSHxIl7jV6cH76O8NKOgPcVzGmIFHOLVS7WPoe/+jp1jYAhAf9dA/MWhXevTH1I8tgSY PY+d72HmiAaK1INwMtfeA4lPaNkId0hOt2lYlERFGouyNH97B7UFwRVQ6MN1fJlMS13x +PU2dAFLkXhBh6uLfBuYnsll1K2HajP7CylnpY9h3vpAooFkwAVrZHiG6NSQ2rzCnvZr JdYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VfoWzIel; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n13-20020a638f0d000000b004fba8ec69f8si4971277pgd.238.2023.02.14.00.50.53; Tue, 14 Feb 2023 00:51:06 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=VfoWzIel; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232051AbjBNIt6 (ORCPT + 99 others); Tue, 14 Feb 2023 03:49:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232010AbjBNItp (ORCPT ); Tue, 14 Feb 2023 03:49:45 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF9BE1D936; Tue, 14 Feb 2023 00:49:43 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id gd1so3663584pjb.1; Tue, 14 Feb 2023 00:49:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vlEay2KekcluULkM2aY9GsNqvKMbxc6zn+AXy38vrsQ=; b=VfoWzIelLWZQjbABnEY77qXMSoK9tnMmRZv5UnbSZPb4TuxTn5rDoNtXbKyL1xzNJG zKBha3O5S8Qvcw/PPjtNOYVqYbjBxr1o3BLl4LFDuNLj53ckKR8EzYvGwwe2/Lq3zoxe W4tALUFWdvfB2HS5aGdhX102KtOb9cV9V7MCtPF5LHo+oyH/jn+HQoLPVGRQxp7qErdr r+lJMCSUN5snHb/5CZM2YQ3388XfcTsk4Qx2BmFqUvGOO6pss1gWzk7Nj3XuaBfcmURj tf+15XTOAlq9LZ6krxNalAvuru4pNjcsqpKs6dpohba79JmtdrHMZTUgQ+uHT/NeWJqU bohQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vlEay2KekcluULkM2aY9GsNqvKMbxc6zn+AXy38vrsQ=; b=5PG+Gg2s58NuxfxQEtfPr6foF5iUWVLoMUbtobcO2ylVsmtmeLXLM44jAdnNMi4ALi IeFXvk68bm4eNEPIA3lH3+VGuI4TTaBKcjyLzqqW+AwhLxohNHk052U+BvrFEzdhGkee 28zsg4crJvNsEwuCGmkNmYRyvVL6spNcGZnMMauGBbsUTeIGK3tX8Tx4ryvLDltCL4aA x7jPwXu2t6jwRHH8PoecHxeDcOCUCdqx2EyK1/zyoa/6537vWc4J6AvS5eZMOLTzKMmr dvoxjJFZcrk7cgHnC85wf1QXsS978pMnznZ2nmP66eUAFFj4oRr6V2BfJjsoulHf2Kh5 fD5Q== X-Gm-Message-State: AO0yUKUE8eDF/uG8eGX2pLhfCTbtxLd6On9vRVohDBfjqiKzXDSIKHXR 22qvaPBIal+JFt18wgdWA82mHxeQKBtb0LrWCZw= X-Received: by 2002:a17:90b:4a82:b0:233:a890:2c1d with SMTP id lp2-20020a17090b4a8200b00233a8902c1dmr1690945pjb.16.1676364583429; Tue, 14 Feb 2023 00:49:43 -0800 (PST) Received: from localhost.localdomain ([103.7.29.32]) by smtp.gmail.com with ESMTPSA id o9-20020a17090a3d4900b00233b1da232csm6549475pjf.41.2023.02.14.00.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 00:49:43 -0800 (PST) From: Like Xu X-Google-Original-From: Like Xu To: Sean Christopherson Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] KVM: selftests: Report enable_pmu module value when test is skipped Date: Tue, 14 Feb 2023 16:49:20 +0800 Message-Id: <20230214084920.59787-3-likexu@tencent.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214084920.59787-1-likexu@tencent.com> References: <20230214084920.59787-1-likexu@tencent.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757795708474783865?= X-GMAIL-MSGID: =?utf-8?q?1757795757312493952?= From: Like Xu Running x86_64/pmu_event_filter_test with enable_pmu globally disabled will report the following skipping prompt: 1..0 # SKIP - Requirement not met: use_intel_pmu() || use_amd_pmu() this can be confusing, so add a check on enable_pmu. Signed-off-by: Like Xu --- tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c index bad7ef8c5b92..070bc8a60a7f 100644 --- a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +++ b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c @@ -771,6 +771,7 @@ int main(int argc, char *argv[]) TEST_REQUIRE(kvm_has_cap(KVM_CAP_PMU_EVENT_FILTER)); TEST_REQUIRE(kvm_has_cap(KVM_CAP_PMU_EVENT_MASKED_EVENTS)); + TEST_REQUIRE(get_kvm_param_bool("enable_pmu")); TEST_REQUIRE(use_intel_pmu() || use_amd_pmu()); guest_code = use_intel_pmu() ? intel_guest_code : amd_guest_code;