Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2531692pxa; Mon, 24 Aug 2020 17:34:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvacLsH63jwxNZjxBoid3KVsuc1+pP56D24jQXX4aNe5yNVWwR2MMpjLwrL6/9dUpnIoJI X-Received: by 2002:a17:906:1990:: with SMTP id g16mr5191554ejd.223.1598315684896; Mon, 24 Aug 2020 17:34:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598315684; cv=none; d=google.com; s=arc-20160816; b=h8M5FWHxbrNb/4KfWe7/HOrBJDIwngF694aRGUQ3siWkDlNtCg/oAJEcJFN1AOaY/j QF9QzVdWNp8PsRayVMYMTHj+oV+uwm3voLz6kWiXutruT1t8iNqPDTCtEDaSM0wzjrdD bRMCK5/UQacTG+/KaHsn17QfLbkv0+mF01/HA7zJXB8QHe3ee9TNxhWNRvtKB4RpqrK4 Ry2yOWBrvBHQcqd30f7mEIE1X/luXdnMgwT3F9ogwimDGsV8EIqQLbpCf4vO83wAeLop cTNESNJOwiOpWvCnbxoZlzV0KNN2qLtTZ8ks62cOGt7bWBh7F3JzLnKDnCFU334RzFTH b/qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=27WeQG/U7MZ3XdD0KtaFoFmxisSQl0AVh6fcPM8sn74=; b=dsNs+R1GilwkIrvJluueq+rbfH+kBkR0But6MhK8DzjOkgBjSu6yHb6YuscTgc8YGW 14Tx5Sg93rNZuScYv52dW42D4M6Gip67T8HhwvOU973ZArExgmjlLmDpY1gn0fjv2SRq piMMZLS4YAcj9j/N7rKTm3mKE6+Azih9wxbwLTCZal6Y2NrXQQgVXQjcQQr0+7zINe8E rW6/J/4tTx5Rl5BEdRlNxxJME4GGJetbyyo7dqKH9H+JGOsQlQaDRSpZdP5BNga7Tu7v waTRu9k3gHByCfpu+BYeBtti8wwNG6jW0xhmJHpL3hNszY066zqVerV7uLlyIjVysubI 2TzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t24si2833719edy.243.2020.08.24.17.34.21; Mon, 24 Aug 2020 17:34:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728587AbgHYAbY (ORCPT + 99 others); Mon, 24 Aug 2020 20:31:24 -0400 Received: from mga01.intel.com ([192.55.52.88]:28757 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728484AbgHYAak (ORCPT ); Mon, 24 Aug 2020 20:30:40 -0400 IronPort-SDR: nqaT8NBuMY6lgo1BNPwxk6VsDx81Iis7RCevEWQZOGBuR1lZp3QP0ULAFOMmTgJOx4bxt8pinh QUXPqh2ZL7Dg== X-IronPort-AV: E=McAfee;i="6000,8403,9723"; a="174053281" X-IronPort-AV: E=Sophos;i="5.76,350,1592895600"; d="scan'208";a="174053281" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2020 17:30:37 -0700 IronPort-SDR: wh7Suymihw1wSYVbZJBKpl9o/wmOnOeXhZ1K8M/H+4znuZ/pgAXfw+FoXDL77NlUH2NWj143wt v0FHQnqFMhIw== X-IronPort-AV: E=Sophos;i="5.76,350,1592895600"; d="scan'208";a="443429331" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2020 17:30:36 -0700 From: Yu-cheng Yu To: x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue , Dave Martin , Weijiang Yang Cc: Yu-cheng Yu Subject: [PATCH v11 7/9] x86/vdso/32: Add ENDBR32 to __kernel_vsyscall entry point Date: Mon, 24 Aug 2020 17:26:42 -0700 Message-Id: <20200825002645.3658-8-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200825002645.3658-1-yu-cheng.yu@intel.com> References: <20200825002645.3658-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "H.J. Lu" Add ENDBR32 to __kernel_vsyscall entry point. Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu Acked-by: Andy Lutomirski --- arch/x86/entry/vdso/vdso32/system_call.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/entry/vdso/vdso32/system_call.S b/arch/x86/entry/vdso/vdso32/system_call.S index de1fff7188aa..5cf74ebd4746 100644 --- a/arch/x86/entry/vdso/vdso32/system_call.S +++ b/arch/x86/entry/vdso/vdso32/system_call.S @@ -14,6 +14,9 @@ ALIGN __kernel_vsyscall: CFI_STARTPROC +#ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + endbr32 +#endif /* * Reshuffle regs so that all of any of the entry instructions * will preserve enough state. -- 2.21.0