From patchwork Fri Nov 10 02:12:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 163749 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp838020vqs; Thu, 9 Nov 2023 18:16:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyUkxy27P9V8dRom0K25LwPbYVrPoI5MG1HwAmsFCBq5hKXY0TwAVihY0AgeQS9MIXBTIY X-Received: by 2002:a05:6a20:8417:b0:181:16c7:6cd0 with SMTP id c23-20020a056a20841700b0018116c76cd0mr8524068pzd.17.1699582611597; Thu, 09 Nov 2023 18:16:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699582611; cv=none; d=google.com; s=arc-20160816; b=CgKNdG9A0YwHYrG8Vxq2m6+5ZkNPNx5HldL9dhHXgys0BT7GVZU7hYzqeiyVbXZBnG vIOpmOOpD1h43D1iT7TtKCXHfQvG1TNTX2oYyftzZ+A1gRgwT1bXmFkkr2SQ9AGLneQz P7xU1R7nCHnYadi35P9ugf2qd7XtNCgxdXRD+I4/2PiDMcLAqQkXO1EuNy5GDROcS3OU KA/DYiuVQIxy5Fr3T6p8IxQlB6e1A5ZXag4rTvw3tROzGcAMGgBzEhRVjZRuZnECAaVB HatM6xSQ1Qsjjrai1lJzB0zfECplgS0dSmyA0S/w5e3muN77cmwRhq+WWPj4mRk31F0O nmGw== 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=2PzRa92RKIbv75Ni9RyZiiDqwO+fW7tfrLRiix/ZeFk=; fh=gm96CM+cG0KJxn7vnhn0c1c98ILNP1HHUrKfrGecw3M=; b=MfYqsNpaGajEgAcrBPD8crai36GfWUU5/WzVbwGOAdoOh8b3QZByYJtWZjE2K0hbXq YTYqiCPV6RBecm1iFig6wVkF3/kGlfJv3MAP1Lamafhy6Vw+NQZVFZzm/8EwUNhpzKB4 vwrTQY7zfUmhqOiNf4w0ljWQ+NITYV4SUvctgYJejjFIPDYvtmxXEGIfTKpIhY2l9T5x zRWEoEf5PH7vnskAftLghEJCjPi9Hst0rFaXM6UdVQBYiXO06hdrTVcVnJy5kdOd0F1B zBJVUDcA5tf23S9AoRy8IMSQXjD9zEOerfjIsTkfntKWI/wHdblQIYC5+rEDIR1Po0AK BQHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=bXDhMts0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id mi12-20020a17090b4b4c00b002800b13adb7si3348533pjb.72.2023.11.09.18.16.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 18:16:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=bXDhMts0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id C889D8088A6A; Thu, 9 Nov 2023 18:16:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345764AbjKJCNk (ORCPT + 30 others); Thu, 9 Nov 2023 21:13:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345750AbjKJCNa (ORCPT ); Thu, 9 Nov 2023 21:13:30 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D910246B0 for ; Thu, 9 Nov 2023 18:13:24 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-6bd5730bef9so1600784b3a.1 for ; Thu, 09 Nov 2023 18:13:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699582404; x=1700187204; darn=vger.kernel.org; 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=2PzRa92RKIbv75Ni9RyZiiDqwO+fW7tfrLRiix/ZeFk=; b=bXDhMts0VFGhCFMxQcwTJVIpNNRQB12quF39HGoUaMnmJmBF0/zLs4fGEaw0vXQwQ8 srxHHbZo1ALBhjPibLVsZYibRdWluMyosvRKnaFTWVAtGd0JCtYNz5ETg+gid6qwuq/W 1fBTkAheO5sp0JakE8iE2utTx5uWe0nTeAj9b/cDAdbKYijTHIsl7bZCuyRN8ghONMXq 89dexPCJVqATkG9NA8QjTvLvBKDgvSvOzCRRJqzPIB8RoRjmYc9fLaAOheKHIcz5Pkro RvW4j08WGNOnaIcJkcshTPxNTJ4c7nxXV/xThqWoQj0Pb68oL3bs14hJ/zVrWpP384PL SMTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699582404; x=1700187204; 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=2PzRa92RKIbv75Ni9RyZiiDqwO+fW7tfrLRiix/ZeFk=; b=hzOgQlFBk/Q3gdloRGHkZDKmmNfwGrLZ5s12lZ7RujyE84LKAAKIbOpIxD/2g5SqHu FV/3GaXbs9UnG3h4QhVDe6cCpj+MHcREXir3FyKxB2Gl1IOrQmQXd9IDWflhNqDQQcOb gyQJgGpWolt8TOipajxVE9GeS1HRH6Cq0Ut8OlZgZa8SPw3IA2v0kndPy/o2+TiRxOLs Y5HXN2kbpZqA+h2dWgqbkuJIfUan4kNtrZZ1CWe07GgjwwwcjMXnHE3pttgP2qxY3wVM U2WoM3E/AVeLUROBh2j+IItBNXjX9EG5HcvvwSEVDKO92LfvWuOyaQKTzALYSwBTozwr MGaA== X-Gm-Message-State: AOJu0YxwzbcdM5PNdfo1TqQzM39M5ATVLYhLYdjtbYrRnfdz1QMPMcqb 28B84Gz1lcp2OKS+sR1CvQ+iOouvp4w= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:a09:b0:6c3:9efc:6747 with SMTP id p9-20020a056a000a0900b006c39efc6747mr428065pfh.3.1699582404364; Thu, 09 Nov 2023 18:13:24 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 9 Nov 2023 18:12:46 -0800 In-Reply-To: <20231110021306.1269082-1-seanjc@google.com> Mime-Version: 1.0 References: <20231110021306.1269082-1-seanjc@google.com> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog Message-ID: <20231110021306.1269082-7-seanjc@google.com> Subject: [PATCH v8 06/26] KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Kan Liang , Dapeng Mi , Jim Mattson , Jinrong Liang , Aaron Lewis , Like Xu Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 09 Nov 2023 18:16:25 -0800 (PST) X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782141536545931508 X-GMAIL-MSGID: 1782141536545931508 Stop stripping bits 31:30 prior to validating/consuming the RDPMC index on AMD. Per the APM's documentation of RDPMC, *values* greater than 27 are reserved. The behavior of upper bits being flags is firmly Intel-only. Fixes: ca724305a2b0 ("KVM: x86/vPMU: Implement AMD vPMU code for KVM") Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/pmu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/kvm/svm/pmu.c b/arch/x86/kvm/svm/pmu.c index 5596fe816ea8..427ec055c8bb 100644 --- a/arch/x86/kvm/svm/pmu.c +++ b/arch/x86/kvm/svm/pmu.c @@ -77,8 +77,6 @@ static bool amd_is_valid_rdpmc_ecx(struct kvm_vcpu *vcpu, unsigned int idx) { struct kvm_pmu *pmu = vcpu_to_pmu(vcpu); - idx &= ~(3u << 30); - return idx < pmu->nr_arch_gp_counters; } @@ -86,7 +84,7 @@ static bool amd_is_valid_rdpmc_ecx(struct kvm_vcpu *vcpu, unsigned int idx) static struct kvm_pmc *amd_rdpmc_ecx_to_pmc(struct kvm_vcpu *vcpu, unsigned int idx, u64 *mask) { - return amd_pmc_idx_to_pmc(vcpu_to_pmu(vcpu), idx & ~(3u << 30)); + return amd_pmc_idx_to_pmc(vcpu_to_pmu(vcpu), idx); } static struct kvm_pmc *amd_msr_idx_to_pmc(struct kvm_vcpu *vcpu, u32 msr)