From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 26 Jun 2017 14:08:31 +0200 (CEST) Received: from foss.arm.com ([217.140.101.70]:47146 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S23993935AbdFZMIW1lOHA (ORCPT ); Mon, 26 Jun 2017 14:08:22 +0200 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7D63B2B; Mon, 26 Jun 2017 05:08:15 -0700 (PDT) Received: from edgewater-inn.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4B67D3F41F; Mon, 26 Jun 2017 05:08:15 -0700 (PDT) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 9BCC01AE0B65; Mon, 26 Jun 2017 13:08:14 +0100 (BST) Date: Mon, 26 Jun 2017 13:08:14 +0100 From: Will Deacon To: Jiri Slaby Cc: Thomas Gleixner , mingo@redhat.com, peterz@infradead.org, dvhart@infradead.org, linux-kernel@vger.kernel.org, Richard Henderson , Ivan Kokshaysky , Matt Turner , Vineet Gupta , Catalin Marinas , Richard Kuo , Tony Luck , Fenghua Yu , Michal Simek , Ralf Baechle , Jonas Bonn , Stefan Kristiansson , Stafford Horne , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , Martin Schwidefsky , Yoshinori Sato , Rich Felker , "David S. Miller" , "H. Peter Anvin" , Chris Zankel , Max Filippov , Arnd Bergmann , x86@kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-arch@vger.kernel.org Subject: Re: [PATCH 1/1] futex: remove duplicated code and fix UB Message-ID: <20170626120814.GF1691@arm.com> References: <20170621115318.2781-1-jslaby@suse.cz> <80af8d81-4522-de2d-8289-1ab46565505a@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <80af8d81-4522-de2d-8289-1ab46565505a@suse.cz> User-Agent: Mutt/1.5.23 (2014-03-12) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 58804 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: will.deacon@arm.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips On Mon, Jun 26, 2017 at 02:02:31PM +0200, Jiri Slaby wrote: > On 06/23/2017, 09:51 AM, Thomas Gleixner wrote: > > On Wed, 21 Jun 2017, Jiri Slaby wrote: > >> diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h > >> index f32b42e8725d..5bb2fd4674e7 100644 > >> --- a/arch/arm64/include/asm/futex.h > >> +++ b/arch/arm64/include/asm/futex.h > >> @@ -48,20 +48,10 @@ do { \ > >> } while (0) > >> > >> static inline int > >> -futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr) > > > > That unsigned int seems to be a change from the arm64 tree in next. It's > > not upstream and it'll cause a (easy to resolve) conflict. > > Ugh, I thought the arm64 is in upstream already. Note that this patch > just takes what is in this arm64 fix and makes it effective for all > architectures. So I will wait with v2 until it merges upstream. > > So, Will, will you incorporate Thomas' comments into your arm64 fix? I wasn't planning to (it's already queued and I think they're just cosmetic changes). The easiest thing is probably for you to make the changes in the generic version when you post v2. Will