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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A9B5C433F5 for ; Tue, 26 Oct 2021 16:18:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0F3460EB4 for ; Tue, 26 Oct 2021 16:18:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236328AbhJZQU2 (ORCPT ); Tue, 26 Oct 2021 12:20:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55188 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237343AbhJZQTj (ORCPT ); Tue, 26 Oct 2021 12:19:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635265035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3jgSUASYWyT5tYVtpdVqMRt2uKiCafnLlQ6NZfT7RQo=; b=b59d03RPGvXLGgJwo/7UYiSOYCDzeh5R2YIrYXAq94+jcDHhjSVMuNVIRhZbArKS65HaBR /E4hMVGchUXQwARlbo3LfQcvWD8vwSKziQi6AQhOIEcvVaV0U0T1g+Kwz9HEATudE2oX/z BM/5qbJloB7cTNaW456Eq4ETW5wFLTo= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-508-ZJ__onpcMQyXQWjmvC19iQ-1; Tue, 26 Oct 2021 12:17:14 -0400 X-MC-Unique: ZJ__onpcMQyXQWjmvC19iQ-1 Received: by mail-ed1-f72.google.com with SMTP id x13-20020a05640226cd00b003dd4720703bso7592799edd.8 for ; Tue, 26 Oct 2021 09:17:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=3jgSUASYWyT5tYVtpdVqMRt2uKiCafnLlQ6NZfT7RQo=; b=sQkOFFSe7x8HewFejT1prQCxQI1dJhYg5VWORvvmIK/Bn1DflkUYLXhfAyzcNJrfGG Wpm9ZyfobaZsXdJG4B3YPkYqM5Fj8sTje2jj3Ewwaj0R6KO61lp5yq4rVXb49xRAmgsT 4RMhJM5JD9yKJpN1g4O0m16yOmrhRzIwLLyW6bhbJ+lo542OJ27VjffRrXjGVEp0Gd95 ZFh/+7+tEwz4KRv4ugnv4yDVIjGjPUtfY/PTl9QhOoILHAXIuk/0x6KuZFqMAhDLin/7 1N8x8SizxvbdhMQnQc6qa1Rgs+BcKIhCiK0F+F5Z/KUHnjCplrWRMT8353u4T4f9DQmD TtQw== X-Gm-Message-State: AOAM530Y7dChm2eWWxpB+/QNgsjbvUsjsr8IR9UZ0pPpFw4+Ip6IFb8G rM2NNef99JdFzoHIlt0msTuFlNsxm9SR9/H9LdPTnVwHwpnYuD5sHI6/C/WMnDEEcU2GJxYec4f V8s9J4f7NSRUr+GrA X-Received: by 2002:a17:906:b184:: with SMTP id w4mr31291857ejy.418.1635265032943; Tue, 26 Oct 2021 09:17:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0CHq+n59DAZ2qwoWG3v25yTG1EA+fzNL7P1VBFbJ8j5wzwu7ibo4hUT23/l+2O/v0fOKE0A== X-Received: by 2002:a17:906:b184:: with SMTP id w4mr31291837ejy.418.1635265032719; Tue, 26 Oct 2021 09:17:12 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:c8dd:75d4:99ab:290a? ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id nd22sm10019205ejc.98.2021.10.26.09.17.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Oct 2021 09:17:12 -0700 (PDT) Message-ID: <54842867-9d40-5b8d-ea24-3ce32c8137ac@redhat.com> Date: Tue, 26 Oct 2021 18:17:09 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH MANUALSEL 5.14 5/5] KVM: MMU: Reset mmu->pkru_mask to avoid stale data Content-Language: en-US To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chenyi Qiang , Sean Christopherson , tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, huaitong.han@intel.com, guangrong.xiao@linux.intel.com, kvm@vger.kernel.org References: <20211025203828.1404503-1-sashal@kernel.org> <20211025203828.1404503-5-sashal@kernel.org> From: Paolo Bonzini In-Reply-To: <20211025203828.1404503-5-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On 25/10/21 22:38, Sasha Levin wrote: > From: Chenyi Qiang > > [ Upstream commit a3ca5281bb771d8103ea16f0a6a8a5df9a7fb4f3 ] > > When updating mmu->pkru_mask, the value can only be added but it isn't > reset in advance. This will make mmu->pkru_mask keep the stale data. > Fix this issue. > > Fixes: 2d344105f57c ("KVM, pkeys: introduce pkru_mask to cache conditions") > Signed-off-by: Chenyi Qiang > Message-Id: <20211021071022.1140-1-chenyi.qiang@intel.com> > Reviewed-by: Sean Christopherson > Signed-off-by: Paolo Bonzini > Signed-off-by: Sasha Levin > --- > arch/x86/kvm/mmu/mmu.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index c268fb59f779..6719a8041f59 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -4465,10 +4465,10 @@ static void update_pkru_bitmask(struct kvm_mmu *mmu) > unsigned bit; > bool wp; > > - if (!is_cr4_pke(mmu)) { > - mmu->pkru_mask = 0; > + mmu->pkru_mask = 0; > + > + if (!is_cr4_pke(mmu)) > return; > - } > > wp = is_cr0_wp(mmu); > > Acked-by: Paolo Bonzini