Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   "Suthikulpanit, Suravee" <Suravee.Suthikulpanit@amd.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "kvm@vger.kernel.org" <kvm@vger.kernel.org>
CC:     "joro@8bytes.org" <joro@8bytes.org>,
        "pbonzini@redhat.com" <pbonzini@redhat.com>,
        "rkrcmar@redhat.com" <rkrcmar@redhat.com>,
        "Suthikulpanit, Suravee" <Suravee.Suthikulpanit@amd.com>
Subject: [PATCH] svm/avic: Fix invalidate logical APIC id entry
Thread-Topic: [PATCH] svm/avic: Fix invalidate logical APIC id entry
Thread-Index: AQHU4Jh8MXOh/YIDZE+Tvx4LHPVDEQ==
Date:   Fri, 22 Mar 2019 10:17:43 +0000
Message-ID: <20190322101706.9377-1-suravee.suthikulpanit@amd.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.17.1
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 5710d561-80b4-4d2f-bde8-08d6aeaf9ebd
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:DM6PR12MB3244;
x-ms-traffictypediagnostic: DM6PR12MB3244:
x-microsoft-antispam-prvs: <DM6PR12MB324476EB6D0D03AFB16CFB9EF3430@DM6PR12MB3244.namprd12.prod.outlook.com>
x-forefront-prvs: 09840A4839
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(366004)(136003)(376002)(396003)(39860400002)(199004)(189003)(386003)(256004)(6506007)(110136005)(14444005)(25786009)(52116002)(7736002)(50226002)(68736007)(99286004)(106356001)(305945005)(71190400001)(71200400001)(5660300002)(72206003)(102836004)(86362001)(54906003)(2501003)(14454004)(2906002)(316002)(3846002)(6116002)(186003)(97736004)(4326008)(26005)(478600001)(8676002)(81156014)(81166006)(486006)(1076003)(2616005)(476003)(4744005)(6436002)(6486002)(8936002)(53936002)(36756003)(66066001)(105586002)(6512007);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3244;H:DM6PR12MB2844.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: 9+us0N+F/rjB+AXL5I31oQZUjZMCpj4GIFM6nwgCWzcwuVd0duV0avc2Dhbv0qhSgsTqRSppyowJEzEPNDWb89HnPw6c8eAx2eZMJ5eaYpwC3Tu1XgEW4YVtIzL9jVQKrsdsBNNEPt4HSdlu6ga6e616f/mVd/1Wq1cc/ETP5zBJpD//PP2Rn1Tq6gf9H67MXhzQATUStdx7PgFiAcDYAyJA4mxKavi/VuuIqoGQJ5plF0SG0fOmh51bT1n/bibqyV3qtqTKV3ssFt3zdzVVU7MqoyminKmXdwn3IcRn2/umzXVEVy3f4hKy2ZE4wxhTwJ9Gy/f42gceziVwZa/r9m7/y2T5uvCbt7ml/83uoxOv4KDs36df+o9CL855jkOtj0Y2AKbqmgTyxkCHh1d4I3rjo4VOqzxUGmpB3YhmLa0=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5710d561-80b4-4d2f-bde8-08d6aeaf9ebd
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Mar 2019 10:17:43.5226
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3244
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Only clear the valid bit when invalidate logical APIC id entry.
The current logic clear the valid bit, but also set the rest of
the bits (including reserved bits) to 1.

Fixes: 98d90582be2e ('svm: Fix AVIC DFR and LDR handling')
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
 arch/x86/kvm/svm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 7a4ce1a22ca0..f4fb766e474c 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -4640,7 +4640,7 @@ static void avic_invalidate_logical_id_entry(struct k=
vm_vcpu *vcpu)
 	u32 *entry =3D avic_get_logical_id_entry(vcpu, svm->ldr_reg, flat);
=20
 	if (entry)
-		WRITE_ONCE(*entry, (u32) ~AVIC_LOGICAL_ID_ENTRY_VALID_MASK);
+		WRITE_ONCE(*entry, (u32)(*entry & ~AVIC_LOGICAL_ID_ENTRY_VALID_MASK));
 }
=20
 static int avic_handle_ldr_update(struct kvm_vcpu *vcpu)
--=20
2.17.1