From patchwork Sat Mar 11 00:22:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67898 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp49267wrd; Fri, 10 Mar 2023 16:43:23 -0800 (PST) X-Google-Smtp-Source: AK7set98jUawvmSdgx0FtyFwtNQEhEXB5QURh6PFiAv2PGJaRMkPIeK+vaFkKB4cqeJw3skoaGq+ X-Received: by 2002:a17:90b:3a82:b0:237:c5cc:15bf with SMTP id om2-20020a17090b3a8200b00237c5cc15bfmr27828221pjb.13.1678495403559; Fri, 10 Mar 2023 16:43:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678495403; cv=none; d=google.com; s=arc-20160816; b=yvflS7kH6e7GxjRc33gngU5ggrzp/1hJS2RkcIE/E2oDYn4fufXXE/LsYHNlSdyUyE WJlPUdsfeFNOUXOTEr0al16WtG6DXm23XhOa+2BY6Jqmz+LZjEwUSCVCq98zuJmhp1Fm sdsXXRSQzeix/FgQyMN+uONo2OvgRUv1nqJghu/amqaBU6m4velxInP70iN6Sh4d9882 1molsNYyUGjTI/PdZL4hd1ADqVkhSkS3qiperAX6eiJyRXvO1+B9LTaoiPS89LQOSw3n C0O9/fPzVXcdVyDoJijYWZHNmr58nh4w0a2HWTLp13BuxZne6O9+ztFHW/rhIBtT84UH fGIw== 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=/BQVuzY+1aniIxFwV3nAIhGW3ZAM3GsrQzHkvtpaNHU=; b=nzLiTP5q1eR/HdLTDAd8L3OA5c6DSbI9tUMznOPO2sbymjIS0CTvB3McGoP2whppLm oomTcWjnhU4Di0HzPas9oJxMXPxIRpQ+uJekpDpzdb6H9oo6cWoRYsqUOOFRQpqoEPyx /R6qL9hCa863kpklIRIfDtVhmITm+nTzM20lZbFgqfPwUIQDLdTT7WB4ChvKk/abt4dI bhom6APJWgIIRZEGFV8kIVfSkMbRhjCX8BdA/0xVVqub22tLWXceosA5c7DTCZ88aF25 3AFyFLieJAebVDlg6+nSo3vqEdUDhG/Qk9PMwafbIgrRsOY9A5RhGUHnRscBGO7NqfiZ l9OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Ab0v8Ymp; 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 j19-20020a17090a7e9300b00233cee16612si965056pjl.151.2023.03.10.16.43.08; Fri, 10 Mar 2023 16:43:23 -0800 (PST) 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=20210112 header.b=Ab0v8Ymp; 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 S231660AbjCKAZr (ORCPT + 99 others); Fri, 10 Mar 2023 19:25:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231563AbjCKAY4 (ORCPT ); Fri, 10 Mar 2023 19:24:56 -0500 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D56E13F6B1 for ; Fri, 10 Mar 2023 16:24:02 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id k17-20020a170902d59100b0019abcf45d75so3562064plh.8 for ; Fri, 10 Mar 2023 16:24:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678494229; 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=/BQVuzY+1aniIxFwV3nAIhGW3ZAM3GsrQzHkvtpaNHU=; b=Ab0v8YmpDERByolnb028YKVIlfH4MiO7yQrc4RKRFL5GBnbXvna4+5GVmm19EWQOhj egIfhucrWh67+17xUMC+0ozgET86EcLL8gnfW3xTY437OsCd7ohRm5I91JQSjbDvGVei dxWVJkzKLqqg0c0shd3w8KO9sXN0xg9lUPSDNOCubHZ/a7B1QgL0e+FDanDFF0/DULCS LHcCjqWQV6U+85Rp05fZB7kujyhcAXUJtL7t5mdIK0oGB6Qi/WSWx7CHQVZHOz+RwLY5 rrcbP1RyosYGKPBD9kFA2WvKZVxc6aJmOd7YPCqPh6RRazY0E+Z0WNTZjUfo5H8kFcEs IDpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678494229; 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=/BQVuzY+1aniIxFwV3nAIhGW3ZAM3GsrQzHkvtpaNHU=; b=SWn9GQzIKyz3kE2x8RMQGVoFIqP5UwD/jVLlwyPo+J/o49tVqUcxOJqzFuh4lwuOM3 /dIQHfhLcDqrs3Eq3Xr0AcFk2v/1DDRspf0nAZuAIj4XRry1lM9M/1A0vaX7Wtk/OvQG 217BnTJVVHZN7PkeA0CmjKsLELsf+Cf7t/0u4LMiknCP9oGHAjxxJBHLFac/txKIZ2ot H9AVLznspj18DHYB4RcLoZDklydLx5z6ySWDf8daR6i4c9ii05KeR1qYJiWJYGuYCAav F56WCL6ffsMbXUafCIyt0zAJ9cTQxdEggJh8XrcXmc48fsIO0YHtft62DXYeOvj68cLd lOHA== X-Gm-Message-State: AO0yUKUxJ5tjAXkKCmVNivB0pjjAmOBBHdm0XjJvE6kwZWeA6qDKbh/w UT3ugRoW4TfF0lGRPvKCLlVb1ZMDdxk= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:716:b0:231:1d90:7b1b with SMTP id l22-20020a17090a071600b002311d907b1bmr9612096pjl.2.1678494229325; Fri, 10 Mar 2023 16:23:49 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:22:54 -0800 In-Reply-To: <20230311002258.852397-1-seanjc@google.com> Mime-Version: 1.0 References: <20230311002258.852397-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230311002258.852397-24-seanjc@google.com> Subject: [PATCH v2 23/27] KVM: x86/mmu: Assert that correct locks are held for page write-tracking From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Zhenyu Wang , Zhi Wang Cc: kvm@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yan Zhao , Ben Gardon 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_NONE, SPF_HELO_NONE,SPF_PASS,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760029996727809295?= X-GMAIL-MSGID: =?utf-8?q?1760029996727809295?= When adding/removing gfns to/from write-tracking, assert that mmu_lock is held for write, and that either slots_lock or kvm->srcu is held. mmu_lock must be held for write to protect gfn_write_track's refcount, and SRCU or slots_lock must be held to protect the memslot itself. Signed-off-by: Sean Christopherson Tested-by: Yan Zhao --- arch/x86/kvm/mmu/page_track.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index 1993db4578e5..ffcd7ac66f9e 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -12,6 +12,7 @@ */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include #include #include @@ -77,9 +78,6 @@ static void update_gfn_write_track(struct kvm_memory_slot *slot, gfn_t gfn, * add guest page to the tracking pool so that corresponding access on that * page will be intercepted. * - * It should be called under the protection both of mmu-lock and kvm->srcu - * or kvm->slots_lock. - * * @kvm: the guest instance we are interested in. * @slot: the @gfn belongs to. * @gfn: the guest page. @@ -87,6 +85,11 @@ static void update_gfn_write_track(struct kvm_memory_slot *slot, gfn_t gfn, void kvm_write_track_add_gfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn) { + lockdep_assert_held_write(&kvm->mmu_lock); + + lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) || + srcu_read_lock_held(&kvm->srcu)); + if (WARN_ON(!kvm_page_track_write_tracking_enabled(kvm))) return; @@ -107,9 +110,6 @@ EXPORT_SYMBOL_GPL(kvm_write_track_add_gfn); * remove the guest page from the tracking pool which stops the interception * of corresponding access on that page. * - * It should be called under the protection both of mmu-lock and kvm->srcu - * or kvm->slots_lock. - * * @kvm: the guest instance we are interested in. * @slot: the @gfn belongs to. * @gfn: the guest page. @@ -117,6 +117,11 @@ EXPORT_SYMBOL_GPL(kvm_write_track_add_gfn); void kvm_write_track_remove_gfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn) { + lockdep_assert_held_write(&kvm->mmu_lock); + + lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) || + srcu_read_lock_held(&kvm->srcu)); + if (WARN_ON(!kvm_page_track_write_tracking_enabled(kvm))) return;