From patchwork Thu Oct 12 17:50:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 152095 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1402672vqb; Thu, 12 Oct 2023 10:51:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEytGcDEQnhW7FB4345Hs309OcF3OZgsJCZlCazAca8QrQzVgov6ez/zKpG7gaABxtSxrNY X-Received: by 2002:a05:6e02:2185:b0:357:5188:1f83 with SMTP id j5-20020a056e02218500b0035751881f83mr5222191ila.1.1697133065974; Thu, 12 Oct 2023 10:51:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697133065; cv=none; d=google.com; s=arc-20160816; b=X2UCt+9rsig8Og7SzgAUv1CtvfnMu9CiDpTwtbRW8XZf1lTFbBvrps3ehzZQlL0KsK BEg7tGziDkcZWFQGL3w8hmO8v++VSmS2Q8YAo6Wr6ub3BMcZVGAu7r0BIBRR7QzCDzPQ goV+7gNuOKCADHTvfSvg2aeE1y9uIaTy0+2m+rffdp4rvQ7j17GTh/plkoig21DNBdbh PTd0IhLGYz4WNeC90bFyGMTZ3dWmlPhe66tqcX8ZWewNqjfRMUm4FmNk17ZLHx5QRXHy y2iE1diKvV5x2pHb4gQcETRXNvEuzUTAWIQMmITrF7nsPkVAJ1nNxMvZ9gKFdnJQmdOe KEzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=IFxajUsa9FTTUCqjV6kFt+MmxG7sRnqRbV03Tf5QmSg=; fh=L3STPe2QwZ1YxqBdNh0vxZSj3kBIMfI0nfbPoK9skWs=; b=osALRyeECWjIPwDnI7IV5aDJXOg7bf2R5ElMgahhcO6j67PEbC19W/5mwp3FMXrDnG gTjxuK5vfpywoIUilOz2RzmeTKwHwiyGopF4BbTT7wxSP4pns6P7CIxmqquOwSfyCGli lBl8CI57tY9MFDADkPSEOYgzPRyIaF3t+toim0Rb52bKa9Isp1GezWiVViQf3JVdm6dY yfEemND8EEHsyokSxYTtF8z+6vT0GgyMA/bpWagFqbIIWMYPijv3/wVl/Jg8atWv90hl aAHMyuwqT9c4SH07fYilbz4xgE/ppQrL12YwaVNQJ3yvAcS5zQXu0FL1WIYkMgStROnT zqzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=G27L8g81; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="M/xcXtbU"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id v189-20020a6389c6000000b005a9e4c3d350si105246pgd.743.2023.10.12.10.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 10:51:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=G27L8g81; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="M/xcXtbU"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 1FF13832A20E; Thu, 12 Oct 2023 10:51:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1441848AbjJLRuq (ORCPT + 19 others); Thu, 12 Oct 2023 13:50:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379666AbjJLRuk (ORCPT ); Thu, 12 Oct 2023 13:50:40 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 354ADBB; Thu, 12 Oct 2023 10:50:38 -0700 (PDT) Date: Thu, 12 Oct 2023 17:50:35 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697133036; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IFxajUsa9FTTUCqjV6kFt+MmxG7sRnqRbV03Tf5QmSg=; b=G27L8g81QXJ0Nw7WnkBAjE7UiVbFXS+sbY613+GwywcUE7ddFpRN2uk6ZI7Mk6tH0IQ/58 DXq3L3hvWj7aeUS5u1DEqbCcVOBYQeo7vMqHHWP2xL8m3tun5/eGeO7GhOF646YTTZaQZW OXcf9fFVflj0uNlxXruQ+M8wNlmpfireUtVQWGrvbi2UuaOgs6L6u7doBO8ENfR9qh18Em EdZNNnadShfHTKKtgNOEHElumWjMT3P9kC2jVzmi4G/okwetHwoxgd/ScH7CNKooqTxz2D XE5kAqzgItfT019iISeANY3kEe+O4/KoX1bm7qL4tOspXG0Q77OQijrX7S4u2w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697133036; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IFxajUsa9FTTUCqjV6kFt+MmxG7sRnqRbV03Tf5QmSg=; b=M/xcXtbU1GuWoz+MgWoxyLUQY5q7DW6ozBwTHaFXYOgeuYx+WiqVlSHIVQ/n4L12FxgfIG bv1VEScAFB5QMzBw== From: "tip-bot2 for David Kaplan" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/bugs] x86/vdso: Run objtool on vdso32-setup.o Cc: David Kaplan , Ingo Molnar , "Borislav Petkov (AMD)" , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231010171020.462211-3-david.kaplan@amd.com> References: <20231010171020.462211-3-david.kaplan@amd.com> MIME-Version: 1.0 Message-ID: <169713303595.3135.9716744359353391644.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 12 Oct 2023 10:51:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779573001542856545 X-GMAIL-MSGID: 1779573001542856545 The following commit has been merged into the x86/bugs branch of tip: Commit-ID: 99b5bf0276d4ae5028ab9743053c6d16044009ea Gitweb: https://git.kernel.org/tip/99b5bf0276d4ae5028ab9743053c6d16044009ea Author: David Kaplan AuthorDate: Tue, 10 Oct 2023 12:10:19 -05:00 Committer: Ingo Molnar CommitterDate: Thu, 12 Oct 2023 19:44:07 +02:00 x86/vdso: Run objtool on vdso32-setup.o vdso32-setup.c is part of the main kernel image and should not be excluded from objtool. Objtool is necessary in part for ensuring that returns in this file are correctly patched to the appropriate return thunk at runtime. Signed-off-by: David Kaplan Signed-off-by: Ingo Molnar Acked-by: Borislav Petkov (AMD) Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20231010171020.462211-3-david.kaplan@amd.com --- arch/x86/entry/vdso/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 6a1821b..83c0afb 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -42,7 +42,8 @@ vdso_img-$(VDSO64-y) += 64 vdso_img-$(VDSOX32-y) += x32 vdso_img-$(VDSO32-y) += 32 -obj-$(VDSO32-y) += vdso32-setup.o +obj-$(VDSO32-y) += vdso32-setup.o +OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) vobjs32 := $(foreach F,$(vobjs32-y),$(obj)/$F)