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=-9.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 B8260C433DF for ; Sat, 8 Aug 2020 01:00:24 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (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 6DE2720866 for ; Sat, 8 Aug 2020 01:00:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DE2720866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zeniv.linux.org.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BNkRV50lgzDqvK for ; Sat, 8 Aug 2020 11:00:22 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=ftp.linux.org.uk (client-ip=2002:c35c:fd02::1; helo=zeniv.linux.org.uk; envelope-from=viro@ftp.linux.org.uk; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=zeniv.linux.org.uk Received: from ZenIV.linux.org.uk (zeniv.linux.org.uk [IPv6:2002:c35c:fd02::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4BNZpF5W97zDqSY for ; Sat, 8 Aug 2020 05:16:05 +1000 (AEST) Received: from viro by ZenIV.linux.org.uk with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1k47on-00BJ6k-Ez; Fri, 07 Aug 2020 19:14:17 +0000 Date: Fri, 7 Aug 2020 20:14:17 +0100 From: Al Viro To: Linus Torvalds Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.9-1 tag Message-ID: <20200807191417.GU1236603@ZenIV.linux.org.uk> References: <87h7tey4xq.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailman-Approved-At: Sat, 08 Aug 2020 10:06:32 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thadeu Lima de Souza Cascardo , desnesn@linux.ibm.com, Srikar Dronamraju , ego@linux.vnet.ibm.com, aik@ozlabs.ru, jniethe5@gmail.com, bin.meng@windriver.com, psampat@linux.ibm.com, bala24@linux.ibm.com, msuchanek@suse.de, sathnaga@linux.vnet.ibm.com, Oliver O'Halloran , fthain@telegraphics.com.au, Christoph Hellwig , Linux Kernel Mailing List , equinox@diac24.net, leobras.c@gmail.com, santosh@fossix.org, maddy@linux.ibm.com, Nayna Jain , YueHaibing , mahesh@linux.ibm.com, Peter Zijlstra , anju@linux.vnet.ibm.com, Geert Uytterhoeven , weiyongjun1@huawei.com, alastair@d-silva.org, harish@linux.ibm.com, Waiman Long , "Naveen N. Rao" , dyoung@redhat.com, vdronov@redhat.com, nathanl@linux.ibm.com, miltonm@us.ibm.com, palmerdabbelt@google.com, ajd@linux.ibm.com, Arnd Bergmann , lirongqing@baidu.com, sandipan@linux.ibm.com, kjain@linux.ibm.com, muriloo@linux.ibm.com, Nick Piggin , Nathan Chancellor , Joe Perches , chris.packham@alliedtelesis.co.nz, Vaibhav Jain , felix@linux.ibm.com, hbathini@linux.ibm.com, Christophe Leroy , atrajeev@linux.vnet.ibm.com, wenxiong@linux.vnet.ibm.com, sbobroff@linux.ibm.com, Randy Dunlap , "Gustavo A. R. Silva" , sourabhjain@linux.ibm.com, bharata@linux.ibm.com, Tejun Heo , miaoqinglang@huawei.com, Jeremy Kerr , grandmaster@al2klimov.de, "Aneesh Kumar K.V" , fbarrat@linux.ibm.com, huntbag@linux.vnet.ibm.com, kaloz@openwrt.org, linuxppc-dev , Ravi Bangoria , Bill Wendling Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Fri, Aug 07, 2020 at 10:46:13AM -0700, Linus Torvalds wrote: > On Fri, Aug 7, 2020 at 6:14 AM Michael Ellerman wrote: > > > > Just one minor conflict, in a comment in drivers/misc/ocxl/config.c. > > Well, this morning I merged the ptrace ->regset_get() updates from Al, > and that brought in a different conflict. > > I _think_ I resolved it correctly, but while the new model is fairly > readable, the old one sure wasn't, and who knows how messed up my > attempt to sort it out was. I don't know the pkey details on powerpc.. > > So I'd appreciate it if both Al and Aneesh Kumar would check that what > I did to pkey_get() in arch/powerpc/kernel/ptrace/ptrace-view.c makes > sense and works.. Grabbing... Looks sane and yes, 3 membuf_store() instead of membuf_write() + membuf_store() would make sense (might even yield better code). Up to ppc folks... > Side note - it might have been cleaner to just make it do > > membuf_store(&to, target->thread.amr); > membuf_store(&to, target->thread.iamr); > return membuf_store(&to, default_uamor); > > instead of doing that membuf_write() for the first two ones and then > the membuf_store() for the uamor field, but I did what I did to keep > the logic as close to what it used to be as possible. > > If I messed up, I apologize. > > And if you agree that making it three membuf_store() instead of that > odd "depend on the exact order of the thread struct and pick two > consecutive values", I'll leave that to you as a separate cleanup. > > Linus