Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <986a5886-4ddc-aa88-db52-e8781ec95aed@amd.com>
Date:   Tue, 4 Oct 2022 09:05:24 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Content-Language: en-US
To:     tglx@linutronix.de, bp@alien8.de, mingo@redhat.com,
        dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
        venu.busireddy@oracle.com, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org
From:   Carlos Bilbao <carlos.bilbao@amd.com>
Cc:     "Lendacky, Thomas" <Thomas.Lendacky@amd.com>, bilbao@vt.edu
Subject: [PATCH] KVM: SVM: Fix reserved fields of struct sev_es_save_area
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NXc3ZE81ckc1Y0JtNGFBRm1Lb1BzaUdkL2QyYkRrdldZUU1DcnEyNjRkMTMr?=
 =?utf-8?B?TkxKWk43cFhDSU5SdGdZRkszcVArZVdqbGovbHo2WHRENXpPQ0ZOQjdSd0w3?=
 =?utf-8?B?NlM4V3Q1MmptM0Zjb1d6QVg1ck1QM3NaWENJUERnQ24yUlVUZmlxVWd2WjRV?=
 =?utf-8?B?YzB2bDFUNE1LNU1jY0JpRTBYbDU2ZlMrZFJBR0xiREdIZGU5RUdpeThadzZw?=
 =?utf-8?B?bjdMK0Y1K3V2Y0xFUnBlOTRQejRtTS9UN0QzMW9tSnN0SWkzSEJBMEJlZVpW?=
 =?utf-8?B?MXd1ZEhzSFFGdUhUV2FadXY3bEJEc1k3eEtDRnVlMXpBdzFkK2hYdG1Ec3FF?=
 =?utf-8?B?YllZSGRma0FucTlCai9jR092b1ZidzBUZUxjR0l3M3k3Sk9sclRKb2s0d0pq?=
 =?utf-8?B?NlE3aFBBVFlFd2FYVlF1M3g3ejliVlRueGFCcjBzRGFIMStuZ0dFckVpdzB5?=
 =?utf-8?B?Y3h5ZFJseW9RU1NSS2FkY0VHVDBSQUQxalRXU0t0NUF0SEIwN2tlOVlKamZa?=
 =?utf-8?B?cHlNUHI5T0JTdmFGekxJM3dOR0poTDJ1TkhKN2dJZCtzRkwrZkkvQXhvNVh6?=
 =?utf-8?B?ajAzcU5WdFh4NDByRzh3N254V0ZIOVJBVWJ1SGUvb2daNWp2bEllRUxHTXY1?=
 =?utf-8?B?YUl5MkhqWXRGMmpjVVo2Y0pYNUdld3lYWU9qOVNpcmN5QkVOSWx2czNVWm05?=
 =?utf-8?B?b29YbUxpNjMxZW0vUzd2ME5FazJOcUxZQlcxTVd6ZzBLa3ZMeHVza1pFSE1K?=
 =?utf-8?B?VnZuUVhVUm43ZGluZ2RMRFhGYWFjWjUxWG5ZMGFuYktSK0FFL2x1Tmd3SFRK?=
 =?utf-8?B?Q00rbWVLTkEwMzg5cEQ4bGZYL3lzcXdIZDdlMlJKUjRZR3VIZlhRMFpHWkdE?=
 =?utf-8?B?Uy9GN0xxanhmSzkyWkVNMTNiYjJ0MzJFamNKZ1ZaZnFIaGpNQW8vYUFRd1B6?=
 =?utf-8?B?WE13OVpRV09ZcU1KKzNCdzNZN1VNRXlDSmg4YnRWbytxanJrQks5MzZhQmY4?=
 =?utf-8?B?bDdESXB5L1FxdHpnMkFuaEFEQ3BjVjRGanYxTVg4WTVYalI3U3UxSTM2VlJB?=
 =?utf-8?B?NDlWN0x4eHBRU1hnNjRqeEZzN1Vvd2M1alhabGlOT2t1WldIV0U1NmI3aCtX?=
 =?utf-8?B?dVpFMjV1MzF5MUVPdmZIVFBjcU0wb05VYmhjV3NPTXEvT09YRGloK3h5TWND?=
 =?utf-8?B?Y3czaHNHYUlTZW04WW14TmFGOHpsRGV3c1gzaXc2d0JnUVpTNEVEb2FUN2ll?=
 =?utf-8?B?clJWMjl1d3gyR3k3OUNaTnV5YnpLK05VRWV4clgwejlMTWZHT0VkT2ZRdzg0?=
 =?utf-8?B?RW9NSkRhYWQ2dmEycHExeGI0S2JEVjR1OGU0S2k0SnBvL0hPZGFkNkM2SUxQ?=
 =?utf-8?B?R2hUQ1NqR3VLa2U3N1BMeGN1dHFSaG9IY2RGbUFuWnRRcUJFNGZHbVEvWDA5?=
 =?utf-8?B?T3BRSzdOSkRsSm5iSGNGOXA2endJSzNhRDdtWUI2dDB2M3J0cS9xN0JwTlZs?=
 =?utf-8?B?SWNFbmlnNDNZS0Zud2tqTFFhQ0RQUXNuUkdpSWR6dlA3bnd6VWQzRkJucUcr?=
 =?utf-8?B?SDdFMFFFMlk4R2Ftb1FwUk14N0ZYSjhLTWQ4NlBHdkkrNW9UamNGYzYzVXZk?=
 =?utf-8?B?NWhGbVNvejMwcGZ6VytqUkZFZEd0UnU5dHo3NmxnTTlxSURWWGluZ2QwZVVk?=
 =?utf-8?B?UHFsV1dOdm16MERkQXVRMTdremc1cHFlR1d4NzBmckRUY0dNVjd0cGtlQ01r?=
 =?utf-8?B?Njh2QWZjUllhbUFGZHc1dFVWMnJVbm1oczNDRjlsTHAxSXdhdzFrQ2tmaVFN?=
 =?utf-8?B?UkNwc2N2TEJyQnd4TWVkbWQwNzRHV0hCRVk3QVIwQzNUNjYzcWljaDVqYUIv?=
 =?utf-8?B?cFJCOWdCa0RyUUxvQmJlKzNoOE1HMGJpc01QTWNDOHZEVE51S2xUeWx6VjJo?=
 =?utf-8?B?VytGSDVSY09GSzZZeENwNndWaGEvMktkLzB3RGwvV0kzVHRTZDJiamRuNkxa?=
 =?utf-8?B?QkVnRGQ2c29JcVdoQnFZbHpWOWgrZDQ2aWxKYk9xQmtZNTF4Y2c3QndpSG5k?=
 =?utf-8?B?NGVJNkJUUzNjeU4yYUJxQmVYMFRXcVJwQTAxQmhHQWZPYW8wczBxMmdrV2VO?=
 =?utf-8?Q?AAnNE/4x4Hmf92RM2IWvfsLJU?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 479efe3a-9676-4c27-5f2d-08daa6117cd3
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5874.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2022 14:05:26.6634
 (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-CrossTenant-UserPrincipalName: 5EtV4p3xptCkF7/GukRykM4mMAzebk6h4liUqM3fuiCo99DSnRDHW0A38elbG6cpQFzlUGu0wYC7ioFe/hvRiQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6036
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Reserved fields of struct sev_es_save_area are named by their order of
appearance, but right now they jump from reserved_5 to reserved_7. Rename
them with the correct order.

Fixes: 6d3b3d34e39eb ("KVM: SVM: Update the SEV-ES save area mapping")

Signed-off-by: Carlos Bilbao <carlos.bilbao@amd.com>
---
  arch/x86/include/asm/svm.h | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h
index 0361626841bc..6ab45a0389dc 100644
--- a/arch/x86/include/asm/svm.h
+++ b/arch/x86/include/asm/svm.h
@@ -393,14 +393,14 @@ struct sev_es_save_area {
      u64 br_to;
      u64 last_excp_from;
      u64 last_excp_to;
-    u8 reserved_7[80];
+    u8 reserved_6[80];
      u32 pkru;
-    u8 reserved_8[20];
-    u64 reserved_9;        /* rax already available at 0x01f8 */
+    u8 reserved_7[20];
+    u64 reserved_8;        /* rax already available at 0x01f8 */
      u64 rcx;
      u64 rdx;
      u64 rbx;
-    u64 reserved_10;    /* rsp already available at 0x01d8 */
+    u64 reserved_9;    /* rsp already available at 0x01d8 */
      u64 rbp;
      u64 rsi;
      u64 rdi;
@@ -412,7 +412,7 @@ struct sev_es_save_area {
      u64 r13;
      u64 r14;
      u64 r15;
-    u8 reserved_11[16];
+    u8 reserved_10[16];
      u64 guest_exit_info_1;
      u64 guest_exit_info_2;
      u64 guest_exit_int_info;
@@ -425,7 +425,7 @@ struct sev_es_save_area {
      u64 pcpu_id;
      u64 event_inj;
      u64 xcr0;
-    u8 reserved_12[16];
+    u8 reserved_11[16];

      /* Floating point area */
      u64 x87_dp;
-- 
2.37.0 (Apple Git-136)