From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1B95C54EBE for ; Mon, 16 Jan 2023 16:47:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233790AbjAPQrA (ORCPT ); Mon, 16 Jan 2023 11:47:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233855AbjAPQqS (ORCPT ); Mon, 16 Jan 2023 11:46:18 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8CA1301BF for ; Mon, 16 Jan 2023 08:34:17 -0800 (PST) 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 7661461057 for ; Mon, 16 Jan 2023 16:34:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B0D2C4339C; Mon, 16 Jan 2023 16:34:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673886856; bh=gaBQOvQmd8qYoVCeTpR27jDEAdu4UZUYHuQ5jkov4JA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z85VBekFlSuBhbawtnBASE2HmzdoHW9Xdsp4NGzqstALxA6pylSiu6SJpYkCYG00k VIDjMa509GtROCYIK3KFeW0tfz77BbfP2swlDyZA8P0s5sOYuUZzqRgRTRv2ey3wBM jZfuxY53MAuwL7XKAIVJ0ZOAnNF62OqI4HzDmK70= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rodrigo Branco , "Borislav Petkov (AMD)" , Ingo Molnar Subject: [PATCH 5.4 589/658] x86/bugs: Flush IBP in ib_prctl_set() Date: Mon, 16 Jan 2023 16:51:17 +0100 Message-Id: <20230116154936.438110961@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116154909.645460653@linuxfoundation.org> References: <20230116154909.645460653@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rodrigo Branco commit a664ec9158eeddd75121d39c9a0758016097fa96 upstream. We missed the window between the TIF flag update and the next reschedule. Signed-off-by: Rodrigo Branco Reviewed-by: Borislav Petkov (AMD) Signed-off-by: Ingo Molnar Cc: Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/bugs.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1787,6 +1787,8 @@ static int ib_prctl_set(struct task_stru if (ctrl == PR_SPEC_FORCE_DISABLE) task_set_spec_ib_force_disable(task); task_update_spec_tif(task); + if (task == current) + indirect_branch_prediction_barrier(); break; default: return -ERANGE;