From nobody Sat May 4 23:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1612431393; cv=none; d=zohomail.com; s=zohoarc; b=itQbnhSPcT5wv3Ug22Ms7d6B7KoOYG3WoBMEPJNQVElOtgdx4njQFjDy2njmdqQcpUyzhNjMOGQDSQYGVKqZTByejNzhM/sHfOjF3Oxn5ZiniC6e0wlRg5m2fYrgKhrPvjLrEqFeWGBbkzObJZdIrD+ajxF3aCQ+QVuxFdCY5D8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612431393; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=W8SxtxQ4Ttrtlh6kMq9Cjh6bi20t2gWEjxJPBHgcr/U=; b=mGbgV2OEBKv78R2Hg5i3lEj56o5ogKWRoNcqOqiY+G/dmtl+qKlhzpj+FEQ6neCHYIfZtwuYcrBpig6ooyevyO8+Ac20wwF7j0hJP/6y9Bw71WayGOE+k5eQwpiYHjXmKHaVOPiHym+U6IRAbM+F0kOF6ncnXvin2cPZJxs4kbY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1612431393847157.33763344214253; Thu, 4 Feb 2021 01:36:33 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.81192.149543 (Exim 4.92) (envelope-from ) id 1l7b3a-00079G-R4; Thu, 04 Feb 2021 09:36:10 +0000 Received: by outflank-mailman (output) from mailman id 81192.149543; Thu, 04 Feb 2021 09:36:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7b3a-000799-Ng; Thu, 04 Feb 2021 09:36:10 +0000 Received: by outflank-mailman (input) for mailman id 81192; Thu, 04 Feb 2021 09:36:09 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7b3Z-000794-3j for xen-devel@lists.xenproject.org; Thu, 04 Feb 2021 09:36:09 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 559ac284-2077-457e-8b54-c2069740b797; Thu, 04 Feb 2021 09:36:07 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id BF5E4AC97; Thu, 4 Feb 2021 09:36:06 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 559ac284-2077-457e-8b54-c2069740b797 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1612431366; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W8SxtxQ4Ttrtlh6kMq9Cjh6bi20t2gWEjxJPBHgcr/U=; b=WWXyqVm72x1U+TLG9qEN+4FPUIhDAbpXuU9AIqpWltcoNPIe06Pcyw/0iN3iGTx8uOY4Ea bJg/aMj54jFKsRegtWaDzU7HATvvlD1wTKcbMsSULdCd5n5u13KI/+B3U1tNs6AgxJztDp JlKXCiVy0fQBSXB81p1+2BqzYlfNdSI= To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , James Dingwall From: Jan Beulich Subject: [PATCH for-4.12 and older] x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL} (again) Message-ID: <1f4a8233-7f7b-dbd9-26f5-69e3eb659fa2@suse.com> Date: Thu, 4 Feb 2021 10:36:06 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" X86_VENDOR_* aren't bit masks in the older trees. Reported-by: James Dingwall Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -226,7 +226,8 @@ int guest_rdmsr(const struct vcpu *v, ui */ case MSR_IA32_PERF_STATUS: case MSR_IA32_PERF_CTL: - if ( !(cp->x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_CENTAUR)) ) + if ( cp->x86_vendor !=3D X86_VENDOR_INTEL && + cp->x86_vendor !=3D X86_VENDOR_CENTAUR ) goto gp_fault; =20 *val =3D 0;