Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp633472pxf; Wed, 10 Mar 2021 13:49:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJy8uliXsnnfjiIFd8aXG/wzX9ynvW3Kuot5OL+VbonUJEh0S9UrdcXRd+UX2CIaxo06vD0t X-Received: by 2002:aa7:c551:: with SMTP id s17mr5476551edr.291.1615412979849; Wed, 10 Mar 2021 13:49:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615412979; cv=none; d=google.com; s=arc-20160816; b=R+Y/aDxbpPvLhZtA0IYLpf+y3fUleq7QjeQd/iZHmX7R9wD50ATYgoxDLiKNg3NHNL sWk9y0UalmicpGjICvhl8iOQIC0UwAnOWbjFbgkuVWlLiOPR4y3vtge1E/7E9VfCzRKz 2rR6JZ8lI77Zfj27wrEzBbsztM+gnINoKuvuOI6SN0ywiB7J24++GWdkcErWn4kmXU11 13WVBTOUmDAzTfLuiDGng3PvViz2f1W06VanhK5MdUH0rKLNLNR7kghSqU9aLISI2Q2p BxFnU5GVYGiXDpqgWG2RWuyPWgB7RSrPjzJr+rsbiQpwwGze+SB+qZLfTRJlv2XL9a+F qtoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:dkim-signature; bh=mCiogpXAvnyIZ07NXe3U+jkz++MrPHNJq4E2jewoVME=; b=F5GGq5RiAXAL8QyodNeeD6BxczmESTWjDkg7/9y6BlzlOyRu+WrdXZ7UpK3ZdUlbNH KMiCCIfBNbY7p4RLUv3r4MtqRHn2Q5vQg6Xx6kIRQqtpcgF6p/zrNK5Yz7UVWO+adj9A hc3O4Cqv6ADDfjXK9+QmUxpTUYwftFGhzNBURtnCpce69opru+k7VMyJQwwgtqinZLwf raw9JO40VcCcmSe5aO956b8K/Exg9Q8CNUIiPLYM694kyBYVuAswoTF+USagWQIojhwJ mrKFII6EWCwbKQYQHOTdZYnkFcj6B8H7At0NhAgT7Zqkv3Dqb1KU6xGA5wzUBDjQ1Lor vQKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@axtens.net header.s=google header.b=bJVDkR3w; 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 pj9si392842ejb.230.2021.03.10.13.49.17; Wed, 10 Mar 2021 13:49:39 -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; dkim=pass header.i=@axtens.net header.s=google header.b=bJVDkR3w; 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 S229505AbhCJVsM (ORCPT + 99 others); Wed, 10 Mar 2021 16:48:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231880AbhCJVrq (ORCPT ); Wed, 10 Mar 2021 16:47:46 -0500 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A056C061574 for ; Wed, 10 Mar 2021 13:47:46 -0800 (PST) Received: by mail-pg1-x52d.google.com with SMTP id t26so12283866pgv.3 for ; Wed, 10 Mar 2021 13:47:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=mCiogpXAvnyIZ07NXe3U+jkz++MrPHNJq4E2jewoVME=; b=bJVDkR3wZsBDZQRcdc+hvRJ1PGY2Hy2AjnBbtHH48u/3UTXKpLx2GJnN8CtqqEI2IE t6a5cS6JRWbLHVsWfNnGvUjZCtDMie7O0bFnwatk6kpCMWr50sJksoUJ5SOFfm/v5Dev R4Q55JBOGbBSDtz9n+CT3p6TXvqnwojvbaPtk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=mCiogpXAvnyIZ07NXe3U+jkz++MrPHNJq4E2jewoVME=; b=YT9N4qQ10pplQmH+G/tCCa5jFpNzqJP115SZxxf2DmP2/SiGPDtDMY9CP5/CAg1jr8 PHNOJZ5l3BwIFVBzNo1+OXxI2fPfZ3dG81V8b/LtRSbRyGtEwcHYaGthDJrNb96CdMXI tTXw0JoM+sCyHo5HgxPYRW+Sp2MCG197SefLxKRy6BX6FW4Xw3yUxW0EaPCEppu1Sbjg louPZc4lRh3Qg7Qs+WKXGVsvELQNEO49xaDNpjZKfM8DzD/EKBEi4YWgbuJDPY5leT/Z T0hbpw367uoehumXB9qAf3pnhaV6p5l3cHE8mA4KwFhQEPuL8AcuzUS0aWRdAELpbXW6 5Wng== X-Gm-Message-State: AOAM533rEX0qmS3kVQL5/hK5fPUUs8MGNIKkul3t/PB7JP9MSFfUC74E LJuxKW7ZWhA2JMIplY1E9O5YLwTMhhj7h32A X-Received: by 2002:a65:4344:: with SMTP id k4mr4502725pgq.48.1615412865961; Wed, 10 Mar 2021 13:47:45 -0800 (PST) Received: from localhost (2001-44b8-1113-6700-0e28-c46d-f4e0-67e7.static.ipv6.internode.on.net. [2001:44b8:1113:6700:e28:c46d:f4e0:67e7]) by smtp.gmail.com with ESMTPSA id j3sm290489pjf.36.2021.03.10.13.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 13:47:45 -0800 (PST) From: Daniel Axtens To: Christophe Leroy , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 01/15] powerpc/uaccess: Remove __get_user_allowed() and unsafe_op_wrap() In-Reply-To: <439179c5e54c18f2cb8bdf1eea13ea0ef6b98375.1615398265.git.christophe.leroy@csgroup.eu> References: <439179c5e54c18f2cb8bdf1eea13ea0ef6b98375.1615398265.git.christophe.leroy@csgroup.eu> Date: Thu, 11 Mar 2021 08:47:42 +1100 Message-ID: <877dmed6kh.fsf@dja-thinkpad.axtens.net> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Christophe, Thanks for the answers to my questions on v1. This all looks good to me. Reviewed-by: Daniel Axtens Kind regards, Daniel > Those two macros have only one user which is unsafe_get_user(). > > Put everything in one place and remove them. > > Signed-off-by: Christophe Leroy > --- > arch/powerpc/include/asm/uaccess.h | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h > index 78e2a3990eab..8cbf3e3874f1 100644 > --- a/arch/powerpc/include/asm/uaccess.h > +++ b/arch/powerpc/include/asm/uaccess.h > @@ -53,9 +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))) > > -#define __get_user_allowed(x, ptr) \ > - __get_user_nocheck((x), (ptr), sizeof(*(ptr)), false) > - > #define __get_user_inatomic(x, ptr) \ > __get_user_nosleep((x), (ptr), sizeof(*(ptr))) > #define __put_user_inatomic(x, ptr) \ > @@ -482,8 +479,11 @@ user_write_access_begin(const void __user *ptr, size_t len) > #define user_write_access_begin user_write_access_begin > #define user_write_access_end prevent_current_write_to_user > > -#define unsafe_op_wrap(op, err) do { if (unlikely(op)) goto err; } while (0) > -#define unsafe_get_user(x, p, e) unsafe_op_wrap(__get_user_allowed(x, p), e) > +#define unsafe_get_user(x, p, e) do { \ > + if (unlikely(__get_user_nocheck((x), (p), sizeof(*(p)), false)))\ > + goto e; \ > +} while (0) > + > #define unsafe_put_user(x, p, e) \ > __unsafe_put_user_goto((__typeof__(*(p)))(x), (p), sizeof(*(p)), e) > > -- > 2.25.0