From patchwork Wed May 18 17:58:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12853935 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7258C433FE for ; Wed, 18 May 2022 17:59:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241267AbiERR7S (ORCPT ); Wed, 18 May 2022 13:59:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231783AbiERR7L (ORCPT ); Wed, 18 May 2022 13:59:11 -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 E50B08CB0D for ; Wed, 18 May 2022 10:59:10 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id j13-20020a170902da8d00b00161d78a9e3eso76353plx.17 for ; Wed, 18 May 2022 10:59:10 -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=fMGKhekV0sa/YRSHAxxD4jBJX+Cxj4sGMKO6wGVMLLU=; b=rDo4lZZNt9Jya8MiZXgjYNXvz5J37fb6AuEUs8DN3vWndBXOI1tlgJDwCnvUKvBPc6 TnxRUc2etnh7q3vcNtEJshhc10uQivQXWKv6a8RKBrOUXLNW3i9tz5EGrsvAcVoADMiL PvNIKKOQMpui5nbSexy36l2tOwTHjFolG+IARW9zKt9E0WsklNY44NvY7EeSIM1LAImr Qdh1TwS91bwJhJQCqcCHxjySJSl0uXy2thSsDiVRnnjlIcxwEEC5/N6c0tEtDCClsxFr WAgaQSTqdu1IYn2f/p7uzC4BPyx+3E9A3cU+HE2HUs8/0d37lyEl4oXbbkNUg4GBWFXk XEXA== 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=fMGKhekV0sa/YRSHAxxD4jBJX+Cxj4sGMKO6wGVMLLU=; b=tGwUxXZ/t41aX8PS6MIh//sU+N8UImlbdZMljSx/TaoMrjckWsftVpL8E2RKxZV/bS 1f+lFgVwSUG9T81No+euCLb4LeRZnlKQnNyflyT3yAMw9UkKlPQTAen0GNSzRSQ66YXg fRSUmkkiMU4bx3/8BtQ0pFwUulNgkoZbRaf/iI70U6HhNCUx7hqGHFZ7xONARwVwwheo Ax2c0+fShGefpSkv5vwE4lRq09rLt1GRG5bV2vBu3lGfpXpW7RL3I9tbL/eb+UXahJ41 +Njbuwnzb9EChf8ER5jbHhNrVzCG7nRmp986LcQilDP8Tn5Wgu3qg0oxgQ3/k5ffYyZZ DTXQ== X-Gm-Message-State: AOAM5302yeg4421bh54QBqxycW/SaKKup/HG7V8tWj/0w4SxjmchjlEt 0ogwrTirauCyIqoNZeNHnq6TBhhKwegLMS8L1hUKWuNKbL7E+h7vf+SRhqMWPXsyUTFTuZ5/2K0 B1cd7LjJxFIiiwOYnqjUB0QrQOp4UyDt57xQTENH5o9zCBoag/oQX6yn0dA== X-Google-Smtp-Source: ABdhPJyZ+5KTCDASJ2VzQHVK+2cDZhp3NrE9g00eRb9QNAZGfGNos3Q7HEHF07BETonFHNlM4Zm3P3D3UZ0= X-Received: from oupton3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:21eb]) (user=oupton job=sendgmr) by 2002:a05:6a00:24c1:b0:50d:33cf:811f with SMTP id d1-20020a056a0024c100b0050d33cf811fmr827317pfv.78.1652896749987; Wed, 18 May 2022 10:59:09 -0700 (PDT) Date: Wed, 18 May 2022 17:58:07 +0000 In-Reply-To: <20220518175811.2758661-1-oupton@google.com> Message-Id: <20220518175811.2758661-2-oupton@google.com> Mime-Version: 1.0 References: <20220518175811.2758661-1-oupton@google.com> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog Subject: [PATCH v2 1/5] KVM: Shove vm stats_id init into kvm_create_vm() From: Oliver Upton To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, seanjc@google.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Initialize the field alongside the other struct kvm fields. No functional change intended. Signed-off-by: Oliver Upton --- virt/kvm/kvm_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 6d971fb1b08d..36dc9271d039 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1101,6 +1101,9 @@ static struct kvm *kvm_create_vm(unsigned long type) */ kvm->debugfs_dentry = ERR_PTR(-ENOENT); + snprintf(kvm->stats_id, sizeof(kvm->stats_id), + "kvm-%d", task_pid_nr(current)); + if (init_srcu_struct(&kvm->srcu)) goto out_err_no_srcu; if (init_srcu_struct(&kvm->irq_srcu)) @@ -4787,9 +4790,6 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) if (r < 0) goto put_kvm; - snprintf(kvm->stats_id, sizeof(kvm->stats_id), - "kvm-%d", task_pid_nr(current)); - file = anon_inode_getfile("kvm-vm", &kvm_vm_fops, kvm, O_RDWR); if (IS_ERR(file)) { put_unused_fd(r); From patchwork Wed May 18 17:58:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12853936 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B807C433EF for ; Wed, 18 May 2022 17:59:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241288AbiERR7T (ORCPT ); Wed, 18 May 2022 13:59:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241173AbiERR7O (ORCPT ); Wed, 18 May 2022 13:59:14 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1D6C8CB0D for ; Wed, 18 May 2022 10:59:12 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id d12-20020a17090a628c00b001dcd2efca39so1571074pjj.2 for ; Wed, 18 May 2022 10:59: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=ngCuMiQQu2crWaF3N2+jr0MQPsojQwzxANrtvFLoUs0=; b=gEFnGQRvL1SNUeweZldlNB86h9cbsmE4kfueDxykeLC/dgnbC0SW+2zdJwA8PwDw3d nJcI92lhr0cTAkYC081GdamU0nFn4qz63tbJnUHAWZZM7p0i5OC3efWKdPGxiDYYSOvn US1kgaHZgh0AJrTlTCqeqJ0KWTTu5Vg5Zm/3+VdiiecTxvK+6Mc8P74ANC43GhnciX3l klYm8L1zxexX5JH4E0wKhLTh05FhuSJb/RCh8FZMMnl2aduowRZrqhMoO3eQFiOXDC+E 5xQtRe/6bAGUTFBmBJ/8cVelvh0swyS46siJSC75IlQtQyz52F8D0yN3qSHhIOJuvU7o r2kQ== 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=ngCuMiQQu2crWaF3N2+jr0MQPsojQwzxANrtvFLoUs0=; b=7/Q4uSWkL4Nqu8r2MABFucHxUJ8cPYeB6bCKs2coLL9poO4PDOgrpSO55TfWAE4ww5 rCmAccwQYCoUkKt7/aPhy0V56PgX2be5Z+diEioejR/8GSzrrtlLRl0cASl85KZWdJVz OjKo83POEeiCyj00Cn1BCvRe/JOI5+qonbOQxvShaFxV8+GkWBjHu0kFUte7VzqUjZLp myeCn+NDsDiDQpCaDoJNz+OGvzkW5KkaBrzl6PxW4vX8yhPmlrGaLFnv/uohwUZR/YLB mp/b0eteCILWSQF7bCoYylLWe9WSQtk8l8LVmt/bqZ9iZ6CC3meW+OBgR7bLWlX4tv2E NGYw== X-Gm-Message-State: AOAM533gF1YfjollzZYX5aQz+PMHRdWtjuIWYKJvTyHLT8Dvr3cwwn0q XW9bg3TOQf7QGiTmkjeBQFUOUtWoXyAVPCiW9hcIkbBaO7Y61St2639V+vwY8leW4jAJGeo8P85 tSkJADhvbIdZZmKSYs5G63T/JCtDt9SU9q545GUWg2T06kMExgNqktUgnEQ== X-Google-Smtp-Source: ABdhPJyBeXg2Aa9RwjM1V9d2ErVROM4+cPUe/IbabCLnLVoPOu/rW/D34Dh5ELw+xdfdzqlCet6MBrjc+sk= X-Received: from oupton3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:21eb]) (user=oupton job=sendgmr) by 2002:a17:90a:2a8a:b0:1df:26ba:6333 with SMTP id j10-20020a17090a2a8a00b001df26ba6333mr350472pjd.0.1652896751753; Wed, 18 May 2022 10:59:11 -0700 (PDT) Date: Wed, 18 May 2022 17:58:08 +0000 In-Reply-To: <20220518175811.2758661-1-oupton@google.com> Message-Id: <20220518175811.2758661-3-oupton@google.com> Mime-Version: 1.0 References: <20220518175811.2758661-1-oupton@google.com> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog Subject: [PATCH v2 2/5] KVM: Shove vcpu stats_id init into kvm_vcpu_init() From: Oliver Upton To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, seanjc@google.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Initialize the field alongside other kvm_vcpu fields. No functional change intended. Signed-off-by: Oliver Upton --- virt/kvm/kvm_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 36dc9271d039..778151333ac0 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -440,6 +440,10 @@ static void kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) vcpu->ready = false; preempt_notifier_init(&vcpu->preempt_notifier, &kvm_preempt_ops); vcpu->last_used_slot = NULL; + + /* Fill the stats id string for the vcpu */ + snprintf(vcpu->stats_id, sizeof(vcpu->stats_id), "kvm-%d/vcpu-%d", + task_pid_nr(current), id); } static void kvm_vcpu_destroy(struct kvm_vcpu *vcpu) @@ -3807,10 +3811,6 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) if (r) goto unlock_vcpu_destroy; - /* Fill the stats id string for the vcpu */ - snprintf(vcpu->stats_id, sizeof(vcpu->stats_id), "kvm-%d/vcpu-%d", - task_pid_nr(current), id); - /* Now it's all set up, let userspace reach it */ kvm_get_kvm(kvm); r = create_vcpu_fd(vcpu); From patchwork Wed May 18 17:58:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12853939 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4ADB5C433EF for ; Wed, 18 May 2022 17:59:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241277AbiERR70 (ORCPT ); Wed, 18 May 2022 13:59:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241251AbiERR7Q (ORCPT ); Wed, 18 May 2022 13:59:16 -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 900678CB37 for ; Wed, 18 May 2022 10:59:14 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id b20-20020a62a114000000b0050a6280e374so1486506pff.13 for ; Wed, 18 May 2022 10:59:14 -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=OZkEtfeO16+WBXKIrEVzWaZgX0pGEVfJdhpX9jyjq9s=; b=XJnCL2DYM9o+Jy3j+sEoMXrtNq6JAflArhwOtUHIjrEJ8kcHsgAPojP2qMv6peZSpu AVnDrXhMKunZ+7DZv8Ykv0Xkyb4dOPzi3bZnMCqecQ2bk5JiSZNRSl5Ll4UYCVlHOF9l vrMxF6Hgc8ELAaEsQW04jMYqjYJulXTOreiHeNdsa5Zv6D+y5WW11Ee6AKmwybmm8JX1 SBi5k0bDcYSbA9Q4cQNcBwwYLFFiPoU6k2ncYTfq6vQQGTST7+g+Ay8IDn63zRbNrdUq VdqpFcYBnP9M/mrXKdjnnCiIAKV+DZB4adpHjcpMLZeJb3vOBQodZed2QVril2oAvOZP CQhA== 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=OZkEtfeO16+WBXKIrEVzWaZgX0pGEVfJdhpX9jyjq9s=; b=uf3x9lYCU5vLZiIUWi8umCj61+yQOMFEj5h46hWp/WTKlIG+zgaVkBnkMi31js+ulb RoskFVVYF6qpU2fJ4LfDPeZhepHFkjuv+hlPwFWjFORFxfUBYCWUYqpfnDkIQXROczfS NLeBZPQ9VeqAXMlNxt6N8o2jU+zUso45FXhS845lhX+kwWQputiv+X14JZxQTARgB5Co 6cASx2OBxL5C8/QWUs2Xx07O4x69YA0YAgqu2HQI9gCVcmoihZ7rOe6BgwNubYN1dxLm GNuP+CNR8fpOgdx5DkKUye0xQLLSRES3+B5gBmT2YJiEL4auOXn7E3Frri0CHITMoI/6 bvLw== X-Gm-Message-State: AOAM533iOCmQJCN+28awEU13ZG6bkTK2deeU0qdrHxtVeLnAdFTEgI4P qXNzfV0IuIQqwDSRa487pXITB5fbETIBDCsYuUnY5JvV2lN58l7acNHiuv3XG284RYCxslJ5J4Q 9HKtqctkReno85hptFkAY57Xm0P2YMFXDIGGDi7V7Ti4ItF5xDFZK0DvPug== X-Google-Smtp-Source: ABdhPJx5Hvz7aJKam/sS0xyXJXyVtOFQQc1blLiFh+vfuuj+mPAMcQ+wZ2ANZdo1mfsv8fBY7dTmpQyN9J0= X-Received: from oupton3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:21eb]) (user=oupton job=sendgmr) by 2002:a05:6a00:22d4:b0:510:6d75:e3da with SMTP id f20-20020a056a0022d400b005106d75e3damr520307pfj.3.1652896753816; Wed, 18 May 2022 10:59:13 -0700 (PDT) Date: Wed, 18 May 2022 17:58:09 +0000 In-Reply-To: <20220518175811.2758661-1-oupton@google.com> Message-Id: <20220518175811.2758661-4-oupton@google.com> Mime-Version: 1.0 References: <20220518175811.2758661-1-oupton@google.com> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog Subject: [PATCH v2 3/5] KVM: Get an fd before creating the VM From: Oliver Upton To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, seanjc@google.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hoist fd init to the very beginning of kvm_create_vm() so we can make use of it in other init routines. Signed-off-by: Oliver Upton --- virt/kvm/kvm_main.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 778151333ac0..87ccab74dc80 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4774,25 +4774,27 @@ EXPORT_SYMBOL_GPL(file_is_kvm); static int kvm_dev_ioctl_create_vm(unsigned long type) { - int r; + int r, fd; struct kvm *kvm; struct file *file; + fd = get_unused_fd_flags(O_CLOEXEC); + if (fd < 0) + return fd; + kvm = kvm_create_vm(type); - if (IS_ERR(kvm)) - return PTR_ERR(kvm); + if (IS_ERR(kvm)) { + r = PTR_ERR(kvm); + goto put_fd; + } + #ifdef CONFIG_KVM_MMIO r = kvm_coalesced_mmio_init(kvm); if (r < 0) goto put_kvm; #endif - r = get_unused_fd_flags(O_CLOEXEC); - if (r < 0) - goto put_kvm; - file = anon_inode_getfile("kvm-vm", &kvm_vm_fops, kvm, O_RDWR); if (IS_ERR(file)) { - put_unused_fd(r); r = PTR_ERR(file); goto put_kvm; } @@ -4804,17 +4806,19 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) * care of doing kvm_put_kvm(kvm). */ if (kvm_create_vm_debugfs(kvm, r) < 0) { - put_unused_fd(r); fput(file); - return -ENOMEM; + r = -ENOMEM; + goto put_fd; } kvm_uevent_notify_change(KVM_EVENT_CREATE_VM, kvm); - fd_install(r, file); - return r; + fd_install(fd, file); + return fd; put_kvm: kvm_put_kvm(kvm); +put_fd: + put_unused_fd(fd); return r; } From patchwork Wed May 18 17:58:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12853938 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 534D2C433F5 for ; Wed, 18 May 2022 17:59:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241248AbiERR7Y (ORCPT ); Wed, 18 May 2022 13:59:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241263AbiERR7R (ORCPT ); Wed, 18 May 2022 13:59:17 -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 302AE8CB3E for ; Wed, 18 May 2022 10:59:16 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id z1-20020a170902ee0100b00161cf3e64c4so592643plb.11 for ; Wed, 18 May 2022 10:59:16 -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=QhLBePrrsUfJqUjAdy8m5ffbR0ZWKR+39fgcfWSusVo=; b=M1C+Zm9YUdMgkVq8XYmwYRC/KYqLg/NSip/HcNoOJY1mDd5E2Jy8OI7YZq2oDN/+E1 zIaq/Y2usPhok+ry9KUReOq2l6U9UEwcQZv4Vsxy/96n/5JuS7zq+DwXH0tdwVEkFvoM o4RjLgi0hzah9zAMybpZHDzc3/RCmQleOfpe8WymoN3YZk9lLikWwQi6L3hlq8i3/pNZ 2pHx/VO3hyKIKxkG3Hwz0lfWh16djOs/FiDEEkFncRzI4c2eHmAj2JnhUBtXr3ThlPvl 6XZrYi9hBBEXn8ergX/MD3mzshT5mymTVLRYZHdWKduiTpnuhWaIkFvTIBNIaUizt0So k1/g== 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=QhLBePrrsUfJqUjAdy8m5ffbR0ZWKR+39fgcfWSusVo=; b=px9Y7gumpJGgSQy26f9rRu9ngqk8NlvEgRCfOaRxs2nCAX4lyRbHwpxuI/tcJGVr5g /I7f5o7Fnubg7cENObqjCncD2/A02mMzYknkC7MBaVp2hinB9iXu+WWpR3mxzOYtY/M1 S6Nw79DIiNM5WMU+y8UUPsqh/rjEFgcqdYqDkJUBkqGJamKaiT8pLA6T/VHsRNLDbW9D N9eHWyzdT+Un8J1xpytw/6uG9nvtEgV5wZgETsyF5LVtZa3WaoloNJcrShU8fJrLCH7q zn/MUqRY6f0+ibPH4nV3xDhKJVf10ng8O31JvdrWd/LQfZBUXLVoPuVcQQY8BIQvZiFY hSdw== X-Gm-Message-State: AOAM530A5OVH30QkqoD+7IkLkKccquFs6TT7oPo8JeAxmVylIEcTs2ud Ar1oQ1tuxiq+gbZAdbC5NCLSiI3mVTtu9C6MKCyv0TTfaEjgOPj3kxX7uj+3kl8VA9D8NwWBvNP ZlEmB6QBR+nfS/SlsKZnvFQCped+fuGi77YELc0eMPntRQjNhQla/kulk3g== X-Google-Smtp-Source: ABdhPJyftOKTs4TW1CVxNNaLvjfHTVmTnPth5OjQSvoYn6Q6fNGvLzKQEtpspBNEgoT6+jWO02KU1CIE+rk= X-Received: from oupton3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:21eb]) (user=oupton job=sendgmr) by 2002:a63:2209:0:b0:3ab:113b:9a2b with SMTP id i9-20020a632209000000b003ab113b9a2bmr524140pgi.235.1652896755458; Wed, 18 May 2022 10:59:15 -0700 (PDT) Date: Wed, 18 May 2022 17:58:10 +0000 In-Reply-To: <20220518175811.2758661-1-oupton@google.com> Message-Id: <20220518175811.2758661-5-oupton@google.com> Mime-Version: 1.0 References: <20220518175811.2758661-1-oupton@google.com> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog Subject: [PATCH v2 4/5] KVM: Actually create debugfs in kvm_create_vm() From: Oliver Upton To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, seanjc@google.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Doing debugfs creation after vm creation leaves things in a quasi-initialized state for a while. This is further complicated by the fact that we tear down debugfs from kvm_destroy_vm(). Align debugfs and stats init/destroy with the vm init/destroy pattern to avoid any headaches. Pass around the fd number as a string, as poking at the fd in any other way is nonsensical. Note the fix for a benign mistake in error handling for calls to kvm_arch_create_vm_debugfs() rolled in. Since all implementations of the function return 0 unconditionally it isn't actually a bug at the moment. Lastly, tear down debugfs/stats data in the kvm_create_vm_debugfs() error path. Previously it was safe to assume that kvm_destroy_vm() would take out the garbage, that is no longer the case. Signed-off-by: Oliver Upton --- virt/kvm/kvm_main.c | 48 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 87ccab74dc80..aaa7213b34dd 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -968,21 +968,21 @@ static void kvm_destroy_vm_debugfs(struct kvm *kvm) } } -static int kvm_create_vm_debugfs(struct kvm *kvm, int fd) +static int kvm_create_vm_debugfs(struct kvm *kvm, const char *fdname) { static DEFINE_MUTEX(kvm_debugfs_lock); struct dentry *dent; char dir_name[ITOA_MAX_LEN * 2]; struct kvm_stat_data *stat_data; const struct _kvm_stats_desc *pdesc; - int i, ret; + int i, ret = -ENOMEM; int kvm_debugfs_num_entries = kvm_vm_stats_header.num_desc + kvm_vcpu_stats_header.num_desc; if (!debugfs_initialized()) return 0; - snprintf(dir_name, sizeof(dir_name), "%d-%d", task_pid_nr(current), fd); + snprintf(dir_name, sizeof(dir_name), "%d-%s", task_pid_nr(current), fdname); mutex_lock(&kvm_debugfs_lock); dent = debugfs_lookup(dir_name, kvm_debugfs_dir); if (dent) { @@ -1001,13 +1001,13 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, int fd) sizeof(*kvm->debugfs_stat_data), GFP_KERNEL_ACCOUNT); if (!kvm->debugfs_stat_data) - return -ENOMEM; + goto out_err; for (i = 0; i < kvm_vm_stats_header.num_desc; ++i) { pdesc = &kvm_vm_stats_desc[i]; stat_data = kzalloc(sizeof(*stat_data), GFP_KERNEL_ACCOUNT); if (!stat_data) - return -ENOMEM; + goto out_err; stat_data->kvm = kvm; stat_data->desc = pdesc; @@ -1022,7 +1022,7 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, int fd) pdesc = &kvm_vcpu_stats_desc[i]; stat_data = kzalloc(sizeof(*stat_data), GFP_KERNEL_ACCOUNT); if (!stat_data) - return -ENOMEM; + goto out_err; stat_data->kvm = kvm; stat_data->desc = pdesc; @@ -1034,12 +1034,13 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, int fd) } ret = kvm_arch_create_vm_debugfs(kvm); - if (ret) { - kvm_destroy_vm_debugfs(kvm); - return i; - } + if (ret) + goto out_err; return 0; +out_err: + kvm_destroy_vm_debugfs(kvm); + return ret; } /* @@ -1070,7 +1071,7 @@ int __weak kvm_arch_create_vm_debugfs(struct kvm *kvm) return 0; } -static struct kvm *kvm_create_vm(unsigned long type) +static struct kvm *kvm_create_vm(unsigned long type, const char *fdname) { struct kvm *kvm = kvm_arch_alloc_vm(); struct kvm_memslots *slots; @@ -1158,7 +1159,7 @@ static struct kvm *kvm_create_vm(unsigned long type) r = kvm_arch_post_init_vm(kvm); if (r) - goto out_err; + goto out_err_mmu_notifier; mutex_lock(&kvm_lock); list_add(&kvm->vm_list, &vm_list); @@ -1174,12 +1175,18 @@ static struct kvm *kvm_create_vm(unsigned long type) */ if (!try_module_get(kvm_chardev_ops.owner)) { r = -ENODEV; - goto out_err; + goto out_err_mmu_notifier; } + r = kvm_create_vm_debugfs(kvm, fdname); + if (r) + goto out_err; + return kvm; out_err: + module_put(kvm_chardev_ops.owner); +out_err_mmu_notifier: #if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) if (kvm->mmu_notifier.ops) mmu_notifier_unregister(&kvm->mmu_notifier, current->mm); @@ -4774,6 +4781,7 @@ EXPORT_SYMBOL_GPL(file_is_kvm); static int kvm_dev_ioctl_create_vm(unsigned long type) { + char fdname[ITOA_MAX_LEN + 1]; int r, fd; struct kvm *kvm; struct file *file; @@ -4782,7 +4790,8 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) if (fd < 0) return fd; - kvm = kvm_create_vm(type); + snprintf(fdname, sizeof(fdname), "%d", fd); + kvm = kvm_create_vm(type, fdname); if (IS_ERR(kvm)) { r = PTR_ERR(kvm); goto put_fd; @@ -4799,17 +4808,6 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) goto put_kvm; } - /* - * Don't call kvm_put_kvm anymore at this point; file->f_op is - * already set, with ->release() being kvm_vm_release(). In error - * cases it will be called by the final fput(file) and will take - * care of doing kvm_put_kvm(kvm). - */ - if (kvm_create_vm_debugfs(kvm, r) < 0) { - fput(file); - r = -ENOMEM; - goto put_fd; - } kvm_uevent_notify_change(KVM_EVENT_CREATE_VM, kvm); fd_install(fd, file); From patchwork Wed May 18 17:58:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12853937 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96EA1C433F5 for ; Wed, 18 May 2022 17:59:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231783AbiERR7W (ORCPT ); Wed, 18 May 2022 13:59:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241277AbiERR7T (ORCPT ); Wed, 18 May 2022 13:59:19 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F58E8CB31 for ; Wed, 18 May 2022 10:59:18 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2fef32314f7so25129487b3.18 for ; Wed, 18 May 2022 10:59:18 -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=wW/lYQK8VggoySTpe050tppXxqMna8Q7adRf7tVfVhg=; b=m7dz77VdABiVhTzfZaIE0LeeSvBl6t9Qe9hFsM9WYPe2IsqVOFN0CjpDqYmVm1IzVX lelo5I7GsEpdephGyPib6OfJPar543AGL0CyQXWm2mTzukn96l0CaUGRcaEOct9no4gO A5XScGLwYy9u48ePPFPh9hkTcjAZhnjw3riCuKtzo/lwuxduEUHbGS8vcrjl+dnb4m/L oQ9v7L4h//c5pAgL60dEsnNWnY/WfTj7W882amwZSRc96CGohagTca7JD1NDTSWfJdbr CdudJwHuEyUAeeTt6e34RcIMt4Y+q28oZCqtghHRxw8q7PFELQWtHBN7BZazYF49ApTU Mr6g== 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=wW/lYQK8VggoySTpe050tppXxqMna8Q7adRf7tVfVhg=; b=6jA+O6WrGL0mU0EIUSXGq1v+TtalRszEdunORotD6K+DMXYwRvImEjPnUqQEhVAGbI HXhcdkoR3Gd0tLDXLyayeQHUM2k2EJHp0MIYn7mVwfTL30pT6kZzIiaLBqQjoS/2jYYa YcOJdtoGAIQXV45XoFxOrUe1z2NqYHeGGuLVGpk4Vq+vTdBw28WhZ+BLczsyTjSnr36m y7dt5ekgXonxz0rVJhB7GyRiU48m6GE+fHyEub3hX19TG4XSk1trjZeb8JEjaFypvRNF HG/FB3WgD7ZYQ/CHrqtp0He8CIrxUYBzA3bLh8kKMiJ7eOmTUU9hVYfp2Ya+j7PMnfw8 9ZPQ== X-Gm-Message-State: AOAM532g5MXzu4xPbXkR1jooPoq1Yv7nhayGD3NO8UlB0hhB0lMU8WtQ BzEs1h1/eZDvlG2hY0pVhaqRijCXFVpdHJGAMi+Kp9UYTakcMzm88xtSnv6CtRtpFfZD2IpHCrD Lp4pDJAPwNUq4by+yULHRffJYCY3LOKdBOuM/A0GyqV50nB6m0ro4+TyVLQ== X-Google-Smtp-Source: ABdhPJw5H1xUyMPhKN/sPf1QXyNfjUugFkOmTeSYbv+d8ETvnoloSmWGNmYxD/mOirbcPIE+KlziYPCyXNk= X-Received: from oupton3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:21eb]) (user=oupton job=sendgmr) by 2002:a25:e20d:0:b0:64a:6397:1fad with SMTP id h13-20020a25e20d000000b0064a63971fadmr780425ybe.496.1652896757121; Wed, 18 May 2022 10:59:17 -0700 (PDT) Date: Wed, 18 May 2022 17:58:11 +0000 In-Reply-To: <20220518175811.2758661-1-oupton@google.com> Message-Id: <20220518175811.2758661-6-oupton@google.com> Mime-Version: 1.0 References: <20220518175811.2758661-1-oupton@google.com> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog Subject: [PATCH v2 5/5] KVM: Hoist debugfs_dentry init to kvm_create_vm_debugfs() (again) From: Oliver Upton To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, seanjc@google.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, Oliver Upton Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Since KVM now sanely handles debugfs init/destroy w.r.t. the VM, it is safe to hoist kvm_create_vm_debugfs() back into kvm_create_vm(). The author of this commit remains bitter for having been burned by the old wreck in commit a44a4cc1c969 ("KVM: Don't create VM debugfs files outside of the VM directory"). Signed-off-by: Oliver Upton Reviewed-by: Sean Christopherson --- virt/kvm/kvm_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index aaa7213b34dd..558de6a252de 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -979,6 +979,12 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, const char *fdname) int kvm_debugfs_num_entries = kvm_vm_stats_header.num_desc + kvm_vcpu_stats_header.num_desc; + /* + * Force subsequent debugfs file creations to fail if the VM directory + * is not created. + */ + kvm->debugfs_dentry = ERR_PTR(-ENOENT); + if (!debugfs_initialized()) return 0; @@ -1100,12 +1106,6 @@ static struct kvm *kvm_create_vm(unsigned long type, const char *fdname) BUILD_BUG_ON(KVM_MEM_SLOTS_NUM > SHRT_MAX); - /* - * Force subsequent debugfs file creations to fail if the VM directory - * is not created (by kvm_create_vm_debugfs()). - */ - kvm->debugfs_dentry = ERR_PTR(-ENOENT); - snprintf(kvm->stats_id, sizeof(kvm->stats_id), "kvm-%d", task_pid_nr(current));