From mboxrd@z Thu Jan 1 00:00:00 1970 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 D5E26C433FE for ; Mon, 23 May 2022 16:18:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238718AbiEWQR7 (ORCPT ); Mon, 23 May 2022 12:17:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238765AbiEWQRt (ORCPT ); Mon, 23 May 2022 12:17:49 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 088CD66AFA for ; Mon, 23 May 2022 09:17:39 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id c22so14118212pgu.2 for ; Mon, 23 May 2022 09:17:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=eNbcOsis/KpOazxwoapGqmAzQvleW1ZvCZVss5TACNY=; b=PvlTBp13muG1TUI68g94aTQ/FiuK9qHmMCLEhGVjZ0ZOVhN6vz5vhhS+wmUP4+Lno7 7IlNEdS8L46cr3LPygXWejIC2R5nVJHYFz2RQibrrPusEsaLKGvIB9h6v7KfX7A7i0kB v+P2h1gE9IKmT0G5rBzwpuio2B55DiAPk8drqySZQ6ng/a9/tF4skaP1vmmzJ5HO8Eae PxGQp8Gqh3zX4GFCTSCnZ/kLWXYyzDQ0QstOp7r3CfZjsMSi22A3To/WeaVSCKJ0a/sA PopRzqh3tQ/XAtcJTZ/asZNoRcRGEGNwG+tcYnQThEJqQPzA4Ro2opqfmf1ZUxg77Xkw zo6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=eNbcOsis/KpOazxwoapGqmAzQvleW1ZvCZVss5TACNY=; b=Eapkp+F8xBn+L4ab38CZg9UWflcDZwJ8pZhYY/sPeSpTerA4EUGPPwCzuVT8/nUft2 nO8Wn3Yv/tJ1QrG7+CYodd68kx2fKFW1VQG+dhSn55b2+kJj3hNJ0MnLVbjiiUAoJMwb kt95dVhAKQvsXmLq4+nTNZyYClnGKPP0wb1PFafARsaGB/znNr4RU5Yzw1JmoOG3ujGo JeGRr4H5RnDtuSMhOL6roPpxRL1u67uh2PwGLeFLbp0jZ/URhd6ls2ANRFw3DCD7PggK Q5fDMkCvgtAeYYoCaRlSVZNHgILcfThQ34Qxfetago9S85Ufe2+h6t/XZ78mEGcSv/T9 ujoA== X-Gm-Message-State: AOAM5329TGNRQuHOOW9LZUvOyADtMZNrIldDWewDp/cwEff3EAcS17Tb /e0uEVKhpkcjwMggg6QX8c/w9A== X-Google-Smtp-Source: ABdhPJxjulk6DvCNQRz3GNKlx5A5+lWZ+jpdQDxApa+oqiYCn513L8CGqWxpc26B7Dlc/KO80E966g== X-Received: by 2002:a05:6a00:1511:b0:510:30d1:e8fd with SMTP id q17-20020a056a00151100b0051030d1e8fdmr24535196pfu.37.1653322658336; Mon, 23 May 2022 09:17:38 -0700 (PDT) Received: from google.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id e18-20020a170902f11200b00162017529easm5297369plb.167.2022.05.23.09.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 09:17:37 -0700 (PDT) Date: Mon, 23 May 2022 16:17:34 +0000 From: Sean Christopherson To: shaoqin.huang@intel.com Cc: pbonzini@redhat.com, Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] KVM: x86/mmu: Check every prev_roots in __kvm_mmu_free_obsolete_roots() Message-ID: References: <20220523010948.2018342-1-shaoqin.huang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220523010948.2018342-1-shaoqin.huang@intel.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Sun, May 22, 2022, shaoqin.huang@intel.com wrote: > From: Shaoqin Huang > > Iterate every prev_roots and only zap obsoleted roots. Better would be something like: When freeing obsolete previous roots, check prev_roots as intended, not the current root. Ugh, my bad. This escaped into v5.18 :-( Fixes: 527d5cd7eece ("KVM: x86/mmu: Zap only obsolete roots if a root shadow page is zapped") Cc: stable@vger.kernel.org > > Signed-off-by: Shaoqin Huang > --- > arch/x86/kvm/mmu/mmu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 45e1573f8f1d..22803916a609 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -5168,7 +5168,7 @@ static void __kvm_mmu_free_obsolete_roots(struct kvm *kvm, struct kvm_mmu *mmu) > roots_to_free |= KVM_MMU_ROOT_CURRENT; > > for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++) { > - if (is_obsolete_root(kvm, mmu->root.hpa)) > + if (is_obsolete_root(kvm, mmu->prev_roots.hpa)) My version is bad, but at least it compiles ;-) arch/x86/kvm/mmu/mmu.c: In function ‘__kvm_mmu_free_obsolete_roots’: arch/x86/kvm/mmu/mmu.c:5182:58: error: ‘(struct kvm_mmu_root_info *)&mmu->prev_roots’ is a pointer; did you mean to use ‘->’? 5182 | if (is_obsolete_root(kvm, mmu->prev_roots.hpa)) | ^ | -> if (is_obsolete_root(kvm, mmu->prev_roots[i].hpa)) > roots_to_free |= KVM_MMU_ROOT_PREVIOUS(i); > } > > -- > 2.30.2 >