From patchwork Fri Dec 9 14:02:13 2022 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: 31752 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp794282wrr; Fri, 9 Dec 2022 06:06:20 -0800 (PST) X-Google-Smtp-Source: AA0mqf7yESZ0wQnX4R4lM515eejySV2/aFR6/Kc/Y5b3FfNW6NBnc1nIm8xgVtAwE3YYUdaTK0OL X-Received: by 2002:a05:6a20:d387:b0:aa:42ab:a3bb with SMTP id iq7-20020a056a20d38700b000aa42aba3bbmr8560271pzb.40.1670594779724; Fri, 09 Dec 2022 06:06:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670594779; cv=none; d=google.com; s=arc-20160816; b=dsq0TB+XFI6tiGYgUu2iUH1Kgo4Yu99+paBtJP2Qqv2PTd0BcHJmQyY4AboGiScPYe kXOnSV7j1An+kee6QQiDu+guNKIHfn3hqNCEQEapJRJzi77pcW73YvMHyFpnV0BWtyV1 83+hTHja+dJf7IVa2JACNis+0VveQ4xIUPB7MYGWRx759J3LY0FbVK1CbFYIMZyul2CD q2oPh8vgadSS2Vy/BvODbkHurtKOChVHm6VhjmqALs07XplluY+yl3EyHJzV8sedz3af cRSPx8kCvbLawYUtJ4ABRTkZdm8IJM0EpcJvBqwqqtERYz01F6EXy3n9WAU0F4qTPxIb EgVw== 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=rlvOtxHlbZnArbZNDsk3G3V1HbQjDIct7Qhi937Mogs=; b=1H3xaqf0x3CbyW9ZWrbJCccGxDsSpKXJDkAO0EFOJ3oLilOHcQfB6asN72CGPCAjhd RSoTqI1bcq7JdYcb2PtOoj7lruKuUDw+Q5Atj+PGAKpZwdVB6Q70uMKZKlhykAlLy1SK G3n3D+f/xzg31SAUDIiTzyYki4dl7+jn+T9MGGcQkruNVW6pJCxkAYiPFjPgGbKWp7TP 8fsaZcgxCKH0vZ3UT+OM0OR0udcFbTVsqUhs9K2cqXHv+wtLefp71iv7T/Kqi3jp8zl4 e3uT1VKp9Hhx0pISywVK4Mw4GpbapA0q4q6t2N5ViND50QE/heyjNislVUwRNDLlBawR RH0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nJE100an; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bc22-20020a656d96000000b0043c05df34c0si1568081pgb.411.2022.12.09.06.05.44; Fri, 09 Dec 2022 06:06:19 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nJE100an; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229685AbiLIOCS (ORCPT + 99 others); Fri, 9 Dec 2022 09:02:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229517AbiLIOCQ (ORCPT ); Fri, 9 Dec 2022 09:02:16 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BD7876153; Fri, 9 Dec 2022 06:02:16 -0800 (PST) Date: Fri, 09 Dec 2022 14:02:13 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1670594534; 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=rlvOtxHlbZnArbZNDsk3G3V1HbQjDIct7Qhi937Mogs=; b=nJE100anZl4dA99kVQfE+kUYCy8X70dZNBcIFa/QPk/BD+YqEWwqbxjLu8GFSCm6dRHmJ6 q6dt79lkhWAv+2mg4MPrCN6dd4TSI0apMIdPKtChOHFJdQ4LLFG6WBbOStqXI4uxjO0J+k ZQ79LO+OuMxepgqJj7XMQs3GAvVJS/K0ZGvYAyRll0HtYBsAWtCHRhqd3s+fbUuHG/VfrA d1nHnVLZk+HXdwuUvSx9a/3WsB33TGHCVe7RoFfTddzcxQCRZkEyuAvCOj3lZIBCJen3ds 8bQbGrP0PXJDaCzey0KIPxq7oo55Mcn0++gXIzNSlCa5PA2gXMu+M2mlYUiBGA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1670594534; 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=rlvOtxHlbZnArbZNDsk3G3V1HbQjDIct7Qhi937Mogs=; b=kK/+o9NXkYcZtDV1L+vKkElo3zm+DM0lrq5Bt/hKzCOvHAji0Pf/xlxATilzSGF+Z68H+/ UmpycKL9wn/CUpAQ== From: "tip-bot2 for Nathan Chancellor" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/vdso: Conditionally export __vdso_sgx_enter_enclave() Cc: Nathan Chancellor , Thomas Gleixner , Nick Desaulniers , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221109000306.1407357-1-nathan@kernel.org> References: <20221109000306.1407357-1-nathan@kernel.org> MIME-Version: 1.0 Message-ID: <167059453391.4906.374881146743460680.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751745591922695666?= X-GMAIL-MSGID: =?utf-8?q?1751745591922695666?= The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 45be2ad007a9c6bea70249c4cf3e4905afe4caeb Gitweb: https://git.kernel.org/tip/45be2ad007a9c6bea70249c4cf3e4905afe4caeb Author: Nathan Chancellor AuthorDate: Tue, 08 Nov 2022 17:03:07 -07:00 Committer: Thomas Gleixner CommitterDate: Fri, 09 Dec 2022 14:58:02 +01:00 x86/vdso: Conditionally export __vdso_sgx_enter_enclave() Recently, ld.lld moved from '--undefined-version' to '--no-undefined-version' as the default, which breaks building the vDSO when CONFIG_X86_SGX is not set: ld.lld: error: version script assignment of 'LINUX_2.6' to symbol '__vdso_sgx_enter_enclave' failed: symbol not defined __vdso_sgx_enter_enclave is only included in the vDSO when CONFIG_X86_SGX is set. Only export it if it will be present in the final object, which clears up the error. Fixes: 8466436952017 ("x86/vdso: Implement a vDSO for Intel SGX enclave call") Signed-off-by: Nathan Chancellor Signed-off-by: Thomas Gleixner Reviewed-by: Nick Desaulniers Link: https://github.com/ClangBuiltLinux/linux/issues/1756 Link: https://lore.kernel.org/r/20221109000306.1407357-1-nathan@kernel.org --- arch/x86/entry/vdso/vdso.lds.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/entry/vdso/vdso.lds.S b/arch/x86/entry/vdso/vdso.lds.S index 4bf4846..e8c60ae 100644 --- a/arch/x86/entry/vdso/vdso.lds.S +++ b/arch/x86/entry/vdso/vdso.lds.S @@ -27,7 +27,9 @@ VERSION { __vdso_time; clock_getres; __vdso_clock_getres; +#ifdef CONFIG_X86_SGX __vdso_sgx_enter_enclave; +#endif local: *; }; }