Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp470080pxf; Wed, 10 Mar 2021 09:49:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwr4A6cljDFegxw8zjmfVoV83yRZIWxCeiE0RcW6w+Rcxl2wyd9K8NUEgNBOItB8t+11sZK X-Received: by 2002:aa7:d98b:: with SMTP id u11mr4752115eds.352.1615398593322; Wed, 10 Mar 2021 09:49:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615398593; cv=none; d=google.com; s=arc-20160816; b=k1gKLc7YOZGe87OWR79xkZ6r3JC//wU5QKn/Og4E4HKhVkVX65GvPx+pFmLBK3NtZ/ +Ymhh+XOzjebT1674IbB10wpwt0pBA+3icPR4GEQdONi7uwdvIfcN8CHedQvOjKcaqzY QMHOWFK4NUIMNMajThguM4lAcHIgHgOMKjadnVMun1Fp/vr0Oxusb/3hl6VxmcPsT+pF SoL6wO4Lge1lXGWTraQr1pUeCbi5N4sc43n29rlaVjEG6VyM9h+Zu4EHG7DsLHAddeJ8 S2hPw6fUElLBJVyurOBCPldBI/aoN5S1WelcXwAVw0IKaLBjM8IQ1zU/xCaXD+qXhLjV QjpA== 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=8nfQEgCjJg3JFbsV6yvnX1wPNnCfJU3VrEcbrWvg2TU=; b=EqS8sggo355Dau8QzTtuTAZ3UpFap9ihe+s6W73RXGZh4zAXbbK7zTl9FZEFXg9mri kxh+JqBYUIy/qaoQoibFKuYosUBuM+8CXjoIYO/gXZa3ChEVVqLE2+tPEhoJ4tTeQj6D nAc6+WGsp4sCC4V04TjrjXKz41wmKVCUbupZYbzrGZnDjBS18JHoGOeo8Mh99hzYEcNj h/GU5J1ERa8a5AcfX7rFhURqfCd+S7nD0fg8B/NkG0rsp1ZZhQjnOHW0Z3/XzM/7Jj/T hUnFDExmTmknGsJp6jFW0LUvoxMSH9E+BaoYhtBDU+UzSjtua8wrWN8DLpROehWuiSRP i3SA== 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 zc18si43919ejb.148.2021.03.10.09.49.30; Wed, 10 Mar 2021 09:49:53 -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 S233815AbhCJRrX (ORCPT + 99 others); Wed, 10 Mar 2021 12:47:23 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:44957 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233542AbhCJRqq (ORCPT ); Wed, 10 Mar 2021 12:46:46 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4Dwfdv2j0wz9tytW; Wed, 10 Mar 2021 18:46:43 +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 6XlsGUGhnDDI; Wed, 10 Mar 2021 18:46:43 +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 4Dwfdv1r4hz9tytQ; Wed, 10 Mar 2021 18:46:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 07A698B78D; Wed, 10 Mar 2021 18:46:45 +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 13uzWABqKiYi; Wed, 10 Mar 2021 18:46:44 +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 B0A898B77E; Wed, 10 Mar 2021 18:46:44 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 8F65A67568; Wed, 10 Mar 2021 17:46:44 +0000 (UTC) Message-Id: <2c6e83581b4fa434aa7cf2fa7714c41e98f57007.1615398265.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 05/15] powerpc/uaccess: Move get_user_instr helpers in asm/inst.h To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Wed, 10 Mar 2021 17:46:44 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Those helpers use get_user helpers but they don't participate in their implementation, so they do not belong to asm/uaccess.h Move them in asm/inst.h Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/inst.h | 34 ++++++++++++++++++++++++++++++ arch/powerpc/include/asm/uaccess.h | 34 ------------------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/arch/powerpc/include/asm/inst.h b/arch/powerpc/include/asm/inst.h index cc73c1267572..19e18af2fac9 100644 --- a/arch/powerpc/include/asm/inst.h +++ b/arch/powerpc/include/asm/inst.h @@ -4,6 +4,40 @@ #include +#ifdef CONFIG_PPC64 + +#define ___get_user_instr(gu_op, dest, ptr) \ +({ \ + long __gui_ret = 0; \ + unsigned long __gui_ptr = (unsigned long)ptr; \ + struct ppc_inst __gui_inst; \ + unsigned int __prefix, __suffix; \ + __gui_ret = gu_op(__prefix, (unsigned int __user *)__gui_ptr); \ + if (__gui_ret == 0) { \ + if ((__prefix >> 26) == OP_PREFIX) { \ + __gui_ret = gu_op(__suffix, \ + (unsigned int __user *)__gui_ptr + 1); \ + __gui_inst = ppc_inst_prefix(__prefix, \ + __suffix); \ + } else { \ + __gui_inst = ppc_inst(__prefix); \ + } \ + if (__gui_ret == 0) \ + (dest) = __gui_inst; \ + } \ + __gui_ret; \ +}) +#else /* !CONFIG_PPC64 */ +#define ___get_user_instr(gu_op, dest, ptr) \ + gu_op((dest).val, (u32 __user *)(ptr)) +#endif /* CONFIG_PPC64 */ + +#define get_user_instr(x, ptr) \ + ___get_user_instr(get_user, x, ptr) + +#define __get_user_instr(x, ptr) \ + ___get_user_instr(__get_user, x, ptr) + /* * Instruction data type for POWER */ diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h index 01aea0df4dd0..eaa828a6a419 100644 --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -53,40 +53,6 @@ static inline bool __access_ok(unsigned long addr, unsigned long size) #define __put_user(x, ptr) \ __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) -#ifdef CONFIG_PPC64 - -#define ___get_user_instr(gu_op, dest, ptr) \ -({ \ - long __gui_ret = 0; \ - unsigned long __gui_ptr = (unsigned long)ptr; \ - struct ppc_inst __gui_inst; \ - unsigned int __prefix, __suffix; \ - __gui_ret = gu_op(__prefix, (unsigned int __user *)__gui_ptr); \ - if (__gui_ret == 0) { \ - if ((__prefix >> 26) == OP_PREFIX) { \ - __gui_ret = gu_op(__suffix, \ - (unsigned int __user *)__gui_ptr + 1); \ - __gui_inst = ppc_inst_prefix(__prefix, \ - __suffix); \ - } else { \ - __gui_inst = ppc_inst(__prefix); \ - } \ - if (__gui_ret == 0) \ - (dest) = __gui_inst; \ - } \ - __gui_ret; \ -}) -#else /* !CONFIG_PPC64 */ -#define ___get_user_instr(gu_op, dest, ptr) \ - gu_op((dest).val, (u32 __user *)(ptr)) -#endif /* CONFIG_PPC64 */ - -#define get_user_instr(x, ptr) \ - ___get_user_instr(get_user, x, ptr) - -#define __get_user_instr(x, ptr) \ - ___get_user_instr(__get_user, x, ptr) - extern long __put_user_bad(void); #define __put_user_size(x, ptr, size, retval) \ -- 2.25.0