From patchwork Sat Jul 29 00:47:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 127943 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp791890vqg; Fri, 28 Jul 2023 18:38:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlF7AHw0Ybn0k+aCnUKYT6SB0xd4jyucziVIio/NKrz7aeA33y391dkcSOoD/0NedM7pkZPx X-Received: by 2002:a17:906:cd0e:b0:99b:c845:791d with SMTP id oz14-20020a170906cd0e00b0099bc845791dmr676117ejb.76.1690594723524; Fri, 28 Jul 2023 18:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690594723; cv=none; d=google.com; s=arc-20160816; b=yb1eR4oYS/Vt+o6CuChoaig+oeDYHqSOTcbLNWHU+nOAkdOl0X3GgqwtIzHwlXO/rq vvvWIa1AWKQmJ9VG7ra6vNwirRvkPCIVd4alcDcDb4DluCxlF1GNouN1BAwJPLChpywh wb60Sjob4L13dM1CGqj1nFyxThIFURoKTT83mcTi1MZe0uTe1Zug+rgmsCNX+RIBi+Qq or5sYFYAvxBtepHiDDHyXns9sz92wiDaPbR6Cdo4uo2cLVP5Eg5Wpp3M9y2f4r8HShmJ BVReDZyGGifR8K+qzJNJGpYYTKp6ynW9qFjj+99t1UkHhy/Wrga6GIvaJhLcZVlUbJ/k hSRQ== 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=zg26OyCczKyFRFTxHD1ktdVAbwOnbHTDCM7ufXEGy6o=; fh=sOnAx2GuCQaI5IJu7Mo1xgLCDrPH4l5HM1pSkvn/pIo=; b=UjvoMhZWjlPgxnS9wRNEiNj/lT3NnsL5RnPGvmPT+cuXq916g1or6+OyxbTDWnCR9H 4YE8wa+AL0pjkFd0KIyatThB88nPE5CO4ZNcqDtuAIxQOsTWopBhxcNc6hmRJ30+Z7oe FBIaorfoTkZFRhgSG4rUjOwjbHTysKLPUtKrWHgQoPRIYVIAt7tMveY9V3CTO9ojJGxD PeS7eI57kYBnhM/WZw9ClJAycLUrVIRqteUrduotCt5xhD8F+kvmhsSS8IYHOz9xQvdi gVcNFmpUUJ+rexvvd2/uFoKtj6TeHFNx3V2G9IsIeq8j/PH5nfTagRpBr3c1Jn7YoOOF jHsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=yBgD4egD; 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 l12-20020a1709065a8c00b00992ae4dfc05si3718002ejq.1021.2023.07.28.18.38.20; Fri, 28 Jul 2023 18:38:43 -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=yBgD4egD; 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 S235552AbjG2Ate (ORCPT + 99 others); Fri, 28 Jul 2023 20:49:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236976AbjG2AtO (ORCPT ); Fri, 28 Jul 2023 20:49:14 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E22BE49FC for ; Fri, 28 Jul 2023 17:48:36 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d2a392775c6so529229276.0 for ; Fri, 28 Jul 2023 17:48:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690591655; x=1691196455; 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=zg26OyCczKyFRFTxHD1ktdVAbwOnbHTDCM7ufXEGy6o=; b=yBgD4egDyD7rn5Rlgh5FzPjyIZK4NrQZnJM1XrsEWRbnhlUJw2W+HwTx6xEzr65Djo d5xWhDMzlm0ICw9QLqr0W/Pmm4dWjeERc0IF1lelxEBluV7VrHar/xOIrk7VKhd7mvKo U/IXmBY88FL+332U62NfJQT6PL5AF7CP+NHFuMECDhqsM1ymjNUVKHOgJWcF/Tp3+M+M zeOoyliISA4B2nUv4cyAPRkrkzcucMs56N9AE1YLAwXUh4cDFDq5lJByKszSr/GFE99y 5qlO+lGEK4m9OiYMzAwk8RJtyKfLgfTYgAIPqlq5y9w/OkjyoWnZ8EZZvmsqK+tTEXGs 4xAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591655; x=1691196455; 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=zg26OyCczKyFRFTxHD1ktdVAbwOnbHTDCM7ufXEGy6o=; b=UspaHsGFr5dty84LuzpGHsHepigOKeLZlHZ2Bfi3Ugx2LT6g6jIwX65zj8/xcDPJYO 68U4/DABftUwf/Vt3TOqKk5wuIVeG6dds6hTt+ioPtVx1KcZX1DQ91DTO+7hN8zA1hll ntveq2D8IzmuYiffV60P8DGy6eiqfdZ89a8z4a88BnEjhW76r+Zb6NSIlTLtppE3q36B MGPQmNnsm94z6HTCEuSxBd3GuaaWE6lxiG69YS2uMTQmhpnF5jwyWR6Vc01KYydFG/JD bdIH/npqYk5bxZsErV8phO8V5+TD9cYVuGVBDlJqlI1tbWYIf5pL3A/4WqeMBvM33IS1 95Cw== X-Gm-Message-State: ABy/qLa+mY19MdnbDDjaY+WfGGfOx6CZouWz2Pn0Nvn3AAEmPco7s1fs s9+RFRvlk1S3Ykw7VTBSffmbIg2YhH4= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:100f:b0:cf9:3564:33cc with SMTP id w15-20020a056902100f00b00cf9356433ccmr24320ybt.13.1690591655397; Fri, 28 Jul 2023 17:47:35 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 17:47:16 -0700 In-Reply-To: <20230729004722.1056172-1-seanjc@google.com> Mime-Version: 1.0 References: <20230729004722.1056172-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230729004722.1056172-7-seanjc@google.com> Subject: [PATCH v3 06/12] KVM: x86/mmu: Rename MMU_WARN_ON() to KVM_MMU_WARN_ON() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Mingwei Zhang , David Matlack , Jim Mattson 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,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: 1772717052723755016 X-GMAIL-MSGID: 1772717052723755016 Rename MMU_WARN_ON() to make it super obvious that the assertions are all about KVM's MMU, not the primary MMU. Signed-off-by: Sean Christopherson Reviewed-by: Philippe Mathieu-Daudé --- arch/x86/kvm/mmu/mmu.c | 4 ++-- arch/x86/kvm/mmu/mmu_internal.h | 4 ++-- arch/x86/kvm/mmu/spte.h | 8 ++++---- arch/x86/kvm/mmu/tdp_mmu.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 8a21b06a9646..80daaa84a8eb 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1255,7 +1255,7 @@ static bool spte_clear_dirty(u64 *sptep) { u64 spte = *sptep; - MMU_WARN_ON(!spte_ad_enabled(spte)); + KVM_MMU_WARN_ON(!spte_ad_enabled(spte)); spte &= ~shadow_dirty_mask; return mmu_spte_update(sptep, spte); } @@ -1699,7 +1699,7 @@ static void kvm_mmu_check_sptes_at_free(struct kvm_mmu_page *sp) int i; for (i = 0; i < SPTE_ENT_PER_PAGE; i++) { - if (MMU_WARN_ON(is_shadow_present_pte(sp->spt[i]))) + if (KVM_MMU_WARN_ON(is_shadow_present_pte(sp->spt[i]))) pr_err_ratelimited("SPTE %llx (@ %p) for gfn %llx shadow-present at free", sp->spt[i], &sp->spt[i], kvm_mmu_page_get_gfn(sp, i)); diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h index 9ea80e4d463c..bb1649669bc9 100644 --- a/arch/x86/kvm/mmu/mmu_internal.h +++ b/arch/x86/kvm/mmu/mmu_internal.h @@ -9,9 +9,9 @@ #undef MMU_DEBUG #ifdef MMU_DEBUG -#define MMU_WARN_ON(x) WARN_ON(x) +#define KVM_MMU_WARN_ON(x) WARN_ON(x) #else -#define MMU_WARN_ON(x) do { } while (0) +#define KVM_MMU_WARN_ON(x) do { } while (0) #endif /* Page table builder macros common to shadow (host) PTEs and guest PTEs. */ diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h index 1279db2eab44..83e6614f3720 100644 --- a/arch/x86/kvm/mmu/spte.h +++ b/arch/x86/kvm/mmu/spte.h @@ -265,13 +265,13 @@ static inline bool sp_ad_disabled(struct kvm_mmu_page *sp) static inline bool spte_ad_enabled(u64 spte) { - MMU_WARN_ON(!is_shadow_present_pte(spte)); + KVM_MMU_WARN_ON(!is_shadow_present_pte(spte)); return (spte & SPTE_TDP_AD_MASK) != SPTE_TDP_AD_DISABLED; } static inline bool spte_ad_need_write_protect(u64 spte) { - MMU_WARN_ON(!is_shadow_present_pte(spte)); + KVM_MMU_WARN_ON(!is_shadow_present_pte(spte)); /* * This is benign for non-TDP SPTEs as SPTE_TDP_AD_ENABLED is '0', * and non-TDP SPTEs will never set these bits. Optimize for 64-bit @@ -282,13 +282,13 @@ static inline bool spte_ad_need_write_protect(u64 spte) static inline u64 spte_shadow_accessed_mask(u64 spte) { - MMU_WARN_ON(!is_shadow_present_pte(spte)); + KVM_MMU_WARN_ON(!is_shadow_present_pte(spte)); return spte_ad_enabled(spte) ? shadow_accessed_mask : 0; } static inline u64 spte_shadow_dirty_mask(u64 spte) { - MMU_WARN_ON(!is_shadow_present_pte(spte)); + KVM_MMU_WARN_ON(!is_shadow_present_pte(spte)); return spte_ad_enabled(spte) ? shadow_dirty_mask : 0; } diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 512163d52194..f881de40f9ef 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1548,8 +1548,8 @@ static bool clear_dirty_gfn_range(struct kvm *kvm, struct kvm_mmu_page *root, if (!is_shadow_present_pte(iter.old_spte)) continue; - MMU_WARN_ON(kvm_ad_enabled() && - spte_ad_need_write_protect(iter.old_spte)); + KVM_MMU_WARN_ON(kvm_ad_enabled() && + spte_ad_need_write_protect(iter.old_spte)); if (!(iter.old_spte & dbit)) continue; @@ -1607,8 +1607,8 @@ static void clear_dirty_pt_masked(struct kvm *kvm, struct kvm_mmu_page *root, if (!mask) break; - MMU_WARN_ON(kvm_ad_enabled() && - spte_ad_need_write_protect(iter.old_spte)); + KVM_MMU_WARN_ON(kvm_ad_enabled() && + spte_ad_need_write_protect(iter.old_spte)); if (iter.level > PG_LEVEL_4K || !(mask & (1UL << (iter.gfn - gfn))))