Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp719989pxb; Tue, 5 Apr 2022 20:13:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0XbHKQkcTK84Yq8X6f4AniCVlKBlio6BXGcLwLQU9P9TXADGpcp2Y8laG8Czs7xhOVIiK X-Received: by 2002:a63:3403:0:b0:399:2df0:7551 with SMTP id b3-20020a633403000000b003992df07551mr5460026pga.407.1649214830676; Tue, 05 Apr 2022 20:13:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649214830; cv=none; d=google.com; s=arc-20160816; b=DJgbOnGvvFALW/jwcPhz/3B1sHdjUucM1CFKaw0Qb+UNLIkVCcm8MZAyxNLbQxwOw1 piZQmfEwRdWO63nncmY/n4Jg3HVvx99+ZweuXZSsKJ9h+GSFAE+jeWS5Z9Y10aGqQXuU 2x4B8RHQpbq112VgvtpQF+EJEXxvnfcsGpne1wZi6ugsDMUeTvZO8+v7kQSgXRQ43+aM U8XCijnpKdGG3mMr/grf5+VijU8h64CpuPfwyxaFSRkWZ2ebnoehMWzg5yDo/OiZf8Zx qC61aGpYedak2mPRMOMQft7gPE4ChbMn4LekdZ/trlH3kK9Yw/99nHxJ0CN/t5lVMZHS LfFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VjgUxY8ty8JDzL360aHAuOqSDu+wy5leVCeugnMKD/M=; b=dj+zALFtt+3l9uCFZ3V5kFdOaHK8CVAUkUKb0EvbqVD1alkBIEsCtqWnB23ivgXNjc yUYl4eXgsv9dyrUxUziP2PCHRIiAwGwMp/OaWu1romXn3eQxG9CYWjyKcPyE7pyv+4al 4CbgAXFihyCH9HPqG8dMXfya6l89OT3NR6ez8VS0pMFQKZCRNxbvp+SgfT5veuX+Ysd0 wCE3VqcH5iAypNlasTHBxIIOXLyqMrO/6hAUuHTBu5f1aQRNEIrAgcpgTBuofZ2mTPl9 /2esedem+IfeMOa3LIx8aDKh9urKXQ7jSEub7r68A/kkMWcNiV3igO4JTKPCYpF+hIn0 k3NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DKFs3s7V; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id p10-20020a170902f08a00b001501189ca21si4199548pla.1.2022.04.05.20.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 20:13:50 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DKFs3s7V; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AD2C22F0B0D; Tue, 5 Apr 2022 19:53:11 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1389411AbiDENdv (ORCPT + 99 others); Tue, 5 Apr 2022 09:33:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345993AbiDEJXP (ORCPT ); Tue, 5 Apr 2022 05:23:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 292E5A8ED2; Tue, 5 Apr 2022 02:12:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 98831B818F3; Tue, 5 Apr 2022 09:12:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1179C385A3; Tue, 5 Apr 2022 09:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649149962; bh=HmXyQy+1K/lealDgdQq2ot7mCjmICWhV+Bgh4pBkcn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DKFs3s7VzLXfX61/QrJfyaJsJWdIMNfijBVdnjeGAoiSSh5cztwMEKyGOVaY3d8zZ g0Ddn7ANVmDEQF/Qr/QZtpx0KxsJCiP/4P7m4v8GPZ5O6GsLn3dIZm2gG9083sV4yO QfifREBxznTYinmPkJazEnFrvs6OC/XgXhg+nZxw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Gardon , David Matlack , Paolo Bonzini Subject: [PATCH 5.16 0904/1017] KVM: Prevent module exit until all VMs are freed Date: Tue, 5 Apr 2022 09:30:17 +0200 Message-Id: <20220405070421.058915912@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: David Matlack commit 5f6de5cbebee925a612856fce6f9182bb3eee0db upstream. Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via kvm_get_kvm() cannot accidentally outlive the KVM module. Prior to this commit, the lifetime of the KVM module was tied to the lifetime of /dev/kvm file descriptors, VM file descriptors, and vCPU file descriptors by their respective file_operations "owner" field. This approach is insufficient because references grabbed via kvm_get_kvm() do not prevent closing any of the aforementioned file descriptors. This fixes a long standing theoretical bug in KVM that at least affects async page faults. kvm_setup_async_pf() grabs a reference via kvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs. Fixes: af585b921e5d ("KVM: Halt vcpu if page it tries to access is swapped out") Fixes: 3d3aab1b973b ("KVM: set owner of cpu and vm file operations") Cc: stable@vger.kernel.org Suggested-by: Ben Gardon [ Based on a patch from Ben implemented for Google's kernel. ] Signed-off-by: David Matlack Message-Id: <20220303183328.1499189-2-dmatlack@google.com> Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- virt/kvm/kvm_main.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -117,6 +117,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir); static const struct file_operations stat_fops_per_vm; +static struct file_operations kvm_chardev_ops; + static long kvm_vcpu_ioctl(struct file *file, unsigned int ioctl, unsigned long arg); #ifdef CONFIG_KVM_COMPAT @@ -1107,6 +1109,16 @@ static struct kvm *kvm_create_vm(unsigne preempt_notifier_inc(); kvm_init_pm_notifier(kvm); + /* + * When the fd passed to this ioctl() is opened it pins the module, + * but try_module_get() also prevents getting a reference if the module + * is in MODULE_STATE_GOING (e.g. if someone ran "rmmod --wait"). + */ + if (!try_module_get(kvm_chardev_ops.owner)) { + r = -ENODEV; + goto out_err; + } + return kvm; out_err: @@ -1196,6 +1208,7 @@ static void kvm_destroy_vm(struct kvm *k preempt_notifier_dec(); hardware_disable_all(); mmdrop(mm); + module_put(kvm_chardev_ops.owner); } void kvm_get_kvm(struct kvm *kvm)