From patchwork Thu Feb 2 18:27:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardon X-Patchwork-Id: 52122 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp401029wrn; Thu, 2 Feb 2023 10:30:29 -0800 (PST) X-Google-Smtp-Source: AK7set9uRLS4jk1J9zJXSshDjgbuUOTxJWSrA+XvjafWJaYLAsazPz8ggnRSDjTlVuVVphnFspyG X-Received: by 2002:a17:903:487:b0:196:3d0a:84cf with SMTP id jj7-20020a170903048700b001963d0a84cfmr7031320plb.34.1675362629567; Thu, 02 Feb 2023 10:30:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675362629; cv=none; d=google.com; s=arc-20160816; b=eUK+nHVpb+trvePR1PZpwvryyntvSMd0TBy6NF78tMkbG5rPI6yhcLedl72lb8WDyI sB7KcAlpJpmsaAos7BRM5qvaasjRd/KmSuVbt+jloD21jcOK5jvhZM36TC1nILRLGa57 ZzoOZ1/d6Oz48FmppAkqsHRIDmEGtOxYZFLxUiWEsZ4W3KWDmBPv3VVdw88dVsuDVNUG PrjUcKNr85xV61kjckTVfPPvO1OINKcNSWpp5u03wuxbVqzyuqJQz9k6Q4tcBNTZHs7H kl2TWsTLqfXbDX3UzlDsdML2nGIFMM+2wYOmrQX2DhRlpLW+jYjtEESJAPigZhOEgDIf dCNA== 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:dkim-signature; bh=68l7Ca3pftQohWSSywgHUbTYrISqbCJiWjSISNH3A/g=; b=bzkrCTE5I6JIVwq8aX+Pzhp1Omk8IUf3oQZx6Ub/44MwybR9FfN9PIC+Vem8g00PEJ gpHIeqwSQFiWTGurRHy0CqX6wQlqkWicLD+G8ht6uaWcesdQvf2Plan5zmRc/mXG6m5X l+hNbWE+1J2jhCf5mC8s0Q+seYmlkeVMy7pwcjS3Tc44k6yrVuZKSzpare7CPJFdoYFS eUz1oRTBNodfcSqYekdwnUTX9mCPo4vz7tvQfti8CwxSLXkc02nnhwuPNB16lGHYhXOo pwwIAvyM5Wj4S0hgy+oSQNRnTcb9YAk+69KEOLAo4qxC0EXtyP9MMToa0tbKD2EvrVvv D1Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=EMXPzaTx; 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 e6-20020a170902744600b00194a297cbaesi22091355plt.347.2023.02.02.10.30.17; Thu, 02 Feb 2023 10:30:29 -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=EMXPzaTx; 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 S232468AbjBBS2V (ORCPT + 99 others); Thu, 2 Feb 2023 13:28:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232135AbjBBS2Q (ORCPT ); Thu, 2 Feb 2023 13:28:16 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88B4615CB2 for ; Thu, 2 Feb 2023 10:28:15 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id z7-20020aa79587000000b00593f19705d5so1367733pfj.10 for ; Thu, 02 Feb 2023 10:28:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=68l7Ca3pftQohWSSywgHUbTYrISqbCJiWjSISNH3A/g=; b=EMXPzaTxaxT9UedHi545O+WFewb41vhprDn/JgWd0GuGuUVJf5bJ/x9JMOgYr/DaUo GbRid8cxpf9fdXPEp33jBiP2VbnEyzckcdCFs7ozLk3ZyQfN8gRLTpYGA1paFQLWnOvY VCC3muI5+X/9OTSPo8pmYE1G3+g+77IGW8s5dN8ACqGG1y1m3K87eLAWbR4LTwMeY60n R2GY+cV9cHHulDNM/vtauKXntnFTmlx9V/URQHJrZFL1dBB3JkanU+9ruEO0KMEnqz0I 6XgC/3Dv3SMD6uxplAxGSCDFMj73TutdCu0MOt4JuHMmUS9zI4MflVOwcaDl/7JL2sy9 cyAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=68l7Ca3pftQohWSSywgHUbTYrISqbCJiWjSISNH3A/g=; b=iTqVQX90G394ExxbG1qzJZPwOSIDQ1eU4RdW4r7QGgQXcyIsnHRAAZZby5v4bM5zxv ++9d2xbSuyRoHUqR8eWuvKQHVh01wgbJz3DS8cvDExZvLlOEEZMs3BtLfUc6/OGTnxhV c3+puF3+7v5B8T7J7iaIKODJgRiXl9pam34Ylt5NeE7JXN2SSBK2X6eu1UBC85hgt5q5 7VNGG667zjYR9mVUqBvBtHZXvnoKqlmeGbyl8CpDI9hEDzFxK965uOQdB4P5Qw4V2Ohz f4RNjLh6o5CFdE/qfhdMNjS7sMRXw+A8E0s3nuuGfNJyo4FcpxSz8YX/144FOYwwoLfJ aleA== X-Gm-Message-State: AO0yUKXXPHbfW0LpqGgjDRe3muVfXCyqD2SMa8ittKy/BTBJ7ejvOCjL P6/vzvaA7Wcx3jAb/8Sk9wDB/CMmoSDiPsu/BptejcMeEAb3FBVtPw1dH3BP1fOmR8lbpFoFNt1 4f0o45eZqjBJOBkLFy9Pd2DiwZga/1cS0Jn+i1o48aqUT3yNovLUz3SJgwwiVcCKLc0ojcl4z X-Received: from sweer.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:e45]) (user=bgardon job=sendgmr) by 2002:a17:903:120e:b0:196:44d4:244b with SMTP id l14-20020a170903120e00b0019644d4244bmr1762579plh.8.1675362494885; Thu, 02 Feb 2023 10:28:14 -0800 (PST) Date: Thu, 2 Feb 2023 18:27:50 +0000 In-Reply-To: <20230202182809.1929122-1-bgardon@google.com> Mime-Version: 1.0 References: <20230202182809.1929122-1-bgardon@google.com> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Message-ID: <20230202182809.1929122-3-bgardon@google.com> Subject: [PATCH 02/21] KVM: x86/mmu: Replace comment with an actual lockdep assertion on mmu_lock From: Ben Gardon To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Peter Xu , Sean Christopherson , David Matlack , Vipin Sharma , Ricardo Koller , 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?1756745044237668066?= X-GMAIL-MSGID: =?utf-8?q?1756745044237668066?= From: Sean Christopherson Assert that mmu_lock is held for write in __walk_slot_rmaps() instead of hoping the function comment will magically prevent introducing bugs. Signed-off-by: Sean Christopherson Signed-off-by: Ben Gardon --- arch/x86/kvm/mmu/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 09a0a2cc76bae..2ea8e58f83256 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5805,7 +5805,6 @@ typedef bool (*slot_rmaps_handler) (struct kvm *kvm, struct kvm_rmap_head *rmap_head, const struct kvm_memory_slot *slot); -/* The caller should hold mmu-lock before calling this function. */ static __always_inline bool __walk_slot_rmaps(struct kvm *kvm, const struct kvm_memory_slot *slot, slot_rmaps_handler fn, @@ -5815,6 +5814,8 @@ static __always_inline bool __walk_slot_rmaps(struct kvm *kvm, { struct slot_rmap_walk_iterator iterator; + lockdep_assert_held_write(&kvm->mmu_lock); + for_each_slot_rmap_range(slot, start_level, end_level, start_gfn, end_gfn, &iterator) { if (iterator.rmap)