From patchwork Mon Aug 16 00:12:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12437533 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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 595DCC432BE for ; Mon, 16 Aug 2021 00:28:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 192996137D for ; Mon, 16 Aug 2021 00:28:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 192996137D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=zTMXQMfU/uMK2454Tyx56CuxYauLHP78y3jJZoIQHA8=; b=B3+xL6a9o+3VDCDXVRddMTwlKN CkW+n2ukOWIR4QNJcLOsRqChhUJMeod1aCkwZFU5CYVypbkU6PwRvy/7sUVgR7XP8/ThOgo0hx5qv eylqqVdxY5zeMuEG6yG5tyPU+JA/pMpSd4htCYVjqpIPDDYCnJGhRlDumtm6W6IZMS3cc36c2KlVQ XLHmijEoS2KWeyVvQCKOFXtOzrwFqIRUaJmlTjy0LQ0hGL7QxperxbSbOARCBGDMWvcXHdRQiFW9J CJtT4opqM0XJQHR40VUkNyzb8TJReKItC0WsaKidG7bUDVNMwj8DlHfEcIuHeFlUsG48sRUIq+cce ZRu2LCjQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mFQRk-00Fq6A-Bt; Mon, 16 Aug 2021 00:25:45 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mFQFN-00FlMJ-6S for linux-arm-kernel@lists.infradead.org; Mon, 16 Aug 2021 00:12:58 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id p71-20020a25424a0000b029056092741626so14937444yba.19 for ; Sun, 15 Aug 2021 17:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=QYCRxSU6hzRxEScdPZjEavlvSGqLDqGY95R82nilknU=; b=nPrPgAfdfNekGbCmGN2vEq+MyvMfwzlUHjKLDCtKxgS8K2/fHTzB2r4moPCptUD6eg 5WWLr9m6Y5nHElPsYh4I+p/6d1611nEo0QJGGr+PRdF8iTApIzLk4fA1+UHlvxMtjfkE PpVnPyjufYcn1I11QAs6aaPOnKNa9rRFlfIhFu3yAIATOYzl3BSkOSqNnGdLNr3nH7Hw YOZGu29M8HAWwFl8SS3MavUWgxnyF7GuGmy+RyZ7ihZlSHfq8BDMqyI6mlBxCj1Wjskz pBU4/XcfXM84/5LFENjJjdg3s+rA7FLTgrAzw7OrpUjZDQH7wU+vpqsDYzuYfjxWOkmP GjHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=QYCRxSU6hzRxEScdPZjEavlvSGqLDqGY95R82nilknU=; b=PyCTAGAkVVdgnnlNmQtk1e3L6Jr8R9CAp/NC8cf9/b6XBCR2z22L/XWCASBhxFLGC/ IBBaADa6lGI9rsrHKo23beIYvyGSxPz6q4lDHflddeytKs/5YJQm5oTATYPuU9KMNXgH QPbUbBZDBqPhyTZDFXzsCIARx9CNaTgQgOAMenQRCNT99I+g0SGL8aJ+D872noRl46A3 E7LTtCITCi0nFOt69ITuIAj5zyR3FgvEO7HFkbED8GQqx84fLwajfiNVH9mRK6U7Ymew XKdLCjTYCEKhHqNz1g13NzRYM3d7qtj7R1+JdY5m5DrR92aCUFBvgu4nI2xVgQtyRTVd NCKA== X-Gm-Message-State: AOAM532zuZuiVOqexC754GzspRX/3mch4o46PMTmZqnvP2rE1/DFwtRJ 5Yk0BtDiThDQOJr5VH9ytUAi5BB6D44= X-Google-Smtp-Source: ABdhPJyFSNI5zwQDtft85GbhMjZlrSiGF5KmrBvQv4f2CVXAK7KuRny2Z8kdgnXXItSvoMx7C3nhgmhqLYg= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a05:6902:102f:: with SMTP id x15mr17251492ybt.30.1629072775027; Sun, 15 Aug 2021 17:12:55 -0700 (PDT) Date: Mon, 16 Aug 2021 00:12:40 +0000 In-Reply-To: <20210816001246.3067312-1-oupton@google.com> Message-Id: <20210816001246.3067312-4-oupton@google.com> Mime-Version: 1.0 References: <20210816001246.3067312-1-oupton@google.com> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog Subject: [PATCH v7 3/9] selftests: KVM: Fix kvm device helper ioctl assertions From: Oliver Upton To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Cc: Paolo Bonzini , Sean Christopherson , Marc Zyngier , Peter Shier , Jim Mattson , David Matlack , Ricardo Koller , Jing Zhang , Raghavendra Rao Anata , James Morse , Alexandru Elisei , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Andrew Jones , Will Deacon , Catalin Marinas , Oliver Upton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210815_171257_312657_F4FB1AD5 X-CRM114-Status: GOOD ( 11.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The KVM_CREATE_DEVICE and KVM_{GET,SET}_DEVICE_ATTR ioctls are defined to return a value of zero on success. As such, tighten the assertions in the helper functions to only pass if the return code is zero. Suggested-by: Andrew Jones Reviewed-by: Andrew Jones Signed-off-by: Oliver Upton --- tools/testing/selftests/kvm/lib/kvm_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 10a8ed691c66..0ffc2d39c80d 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1984,7 +1984,7 @@ int kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr) { int ret = _kvm_device_check_attr(dev_fd, group, attr); - TEST_ASSERT(ret >= 0, "KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i", ret, errno); + TEST_ASSERT(!ret, "KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i", ret, errno); return ret; } @@ -2008,7 +2008,7 @@ int kvm_create_device(struct kvm_vm *vm, uint64_t type, bool test) ret = _kvm_create_device(vm, type, test, &fd); if (!test) { - TEST_ASSERT(ret >= 0, + TEST_ASSERT(!ret, "KVM_CREATE_DEVICE IOCTL failed, rc: %i errno: %i", ret, errno); return fd; } @@ -2036,7 +2036,7 @@ int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr, { int ret = _kvm_device_access(dev_fd, group, attr, val, write); - TEST_ASSERT(ret >= 0, "KVM_SET|GET_DEVICE_ATTR IOCTL failed, rc: %i errno: %i", ret, errno); + TEST_ASSERT(!ret, "KVM_SET|GET_DEVICE_ATTR IOCTL failed, rc: %i errno: %i", ret, errno); return ret; }