Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3172809pxf; Sun, 21 Mar 2021 22:35:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVwTuTUzcXDe8z4dUcDdlqbWFEXtvkwmzh5gXgSNQ2tC5jNAIcXafiCpjv5D2zAkbIHJVo X-Received: by 2002:a17:906:4055:: with SMTP id y21mr17170633ejj.507.1616391341619; Sun, 21 Mar 2021 22:35:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616391341; cv=none; d=google.com; s=arc-20160816; b=LZB9OPNLaaxePc02GJ1sq+lOT6LZzt+j3J6+0tYzlhjrshIJwyLJ5pb7WvAPP7ZDiX yj31Bn1wdL1MdddPcA7JjJ/HLkrQRJ2ptW6QhyNHrwpUD7l49jLAoTnKWrTen9iS2r38 rNVnFOmfuQgeJUY8QRPmIBp9OhqhZsMVYsBaZyRkMbHJOS8DRNyCREggE1onGdjmiHMF WgLdOL5ESTPBwT/opodKaKPCAO8cwOt/wleAUJ/5OoKzinc0ea/sMQowGzaT1CM/V4Au hAMR0fhtQxzfob0AtHmlavmeoX79ON/pWgYJYsVCy65cgQ1qDj+Kx6Dl7etnkAWYscyT XBSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=yxzvq/1Rv2BbZcxzsTs6KpYcol3fd/mXAxB4KaF2eVQ=; b=AYFQ+u3eEstXr7TujrYPn9+6jEAExvkd1LjHflkvK4n1TTDrPo8t2j69DUvLNv4eDi nySkec/3GPMTc9KsL2oJpqh6lqBkkxi0g6uFi4KDgsa/Dyj02mncXgveVwWRQ7g0q6A9 apUjkhXmXLLKrhNertNAWeYcDxTchR6JIKsPtsk1oW0XatcveB5udayvl02RVgQlbTH7 TdxXeyGiVyMDXoRUIOBFljOVh7UNKi2NYL5OfTfdmIBOsimTYvv3TMJuVjwVdpo+xVYS nXtSl6heyAZ8r4a0VFVjX5WzpoUsE93hENpyve6KfTBfj0p1UD4IzLJEKLjw8Z5xmE99 uftg== 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 a7si9957003ejr.564.2021.03.21.22.35.19; Sun, 21 Mar 2021 22:35:41 -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 S230084AbhCVFav (ORCPT + 99 others); Mon, 22 Mar 2021 01:30:51 -0400 Received: from mga09.intel.com ([134.134.136.24]:18631 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229990AbhCVFai (ORCPT ); Mon, 22 Mar 2021 01:30:38 -0400 IronPort-SDR: AjJ3GGFEXiHLSY2yJbUyOWlC9DgBsNq4+qSBv9V8twpMCcnGcZxWcoi5xym02lzcXr9fmJHWtA lntZymlkKI4Q== X-IronPort-AV: E=McAfee;i="6000,8403,9930"; a="190298151" X-IronPort-AV: E=Sophos;i="5.81,268,1610438400"; d="scan'208";a="190298151" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 22:30:37 -0700 IronPort-SDR: sL+mgQO3gB8Uo2ngFekJ0fXYa2NGgQuTzNIYKVBT5tivjJonoJzNp7ax26UU5YQe/t+i8sz8M4 dS3LHDBe8ckw== X-IronPort-AV: E=Sophos;i="5.81,268,1610438400"; d="scan'208";a="607238763" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 22:30:37 -0700 From: ira.weiny@intel.com To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Andy Lutomirski , Peter Zijlstra Cc: Ira Weiny , Dan Williams , Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org, Fenghua Yu , linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH V4 06/10] x86/fault: Adjust WARN_ON for PKey fault Date: Sun, 21 Mar 2021 22:30:16 -0700 Message-Id: <20210322053020.2287058-7-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 In-Reply-To: <20210322053020.2287058-1-ira.weiny@intel.com> References: <20210322053020.2287058-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 PKey faults may now happen on kernel mappings if the feature is enabled. Remove the warning in the fault path if PKS is enabled. Reviewed-by: Dan Williams Signed-off-by: Ira Weiny --- arch/x86/mm/fault.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index a73347e2cdfc..731ec90ed413 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1141,11 +1141,12 @@ 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_PK is expected on kernel addresses when supervisor pkeys are + * enabled. */ - WARN_ON_ONCE(hw_error_code & X86_PF_PK); + if (!cpu_feature_enabled(X86_FEATURE_PKS)) + WARN_ON_ONCE(hw_error_code & X86_PF_PK); + #ifdef CONFIG_X86_32 /* -- 2.28.0.rc0.12.gb6a658bd00c9