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 C6BB6C433EF for ; Wed, 6 Oct 2021 13:37:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACD4E60F9E for ; Wed, 6 Oct 2021 13:37:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239038AbhJFNjA (ORCPT ); Wed, 6 Oct 2021 09:39:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31720 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238995AbhJFNiq (ORCPT ); Wed, 6 Oct 2021 09:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633527414; 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=zi054OphNR4YOrKnGY04qCEpE/Tk8lGtKOdDVzEQgV0=; b=hkvq8NJsRhQfpjVdjxrZRGtJhpW4oeiWTke+Xvrijv0jKYZhwKP32NnOBHHpsH7g7cyvzL kjnVqziaTY2fpnfYiQiYiJfRdFanO4g3sVXe5WpnaFhqfE2DsBQ9jXyoIEPiremE0xEZGx n5iaW+aXgN9P3FdigiGc+NupE+ndmW0= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-Q5dqXw1XNYOG0kg1C1QUag-1; Wed, 06 Oct 2021 09:36:53 -0400 X-MC-Unique: Q5dqXw1XNYOG0kg1C1QUag-1 Received: by mail-ed1-f71.google.com with SMTP id v9-20020a50d849000000b003db459aa3f5so87618edj.15 for ; Wed, 06 Oct 2021 06:36:53 -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=zi054OphNR4YOrKnGY04qCEpE/Tk8lGtKOdDVzEQgV0=; b=o8bmi47peVSi25dNiPuU8fMenovff9xlpJFC7wKaLugKwDj/0yuEJBM+7bgElkcvRh g2yLzz7CzOXVn9ejK9WrGIR/AibmowyPHI/RaujgylcadXeBGXmHvs+FzjXcawNENa9P gjyQo0wM6CB9f5597pcNoFrmVq5QSjx9NG+ydk1IK6ktLrcvlG6fGoPdZE/YCpCEZn7l AkUj2DFceHulje6LkTxuL24xyMcS/LDHvZuhkaqm0XL7PFpJLOLq+ta9tIE5DVOs6mWN eBfh7EC18opU7ugRkXJ8smJ6fFfgQR29sWPM5s0VneNjTgJ9fzcr05h6INgDFucMl4C5 weTQ== X-Gm-Message-State: AOAM531+QugkrrUTY/byHQC+hN5sYqC123cbrxFTll47cgbqQJayQu8D NSEGGA1YOCxg3LguB5FBCgmfu3D1Nx1yGE9nE/66M61tzgS19L9zK2zCm1xCnUiMBZ5QwjRz0go ehvybx/hVgC0+VRsTYqnHRAwW X-Received: by 2002:a17:906:2c53:: with SMTP id f19mr3279739ejh.326.1633527412051; Wed, 06 Oct 2021 06:36:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGhrNpiCcqnxw2q4z0gic+jPTFiIPs5YIp8IwzhKzz3fJa/t/dqSqNd48d9J3px/QNMuYt7A== X-Received: by 2002:a17:906:2c53:: with SMTP id f19mr3279721ejh.326.1633527411866; Wed, 06 Oct 2021 06:36:51 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e? ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id zg6sm1917740ejb.102.2021.10.06.06.36.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 Oct 2021 06:36:50 -0700 (PDT) Message-ID: <5c4a0910-7cb8-da4c-aec5-c88c50f0b2fc@redhat.com> Date: Wed, 6 Oct 2021 15:36:39 +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 7/9] kvm: x86: Add AMD PMU MSRs to msrs_to_save_all[] Content-Language: en-US To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fares Mehanna , tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, kvm@vger.kernel.org References: <20211006133021.271905-1-sashal@kernel.org> <20211006133021.271905-7-sashal@kernel.org> From: Paolo Bonzini In-Reply-To: <20211006133021.271905-7-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/10/21 15:30, Sasha Levin wrote: > From: Fares Mehanna > > [ Upstream commit e1fc1553cd78292ab3521c94c9dd6e3e70e606a1 ] > > Intel PMU MSRs is in msrs_to_save_all[], so add AMD PMU MSRs to have a > consistent behavior between Intel and AMD when using KVM_GET_MSRS, > KVM_SET_MSRS or KVM_GET_MSR_INDEX_LIST. > > We have to add legacy and new MSRs to handle guests running without > X86_FEATURE_PERFCTR_CORE. > > Signed-off-by: Fares Mehanna > Message-Id: <20210915133951.22389-1-faresx@amazon.de> > Signed-off-by: Paolo Bonzini > Signed-off-by: Sasha Levin > --- > arch/x86/kvm/x86.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 1e7d629bbf36..28b86f47fea5 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -1327,6 +1327,13 @@ static const u32 msrs_to_save_all[] = { > MSR_ARCH_PERFMON_EVENTSEL0 + 12, MSR_ARCH_PERFMON_EVENTSEL0 + 13, > MSR_ARCH_PERFMON_EVENTSEL0 + 14, MSR_ARCH_PERFMON_EVENTSEL0 + 15, > MSR_ARCH_PERFMON_EVENTSEL0 + 16, MSR_ARCH_PERFMON_EVENTSEL0 + 17, > + > + MSR_K7_EVNTSEL0, MSR_K7_EVNTSEL1, MSR_K7_EVNTSEL2, MSR_K7_EVNTSEL3, > + MSR_K7_PERFCTR0, MSR_K7_PERFCTR1, MSR_K7_PERFCTR2, MSR_K7_PERFCTR3, > + MSR_F15H_PERF_CTL0, MSR_F15H_PERF_CTL1, MSR_F15H_PERF_CTL2, > + MSR_F15H_PERF_CTL3, MSR_F15H_PERF_CTL4, MSR_F15H_PERF_CTL5, > + MSR_F15H_PERF_CTR0, MSR_F15H_PERF_CTR1, MSR_F15H_PERF_CTR2, > + MSR_F15H_PERF_CTR3, MSR_F15H_PERF_CTR4, MSR_F15H_PERF_CTR5, > }; > > static u32 msrs_to_save[ARRAY_SIZE(msrs_to_save_all)]; > Acked-by: Paolo Bonzini