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=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 23F1CC433DF for ; Fri, 16 Oct 2020 10:58:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9703207F7 for ; Fri, 16 Oct 2020 10:58:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="s3sqnnAy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406681AbgJPK6C (ORCPT ); Fri, 16 Oct 2020 06:58:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406678AbgJPK6B (ORCPT ); Fri, 16 Oct 2020 06:58:01 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C466C061755; Fri, 16 Oct 2020 03:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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; bh=vZekZ76KW1BiiwMFIl0NBOsPALzv6fOefXANoYwORjo=; b=s3sqnnAyqvzeCqqogltPaUvZEd hgR7KOV9Fp54001uE9QNgg1AMWqHaFF5JgVauukBLqaKmERhe7h6OZuPB8JURXapZrfZATGcuctAT 2FHdhg5BHGWOxaGlMWilCHjdNkV1JkDDKEFiz9cDDj1n639XOPcv4wIOP4l6A/t1XTyTxIHPEzsW7 Fef+mSxOUoXwOKB4I2tTW7KtkIGOa86LcD9Sf4h2XhNC3QBU9iWQKu2iTqZKYXqS0uZ9fZ1a+hiUH CA8hoABSndA1QINh/XC8/+hqZfNTqSO4Q80FrZoJwaVoy8PnFxFbI89lyknHaXGnX/yMRVUIBm0iW DSJ6YZ5Q==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kTNQf-00024m-1i; Fri, 16 Oct 2020 10:57:45 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 787DB3011E6; Fri, 16 Oct 2020 12:57:43 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 651BE203C7039; Fri, 16 Oct 2020 12:57:43 +0200 (CEST) Date: Fri, 16 Oct 2020 12:57:43 +0200 From: Peter Zijlstra To: ira.weiny@intel.com Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Andy Lutomirski , Fenghua Yu , x86@kernel.org, Dave Hansen , Dan Williams , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH RFC V3 2/9] x86/fpu: Refactor arch_set_user_pkey_access() for PKS support Message-ID: <20201016105743.GK2611@hirez.programming.kicks-ass.net> References: <20201009194258.3207172-1-ira.weiny@intel.com> <20201009194258.3207172-3-ira.weiny@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201009194258.3207172-3-ira.weiny@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On Fri, Oct 09, 2020 at 12:42:51PM -0700, ira.weiny@intel.com wrote: > From: Fenghua Yu > > Define a helper, update_pkey_val(), which will be used to support both > Protection Key User (PKU) and the new Protection Key for Supervisor > (PKS) in subsequent patches. > > Co-developed-by: Ira Weiny > Signed-off-by: Ira Weiny > Signed-off-by: Fenghua Yu > --- > arch/x86/include/asm/pkeys.h | 2 ++ > arch/x86/kernel/fpu/xstate.c | 22 ++++------------------ > arch/x86/mm/pkeys.c | 21 +++++++++++++++++++++ > 3 files changed, 27 insertions(+), 18 deletions(-) This is not from Fenghua. https://lkml.kernel.org/r/20200717085442.GX10769@hirez.programming.kicks-ass.net This is your patch based on the code I wrote. > diff --git a/arch/x86/mm/pkeys.c b/arch/x86/mm/pkeys.c > index f5efb4007e74..3cf8f775f36d 100644 > --- a/arch/x86/mm/pkeys.c > +++ b/arch/x86/mm/pkeys.c > @@ -208,3 +208,24 @@ static __init int setup_init_pkru(char *opt) > return 1; > } > __setup("init_pkru=", setup_init_pkru); > + > +/* > + * Update the pk_reg value and return it. > + * > + * Kernel users use the same flags as user space: > + * PKEY_DISABLE_ACCESS > + * PKEY_DISABLE_WRITE > + */ > +u32 update_pkey_val(u32 pk_reg, int pkey, unsigned int flags) > +{ > + int pkey_shift = pkey * PKR_BITS_PER_PKEY; > + > + pk_reg &= ~(((1 << PKR_BITS_PER_PKEY) - 1) << pkey_shift); > + > + if (flags & PKEY_DISABLE_ACCESS) > + pk_reg |= PKR_AD_BIT << pkey_shift; > + if (flags & PKEY_DISABLE_WRITE) > + pk_reg |= PKR_WD_BIT << pkey_shift; > + > + return pk_reg; > +} > -- > 2.28.0.rc0.12.gb6a658bd00c9 >