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=-5.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 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 75BE4C74A23 for ; Wed, 10 Jul 2019 13:44:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E3A42084B for ; Wed, 10 Jul 2019 13:44:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="mHjBG21V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727734AbfGJNot (ORCPT ); Wed, 10 Jul 2019 09:44:49 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:59518 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727389AbfGJNos (ORCPT ); Wed, 10 Jul 2019 09:44:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=5it4G6eaywghVnR4elg3H5x4iunu3dNhSVWHqmcRde4=; b=mHjBG21VKFos5ObtmXA/gZ5eL CY+VtlaF6Qv+nMoWEk8bkvUaA1+70L5QWplR8unDu+0jrcE8s2Ii3+acNiJOoRc/TmC33Uu/tMw4d ngGfiyZCH4Niuvf/ZFsc6QOQNu60C331dF9n6RsTWIUexqQd/hQ1HZjM/fX07wTJu0TSJihx/ll4T J2HeDBBDLOoLOXwD7/xapiDYDeasMhXa+z+vCPRmo317iHzxI6detG/a+uWz2o0CQdgfJdWFcABMY UMfBoR6ak4rw5eI1wJeV+PHNG2DcqSd8MgiH+MOU6puSJYB5gaxunAGJzHsHliiyzJFaHWMiCszsB ZQoXK4yqA==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=hirez.programming.kicks-ass.net) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hlCtf-00022s-Ki; Wed, 10 Jul 2019 13:44:35 +0000 Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 735F420976EE4; Wed, 10 Jul 2019 15:44:33 +0200 (CEST) Date: Wed, 10 Jul 2019 15:44:33 +0200 From: Peter Zijlstra To: Xi Ruoyao Cc: Jiri Kosina , Thomas Gleixner , Kees Cook , Linus Torvalds , Ingo Molnar , Linux List Kernel Mailing , Borislav Petkov , Len Brown , Andrew Morton , "Rafael J. Wysocki" , Tony Luck , Bob Moore , Erik Schmauss , Josh Poimboeuf , Daniel Bristot de Oliveira , Nadav Amit Subject: Re: [GIT PULL] x86/topology changes for v5.3 Message-ID: <20190710134433.GN3402@hirez.programming.kicks-ass.net> References: <201907091727.91CC6C72D8@keescook> <1ad2de95e694a29909801d022fe2d556df9a4bd5.camel@mengyan1223.wang> <768463eb26a2feb0fcc374fd7f9cc28b96976917.camel@mengyan1223.wang> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <768463eb26a2feb0fcc374fd7f9cc28b96976917.camel@mengyan1223.wang> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 10, 2019 at 09:25:16PM +0800, Xi Ruoyao wrote: > On 2019-07-10 14:31 +0200, Jiri Kosina wrote: > > Adding Daniel to check whether this couldn't be some fallout of jumplabel > > batching. > > I don't think so. I tried to revert Daniel's jumplabel batching commits and the > issue wasn't solved. But reverting Kees' CR0 and CR4 commits can "fix" it > (apprently). Xi, could you please try the below instead? If we mark the key as RO after init, and then try and modify the key to link module usage sites, things might go bang as described. Thanks! diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 27d7864e7252..5bf7a8354da2 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -366,7 +366,7 @@ static __always_inline void setup_umip(struct cpuinfo_x86 *c) cr4_clear_bits(X86_CR4_UMIP); } -DEFINE_STATIC_KEY_FALSE_RO(cr_pinning); +DEFINE_STATIC_KEY_FALSE(cr_pinning); EXPORT_SYMBOL(cr_pinning); unsigned long cr4_pinned_bits __ro_after_init; EXPORT_SYMBOL(cr4_pinned_bits);