Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp454093imi; Fri, 22 Jul 2022 02:43:55 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uhC49MuY3fNk+p6LHtx7BG9YuzhTRVzz6/yAuNEShSzW7nbfEKi2RqyaBnhM8D52VXPAi6 X-Received: by 2002:a17:902:6ac5:b0:16d:1664:39c9 with SMTP id i5-20020a1709026ac500b0016d166439c9mr2564135plt.104.1658483034998; Fri, 22 Jul 2022 02:43:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658483034; cv=none; d=google.com; s=arc-20160816; b=RmQ5yUUJ2KmROYFfyVZfrKbgVEywQkNxnR0xdfgU8fYW6wHqZOI+jTMhlDPcR7ZHuu 41+/7aXzBh0hbr0vaLwrKi8FprGP2Kc4qP/Gk7HK9oTbehsVSV50MqJ6sd9WMdbe4Xqj ZtDrTE0r53ma9DIkDan7q8eJjyax3cKhPG0tq8EsAOlub3I8bouagZ0330Ndc3B8D1uq 6v8XBxRapzXB53BoQnwB0GskwWCmlDx1V6PHSgDJss4F6rLVkE95GVplfSeszhZuMNjA X2GR3CfFe8b8/tUGS/6/CfYF8aFuSlcIX/qGNce5dw9xWxSMJO+l44r+jSdQm+r+vOAL 3law== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6NThYT8yLo7151ambFoXOSGJJDAIZYIFrdSwdhFOVSE=; b=YlWzE63eoq//9hKV7QeKYpSHqrECoqYQj8voE8/lGbBuUnfQbbobStLnCeQq8IhkcA /1QMEqNgmBBKg3QBzJqO9FroB6Fq3H7k4E+zNk+2nu3dWZYq5Kep2qoYXXR+q17p9QK3 p6M1CgfIOy0JpbLdsowHcXAUgVLLCpU7FkIelCIs2ZQDMb0ox3FJjWUpl1/ecaACG9+0 94L5cWJRxI1kFrjam4HiyplcGKgi7TsVW6pM8ra4qKKqBQqqFX4ULmVUddWPgb+FW5kH OXtuBHMatN3K1qIg38f7gErZxUozVC8Dit9pEz8/q1+3PWQGkk/EzJtM2CRcNruRWHKr Ew2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DJz+fVIR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s16-20020a056a0008d000b005170994dea1si6486176pfu.8.2022.07.22.02.43.39; Fri, 22 Jul 2022 02:43:54 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DJz+fVIR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235802AbiGVJRq (ORCPT + 99 others); Fri, 22 Jul 2022 05:17:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235804AbiGVJRY (ORCPT ); Fri, 22 Jul 2022 05:17:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B24AB5CB2; Fri, 22 Jul 2022 02:12:26 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9D20461F4F; Fri, 22 Jul 2022 09:12:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CEF3C341C6; Fri, 22 Jul 2022 09:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658481145; bh=Bl+a6mW2V4551cZLNN1uv+MJYnjHCcEJrdjJuiWwKEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJz+fVIRGvzw5agpZHFZ0d0LQN3N3QZ3h6IryMq4wCGj52qTvGcqJjwYCCeNeJDno rB09+xxSrxXTRzSyxQoMSuUpihgM9uUs0m+LxVQ7LE2ky9aE1ti3unUGWyjN4ovITI eJwJBfzV//OERgf1be8KGyaA1sreyjCgrcn8Gjmg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Peter Zijlstra (Intel)" , Borislav Petkov , Josh Poimboeuf , Alexei Starovoitov , Thadeu Lima de Souza Cascardo Subject: [PATCH 5.15 11/89] x86/asm: Fix register order Date: Fri, 22 Jul 2022 11:10:45 +0200 Message-Id: <20220722091134.005624858@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220722091133.320803732@linuxfoundation.org> References: <20220722091133.320803732@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,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: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Zijlstra commit a92ede2d584a2e070def59c7e47e6b6f6341c55c upstream. Ensure the register order is correct; this allows for easy translation between register number and trampoline and vice-versa. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Borislav Petkov Acked-by: Josh Poimboeuf Tested-by: Alexei Starovoitov Link: https://lore.kernel.org/r/20211026120309.978573921@infradead.org Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/GEN-for-each-reg.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) --- a/arch/x86/include/asm/GEN-for-each-reg.h +++ b/arch/x86/include/asm/GEN-for-each-reg.h @@ -1,11 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * These are in machine order; things rely on that. + */ #ifdef CONFIG_64BIT GEN(rax) -GEN(rbx) GEN(rcx) GEN(rdx) +GEN(rbx) +GEN(rsp) +GEN(rbp) GEN(rsi) GEN(rdi) -GEN(rbp) GEN(r8) GEN(r9) GEN(r10) @@ -16,10 +21,11 @@ GEN(r14) GEN(r15) #else GEN(eax) -GEN(ebx) GEN(ecx) GEN(edx) +GEN(ebx) +GEN(esp) +GEN(ebp) GEN(esi) GEN(edi) -GEN(ebp) #endif