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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 1835DC433E9 for ; Tue, 2 Mar 2021 15:29:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D94DB64F30 for ; Tue, 2 Mar 2021 15:29:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1578820AbhCBP1W (ORCPT ); Tue, 2 Mar 2021 10:27:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:60558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351017AbhCBNDN (ORCPT ); Tue, 2 Mar 2021 08:03:13 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7A91364FBD; Tue, 2 Mar 2021 11:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686353; bh=eAVB3EdlmAev76zlO/1udvUgZ/7/VVODmbDr8fIgoew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MKQ+1JOI85ICi5B6OD+esOeBtrN2QmJVRNeoTwO/2omUgEZajVfR5tg9aSJll1W/0 gUrr+sVGRk6rU1/vz+TnIrPl9VfSAoRibowv7Vx0mEA8cN4b8svm9RJD1/jFlJRnWW dXFoVmgKdiTQWTmq2Dsn0qS/HFo4NbvqoUkPYdabQ6X+sjDiZxH35ihyfhGkfuPB5F wzlZ0WGrYr3dP3aSNKJwfH6TZYoKeBOUJMfRdcfRNW0k4jjJJL56XbgL85AyVHecG7 uPJrn9Qh87DxlGWBVnmf+jL/ks6dfPMEOH2OzIED/qZLcV3ks62dfTf9d6+kK2dbNZ actYO5tRhOX5Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sami Tolvanen , Kees Cook , Sasha Levin Subject: [PATCH AUTOSEL 4.14 07/13] x86, build: use objtool mcount Date: Tue, 2 Mar 2021 06:58:57 -0500 Message-Id: <20210302115903.63458-7-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115903.63458-1-sashal@kernel.org> References: <20210302115903.63458-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sami Tolvanen [ Upstream commit 6dafca97803309c3cb5148d449bfa711e41ddef2 ] Select HAVE_OBJTOOL_MCOUNT if STACK_VALIDATION is selected to use objtool to generate __mcount_loc sections for dynamic ftrace with Clang and gcc <5 (later versions of gcc use -mrecord-mcount). Signed-off-by: Sami Tolvanen Reviewed-by: Kees Cook Signed-off-by: Sasha Levin --- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c55870ac907e..241bb049e803 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -126,6 +126,7 @@ config X86 select HAVE_CONTEXT_TRACKING if X86_64 select HAVE_COPY_THREAD_TLS select HAVE_C_RECORDMCOUNT + select HAVE_OBJTOOL_MCOUNT if STACK_VALIDATION select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_STACKOVERFLOW select HAVE_DMA_API_DEBUG -- 2.30.1