From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30B92C43460 for ; Tue, 11 May 2021 09:11:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F286A6143C for ; Tue, 11 May 2021 09:11:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231265AbhEKJMo (ORCPT ); Tue, 11 May 2021 05:12:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47124 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230445AbhEKJMn (ORCPT ); Tue, 11 May 2021 05:12:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620724297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Lkp95SPydZDib4PjSFRU1F6sJGwo/bYt24UxdjYiZi0=; b=bI/Y2JVFgqg/GgsdweGIMvFw2oItiVBibuKnbSZlZwPv6RkloiFNq8b7/gGkNgbvAIbPM9 nVtQlDtqzcq6KP+diU1KK8mJH0BMBpjojioISU2SeP5WGNhGI/pqZNOSOcZWjXct6qUFg3 ZAJHn28+cC+P28xQFLNC9EOACqSzceY= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-18-P21s5RAzMm2kmoIZuW46PQ-1; Tue, 11 May 2021 05:11:34 -0400 X-MC-Unique: P21s5RAzMm2kmoIZuW46PQ-1 Received: by mail-ej1-f72.google.com with SMTP id k9-20020a17090646c9b029039d323bd239so5683446ejs.16 for ; Tue, 11 May 2021 02:11:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Lkp95SPydZDib4PjSFRU1F6sJGwo/bYt24UxdjYiZi0=; b=k9WER1OjCseGiXk0/qjJuGfGOvQnSscMxJitndA+OqfjHVl56fHSaT572whuG+Dnmz VnGwpVaVD8/CqxuhL8ecqLz3VOos3O52BsLcmtSxjtAIxGR+GTloFqVbHNDz7pDHtHZa G1GXzYV+Ug/1PwOy6WlsHP9ldMzqv8DpMLfvxdWUwC0PpNtyjcgCgZWPrQq0nZk5FyCx +lGRNS+f8w2syn/T3EG3OJLlyFF8hEhe1eZ/1cbCg2t1rpMZE4yqA8JgkD3XsPTTRQky UKYbd44TtChRTPBqcB3bDRJBEJye/Xq6Ssl82WPz+Fo/fcSgKJFB6Brs0PdzELJlqAz7 H1VA== X-Gm-Message-State: AOAM532UkHuDBjG7WSetv3MEv3xR6gQiPtwzzcD06ar/+UyyhLMrxOGA 3VdzG8+3Cw1MHPzK2lxJIRVkkoEonl36Encaeuz7W9yx4MU7d+Cw0b8yB2kkmUcvN2WBENirgIs rTkxMg7xxoH2k X-Received: by 2002:a17:907:1183:: with SMTP id uz3mr29855468ejb.264.1620724293604; Tue, 11 May 2021 02:11:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwW1HxwRnR6QGAomXex8IQxJo8SmItk7gg0bWvB1p4VX8x8Y2yxgvgRziiwKcbhMLnnzots6w== X-Received: by 2002:a17:907:1183:: with SMTP id uz3mr29855452ejb.264.1620724293423; Tue, 11 May 2021 02:11:33 -0700 (PDT) Received: from gator (cst2-174-132.cust.vodafone.cz. [31.30.174.132]) by smtp.gmail.com with ESMTPSA id v14sm13820490edx.5.2021.05.11.02.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 02:11:33 -0700 (PDT) Date: Tue, 11 May 2021 11:11:31 +0200 From: Andrew Jones To: David Matlack Cc: kvm@vger.kernel.org, Paolo Bonzini , Aaron Lewis Subject: Re: [PATCH v3] KVM: selftests: Print a message if /dev/kvm is missing Message-ID: <20210511091131.dywh2mkpazizyjhb@gator> References: <20210510174639.1130344-1-dmatlack@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210510174639.1130344-1-dmatlack@google.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, May 10, 2021 at 05:46:39PM +0000, David Matlack wrote: > If a KVM selftest is run on a machine without /dev/kvm, it will exit > silently. Make it easy to tell what's happening by printing an error > message. > > Opportunistically consolidate all codepaths that open /dev/kvm into a > single function so they all print the same message. > > This slightly changes the semantics of vm_is_unrestricted_guest() by > changing a TEST_ASSERT() to exit(KSFT_SKIP). However > vm_is_unrestricted_guest() is only called in one place > (x86_64/mmio_warning_test.c) and that is to determine if the test should > be skipped or not. > > Signed-off-by: David Matlack > --- > .../testing/selftests/kvm/include/kvm_util.h | 1 + > tools/testing/selftests/kvm/lib/kvm_util.c | 45 +++++++++++++------ > .../selftests/kvm/lib/x86_64/processor.c | 16 ++----- > .../kvm/x86_64/get_msr_index_features.c | 8 +--- > 4 files changed, 38 insertions(+), 32 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h > index a8f022794ce3..84982eb02b29 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -77,6 +77,7 @@ struct vm_guest_mode_params { > }; > extern const struct vm_guest_mode_params vm_guest_mode_params[]; > > +int open_kvm_dev_path_or_exit(void); > int kvm_check_cap(long cap); > int vm_enable_cap(struct kvm_vm *vm, struct kvm_enable_cap *cap); > int vcpu_enable_cap(struct kvm_vm *vm, uint32_t vcpu_id, > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index fc83f6c5902d..e53f4c0953dc 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -31,6 +31,33 @@ static void *align(void *x, size_t size) > return (void *) (((size_t) x + mask) & ~mask); > } > > +/* > + * Open KVM_DEV_PATH if available, otherwise exit the entire program. > + * > + * Input Args: > + * flags - The flags to pass when opening KVM_DEV_PATH. > + * > + * Return: > + * The opened file descriptor of /dev/kvm. > + */ > +int _open_kvm_dev_path_or_exit(int flags) nit: Could be static or have its prototype added to kvm_util.h > +{ > + int fd; > + > + fd = open(KVM_DEV_PATH, flags); > + if (fd < 0) { > + print_skip("%s not available", KVM_DEV_PATH); > + exit(KSFT_SKIP); > + } > + > + return fd; > +} > + > +int open_kvm_dev_path_or_exit(void) > +{ > + return _open_kvm_dev_path_or_exit(O_RDONLY); > +} > + > /* > * Capability > * > @@ -52,10 +79,7 @@ int kvm_check_cap(long cap) > int ret; > int kvm_fd; > > - kvm_fd = open(KVM_DEV_PATH, O_RDONLY); > - if (kvm_fd < 0) > - exit(KSFT_SKIP); > - > + kvm_fd = open_kvm_dev_path_or_exit(); > ret = ioctl(kvm_fd, KVM_CHECK_EXTENSION, cap); > TEST_ASSERT(ret != -1, "KVM_CHECK_EXTENSION IOCTL failed,\n" > " rc: %i errno: %i", ret, errno); > @@ -128,9 +152,7 @@ void vm_enable_dirty_ring(struct kvm_vm *vm, uint32_t ring_size) > > static void vm_open(struct kvm_vm *vm, int perm) > { > - vm->kvm_fd = open(KVM_DEV_PATH, perm); > - if (vm->kvm_fd < 0) > - exit(KSFT_SKIP); > + vm->kvm_fd = _open_kvm_dev_path_or_exit(perm); > > if (!kvm_check_cap(KVM_CAP_IMMEDIATE_EXIT)) { > print_skip("immediate_exit not available"); > @@ -925,9 +947,7 @@ static int vcpu_mmap_sz(void) > { > int dev_fd, ret; > > - dev_fd = open(KVM_DEV_PATH, O_RDONLY); > - if (dev_fd < 0) > - exit(KSFT_SKIP); > + dev_fd = open_kvm_dev_path_or_exit(); > > ret = ioctl(dev_fd, KVM_GET_VCPU_MMAP_SIZE, NULL); > TEST_ASSERT(ret >= sizeof(struct kvm_run), > @@ -2015,10 +2035,7 @@ bool vm_is_unrestricted_guest(struct kvm_vm *vm) > > if (vm == NULL) { > /* Ensure that the KVM vendor-specific module is loaded. */ > - f = fopen(KVM_DEV_PATH, "r"); > - TEST_ASSERT(f != NULL, "Error in opening KVM dev file: %d", > - errno); > - fclose(f); > + close(open_kvm_dev_path_or_exit()); > } > > f = fopen("/sys/module/kvm_intel/parameters/unrestricted_guest", "r"); > diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c > index a8906e60a108..efe235044421 100644 > --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c > +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c > @@ -657,9 +657,7 @@ struct kvm_cpuid2 *kvm_get_supported_cpuid(void) > return cpuid; > > cpuid = allocate_kvm_cpuid2(); > - kvm_fd = open(KVM_DEV_PATH, O_RDONLY); > - if (kvm_fd < 0) > - exit(KSFT_SKIP); > + kvm_fd = open_kvm_dev_path_or_exit(); > > ret = ioctl(kvm_fd, KVM_GET_SUPPORTED_CPUID, cpuid); > TEST_ASSERT(ret == 0, "KVM_GET_SUPPORTED_CPUID failed %d %d\n", > @@ -691,9 +689,7 @@ uint64_t kvm_get_feature_msr(uint64_t msr_index) > > buffer.header.nmsrs = 1; > buffer.entry.index = msr_index; > - kvm_fd = open(KVM_DEV_PATH, O_RDONLY); > - if (kvm_fd < 0) > - exit(KSFT_SKIP); > + kvm_fd = open_kvm_dev_path_or_exit(); > > r = ioctl(kvm_fd, KVM_GET_MSRS, &buffer.header); > TEST_ASSERT(r == 1, "KVM_GET_MSRS IOCTL failed,\n" > @@ -986,9 +982,7 @@ struct kvm_msr_list *kvm_get_msr_index_list(void) > struct kvm_msr_list *list; > int nmsrs, r, kvm_fd; > > - kvm_fd = open(KVM_DEV_PATH, O_RDONLY); > - if (kvm_fd < 0) > - exit(KSFT_SKIP); > + kvm_fd = open_kvm_dev_path_or_exit(); > > nmsrs = kvm_get_num_msrs_fd(kvm_fd); > list = malloc(sizeof(*list) + nmsrs * sizeof(list->indices[0])); > @@ -1312,9 +1306,7 @@ struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void) > return cpuid; > > cpuid = allocate_kvm_cpuid2(); > - kvm_fd = open(KVM_DEV_PATH, O_RDONLY); > - if (kvm_fd < 0) > - exit(KSFT_SKIP); > + kvm_fd = open_kvm_dev_path_or_exit(); > > ret = ioctl(kvm_fd, KVM_GET_SUPPORTED_HV_CPUID, cpuid); > TEST_ASSERT(ret == 0, "KVM_GET_SUPPORTED_HV_CPUID failed %d %d\n", > diff --git a/tools/testing/selftests/kvm/x86_64/get_msr_index_features.c b/tools/testing/selftests/kvm/x86_64/get_msr_index_features.c > index cb953df4d7d0..8aed0db1331d 100644 > --- a/tools/testing/selftests/kvm/x86_64/get_msr_index_features.c > +++ b/tools/testing/selftests/kvm/x86_64/get_msr_index_features.c > @@ -37,9 +37,7 @@ static void test_get_msr_index(void) > int old_res, res, kvm_fd, r; > struct kvm_msr_list *list; > > - kvm_fd = open(KVM_DEV_PATH, O_RDONLY); > - if (kvm_fd < 0) > - exit(KSFT_SKIP); > + kvm_fd = open_kvm_dev_path_or_exit(); > > old_res = kvm_num_index_msrs(kvm_fd, 0); > TEST_ASSERT(old_res != 0, "Expecting nmsrs to be > 0"); > @@ -101,9 +99,7 @@ static void test_get_msr_feature(void) > int res, old_res, i, kvm_fd; > struct kvm_msr_list *feature_list; > > - kvm_fd = open(KVM_DEV_PATH, O_RDONLY); > - if (kvm_fd < 0) > - exit(KSFT_SKIP); > + kvm_fd = open_kvm_dev_path_or_exit(); > > old_res = kvm_num_feature_msrs(kvm_fd, 0); > TEST_ASSERT(old_res != 0, "Expecting nmsrs to be > 0"); > -- > 2.31.1.607.g51e8a6a459-goog > Reviewed-by: Andrew Jones Thanks, drew