Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3326599pxf; Mon, 5 Apr 2021 09:06:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGKtxUlaFFQfOP7hP90xA2nl+yoFPjcgX7v3u2sHigX+U01Z8GC5yIPPtpT1jOPH3tpfDU X-Received: by 2002:a17:907:77d4:: with SMTP id kz20mr29541956ejc.93.1617638793577; Mon, 05 Apr 2021 09:06:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617638793; cv=none; d=google.com; s=arc-20160816; b=OHMxHxlkQZ/dihsqrP8spsxUgBSWZbCEBxHsTU2UiW5thZDuk3ZeWXwkY0rxroD/6K r/hBcEJBMzTmwgl4aV7zw2EOby5qXsaoRRTZOFrF5aeyzopOn2TciKneF6CTSjuPttoR 2i72rYdCW3eqQZUQ1/1RgWepcwmCtOT/DC1hZj7Mz3hvu6BNeRxIzPU20v/AtWxonSto kZPRe2HH3pucK5yBbQw2dOV0XfQ+b4EYC25knJHwpvnzLRDcefoBPlrPADJArVCRZwvh 2ond8GJ6ipjek2ruCJSLbnACROL7GRrkjylUg4k2XJMJhGQ9Pt+taurH3AM9deyXT8OA 3ZYQ== 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=dn1f0J0V7Mk50R3JmniExxhH1QlNAd/VnoPTD2XML0A=; b=S+0P1hOXS9GNJaTjx4sq5C1hKjLjvTAbo3am7Cc5/bvdpn72fAjEWjJawF2Ky79zGt NdNHwNlfKVZmf8MdkC4igAvzJnR7u0HWAijdQB0CXpqI080sUzbBE7Qwp6xPMzKUDYvK lps7sD6xTBXcUqXTm0EhhirDZffUiSQVAVzxknMgTbJP2e/jUjr9bX1WRTwdCEfGHwqj Ar415v3pUT8wxjOO6MWSz45hUXaoCe6mR3haqvyQVs6+CWzI8Cmlqy/hUsVG84JpG59G taYFCZWp670yBEZ+f8Sgr7llZHXYwJBG8/2qR894IS8Jw5kPvpV1Io/sXPbattCimITM bJWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=R8Mo32bo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t8si15003198edd.473.2021.04.05.09.06.10; Mon, 05 Apr 2021 09:06:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=R8Mo32bo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237885AbhDEJNl (ORCPT + 99 others); Mon, 5 Apr 2021 05:13:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:55896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238486AbhDEJKE (ORCPT ); Mon, 5 Apr 2021 05:10:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E1CF8613AF; Mon, 5 Apr 2021 09:09:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613796; bh=7sosVSFsnIOZ5vDQXTiruRRzJHhz0n9SsU5X1BpEw6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R8Mo32boVTUHfom+q+irpAdsiS6YheyaqXb69gmhq7u97rzZ/VbKYxTmDk8lgIMfr 8uuO3+gNjtrdmvDh4uWFVreGd2hCHv+5FGD3X/YdOZFswY+2Z7akyAYXUO2sXreSHE qh/v3ThHP1kUzmQwivpRkfWzTr+93NqiQbDEArS4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Gardon , Paolo Bonzini , Sasha Levin Subject: [PATCH 5.10 094/126] KVM: x86/mmu: Fix braces in kvm_recover_nx_lpages Date: Mon, 5 Apr 2021 10:54:16 +0200 Message-Id: <20210405085034.164188708@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085031.040238881@linuxfoundation.org> References: <20210405085031.040238881@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Gardon [ Upstream commit 8d1a182ea791f0111b0258c8f3eb8d77af0a8386 ] No functional change intended. Fixes: 29cf0f5007a2 ("kvm: x86/mmu: NX largepage recovery for TDP MMU") Signed-off-by: Ben Gardon Message-Id: <20210202185734.1680553-10-bgardon@google.com> Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/mmu/mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index dacbd13d32c6..0f45ad05f895 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5992,10 +5992,10 @@ static void kvm_recover_nx_lpages(struct kvm *kvm) struct kvm_mmu_page, lpage_disallowed_link); WARN_ON_ONCE(!sp->lpage_disallowed); - if (sp->tdp_mmu_page) + if (sp->tdp_mmu_page) { kvm_tdp_mmu_zap_gfn_range(kvm, sp->gfn, sp->gfn + KVM_PAGES_PER_HPAGE(sp->role.level)); - else { + } else { kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list); WARN_ON_ONCE(sp->lpage_disallowed); } -- 2.30.1