From patchwork Tue Oct 5 14:13:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Gonda X-Patchwork-Id: 12536889 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F5BBC43217 for ; Tue, 5 Oct 2021 14:15:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5971D6115B for ; Tue, 5 Oct 2021 14:15:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235307AbhJEORG (ORCPT ); Tue, 5 Oct 2021 10:17:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235421AbhJEOQ6 (ORCPT ); Tue, 5 Oct 2021 10:16:58 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0395AC0612A3 for ; Tue, 5 Oct 2021 07:14:13 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id i21-20020a253b15000000b005b9c0fbba45so11139298yba.20 for ; Tue, 05 Oct 2021 07:14:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=L0F0DtkdIIrbs8f7DAXmFKruhVt9GF1SIWpOBzoL0lA=; b=enoXjhm8FV8eYVvHHIqW1l2YQ4FkRKbHUMo2M2/ikjHiI84dsyYHfDoI5+nOBJYzKZ WrGW50vemb6hntMAQfOirRtxZwA8w6Y7zPBINqK47RDHWLmJXbnEMSdURS3rgH2juLEf MI7YkVIGi4Z4EuSTb6IkUcwqEtkpawnx3bchGaUkZ3WiglFW3FDD6360mIBTvNuJrSSb 7Wq6n/towapHS7032Ucumk/8Qf2bBGulN+JvilxNT9zT5I2bcwhxDtFsJ6FKBB8UZoMT 6s7M3xVe0RbO8OCoATx5+MoY7XGCsSSWHyN9DXoysencDUsrUgGQB0yORoydZVu89C8w w21A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=L0F0DtkdIIrbs8f7DAXmFKruhVt9GF1SIWpOBzoL0lA=; b=irg0FdAJOLpR48CnsnswuqvTlkCl59ChdHcTT3CBFhlz9wjvv+3PWLu3E3TInXxpaF AzVhEIKGnurcGprtEizNl8jOoAxCPmvIPJv+MQzRQ1YRVWdJIbsWWBqQOgxo+xJ1l/z/ FjOTiYP0XFva6K+Nmla80ZEqm2mGt/7wlxJQxdCr1h6Mm1PW7RcHeQTqsn9kOnNG+3dU AbihBeJgqF9b8x3KeGIdriTCSNNSQMBtcVqVUIV5W1wIVbq/P9pdcNKFGzcuuT3M5u6+ 8vFCQyeG5vXs12ZPTo7Ut4avKhSbdghkOUpuVBc1aiPEJtAfOPCdysko07EqIGESw4RG Q8Jg== X-Gm-Message-State: AOAM533e0sK1ogkk9ZQ7hHcoKL0fZ9HtSuve9Nw/S/Zk8NIKIXfwg6BU X/LTXQ2SEY0Yg/NoVM432GZSrLpCyKbR5eVI1du3bzzpbYh9rLoOiqxb2m+BTdyCiilO73GQ7KZ iDC5qxKrudRqhqLInTTu9lZ8i5gDFE6qynn2HI+VgLipmse6MOXlaeMGTmg== X-Google-Smtp-Source: ABdhPJwdZLTb4dD44FIpStZdluAYYFEIGjipl50EkD6h+SzduEAT8p9G8XOL8D1aeuIcBR22fel86jUFvBk= X-Received: from pgonda1.kir.corp.google.com ([2620:15c:29:204:225f:7216:6111:7f1c]) (user=pgonda job=sendgmr) by 2002:a25:4788:: with SMTP id u130mr21060260yba.489.1633443252162; Tue, 05 Oct 2021 07:14:12 -0700 (PDT) Date: Tue, 5 Oct 2021 07:13:56 -0700 In-Reply-To: <20211005141357.2393627-1-pgonda@google.com> Message-Id: <20211005141357.2393627-4-pgonda@google.com> Mime-Version: 1.0 References: <20211005141357.2393627-1-pgonda@google.com> X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog Subject: [PATCH 3/4 V9] selftest: KVM: Add open sev dev helper From: Peter Gonda To: kvm@vger.kernel.org Cc: Peter Gonda , Sean Christopherson , Marc Orr , Paolo Bonzini , David Rientjes , "Dr . David Alan Gilbert" , Brijesh Singh , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Refactors out open path support from open_kvm_dev_path_or_exit() and adds new helper for SEV device path. Signed-off-by: Peter Gonda Suggested-by: Sean Christopherson Reviewed-by: Marc Orr Cc: Marc Orr Cc: Paolo Bonzini Cc: Sean Christopherson Cc: David Rientjes Cc: Dr. David Alan Gilbert Cc: Brijesh Singh Cc: Vitaly Kuznetsov Cc: Wanpeng Li Cc: Jim Mattson Cc: Joerg Roedel Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- .../testing/selftests/kvm/include/kvm_util.h | 1 + .../selftests/kvm/include/x86_64/svm_util.h | 2 ++ tools/testing/selftests/kvm/lib/kvm_util.c | 24 +++++++++++-------- tools/testing/selftests/kvm/lib/x86_64/svm.c | 13 ++++++++++ 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 010b59b13917..368e88305046 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -80,6 +80,7 @@ struct vm_guest_mode_params { }; 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); int kvm_check_cap(long cap); int vm_enable_cap(struct kvm_vm *vm, struct kvm_enable_cap *cap); diff --git a/tools/testing/selftests/kvm/include/x86_64/svm_util.h b/tools/testing/selftests/kvm/include/x86_64/svm_util.h index b7531c83b8ae..587fbe408b99 100644 --- a/tools/testing/selftests/kvm/include/x86_64/svm_util.h +++ b/tools/testing/selftests/kvm/include/x86_64/svm_util.h @@ -46,4 +46,6 @@ static inline bool cpu_has_svm(void) return ecx & CPUID_SVM; } +int open_sev_dev_path_or_exit(void); + #endif /* SELFTEST_KVM_SVM_UTILS_H */ diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 10a8ed691c66..06a6c04010fb 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -31,6 +31,19 @@ static void *align(void *x, size_t size) return (void *) (((size_t) x + mask) & ~mask); } +int open_path_or_exit(const char *path, int flags) +{ + int fd; + + fd = open(path, flags); + if (fd < 0) { + print_skip("%s not available (errno: %d)", path, errno); + exit(KSFT_SKIP); + } + + return fd; +} + /* * Open KVM_DEV_PATH if available, otherwise exit the entire program. * @@ -42,16 +55,7 @@ static void *align(void *x, size_t size) */ static int _open_kvm_dev_path_or_exit(int flags) { - int fd; - - fd = open(KVM_DEV_PATH, flags); - if (fd < 0) { - print_skip("%s not available, is KVM loaded? (errno: %d)", - KVM_DEV_PATH, errno); - exit(KSFT_SKIP); - } - - return fd; + return open_path_or_exit(KVM_DEV_PATH, flags); } int open_kvm_dev_path_or_exit(void) diff --git a/tools/testing/selftests/kvm/lib/x86_64/svm.c b/tools/testing/selftests/kvm/lib/x86_64/svm.c index 2ac98d70d02b..14a8618efa9c 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/svm.c +++ b/tools/testing/selftests/kvm/lib/x86_64/svm.c @@ -13,6 +13,8 @@ #include "processor.h" #include "svm_util.h" +#define SEV_DEV_PATH "/dev/sev" + struct gpr64_regs guest_regs; u64 rflags; @@ -160,3 +162,14 @@ void nested_svm_check_supported(void) exit(KSFT_SKIP); } } + +/* + * Open SEV_DEV_PATH if available, otherwise exit the entire program. + * + * Return: + * The opened file descriptor of /dev/sev. + */ +int open_sev_dev_path_or_exit(void) +{ + return open_path_or_exit(SEV_DEV_PATH, 0); +}