From patchwork Thu Jul 29 17:32:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12409367 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.5 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 1ABC4C4338F for ; Thu, 29 Jul 2021 17:37:05 +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 E012060E9B for ; Thu, 29 Jul 2021 17:37:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E012060E9B 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=owOxQsETNAbDy9BFIzoZ6VzsftEWjD866JwVDxzHftE=; b=A54ucMEQtYOgibW9ujTUuCKatc KC20/dXUsHzncsK/qxqzLVpC1hAPlunE4+1b75oGCYmsRddCEyQKrS85vAkhGQHJ6P3Hs+gpuxNaD kStlkSJ9CHOpBzlCxoi4zKmW9j7tZZ6CM+0J6Z2aT+f+gNLVxWlOtXNXt0TZDWOdkwfw2mOf3BaBr bNWwtOx7ZOscNo2kS0dwffi0LrUC0Dh5ZnDiRnj5UaSKoP4EYUbIk1UOUmqva0l5W4keFJ9ZV5wQT uHgbJ7MxyxpNstLtFYS53kpvzh4UZHgP3/XVpqvFIi/s4NqB3tTaqYfExqugPqPrHorT9f+iOWB7J L08CrFqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m99wD-005L02-W4; Thu, 29 Jul 2021 17:35:18 +0000 Received: from mail-qk1-x749.google.com ([2607:f8b0:4864:20::749]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m99uB-005KOb-Q8 for linux-arm-kernel@lists.infradead.org; Thu, 29 Jul 2021 17:33:13 +0000 Received: by mail-qk1-x749.google.com with SMTP id u22-20020ae9c0160000b02903b488f9d348so4165767qkk.20 for ; Thu, 29 Jul 2021 10:33:10 -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=TH1Yvn79VJJ2udpoO34z2Zst9bnL7g3/15hMs2k9XrU=; b=RCcrGmTpe6zYpQ8AAlZ+gcpni5nA36NT5jhbrSl3vbAeWO6T12yCE0WZY0NqLb6qiy VF+Fj3BuutHCBqUYzErx+cj/MSmgq2BEOYPXjv5n/rWCGmxg3E4Lt5mSGA+Mv7PSg7Iz IpX1c4Lqs43XQxVCJPOqYGhD2F/mUer9TNikayLhKU3HfVB98aanqGxC2nA0+TMKPsnV 6UATv2svEl1aHfHiKXMGZnSCrzAgFYJwjXxTXqLrU7weJZ3munj8CtOVknEHiajaqTPo z6eF+aweEk9vSymTy/fBzUkFqyYpWgxDnPucCJo+puhA7Q2SjGqnVvLr3xQE/cJCIBec e8bQ== 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=TH1Yvn79VJJ2udpoO34z2Zst9bnL7g3/15hMs2k9XrU=; b=dIGj5YRtkYYA8zSPV8+7QpliYDTtvxN2vF/G6volgEY4a+w70m0uI0IsjJi+H849kb BSiVwSpzYZo5sk/Xhy1O0rvJ7MktSEol1ywYNf3Y0M65SYROl5xB8d2LP4mQw7hl5XWo 6wuuGwjn5eVRc94fjjYEOR+EeOaQVeNJOC8Q/jszquKxbsQ+nqzBLNMcQ9DxMu7denvO DjLJ/mKymym6SkjM0J+rhoPhPzSAUMJL3Bcx19AUAeD4VmzZ0jD0jtZhgvWZ2qhXXpXi tKr9OMmAHqp6GJQu9udhi3h+6qtnekPguMK5yrKf1mzu9tS9Q5+RBBca8pwQpR5jMWjn R6xQ== X-Gm-Message-State: AOAM533FGRkHByjQt8YZ2Fe5vvVK9FNEODoww46nZOes7MVfRaa7OnX3 t+KdtsBf4CMr7I9zoc8Ljtlek0ltA4A= X-Google-Smtp-Source: ABdhPJxJhaIODfs4vcnvGnNLiNAMEqLIdRVuYp2xpMYT1VyfNmqQolmbkLuOOKN177hNR/gEMr029wKo6dU= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a05:6214:84:: with SMTP id n4mr6508541qvr.4.1627579990026; Thu, 29 Jul 2021 10:33:10 -0700 (PDT) Date: Thu, 29 Jul 2021 17:32:53 +0000 In-Reply-To: <20210729173300.181775-1-oupton@google.com> Message-Id: <20210729173300.181775-7-oupton@google.com> Mime-Version: 1.0 References: <20210729173300.181775-1-oupton@google.com> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog Subject: [PATCH v5 06/13] 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 , Oliver Upton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210729_103311_896738_ACBDF609 X-CRM114-Status: GOOD ( 11.27 ) 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; }