From patchwork Fri Aug 4 00:42:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 130897 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1512781vqx; Thu, 3 Aug 2023 18:30:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlELtflWAOLMcpLoyWFxxQzY4KeKjD0apuX+m+ChfIe5GQr7EqIHt7YH3mrDoXDLfuxc/rs4 X-Received: by 2002:a05:6402:5110:b0:51e:5dd8:fc59 with SMTP id m16-20020a056402511000b0051e5dd8fc59mr17362517edd.1.1691112645640; Thu, 03 Aug 2023 18:30:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691112645; cv=none; d=google.com; s=arc-20160816; b=qPJ01N6m8YGqydCJUDFpJwZq7BP07NYDDdvhvfsH/Af8bjioO2LoFAHPNfZV3h7lKd TL6QZGRbxoirIjt2XfIFCBRpyJkji999OZnwYSzJt1c8hPyaZzkGV+fQii2u71Z5nUHA gzcNKWKhcaoXZ/7Bu0D8FCt2LyCM5+W2UdHXoFSbm2SAcSGuNaVUFjbpzfJ+VIBeBroU mSD9031incwEzhajVxzNtO7Da87obqdasanzrp0cfFniL3vM6fnaZYdt2k2kLkN+gpzs s85kNwlnbwynrwwOSrh5N83RXd04aedm70ujQhNeZi/80TCrNAU7TTabf8rKNsUXFfuJ Q+9Q== 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=TPdXiND7N94yuFEwSbECpKkQfmAanLh9RZ+A6BrvR7M=; fh=jdyEzCL89deFuH/4WkyySWR4owAlX/kNfdjkQ94Vils=; b=ULF8PWAe/IGZzLLnkDIO/Z8E3sHEuFsnI6hkWMthziD16VHYrjQvQ0hb8lxj12lGcn X8Ra1Fe4nLHheuDXvHS4fSabVxcTJKdTi2ynVyGGKstu6RoNdSGn6rvaSAGySqT4WzDk PbxE667njFWp7yVNKCIGSaeeS3FKHxldkz7po/5+UiGgeU5/WCGNNguGR2Br5lGW65un +WFbJhx7vlMQga5E7bz16ArbYolNvtLsSAquqb4c8fozu6HBbnkec1PAn7sqaOMcygGC W4Tb3Di5YXd8tOk5ZKWerecudCDmLwJJMEAAGZydR9qPnFoVBBHCMkKWzkB2VS+/kU7Y Bifg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=2tZIajDG; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r2-20020aa7d142000000b00522c1367415si698928edo.658.2023.08.03.18.30.21; Thu, 03 Aug 2023 18:30:45 -0700 (PDT) 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=@google.com header.s=20221208 header.b=2tZIajDG; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232648AbjHDAnb (ORCPT + 99 others); Thu, 3 Aug 2023 20:43:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232749AbjHDAnE (ORCPT ); Thu, 3 Aug 2023 20:43:04 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D567F49F5 for ; Thu, 3 Aug 2023 17:42:30 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1bbbc4ae328so12083665ad.1 for ; Thu, 03 Aug 2023 17:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691109750; x=1691714550; 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=TPdXiND7N94yuFEwSbECpKkQfmAanLh9RZ+A6BrvR7M=; b=2tZIajDGiYM8LOP6oRS7sIm2pcBnaXfZ7Wymplbdn69KUU8q53NcZ7y0HFK8pN3rJv XsgnlEdOHLu6ZqLedVwaja+dve26SOtilLHroxOKcn1gMKyUuqCKj30/Z97mg+qQ0A5R 3Ikj3Cg1e6W0kaLu9miTZWiHb9zsHokxrA3qv+mc/lCMvO6k2YOsSQj0EFs1erqLxsGU 3tJpi1uPKeG7pLmg5VlnYlIpw8x0qWFmi2sg4OydjUAuuqTERt756yyvc0gyoig//M6H 5fTKOOVxD2iGkXDjRyyWPE5G1u+8j6kSj/3rqzdeuj9Xdr5V2hQG6q1B7q16VMnrsqdk zf2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691109750; x=1691714550; 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=TPdXiND7N94yuFEwSbECpKkQfmAanLh9RZ+A6BrvR7M=; b=Xu9uRQfdLYOcd4RmRjDP9S8PwYhWjThZSnHP+QHxGoU/k8hTJpxitbVkk2jNTvrPeS 1CW4fhakKkjDy0otXCQbmLDvjPxJAkdAWpxVopEZIjS3n9CysrM96kSqOR/wWrkbv26p IyARcrnRsM2On7QAAjQv+Z3z7PHkdRs0nMECl+h6B4ISOExscbzhW15bxwfig2dP4hmO 6LZJCmZflwfOMwQ9GCsG1+clEdy7Cp3Bsr1dq5+gnJ1ax4ky2HtwXs3mHgKpU5lT7vdU JkWxpLSv4GUSdoGVtBLpYXiDk+tyi2rTBGGDb8RZu86uMiWmn1Wov+DC97Crr19r4NfO 9XgA== X-Gm-Message-State: AOJu0YxzIPiveMNUVgsKmAA9oW1dKSQ6uE2aQaFb5U8rLiUPj1XiH/py hBuZKgoZXFQTOTK+3taBGXj+vPCFT6Y= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:903:32d2:b0:1b8:5541:9d4d with SMTP id i18-20020a17090332d200b001b855419d4dmr1307plr.6.1691109750368; Thu, 03 Aug 2023 17:42:30 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 3 Aug 2023 17:42:23 -0700 In-Reply-To: <20230804004226.1984505-1-seanjc@google.com> Mime-Version: 1.0 References: <20230804004226.1984505-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.585.gd2178a4bd4-goog Message-ID: <20230804004226.1984505-2-seanjc@google.com> Subject: [PATCH 1/4] KVM: selftests: Drop the single-underscore ioctl() helpers From: Sean Christopherson To: Marc Zyngier , Oliver Upton Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Sean Christopherson , Michal Luczaj 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=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: INBOX X-GMAIL-THRID: 1773260133429061357 X-GMAIL-MSGID: 1773260133429061357 Drop _kvm_ioctl(), _vm_ioctl(), and _vcpu_ioctl(), as they are no longer used by anything other than the no-underscores variants (and may have never been used directly). The single-underscore variants were never intended to be a "feature", they were a stopgap of sorts to ease the conversion to pretty printing ioctl() names when reporting errors. Opportunistically add a comment explaining when to use __KVM_IOCTL_ERROR() versus KVM_IOCTL_ERROR(). The single-underscore macros were subtly ensuring that the name of the ioctl() was printed on error, i.e. it's all too easy to overlook the fact that using __KVM_IOCTL_ERROR() is intentional. Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/kvm_util_base.h | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 07732a157ccd..90b7739ca204 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -227,6 +227,13 @@ static inline bool kvm_has_cap(long cap) #define __KVM_SYSCALL_ERROR(_name, _ret) \ "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno) +/* + * Use the "inner", double-underscore macro when reporting errors from within + * other macros so that the name of ioctl() and not its literal numeric value + * is printed on error. The "outer" macro is strongly preferred when reporting + * errors "directly", i.e. without an additional layer of macros, as it reduces + * the probability of passing in the wrong string. + */ #define __KVM_IOCTL_ERROR(_name, _ret) __KVM_SYSCALL_ERROR(_name, _ret) #define KVM_IOCTL_ERROR(_ioctl, _ret) __KVM_IOCTL_ERROR(#_ioctl, _ret) @@ -239,17 +246,13 @@ static inline bool kvm_has_cap(long cap) #define __kvm_ioctl(kvm_fd, cmd, arg) \ kvm_do_ioctl(kvm_fd, cmd, arg) - -#define _kvm_ioctl(kvm_fd, cmd, name, arg) \ +#define kvm_ioctl(kvm_fd, cmd, arg) \ ({ \ int ret = __kvm_ioctl(kvm_fd, cmd, arg); \ \ - TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(name, ret)); \ + TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(#cmd, ret)); \ }) -#define kvm_ioctl(kvm_fd, cmd, arg) \ - _kvm_ioctl(kvm_fd, cmd, #cmd, arg) - static __always_inline void static_assert_is_vm(struct kvm_vm *vm) { } #define __vm_ioctl(vm, cmd, arg) \ @@ -258,16 +261,12 @@ static __always_inline void static_assert_is_vm(struct kvm_vm *vm) { } kvm_do_ioctl((vm)->fd, cmd, arg); \ }) -#define _vm_ioctl(vm, cmd, name, arg) \ -({ \ - int ret = __vm_ioctl(vm, cmd, arg); \ - \ - TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(name, ret)); \ -}) - #define vm_ioctl(vm, cmd, arg) \ - _vm_ioctl(vm, cmd, #cmd, arg) - +({ \ + int ret = __vm_ioctl(vm, cmd, arg); \ + \ + TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(#cmd, ret)); \ +}) static __always_inline void static_assert_is_vcpu(struct kvm_vcpu *vcpu) { } @@ -277,15 +276,12 @@ static __always_inline void static_assert_is_vcpu(struct kvm_vcpu *vcpu) { } kvm_do_ioctl((vcpu)->fd, cmd, arg); \ }) -#define _vcpu_ioctl(vcpu, cmd, name, arg) \ -({ \ - int ret = __vcpu_ioctl(vcpu, cmd, arg); \ - \ - TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(name, ret)); \ -}) - #define vcpu_ioctl(vcpu, cmd, arg) \ - _vcpu_ioctl(vcpu, cmd, #cmd, arg) +({ \ + int ret = __vcpu_ioctl(vcpu, cmd, arg); \ + \ + TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(#cmd, ret)); \ +}) /* * Looks up and returns the value corresponding to the capability From patchwork Fri Aug 4 00:42:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 130928 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1534696vqx; Thu, 3 Aug 2023 19:34:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlGdHMYvfGC8k/TVSWbno961HawqTlHl+8E1auOZ0sZMIjjCDhs/BpSnwHezUd/ax8cPLcPY X-Received: by 2002:a05:6a00:340b:b0:686:bf43:60fa with SMTP id cn11-20020a056a00340b00b00686bf4360famr18263456pfb.0.1691116463647; Thu, 03 Aug 2023 19:34:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691116463; cv=none; d=google.com; s=arc-20160816; b=XTYtiyDxjMksZV3WAbRu6S2nQYxerPSlA+dLG9LnfobGJZ7WqkhQAT2WQDwc21TqZH eMf+75NRzBjBPeCG8VYQ0VckJSDHitOTgZavagfyJ9SnYiM8RgtsiWqo99gKVK7OJYRw bjXMFyuaAWA+25qeZ3P5ndXwbGk0CUBSkoKFRnTGXO7S0jdsPeVJnsLVgwyRxg5QCKMI aCakVNZJ3KgiJ4eMAa9uorVz8juxFQySV8mZvY623EeInJoiyXEA4aDLjvsyDhD9tXBR 8h0vLH9b1q3BMNXIVRtOXY/NRX6BSJem7qnvsY63fpLDHR+V9muAyRAV8mRE6GgPQ/vp Ykrg== 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=zoisc0YB1XdzgL3Mform49pg3ZfKIVNUNR7ICgYhzqE=; fh=jdyEzCL89deFuH/4WkyySWR4owAlX/kNfdjkQ94Vils=; b=XGFed4lPbV/y4UwA+OKPeK/mZmFXVGptBqwnE1axDTgyVdEugZf2qGZ2tzpIRSzZib qfXrY5mcmXKj9s2JAnUvi+UpYZl2FBYJecos6h2n2xGP4VVOCw6SZFK/DE7cM/KcD0KL x5j1cig4SoQQGN4RDfJuNMAbcfnA6jwtTBEdOeJMtCYp7nG9xaG/J3OzKyo7+NjLwutz cbfZpgahRa/FytRmp9CEkHg2LkdHdeYoNPzt0z869ThqsGbMtM4PMtD9xi+i5Lv2xnRJ TbOb/xQBcF/ACAlgCv2G0rqulSrDJFnmVZVGElDEag12qhvuTfvRvXARJ7JRB8OywqGs G3GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=a4GYzzIG; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 21-20020a630c55000000b0056339e5afaesi988241pgm.331.2023.08.03.19.34.10; Thu, 03 Aug 2023 19:34:23 -0700 (PDT) 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=@google.com header.s=20221208 header.b=a4GYzzIG; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232900AbjHDAnj (ORCPT + 99 others); Thu, 3 Aug 2023 20:43:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232442AbjHDAnG (ORCPT ); Thu, 3 Aug 2023 20:43:06 -0400 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 271414687 for ; Thu, 3 Aug 2023 17:42:33 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5734d919156so16734707b3.3 for ; Thu, 03 Aug 2023 17:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691109752; x=1691714552; 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=zoisc0YB1XdzgL3Mform49pg3ZfKIVNUNR7ICgYhzqE=; b=a4GYzzIGruxXUnQRulR7Q7xPVPhglwcMI8dSt+2D0nS1HKiyVkOdEdTA22kHKgAdy0 HTMrJvInhxVscUAT2jGAxD6GjetlDBEEjRbs5tgpCurFNtDO9srlbkGATO8A+j84QHPn LpTXCF+c1pA439z77TTyZdsi633JbNMsRox+apr+ntnTHhKnkysLOKyzwZ5Q5pXp59tr gtO1qSFLzwPBSFZOp5ceRlT+y/Fr2xvWXpQcJIcBI/Eu/Nnf77Qul2yHoNvPK84le3qc yZvzpyWSa2x/ElmpM+L8ZLi/IuMFNTuqvQUk6U2py9hi+gOnewe10HzpDZCYVmiCJipg Lt6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691109752; x=1691714552; 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=zoisc0YB1XdzgL3Mform49pg3ZfKIVNUNR7ICgYhzqE=; b=H8e6ocNOYH4/PaLcCWCLZqbNzciFuKGf0Z6+YBzSlLmKlgGo6JgZ0RsZNz1v1qlpW0 31uT7Ac5aipPIKXQs19sIevszNZPzVbss/eQ2y8ImZMsMlRFQb7cntEjiSH3gwS3T7d0 V4tM3qj0vXXiu8nNlNlMNLoIyjmYwwISuu5DuGgWwmbo9l2AaY5zG/RMPbA810PsAt9P aDOCjAZ0H52/xfgRFPGAH0zWGAL5cw9xKhVBG2CLAXRB5B+dAyrEf2WusWZqBIQYCkb7 7636vmM/miH+Et1eJdmy++tyqKbp2NkNE0m3HC1S3g6LvtS1NcXg6aOt9hoQ7zh0Dmlq 2dyw== X-Gm-Message-State: AOJu0YziPKrAbGY1FGIegGlAMj2/3saUMV0br9RTU0Q88uUW5wsqMjGW f3GhEImfqkwFz7M/ouoVfS2CqO7BKN8= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:ad04:0:b0:583:6f04:4267 with SMTP id l4-20020a81ad04000000b005836f044267mr1388ywh.8.1691109752403; Thu, 03 Aug 2023 17:42:32 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 3 Aug 2023 17:42:24 -0700 In-Reply-To: <20230804004226.1984505-1-seanjc@google.com> Mime-Version: 1.0 References: <20230804004226.1984505-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.585.gd2178a4bd4-goog Message-ID: <20230804004226.1984505-3-seanjc@google.com> Subject: [PATCH 2/4] KVM: selftests: Add helper macros for ioctl()s that return file descriptors From: Sean Christopherson To: Marc Zyngier , Oliver Upton Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Sean Christopherson , Michal Luczaj 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=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: INBOX X-GMAIL-THRID: 1773264137069866529 X-GMAIL-MSGID: 1773264137069866529 Add KVM, VM, and vCPU scoped helpers for ioctl()s that return file descriptors, i.e. deduplicate code for asserting success on ioctls() for which a positive return value, not just zero, is considered success. Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/kvm_util_base.h | 39 +++++++++++++------ tools/testing/selftests/kvm/lib/kvm_util.c | 17 ++++---- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 90b7739ca204..b35b0bd23683 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -253,6 +253,14 @@ static inline bool kvm_has_cap(long cap) TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(#cmd, ret)); \ }) +#define kvm_fd_ioctl(kvm_fd, cmd, arg) \ +({ \ + int fd = __kvm_ioctl(kvm_fd, cmd, arg); \ + \ + TEST_ASSERT(fd >= 0, __KVM_IOCTL_ERROR(#cmd, fd)); \ + fd; \ +}) + static __always_inline void static_assert_is_vm(struct kvm_vm *vm) { } #define __vm_ioctl(vm, cmd, arg) \ @@ -268,6 +276,14 @@ static __always_inline void static_assert_is_vm(struct kvm_vm *vm) { } TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(#cmd, ret)); \ }) +#define vm_fd_ioctl(vm, cmd, arg) \ +({ \ + int fd = __vm_ioctl(vm, cmd, arg); \ + \ + TEST_ASSERT(fd >= 0, __KVM_IOCTL_ERROR(#cmd, fd)); \ + fd; \ +}) + static __always_inline void static_assert_is_vcpu(struct kvm_vcpu *vcpu) { } #define __vcpu_ioctl(vcpu, cmd, arg) \ @@ -283,16 +299,21 @@ static __always_inline void static_assert_is_vcpu(struct kvm_vcpu *vcpu) { } TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(#cmd, ret)); \ }) +#define vcpu_fd_ioctl(vcpu, cmd, arg) \ +({ \ + int fd = __vcpu_ioctl(vcpu, cmd, arg); \ + \ + TEST_ASSERT(fd >= 0, __KVM_IOCTL_ERROR(#cmd, fd)); \ + fd; \ +}) + /* * Looks up and returns the value corresponding to the capability * (KVM_CAP_*) given by cap. */ static inline int vm_check_cap(struct kvm_vm *vm, long cap) { - int ret = __vm_ioctl(vm, KVM_CHECK_EXTENSION, (void *)cap); - - TEST_ASSERT(ret >= 0, KVM_IOCTL_ERROR(KVM_CHECK_EXTENSION, ret)); - return ret; + return vm_fd_ioctl(vm, KVM_CHECK_EXTENSION, (void *)cap); } static inline int __vm_enable_cap(struct kvm_vm *vm, uint32_t cap, uint64_t arg0) @@ -348,10 +369,7 @@ static inline uint32_t kvm_vm_reset_dirty_ring(struct kvm_vm *vm) static inline int vm_get_stats_fd(struct kvm_vm *vm) { - int fd = __vm_ioctl(vm, KVM_GET_STATS_FD, NULL); - - TEST_ASSERT(fd >= 0, KVM_IOCTL_ERROR(KVM_GET_STATS_FD, fd)); - return fd; + return vm_fd_ioctl(vm, KVM_GET_STATS_FD, NULL); } static inline void read_stats_header(int stats_fd, struct kvm_stats_header *header) @@ -558,10 +576,7 @@ static inline void vcpu_nested_state_set(struct kvm_vcpu *vcpu, #endif static inline int vcpu_get_stats_fd(struct kvm_vcpu *vcpu) { - int fd = __vcpu_ioctl(vcpu, KVM_GET_STATS_FD, NULL); - - TEST_ASSERT(fd >= 0, KVM_IOCTL_ERROR(KVM_GET_STATS_FD, fd)); - return fd; + return vcpu_fd_ioctl(vcpu, KVM_GET_STATS_FD, NULL); } int __kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr); diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 7a8af1821f5d..557de1d26f10 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -117,8 +117,12 @@ unsigned int kvm_check_cap(long cap) int kvm_fd; kvm_fd = open_kvm_dev_path_or_exit(); - ret = __kvm_ioctl(kvm_fd, KVM_CHECK_EXTENSION, (void *)cap); - TEST_ASSERT(ret >= 0, KVM_IOCTL_ERROR(KVM_CHECK_EXTENSION, ret)); + + /* + * KVM_CHECK_EXTENSION doesn't return a file descriptor, but the + * semantics are the same: a negative value is considered a failure. + */ + ret = kvm_fd_ioctl(kvm_fd, KVM_CHECK_EXTENSION, (void *)cap); close(kvm_fd); @@ -136,12 +140,10 @@ void vm_enable_dirty_ring(struct kvm_vm *vm, uint32_t ring_size) static void vm_open(struct kvm_vm *vm) { - vm->kvm_fd = _open_kvm_dev_path_or_exit(O_RDWR); - TEST_REQUIRE(kvm_has_cap(KVM_CAP_IMMEDIATE_EXIT)); - vm->fd = __kvm_ioctl(vm->kvm_fd, KVM_CREATE_VM, (void *)vm->type); - TEST_ASSERT(vm->fd >= 0, KVM_IOCTL_ERROR(KVM_CREATE_VM, vm->fd)); + vm->kvm_fd = _open_kvm_dev_path_or_exit(O_RDWR); + vm->fd = kvm_fd_ioctl(vm->kvm_fd, KVM_CREATE_VM, (void *)vm->type); } const char *vm_guest_mode_string(uint32_t i) @@ -1226,8 +1228,7 @@ struct kvm_vcpu *__vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id) vcpu->vm = vm; vcpu->id = vcpu_id; - vcpu->fd = __vm_ioctl(vm, KVM_CREATE_VCPU, (void *)(unsigned long)vcpu_id); - TEST_ASSERT(vcpu->fd >= 0, KVM_IOCTL_ERROR(KVM_CREATE_VCPU, vcpu->fd)); + vcpu->fd = vm_fd_ioctl(vm, KVM_CREATE_VCPU, (void *)(unsigned long)vcpu_id); TEST_ASSERT(vcpu_mmap_sz() >= sizeof(*vcpu->run), "vcpu mmap size " "smaller than expected, vcpu_mmap_sz: %i expected_min: %zi", From patchwork Fri Aug 4 00:42:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 130900 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1515251vqx; Thu, 3 Aug 2023 18:37:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlGPo6bbvBTSmh12/QEQc7K+L/N8cFzzcwEP8g1ScBlzUJ1oVLeOecikdlWoYV50si+8ivJs X-Received: by 2002:a05:6a20:4282:b0:13d:d5bd:758f with SMTP id o2-20020a056a20428200b0013dd5bd758fmr18450277pzj.6.1691113079118; Thu, 03 Aug 2023 18:37:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691113079; cv=none; d=google.com; s=arc-20160816; b=wAG86ofI1fM/uAqShDH5ig/2JEwsjnW6cUKxr6/+XOTquTPi9JV+7rEs6egr3cqy5n ess97wyYSYhUU4alewM06TPv48CS0z7gD+LacP1HMMxvSEDlnMxxc8Cd5bQqpaeWcsPO q0oa+7cso49zyRPIZKcTJ5BCcx/29LYyExZsPltxBNnKTYhdcUMez0FxV5b98DL8kd55 XxYP61TABE/6uyOBEQbMP77IpR+9wxdFbZWx0eceESWqwya5FSmfwLndNbJBswHJdI8U TWF0G4cmx/7meBjSSzmEy+cehqFvS+2l9I7JrHy2WQqRqan61yWPl5/6BXXu7kw8RZEi cZag== 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=J+mxzLyo3KvL1X1/io+X1OzBSufdvdiiGzpaJwRMhFQ=; fh=jdyEzCL89deFuH/4WkyySWR4owAlX/kNfdjkQ94Vils=; b=KW3sxmfDER1lS0+7jm8WE9h3m5J58jyDTt2YMDiPyArOety1UK23p7m7Mke+ORgegj YaeUyg4i7XYHDAMIKNzq4MqPJvZRv4gRo8dRptU+kMk8kNZlCq5H9DOHrb9u+gP0N0QC zdvcIa+KBPsSCuC8e+b66VEkYYl/3O/JCwulRMRJhrb1SiZFFG3sqUxmL17v5MRUwuIF HAKvH1iQK83XcCX2hpjRNYfyj6ook9TlR4nNIDDor7SXaawQMOdhB+IoPEdZvJxbiR6S ZNiPKD4hpBGORwuhITI+3K96pZ3iKFoaDSwKG6bkfpPrhpDM47if3cy/Z+K1ykkimICm 0oTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=SOX0LmZ7; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ch12-20020a056a00288c00b00680a955d320si867687pfb.56.2023.08.03.18.37.45; Thu, 03 Aug 2023 18:37:59 -0700 (PDT) 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=@google.com header.s=20221208 header.b=SOX0LmZ7; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232767AbjHDAne (ORCPT + 99 others); Thu, 3 Aug 2023 20:43:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232831AbjHDAnG (ORCPT ); Thu, 3 Aug 2023 20:43:06 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0A424215 for ; Thu, 3 Aug 2023 17:42:34 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1bba5563cd6so13212005ad.3 for ; Thu, 03 Aug 2023 17:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691109754; x=1691714554; 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=J+mxzLyo3KvL1X1/io+X1OzBSufdvdiiGzpaJwRMhFQ=; b=SOX0LmZ7M/i5Xu6IShPkO2I+BxiwZ7/tKfFw/OszRJyMzjeA8srrxfMqCj4Z29VgNn T0538ljVhrlqi2oWqsf8SDO/oV45EgP4x4oPafLtiFcA3cCpGCSnbWPlD7O1UBhgOJNe iWOEAZPpkZuEI+dl8Vup28taKKrYkoe9EEkFDZdVyWlSSumkRefUTDG/veJy2F6RniEr D4CN9ItmtE3GLQpzTfzusmxS7gLu+J3zXqOmaxg3BFTHOgLSHC5+aOpOePxVzXkX7y+j 40aPvclyhw23NLYArpVti1fhnKJ/y5UqJGdMWPnW2w3RzepQtSrazDZXeGyOlRrMC0eG uSAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691109754; x=1691714554; 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=J+mxzLyo3KvL1X1/io+X1OzBSufdvdiiGzpaJwRMhFQ=; b=XFCSILRo7y9GT8x1MZy8twQCQW92YEOFCXdo930T1lY7oVu7PF33Px/j4/WmxqbzBp u+lQY8aJl1g2OCA88tUMD4YUmKcvMaDZJoIpoJurwwYOQyqKBUYAj9vHCN9eNRxSiQo5 sehWEbErLwUJu6G0HMkEnNx7fyHXwsouIHzeZTMpSATquEloVWtDLa9rqKY41oQ1S6eg wG/BgosxM1sBV+ew2FitJEMKl8M7CYUzUfHnP/0JgrUGmmSr2/0YzG0iL297Ynl7yaDl 6K1/veAMmn9Ca3z3NXMHfTIw/TP8KHCW//uxvMC7T/UyaJhfhdH8wGlaSwOZCd1KhHNb Yl3g== X-Gm-Message-State: AOJu0YywOL5AVe8LMKejcmWx8ZcxBWzaohRyqHtDuDDa1yGQZuB6/l1I 5E4Bkgv50xJ+iO3jZa3FOP44+N2u/Z4= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:dad1:b0:1b8:a555:385d with SMTP id q17-20020a170902dad100b001b8a555385dmr1165plx.9.1691109754176; Thu, 03 Aug 2023 17:42:34 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 3 Aug 2023 17:42:25 -0700 In-Reply-To: <20230804004226.1984505-1-seanjc@google.com> Mime-Version: 1.0 References: <20230804004226.1984505-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.585.gd2178a4bd4-goog Message-ID: <20230804004226.1984505-4-seanjc@google.com> Subject: [PATCH 3/4] KVM: selftests: Use asserting kvm_ioctl() macros when getting ARM page sizes From: Sean Christopherson To: Marc Zyngier , Oliver Upton Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Sean Christopherson , Michal Luczaj 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=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: INBOX X-GMAIL-THRID: 1773260587790922815 X-GMAIL-MSGID: 1773260587790922815 Use kvm_ioctl() instead of open coding equivalent ioctl()+TEST_ASSERT() calls when getting the support page sizes on ARM. The macro usage is a little funky since the "kvm_fd" parameter implies an actual /dev/kvm fd, but on the other hand the code is invoking KVM ioctl()s. Alternatively, the core utilities could expose a vm_open()+vm_close() pair so that the ARM code could create a dummy, on-stack VM+vCPU pair and use {vm,vcpu}_ioctl() as appropriate. But the odds of something breaking due to oddball, partial usage of kvm_vm and kvm_vcpu structures is much higher than realizing meaningful benefit from using {vm,vcpu}_ioctl(). Signed-off-by: Sean Christopherson --- .../selftests/kvm/lib/aarch64/processor.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c index 3a0259e25335..afec1a30916f 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -496,7 +496,7 @@ void aarch64_get_supported_page_sizes(uint32_t ipa, bool *ps4k, bool *ps16k, bool *ps64k) { struct kvm_vcpu_init preferred_init; - int kvm_fd, vm_fd, vcpu_fd, err; + int kvm_fd, vm_fd, vcpu_fd; uint64_t val; struct kvm_one_reg reg = { .id = KVM_ARM64_SYS_REG(SYS_ID_AA64MMFR0_EL1), @@ -504,19 +504,13 @@ void aarch64_get_supported_page_sizes(uint32_t ipa, }; kvm_fd = open_kvm_dev_path_or_exit(); - vm_fd = __kvm_ioctl(kvm_fd, KVM_CREATE_VM, (void *)(unsigned long)ipa); - TEST_ASSERT(vm_fd >= 0, KVM_IOCTL_ERROR(KVM_CREATE_VM, vm_fd)); + vm_fd = kvm_fd_ioctl(kvm_fd, KVM_CREATE_VM, (void *)(unsigned long)ipa); + vcpu_fd = kvm_fd_ioctl(vm_fd, KVM_CREATE_VCPU, (void *)0ul); - vcpu_fd = ioctl(vm_fd, KVM_CREATE_VCPU, 0); - TEST_ASSERT(vcpu_fd >= 0, KVM_IOCTL_ERROR(KVM_CREATE_VCPU, vcpu_fd)); + kvm_ioctl(vm_fd, KVM_ARM_PREFERRED_TARGET, &preferred_init); + kvm_ioctl(vcpu_fd, KVM_ARM_VCPU_INIT, &preferred_init); - err = ioctl(vm_fd, KVM_ARM_PREFERRED_TARGET, &preferred_init); - TEST_ASSERT(err == 0, KVM_IOCTL_ERROR(KVM_ARM_PREFERRED_TARGET, err)); - err = ioctl(vcpu_fd, KVM_ARM_VCPU_INIT, &preferred_init); - TEST_ASSERT(err == 0, KVM_IOCTL_ERROR(KVM_ARM_VCPU_INIT, err)); - - err = ioctl(vcpu_fd, KVM_GET_ONE_REG, ®); - TEST_ASSERT(err == 0, KVM_IOCTL_ERROR(KVM_GET_ONE_REG, vcpu_fd)); + kvm_ioctl(vcpu_fd, KVM_GET_ONE_REG, ®); *ps4k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_TGRAN4), val) != 0xf; *ps64k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_TGRAN64), val) == 0; From patchwork Fri Aug 4 00:42:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 130899 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1514507vqx; Thu, 3 Aug 2023 18:35:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlGuBB0shGVhpbQvCft6yNd1BWEEpOZoNLdQZJMi1dVwp17TJmysOdv9hy5/C8pW432Spqvt X-Received: by 2002:a17:903:1d0:b0:1bb:b832:4be9 with SMTP id e16-20020a17090301d000b001bbb8324be9mr22108418plh.1.1691112946608; Thu, 03 Aug 2023 18:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691112946; cv=none; d=google.com; s=arc-20160816; b=LxkAQ0F9wVeK3+q2OqfB4ZbsAGmuvURqWfA98DGXw+dkpjCrAvr7fUtgOC6CwcxY1x ykkJoqRRf9OU2GsQPGSYaI0utVeuZdcYJEpvwNXrCEgVLdT04H1EDawPk0E0eU0LI+67 Ylcz21uMqzW3fFXBULaQI1gRuAJf+Ip9oEq7BAOm5ykux1nWUvYBsFzMO5HAvH6ehrBY xXN6ZaY9Qy722x9MUSGMQjSVHyEhlImAJnk8mmk8dVoplVcfNu8RGjrlWtaJK8CwuM9e dolrFjIAaDDkv1aEVf7xIRARH0R3PVQA3S0oaVX1WUkMrCs748kwdWW2MdlPlzn1Dm16 2/uw== 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=2CsV9BMCbijce3IEX7syYt6oaSf9HBzVzUSeSJTTl/c=; fh=jdyEzCL89deFuH/4WkyySWR4owAlX/kNfdjkQ94Vils=; b=WNNSdErxaQ/kmXIMqG+V4ZESNkdszdqH2rZlXtNWYhWaKp1Vay0BtsTk6OeNtAglsf 9KMsAIyUnS50eCxyftHnRH2uNZMhjYOR2ktIpyIouXW9IwO/4SexgQGFdqrcLtURQ8VO djfANyQKR/Pbv3hBi06xJ3cRtn/pakStAzxY6tquPhlo4a3Io3o8V+gnjhxRCAOXMS/o zj+xBD0uoW9d3kZ8XH5ZiILEPL7RkgERFSQImfg9xmUQa24zjl2yOhdpA2HNT/7H8Ejy 7IZHHR19SRULgFVKuuoA8yA/LofvZof2ksfcQ0VOQJHVDmGxbqGxQEL02RKZs8I/faH/ 6Cwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=DNaTTcvy; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j15-20020a170903024f00b001b7ea20dbf2si930369plh.224.2023.08.03.18.35.33; Thu, 03 Aug 2023 18:35:46 -0700 (PDT) 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=@google.com header.s=20221208 header.b=DNaTTcvy; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232986AbjHDAnn (ORCPT + 99 others); Thu, 3 Aug 2023 20:43:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232762AbjHDAnG (ORCPT ); Thu, 3 Aug 2023 20:43:06 -0400 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 E899D4696 for ; Thu, 3 Aug 2023 17:42:36 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-68701df1ac7so982976b3a.1 for ; Thu, 03 Aug 2023 17:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691109756; x=1691714556; 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=2CsV9BMCbijce3IEX7syYt6oaSf9HBzVzUSeSJTTl/c=; b=DNaTTcvyymaqWv5JS/b+Ul58o6UASX5Gzy58D8OgNUL3QP3segv+8o1Nz+GizNekfv rFDM+9jgVrY2UJtz2kl/i/L6udW4AVtdgPGyAjht4ak4W3jUQVvvpj9GFbt2AV7cn4l+ 38Kkl5Ze1Wn9JzG07hlvDqExeNIGqBvSHZmT6nAMyQFB+uihzhtqKN/XrVFhOHZxwJoJ bJ97KvFNHowNRmq00dAMx7hg868GXdY6QdJJAIPSVa5n1tK2uB8ro5zAKxUnv0XJe787 vRwGsDf3w10BvuLmfXZQHbQLUlzVsbY9ElYEmKScB7sxzF9olsQfyFnqpZRmKvxrB54P 7c9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691109756; x=1691714556; 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=2CsV9BMCbijce3IEX7syYt6oaSf9HBzVzUSeSJTTl/c=; b=hOU+BXM0lkzUQi4Pdiucw6LzFW88OqwNuGp7r53gnXsZtcbywWGv9FKvTysAH/qPWY Tw3B4V4+LSwn1g2jCqiQ1DiRBYuhVulpUXhupswozCu4UaaB1wUPUgbwl1LCA1PwANiE mXci6WRBvPVVUGdgY0dQlRmRlxDmJ7R8G8Ms/thsqiL1N0FlrIVA6DLgVoRikVMBWcYk 4/VL99qvrwiGqSGWskOIiAeHl5VCaR6Ki6xzQtN9KQj6UJsWChl6GsdXQi4MIYSa+Sin IdF5+ZhinqEUaedI2N8m+vffne892toMWaAIl+IPHrHWhHYfFTI/RCZscopIKuGGIKIt bDtA== X-Gm-Message-State: AOJu0YwlmzYZx32dDdSv1SngBRUqwh1qOf7YioXoCfQCHHCU68QsfsKB VadidMdZsL0o3kam8zxkfzPw0/S485g= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:124c:b0:687:926f:e62f with SMTP id u12-20020a056a00124c00b00687926fe62fmr1573pfi.2.1691109756391; Thu, 03 Aug 2023 17:42:36 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 3 Aug 2023 17:42:26 -0700 In-Reply-To: <20230804004226.1984505-1-seanjc@google.com> Mime-Version: 1.0 References: <20230804004226.1984505-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.585.gd2178a4bd4-goog Message-ID: <20230804004226.1984505-5-seanjc@google.com> Subject: [PATCH 4/4] KVM: selftests: Add logic to detect if ioctl() failed because VM was killed From: Sean Christopherson To: Marc Zyngier , Oliver Upton Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Sean Christopherson , Michal Luczaj 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=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: INBOX X-GMAIL-THRID: 1773260448961942697 X-GMAIL-MSGID: 1773260448961942697 Add yet another macro to the VM/vCPU ioctl() framework to detect when an ioctl() failed because KVM killed/bugged the VM, i.e. when there was nothing wrong with the ioctl() itself. If KVM kills a VM, e.g. by way of a failed KVM_BUG_ON(), all subsequent VM and vCPU ioctl()s will fail with -EIO, which can be quite misleading and ultimately waste user/developer time. Use KVM_CHECK_EXTENSION on KVM_CAP_USER_MEMORY to detect if the VM is dead and/or bug, as KVM doesn't provide a dedicated ioctl(). Using a heuristic is obviously less than ideal, but practically speaking the logic is bulletproof barring a KVM change, and any such change would arguably break userspace, e.g. if KVM returns something other than -EIO. Without the detection, tearing down a bugged VM yields a cryptic failure when deleting memslots: ==== Test Assertion Failure ==== lib/kvm_util.c:689: !ret pid=45131 tid=45131 errno=5 - Input/output error 1 0x00000000004036c3: __vm_mem_region_delete at kvm_util.c:689 2 0x00000000004042f0: kvm_vm_free at kvm_util.c:724 (discriminator 12) 3 0x0000000000402929: race_sync_regs at sync_regs_test.c:193 4 0x0000000000401cab: main at sync_regs_test.c:334 (discriminator 6) 5 0x0000000000416f13: __libc_start_call_main at libc-start.o:? 6 0x000000000041855f: __libc_start_main_impl at ??:? 7 0x0000000000401d40: _start at ??:? KVM_SET_USER_MEMORY_REGION failed, rc: -1 errno: 5 (Input/output error) Which morphs into a more pointed error message with the detection: ==== Test Assertion Failure ==== lib/kvm_util.c:689: false pid=80347 tid=80347 errno=5 - Input/output error 1 0x00000000004039ab: __vm_mem_region_delete at kvm_util.c:689 (discriminator 5) 2 0x0000000000404660: kvm_vm_free at kvm_util.c:724 (discriminator 12) 3 0x0000000000402ac9: race_sync_regs at sync_regs_test.c:193 4 0x0000000000401cb7: main at sync_regs_test.c:334 (discriminator 6) 5 0x0000000000418263: __libc_start_call_main at libc-start.o:? 6 0x00000000004198af: __libc_start_main_impl at ??:? 7 0x0000000000401d90: _start at ??:? KVM killed/bugged the VM, check the kernel log for clues Suggested-by: Michal Luczaj Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/kvm_util_base.h | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index b35b0bd23683..49ad681d2161 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -269,18 +269,44 @@ static __always_inline void static_assert_is_vm(struct kvm_vm *vm) { } kvm_do_ioctl((vm)->fd, cmd, arg); \ }) +/* + * Assert that a VM or vCPU ioctl() succeeded, with extra magic to detect if + * the ioctl() failed because KVM killed/bugged the VM. To detect a dead VM, + * probe KVM_CAP_USER_MEMORY, which (a) has been supported by KVM since before + * selftests existed and (b) should never outright fail, i.e. is supposed to + * return 0 or 1. If KVM kills a VM, KVM returns -EIO for all ioctl()s for the + * VM and its vCPUs, including KVM_CHECK_EXTENSION. + */ +#define TEST_ASSERT_VM_VCPU_IOCTL(cond, name, ret, vm) \ +do { \ + int __errno = errno; \ + \ + static_assert_is_vm(vm); \ + \ + if (cond) \ + break; \ + \ + if (errno == EIO && \ + __vm_ioctl(vm, KVM_CHECK_EXTENSION, (void *)KVM_CAP_USER_MEMORY) < 0) { \ + TEST_ASSERT(errno == EIO, "KVM killed the VM, should return -EIO"); \ + TEST_FAIL("KVM killed/bugged the VM, check the kernel log for clues"); \ + } \ + errno = __errno; \ + TEST_ASSERT(cond, __KVM_IOCTL_ERROR(name, ret)); \ +} while (0) + #define vm_ioctl(vm, cmd, arg) \ ({ \ int ret = __vm_ioctl(vm, cmd, arg); \ \ - TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(#cmd, ret)); \ + TEST_ASSERT_VM_VCPU_IOCTL(!ret, #cmd, ret, vm); \ }) #define vm_fd_ioctl(vm, cmd, arg) \ ({ \ int fd = __vm_ioctl(vm, cmd, arg); \ \ - TEST_ASSERT(fd >= 0, __KVM_IOCTL_ERROR(#cmd, fd)); \ + TEST_ASSERT_VM_VCPU_IOCTL(fd >= 0, #cmd, fd, vm); \ fd; \ }) @@ -296,14 +322,14 @@ static __always_inline void static_assert_is_vcpu(struct kvm_vcpu *vcpu) { } ({ \ int ret = __vcpu_ioctl(vcpu, cmd, arg); \ \ - TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(#cmd, ret)); \ + TEST_ASSERT_VM_VCPU_IOCTL(!ret, #cmd, ret, (vcpu)->vm); \ }) #define vcpu_fd_ioctl(vcpu, cmd, arg) \ ({ \ int fd = __vcpu_ioctl(vcpu, cmd, arg); \ \ - TEST_ASSERT(fd >= 0, __KVM_IOCTL_ERROR(#cmd, fd)); \ + TEST_ASSERT_VM_VCPU_IOCTL(fd >= 0, #cmd, fd, (vcpu)->vm);\ fd; \ })