From patchwork Tue Jul 11 23:01:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 118741 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp791202vqm; Tue, 11 Jul 2023 16:04:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlE3jiLSPiCiaZZ/votRHlNQ9TThWlUOyg/XHMcOPapwPH9Og/7A3g47R3uOQeevXjOff0lz X-Received: by 2002:a17:903:230d:b0:1b8:7bd2:f77d with SMTP id d13-20020a170903230d00b001b87bd2f77dmr15864794plh.64.1689116678751; Tue, 11 Jul 2023 16:04:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689116678; cv=none; d=google.com; s=arc-20160816; b=xvgZLSHV69ZQeh4p2Yn8q3Inq4G8zhWzJyFVZwiIDZVj+e2ASuO3oRe7hHOWFCHcwp VALIphaqk0Ni8i+nwTFGsGh9FbGTmOCid0VLTkDfC66wy1Op0Mh14eoj1GSY8WgmpKhZ H+2VShsdBVNo1zzlqByGiUcz4Nd3LbS9A9hjNFcBAafvS2WUaUmn0EsRYTZOBMyPnls6 jXM84eCN99W2VcML5+krlSXqzTc3DYXcR+VQpcuR3iwAUZ0fwoHb1E+3byHAnPJZfcoF BXNDAjtakjzMzF7zyGqanTqXMw2A2cztMtHApQF34+jkykUHzhu7EF1wWWEhKzZBTH5b UAww== 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=8VQapMKBQBMTZxsjOULvb/Z6n7A3B0Prs/TRyhAaINo=; fh=WlkBVuaco6NrS/z+1f/wCzwszSt/RBqjyVC/qitxnws=; b=pxfqkOBlnOmx0eu4luKDNm/dKfx4VgudEXsfEqBJcyILnKXViz9y1zMZCJWsDSXdaj 9CoSjCSPIoLHeG6YUKv07mbV2iQDA5/bxn+CzyI9JXgZkl9gSSd2jYvA0PGndS316ypB gF2PuRzTZxKcsZXZ007AAJ+wDT06zNUhP99o2rAyG7fgtZxvXyjB36dKc1MLQEmgFwjy btWoVpKo9CvmGeLrvbrVo7ia/LCL7orEbDozScrH2Oc901SdU8poEwDxA+6+9t7OrHTt e3czhQSHIc7VNDxPjpQJJ6ujDSwGhQ84N8CNMpFL075pY/pQr7tgiAQfEZkG8UvevnC4 WPVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=0meBJIEh; 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 m3-20020a170902e40300b001b8010ad924si2080946ple.103.2023.07.11.16.04.25; Tue, 11 Jul 2023 16:04:38 -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=0meBJIEh; 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 S231308AbjGKXBr (ORCPT + 99 others); Tue, 11 Jul 2023 19:01:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232026AbjGKXBm (ORCPT ); Tue, 11 Jul 2023 19:01:42 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3818310D8 for ; Tue, 11 Jul 2023 16:01:41 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-262d69faef9so6960784a91.3 for ; Tue, 11 Jul 2023 16:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689116500; x=1691708500; 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=8VQapMKBQBMTZxsjOULvb/Z6n7A3B0Prs/TRyhAaINo=; b=0meBJIEhxTgxt0w5IKnl8Z7teH02rv9JZxqyDtEuF1SoUNM0EhdKFpSC+T8V5Zcc4f ItM4ARCIWVT/rgEt8uYkBwBE/REmEktJEKeeLxdD+HYTwWEZGeMbWRig1L8QTKsIQ5T2 hVkbXXKQSkWbxGGMsrcm56i8+aD/5dB7DOJP97opcnl2Ry4E6RHruR/qykibFq0/aUfW extko0Q/JcbDrL4/gyZcVcBTXaYze++0rQtwMUtlL1UnwshBD8Q5le30OExohxvBKRNa iLoDSD7fcIE/6uWCbzRK5jSM2JFe8rTxZeHBnCvka8ar7fO6J7NhQ6ilvUovBerrQ8U2 Jhvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689116500; x=1691708500; 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=8VQapMKBQBMTZxsjOULvb/Z6n7A3B0Prs/TRyhAaINo=; b=H9NxWJiyzBg0uq0tCgVMftQ4zTYVB6mT0QJeDae9gtXzEF01SmscsWyDvKRSuB7j0/ 5p5fwTa5wmogFDBpewq/Jji4TlItgC3hRHSuXGH7UysMec1+cJKXOUqfnGvstc467bUt eRL53sWNIgfug/ruRuTgsCrLl5trZoU3AUnHkhIWsR/IibGKMbFwfQN7Oe+ob7kYwbcn HpW7DvzZ/F7bWNs7OOVYSYvdIk+eIt94XIWxsA+paofF1DEhICHssL0zjxrDesLvRMux BAV9gO/8Bf85a6oow+e6UISQ+52wbYWW3J+tfOHPfd3XkL5EwjLk3ENgPl5wR6n5cjUn RVTg== X-Gm-Message-State: ABy/qLZ0hLRIoLry0OG5rH20qfLr4O60MGOuM4Ha3Ra8H+UWWT7vAGrW 4RnQTmwty40nhdjJU5A4PeJ/rDwU9nY= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:a417:b0:1b8:2055:fc1f with SMTP id p23-20020a170902a41700b001b82055fc1fmr13104726plq.2.1689116500737; Tue, 11 Jul 2023 16:01:40 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 11 Jul 2023 16:01:27 -0700 In-Reply-To: <20230711230131.648752-1-seanjc@google.com> Mime-Version: 1.0 References: <20230711230131.648752-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230711230131.648752-4-seanjc@google.com> Subject: [PATCH 3/7] KVM: selftests: Clean up stats fd in common stats_test() helper From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Zheng Zhang , Kees Cook , Sean Christopherson 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=unavailable 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: 1771167210661699369 X-GMAIL-MSGID: 1771167210661699369 Move the stats fd cleanup code into stats_test() and drop the superfluous vm_stats_test() and vcpu_stats_test() helpers in order to decouple creation of the stats file from consuming/testing the file (deduping code is a bonus). This will make it easier to test various edge cases related to stats, e.g. that userspace can dup() a stats fd, that userspace can have multiple stats files for a singleVM/vCPU, etc. Signed-off-by: Sean Christopherson --- .../selftests/kvm/kvm_binary_stats_test.c | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c index eae99d0e8377..f02663711c90 100644 --- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c +++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c @@ -167,23 +167,7 @@ static void stats_test(int stats_fd) free(stats_data); free(stats_desc); free(id); -} - -static void vm_stats_test(struct kvm_vm *vm) -{ - int stats_fd = vm_get_stats_fd(vm); - - stats_test(stats_fd); - close(stats_fd); - TEST_ASSERT(fcntl(stats_fd, F_GETFD) == -1, "Stats fd not freed"); -} - -static void vcpu_stats_test(struct kvm_vcpu *vcpu) -{ - int stats_fd = vcpu_get_stats_fd(vcpu); - - stats_test(stats_fd); close(stats_fd); TEST_ASSERT(fcntl(stats_fd, F_GETFD) == -1, "Stats fd not freed"); } @@ -241,9 +225,11 @@ int main(int argc, char *argv[]) /* Check stats read for every VM and VCPU */ for (i = 0; i < max_vm; ++i) { - vm_stats_test(vms[i]); + stats_test(vm_get_stats_fd(vms[i])); + for (j = 0; j < max_vcpu; ++j) - vcpu_stats_test(vcpus[i * max_vcpu + j]); + stats_test(vcpu_get_stats_fd(vcpus[i * max_vcpu + j])); + ksft_test_result_pass("vm%i\n", i); }