Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp4699555imw; Tue, 12 Jul 2022 12:40:05 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sEfWJ7BSpcUGVLOb9OLvd6kc3q3F1cbwzanwY+iilFTcXC26HLdZX3t/BbPHbXzz5T5LyG X-Received: by 2002:a05:6402:3690:b0:43a:83f8:93bf with SMTP id ej16-20020a056402369000b0043a83f893bfmr34190754edb.49.1657654805138; Tue, 12 Jul 2022 12:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657654805; cv=none; d=google.com; s=arc-20160816; b=EL8urkiky+i0t48dIAOKv9VzR0tDntHjCi6I6D1+7DdSnLTEuR4PU1Vr8ncHbPWd27 AZP72Orv2W3MEcimJUvWVzf0l+ftUl7aGtm1AxAR/Si+0I97tkBW8LAE90QQ8GKwQUlc C5/RF2QwXoqgvFsSNav0pQpUyuM0wV2FwmQe4HyD3Ll0mk97Wnj2Xl3YExnyk8y/CBCW Vlvozs5F4D4nU402eZws/PXItq3Pl6OcD5dgtxeZXi5tQNtmrKF7RQEckARCBOGeEWIb wDDRyLnFwwzisIzR9zhdxnYJOqwCfaqkPWGXg2yUVtySHIIH+sEQQJI8r7AOZ0Qz2czj WfkQ== 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=WcGchJ6rt7RBrvr6XvuxetvLUYByLAufxCKHO2FsNb/VTIEx9cNrwnoWoHEdEODSXF jLZVGG/1seAv+GTQn+OKoq4VAq6zSeehwt1yfhPOqYiIYXMC0lCT7me80bO6Gyh1Q5i6 /p3BM6u0HG37f38BCU4epna9ke35RxeGe4XoAJCZ0aOVzaB3Q4r73Whvy6yMg7HNd71p 5IUXgthbVN9Nov+2vLHQM28Ub5mrvrXNFDruF4hr44yDjgNw0i/uXIxRTgyRD9H7o6wH pvMLu0iHBAzJqtcgn2USTo3HhPyEoCNLplfdAhrZOtQ4T4j3S4KwAubGCVXi5JALGhNc ESkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cErk5VJL; 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 g6-20020a50ee06000000b004378a88f055si14018443eds.577.2022.07.12.12.39.39; Tue, 12 Jul 2022 12:40:05 -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=cErk5VJL; 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 S235160AbiGLTDl (ORCPT + 99 others); Tue, 12 Jul 2022 15:03:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235100AbiGLTBm (ORCPT ); Tue, 12 Jul 2022 15:01:42 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38D7E33A03; Tue, 12 Jul 2022 11:49:05 -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 ams.source.kernel.org (Postfix) with ESMTPS id B064EB81B96; Tue, 12 Jul 2022 18:49:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0850EC3411C; Tue, 12 Jul 2022 18:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1657651742; bh=Bl+a6mW2V4551cZLNN1uv+MJYnjHCcEJrdjJuiWwKEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cErk5VJLMK2PeCBDCk2Kg05ahCgcEaAGfl6oRlP6O6bjT+dM6z+IxifeNwJ0Gfg6X CTSI6F+6pI3fGo5uCwbbIQv5P+VfulDVqukkLwX4XVyWsLvRjx5ngzeKdWp8OfK6m1 YiIdDyoVV46mrjyvatC7JthTnXs2DQPhPmPExCzw= 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/78] x86/asm: Fix register order Date: Tue, 12 Jul 2022 20:38:41 +0200 Message-Id: <20220712183239.306258445@linuxfoundation.org> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220712183238.844813653@linuxfoundation.org> References: <20220712183238.844813653@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.7 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,T_SCC_BODY_TEXT_LINE 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