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=-3.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 E3680C00A89 for ; Mon, 2 Nov 2020 10:49:12 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 58CF52225E for ; Mon, 2 Nov 2020 10:49:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MXBub+7D" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58CF52225E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dosP50y7WKQTxuvJgjXB8jvTwir3Ro7scAmaNqUJI6k=; b=MXBub+7D/U4ngMn4oeCg1EKXQ Ww2wR70lUkwzbTxHj8mpUKxATgtZo+0N/+OIdXHrpXJYr+h2EhxeFt90YYP0twieoErSlhKSgyJjj X0vmE7xhux1z4viRPIIkJ0dJc2YOefVSpL/tuitjZu8jgJyn10QjOKspfVvGstbz8ufxz+8EHZuX9 5UdNpLAcnxnbIG0rzMO8hmBMR8zCS4djFNu5Mfg2/atsclbu/z+GuwqOpprxpO/k0ruVdgCUavJQo /fM2RMs/PUhMvzNQrUpHz6wsUw+v+rbjAynJmFJ257NZOCeYjeVtOUOi6i0MpXEQ5JMqgvNWAK9DW SrXKPRAUA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZXOK-0007en-Fq; Mon, 02 Nov 2020 10:48:48 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZXOI-0007e5-6a for linux-arm-kernel@lists.infradead.org; Mon, 02 Nov 2020 10:48:47 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9DE6E101E; Mon, 2 Nov 2020 02:48:44 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.54.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8E1423F66E; Mon, 2 Nov 2020 02:48:43 -0800 (PST) Date: Mon, 2 Nov 2020 10:48:41 +0000 From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Subject: Re: [PATCHv3 12/17] arm64: uaccess: split user/kernel routines Message-ID: <20201102104841.GD71783@C02TD0UTHF1T.local> References: <20201026133156.44186-1-mark.rutland@arm.com> <20201026133156.44186-13-mark.rutland@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201026133156.44186-13-mark.rutland@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201102_054846_329716_67A15314 X-CRM114-Status: GOOD ( 11.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: catalin.marinas@arm.com, james.morse@arm.com, hch@lst.de, will@kernel.org, robin.murphy@arm.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Oct 26, 2020 at 01:31:51PM +0000, Mark Rutland wrote: > -#define __raw_get_mem(x, ptr, err) \ > +#define __raw_get_mem(ldr, x, ptr, err) \ > do { \ > unsigned long __gu_val; \ > __chk_user_ptr(ptr); \ > switch (sizeof(*(ptr))) { \ > case 1: \ > - __get_mem_asm("ldrb", "ldtrb", "%w", __gu_val, (ptr), \ > - (err), ARM64_HAS_UAO); \ > + __get_mem_asm(ldr "b", "%w", __gu_val, (ptr), (err)); \ > break; \ > case 2: \ > - __get_mem_asm("ldrh", "ldtrh", "%w", __gu_val, (ptr), \ > - (err), ARM64_HAS_UAO); \ > + __get_mem_asm(ldr "h", "%w", __gu_val, (ptr), (err)); \ > break; \ > case 4: \ > - __get_mem_asm("ldr", "ldtr", "%w", __gu_val, (ptr), \ > - (err), ARM64_HAS_UAO); \ > + __get_mem_asm(ldr, "%w", __gu_val, (ptr), (err)); \ > break; \ > case 8: \ > - __get_mem_asm("ldr", "ldtr", "%x", __gu_val, (ptr), \ > - (err), ARM64_HAS_UAO); \ > + __get_mem_asm(ldr, "%x", __gu_val, (ptr), (err)); \ > break; \ > default: \ > BUILD_BUG(); \ > @@ -298,7 +295,7 @@ do { \ > #define __raw_get_user(x, ptr, err) \ > do { \ > uaccess_enable_not_uao(); \ > - __raw_get_mem(x, ptr, err); \ > + __raw_get_mem("ldtr", x, ptr, err); \ > uaccess_disable_not_uao(); \ > } while (0) > > @@ -323,10 +320,19 @@ do { \ > > #define get_user __get_user > > -#define __put_mem_asm(instr, alt_instr, reg, x, addr, err, feature) \ > +#define __get_kernel_nofault(dst, src, type, err_label) \ > +do { \ > + int __gkn_err; \ > + \ > + __raw_get_mem("ldr", *((type *)(dst)), \ > + (__force type __user *)(src), __gkn_err); \ > + if (unlikely(__gkn_err)) \ > + goto err_label; \ > +} while(0) The `__gkn_err` variables needs to be initialized to zero to avoid spurious errors being returned. > @@ -366,7 +368,7 @@ do { \ > #define __raw_put_user(x, ptr, err) \ > do { \ > uaccess_enable_not_uao(); \ > - __raw_put_mem(x, ptr, err); \ > + __raw_put_mem("sttr", x, ptr, err); \ > uaccess_disable_not_uao(); \ > } while (0) > > @@ -391,6 +393,16 @@ do { \ > > #define put_user __put_user > > +#define __put_kernel_nofault(dst, src, type, err_label) \ > +do { \ > + int __pkn_err; \ > + \ > + __raw_put_mem("str", *((type *)(src)), \ > + (__force type __user *)(dst), __pkn_err); \ > + if (unlikely(__pkn_err)) \ > + goto err_label; \ > +} while(0) ... and likewise here. I've fixed both in my tree. Mark. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel