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;
From:   Alexandre Chartre <alexandre.chartre@oracle.com>
To:     peterz@infradead.org, bp@alien8.de, x86@kernel.org,
        linux-kernel@vger.kernel.org
Cc:     konrad.wilk@oracle.com, alexandre.chartre@oracle.com,
        boris.ostrovsky@oracle.com, ankur.a.arora@oracle.com,
        maciej.szmigiero@oracle.com
Subject: [PATCH] x86/entry: Remove UNTRAIN_RET from native_irq_return_ldt
Date:   Wed, 13 Jul 2022 21:58:08 +0200
Message-Id: <20220713195808.452394-1-alexandre.chartre@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uIsPe7f79l/4WIbxmREtis2DTxcSp2+0RgnfWVziidJg38VV8V/a8MLzH3dj?=
 =?us-ascii?Q?N6NUUiE4eaV7iVl0nxWJKzDSuKTunUCrMV1RTdWTdrA6nFim/POzHgltZ3N+?=
 =?us-ascii?Q?IV7W+E4dwZdHwRUXEXgZhGQI3neQne1NfHpgrzYWSPAzXOEFGUD+w1qLtgQM?=
 =?us-ascii?Q?KTz+hfINphoYQvkGGjED1BwhKvQKrnZyYYqd9Lm+yfst+RBLvmrXbhU7UpLt?=
 =?us-ascii?Q?BMXuEL3XJi02jbOrAcn2qEVVE5VE+evzEkM1wlFnfFC4YI+v8MzlSXONALwe?=
 =?us-ascii?Q?QBfjEcf09UPhfglnYgGf7Xp5FZajgHskdBJWNesmxqJ3bH4bzhIHz7vMZ6op?=
 =?us-ascii?Q?04YeUmgPGukffppKLE5qDs2e6EmDOTSFZL+YDaTneg28hV7lgPP9qjY3JHgk?=
 =?us-ascii?Q?qbD2EB10bemnGeuUaOPynWXH8fgyMEJJP6fbOK0TcB4X1rrl5w+sOo0/tfR1?=
 =?us-ascii?Q?N77g0czaaulqUQQ9TaPuZL2SDTcO3qHsT8DVs31ekdL+ZnMQZttcoUMtZKBR?=
 =?us-ascii?Q?g4QUT3G8o5RwK+9x2VpD8x/YirPlbE+6TDaEz8XKu7K73lg4RVVMiIvANFUr?=
 =?us-ascii?Q?bqF7KZZqdm6ucOT7W/uTqEGufa0AUAl3qdrSIO9AlrBkBAwuK68G3dLlpOip?=
 =?us-ascii?Q?fAIU6W4x7gtJUZHHXROz/PUei7BDcPvfleOyFKjQv5pQKXf4WDlHJ8PV9A/b?=
 =?us-ascii?Q?Ix4M/toB6zwUjkfXQTaP20eDhn5cLOjGagZAQy9nq/PbT4y1zZaMBoIfJmyQ?=
 =?us-ascii?Q?wSnsBN+kd5hRBYBtcYCbYHRUFuAB+mGEtNCZPVp2iIFMgm7M6x0T6lSPQoTb?=
 =?us-ascii?Q?y89S0KVJuyxcyy3hjmrhpI5JRBOIaNLx3f7raQtQpZTdzETZALyvqQ3CMYRe?=
 =?us-ascii?Q?RBg02yJYSomHycz/c2Ad/k8DaqOPxi+p0SqJ2iIs0SF+UJSC2LZfjU4EzowU?=
 =?us-ascii?Q?byQ+kG2140kzNCQO0Q7iWbP+wm1u2WckSmZzlVLpk1mkdL1fyst/C978M0vz?=
 =?us-ascii?Q?csqhWLD5YI8x6t6dtHk2OWNIh3yPPaF/vQdYqBM95Hsg0vocX+IBUjMaPX69?=
 =?us-ascii?Q?ZMBNEosOVpaeCtHh9g8J4YUrkGA3yLyGyDUX4Fui0m85S+WyHlEKwFGCmyVH?=
 =?us-ascii?Q?K7kua8eNfGfdRNURPV2nbr2ijF3q3cK9NZzkj72/1Mas5a4Eud3iO0MORv0n?=
 =?us-ascii?Q?RqVqOw88kGhAeoHIwSzUVBrFwr1EufmBindSxLMr9rXEc4/KxgilbJGf9WmM?=
 =?us-ascii?Q?s1MENnfZ5QpaztlkCakI6Ib7sjDNhjXytC8lQJ+QnGrMaU147i+ryonsNV1T?=
 =?us-ascii?Q?goghUBslZSrxP4HGwNlXVks+SXn6CcgsuDp2YZNWKY9J/QtJu5QHbnjR8M2D?=
 =?us-ascii?Q?huLlrNUPb7PCdHEXjyN+DR+u6mfR8ZYaUNYKq4Vt/l+qwp3NkAHhvj5uMflA?=
 =?us-ascii?Q?Nk1gAN8ta++pv37kW0cxywhwkroCRUNygHhrxpFYWd8rUlQ0z+hqYKoMy+oJ?=
 =?us-ascii?Q?gkPMJwwdec4urbD8LNbc2KmK7k/KeW8xvdTxNFb0RAd8LdDHhy6vu/CXAu33?=
 =?us-ascii?Q?qCARuz5J6d4KOzLCxv/jjBNVUWRKY326+EIASnHyHS1/og22sRqY2T9dl6gL?=
 =?us-ascii?Q?rA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8fe73b58-0caf-490c-d4b9-08da650a015a
X-MS-Exchange-CrossTenant-AuthSource: SN4PR10MB5622.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2022 19:58:08.0809
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: pfo2CY4Zr6yIOkEtRpcC/Lmr4dGKxmPU9ZYWOjnarr+1YNWnP6J+k4MrlDiUMja0uJHMWcsGMuko/cZ5dCkJeICY2rTXCW3pAHKiPryTcbY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2634
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-07-13_07:2022-07-13,2022-07-13 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0 spamscore=0
 adultscore=0 suspectscore=0 bulkscore=0 mlxlogscore=999 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207130073
X-Proofpoint-ORIG-GUID: Mcfah_21eolcHOZqKh89N_KXaV1py_SV
X-Proofpoint-GUID: Mcfah_21eolcHOZqKh89N_KXaV1py_SV
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

UNTRAIN_RET is not needed in native_irq_return_ldt because ret untrain
has already be done at this point. In addition, when the RETBleed
mitigation is IBPB, UNTRAIN_RET clobbers several registers (AX, CX, DX)
so here it trashes user values which are in these registers.

Signed-off-by: Alexandre Chartre <alexandre.chartre@oracle.com>
---
 arch/x86/entry/entry_64.S | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 285e043a3e40..9953d966d124 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -727,7 +727,6 @@ native_irq_return_ldt:
 	pushq	%rdi				/* Stash user RDI */
 	swapgs					/* to kernel GS */
 	SWITCH_TO_KERNEL_CR3 scratch_reg=%rdi	/* to kernel CR3 */
-	UNTRAIN_RET
 
 	movq	PER_CPU_VAR(espfix_waddr), %rdi
 	movq	%rax, (0*8)(%rdi)		/* user RAX */
-- 
2.31.1