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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C400C004C9 for ; Tue, 7 May 2019 05:34:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1347020989 for ; Tue, 7 May 2019 05:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207245; bh=eb4XH/RZms7oiIkPyrmBezPUBJP6PV/bKa9SBqpcRQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JO6yyeWv3xbLkUq3SSWclQ1nREYgcSsHQQIK8+LK9JhjGM6rt8r0mVDjsjF7VHlYA 1LpmTq48GtN+lGqjObHYspKGNXqpUZ5qF4nvYR0NUMIWjW/m4E/iZSG17WQP82aVsP +L4/n44/vqUuVYmcvFrBn1abDcf8q6ARX8p3lHUM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727409AbfEGFeE (ORCPT ); Tue, 7 May 2019 01:34:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:53888 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727386AbfEGFeA (ORCPT ); Tue, 7 May 2019 01:34:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2413C2087F; Tue, 7 May 2019 05:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207239; bh=eb4XH/RZms7oiIkPyrmBezPUBJP6PV/bKa9SBqpcRQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MUpUHx7fKSltZUFC/VtiiYWPL3ymyjVcmdkhZyCUwxqShd5qp+sDm54vxX3kAU2ll Sl89rrXlMa7h8FgUsvc51EkvjB1a5zVjm6trstf40KYOV5K98MnQNwW40gMFxWRC94 vPuOye63M8pEt8lPQewTW0/lTFy23V81YckSi6sY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Zijlstra , Linus Torvalds , Nadav Amit , Andy Lutomirski , Borislav Petkov , Dave Hansen , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 5.0 43/99] x86/mm/tlb: Revert "x86/mm: Align TLB invalidation info" Date: Tue, 7 May 2019 01:31:37 -0400 Message-Id: <20190507053235.29900-43-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053235.29900-1-sashal@kernel.org> References: <20190507053235.29900-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Zijlstra [ Upstream commit 780e0106d468a2962b16b52fdf42898f2639e0a0 ] Revert the following commit: 515ab7c41306: ("x86/mm: Align TLB invalidation info") I found out (the hard way) that under some .config options (notably L1_CACHE_SHIFT=7) and compiler combinations this on-stack alignment leads to a 320 byte stack usage, which then triggers a KASAN stack warning elsewhere. Using 320 bytes of stack space for a 40 byte structure is ludicrous and clearly not right. Signed-off-by: Peter Zijlstra (Intel) Acked-by: Linus Torvalds Acked-by: Nadav Amit Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Dave Hansen Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 515ab7c41306 ("x86/mm: Align TLB invalidation info") Link: http://lkml.kernel.org/r/20190416080335.GM7905@worktop.programming.kicks-ass.net [ Minor changelog edits. ] Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/mm/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 999d6d8f0bef..9a49335e717a 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -731,7 +731,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, { int cpu; - struct flush_tlb_info info __aligned(SMP_CACHE_BYTES) = { + struct flush_tlb_info info = { .mm = mm, .stride_shift = stride_shift, .freed_tables = freed_tables, -- 2.20.1