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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C04A1C433FE for ; Thu, 10 Mar 2022 17:20:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233484AbiCJRV6 (ORCPT ); Thu, 10 Mar 2022 12:21:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244519AbiCJRVq (ORCPT ); Thu, 10 Mar 2022 12:21:46 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE50C194141 for ; Thu, 10 Mar 2022 09:20:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646932844; x=1678468844; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GEA3SMd1Hyd9mgC2yPlyiFisBoFISvY6li4UoRH0Ugk=; b=RNPSn3O7G1EegiUNwKb0XdNMJ17NW5pbaK+mUGhFh5OgpiWE33gH5YwD ty32j+YyrNJbEQjdTZAT5en2ICJlxxkwanVp86iSf9NB8518SKCtGynts y5TQSUHJ3SkBi3neykHIVszGG7rYr5O4r7P3qm7MWSiq8XVVj7jy4Q23N O6KHCFw04YYBdCQAYFY9Z5dxsgLItw3uG1me+Itj3nF2JaCWNmLAaDsOb kmDSvOzdSJb+yMxVM0wkvDjp2bHeMfdpGpowZNd/B2c9aG+dfrhe+qYuW XthWTKEsbQLuDdhwfr0DCZf1PsPAniOx0HqWDnfz6wwRgvfqZCranfkri g==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="255049053" X-IronPort-AV: E=Sophos;i="5.90,171,1643702400"; d="scan'208";a="255049053" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2022 09:20:44 -0800 X-IronPort-AV: E=Sophos;i="5.90,171,1643702400"; d="scan'208";a="538541689" Received: from gdavids1-mobl.amr.corp.intel.com (HELO localhost) ([10.212.65.108]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2022 09:20:43 -0800 From: ira.weiny@intel.com To: Dave Hansen , "H. Peter Anvin" , Dan Williams Cc: Ira Weiny , Fenghua Yu , Rick Edgecombe , "Shankar, Ravi V" , linux-kernel@vger.kernel.org Subject: [PATCH V9 08/45] x86/fault: Adjust WARN_ON for pkey fault Date: Thu, 10 Mar 2022 09:19:42 -0800 Message-Id: <20220310172019.850939-9-ira.weiny@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220310172019.850939-1-ira.weiny@intel.com> References: <20220310172019.850939-1-ira.weiny@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ira Weiny Previously if a protection key fault occurred on a kernel address it indicated something wrong because user page mappings are not supposed to be in the kernel address space. With the addition of PKS, pkey faults may now happen on kernel mappings. If PKS is enabled, avoid the warning in the fault path. Simplify the comment. Cc: Sean Christopherson Cc: Dan Williams Signed-off-by: Ira Weiny --- Changes for V9 From Dave Hansen Clarify the comment and commit message --- arch/x86/mm/fault.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index d0074c6ed31a..5599109d1124 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1148,11 +1148,11 @@ do_kern_addr_fault(struct pt_regs *regs, unsigned long hw_error_code, unsigned long address) { /* - * Protection keys exceptions only happen on user pages. We - * have no user pages in the kernel portion of the address - * space, so do not expect them here. + * PF_PF faults should only occur on kernel + * addresses when supervisor pkeys are enabled. */ - WARN_ON_ONCE(hw_error_code & X86_PF_PK); + WARN_ON_ONCE(!cpu_feature_enabled(X86_FEATURE_PKS) && + (hw_error_code & X86_PF_PK)); #ifdef CONFIG_X86_32 /* -- 2.35.1