Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1214266pxf; Fri, 12 Mar 2021 04:54:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCut5qEPCgV6NzlttxhcEEFqfnEodZKls5tbJZVsdDEg8KkpQBGi4P0XKbciTVxcqSR8a8 X-Received: by 2002:a17:906:2db2:: with SMTP id g18mr8551670eji.73.1615553666064; Fri, 12 Mar 2021 04:54:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615553666; cv=none; d=google.com; s=arc-20160816; b=sPerdBGztoSdruUt3zp40m9+2hh111funQFAk0OX+5oiBaYsr6zxwXMKwxws4iKILh q7oAWr1NmI0NkQlbwzsxHtd/F+jD34L9Zv1ELp5sBEmJiTSn9sFGt0xjrnRzfSOfHaIL JhTB2o7D6H8xkQlFmi1QqSElX8ZC+T55oaFPFkjtKCHHmOK3ozKlxlUj9Cnpj+jhBeX9 0Eb5WIOAadv5iqvFyEWVJnZ00Nhakhw3i6VnnFAWoGnSNoFOfelcGvysowLYYulahx0E n6J3ogq6tkKmHt1pSP8C9pH3Dd6lKZJBoYjJBdXl11VXUFcLGbKH6380ObP7+Hgzpb/B Bmmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=Qyvq6H6n3UqJTuqXeOlpTEdGpy3tEs09vcwCRXrUYxw=; b=uI9YMg8GBknP/szfE/tacXmk8/jquXsgA3GgiAxg7+sztrks3vR8/HDJM6vbxnBst3 73+RRxjVgWFwZXqiyBWSsNcsejTeKa54Nz+ywB2bc7/WFO1dGY+iYz5/fMz6m/RnjvjG YM6agnfoab7nwVJ/9HIQN0ZAzVeaOfn+Jssf3vXR5+/TmLPbLj5V6LnNZVhtW94jyMBV G4/6ElizA0bJ/PlIMQZtbSU2ACd8cfSY0iZZD5sI6ntQBMqMZwkWOhGk2S56caYsrsbc a1g33R1imFLH0eDcQLxf8mB6EOtE6bIYRZnO7G+VwOLSUBrqLqkGjrWZY9mdmSGTApRu BT2w== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v10si3977947eds.85.2021.03.12.04.54.04; Fri, 12 Mar 2021 04:54:26 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232361AbhCLMvy (ORCPT + 99 others); Fri, 12 Mar 2021 07:51:54 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:17672 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232002AbhCLMuw (ORCPT ); Fri, 12 Mar 2021 07:50:52 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DxlzZ4FBjz9ttBV; Fri, 12 Mar 2021 13:50:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id 7nXeDXs50her; Fri, 12 Mar 2021 13:50:50 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4DxlzZ2zscz9ttBP; Fri, 12 Mar 2021 13:50:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5E3F58B812; Fri, 12 Mar 2021 13:50:51 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id lELmzLq3XaFs; Fri, 12 Mar 2021 13:50:51 +0100 (CET) Received: from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 12B9A8B764; Fri, 12 Mar 2021 13:50:51 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id D5EA7675C9; Fri, 12 Mar 2021 12:50:50 +0000 (UTC) Message-Id: <156a7c4b669d26785391422a5581a1d919544c9a.1615552867.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v3 40/41] powerpc/8xx: Create C version of kuap save/restore/check helpers To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 12 Mar 2021 12:50:50 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation of porting PPC32 to C syscall entry/exit, create C version of kuap_save_and_lock() and kuap_user_restore() and kuap_kernel_restore() and kuap_assert_locked() and kuap_get_and_assert_locked() on 8xx. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/nohash/32/kup-8xx.h | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/powerpc/include/asm/nohash/32/kup-8xx.h b/arch/powerpc/include/asm/nohash/32/kup-8xx.h index 17a4a616436f..e6b5ebca47e5 100644 --- a/arch/powerpc/include/asm/nohash/32/kup-8xx.h +++ b/arch/powerpc/include/asm/nohash/32/kup-8xx.h @@ -34,6 +34,37 @@ #include +static inline void kuap_save_and_lock(struct pt_regs *regs) +{ + regs->kuap = mfspr(SPRN_MD_AP); + mtspr(SPRN_MD_AP, MD_APG_KUAP); +} + +static inline void kuap_user_restore(struct pt_regs *regs) +{ +} + +static inline void kuap_kernel_restore(struct pt_regs *regs, unsigned long kuap) +{ + mtspr(SPRN_MD_AP, regs->kuap); +} + +static inline unsigned long kuap_get_and_assert_locked(void) +{ + unsigned long kuap = mfspr(SPRN_MD_AP); + + if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG)) + WARN_ON_ONCE(kuap >> 16 != MD_APG_KUAP >> 16); + + return kuap; +} + +static inline void kuap_assert_locked(void) +{ + if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG)) + kuap_get_and_assert_locked(); +} + static inline void allow_user_access(void __user *to, const void __user *from, unsigned long size, unsigned long dir) { -- 2.25.0