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=-5.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 7D64FC433DF for ; Sat, 6 Jun 2020 00:47:07 +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 E971A206A2 for ; Sat, 6 Jun 2020 00:47:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="PpRZ5bzY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E971A206A2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au 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 49f17F0kHDzDqkS for ; Sat, 6 Jun 2020 10:47:05 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (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 49f15D56MhzDqyb for ; Sat, 6 Jun 2020 10:45:20 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=PpRZ5bzY; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49f1566Qpzz9sSc; Sat, 6 Jun 2020 10:45:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1591404320; bh=IaU5svNPQHhne20TEVlRZ0Kl72R9wx14Smw0PSgLfqw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=PpRZ5bzYtwIKvGBjTsE7uAgTTrKf58mi2pjY4JzXmNwpk062tb0AdkqDy4/SvuLyM 7pUvSDSiEw0bJQwnSXcKitUASlKYBKt9o0WseERFR8HMlCPyASqDOEzCvzczeqyjWw JpGj8nEf+7EG02SGd8auYupz7qxKQMGdhOgkSIRNsp7KGg2NpWN36py1I1geCAuxce ee3s3G5NfaHuMBqbrn48ApQism1lFWVgryRfFyOUSN2n4NYysIxZ/8QVKVwJaYe44S nj3oN2p7KiG9iJhxMW7zR2/LOvR3hu+Ywcfn8kzsHyfZdxrfArZH0EI0Gqcj/BAFyw QIHwQdTvjAkWw== From: Michael Ellerman To: Linus Torvalds Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.8-1 tag In-Reply-To: References: <87eeqth3hi.fsf@mpe.ellerman.id.au> Date: Sat, 06 Jun 2020 10:45:37 +1000 Message-ID: <87a71hggy6.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain 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: ego@linux.vnet.ibm.com, emmanuel.nicolet@gmail.com, chenzhou10@huawei.com, jniethe5@gmail.com, linuxram@us.ibm.com, kernelfans@gmail.com, Linux Kernel Mailing List , st5pub@yandex.ru, Oliver O'Halloran , huhai@tj.kylinos.cn, Markus Elfring , rzinsly@linux.ibm.com, leobras.c@gmail.com, mikey@neuling.org, Herbert Xu , "Aneesh Kumar K.V" , haren@linux.ibm.com, michal.simek@xilinx.com, mahesh@linux.ibm.com, Takashi Iwai , kjain@linux.ibm.com, leonardo@linux.ibm.com, "Naveen N. Rao" , Ravi Bangoria , ajd@linux.ibm.com, Arnd Bergmann , Stephen Rothwell , alistair@popple.id.au, Nick Piggin , wangxiongfeng2@huawei.com, Qian Cai , clg@kaod.org, Nathan Chancellor , hbathini@linux.ibm.com, Christophe Leroy , geoff@infradead.org, Dmitry Torokhov , "Gustavo A. R. Silva" , wsa@kernel.org, sbobroff@linux.ibm.com, fbarrat@linux.ibm.com, Christophe JAILLET , Andrew Morton , linuxppc-dev Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Linus Torvalds writes: > On Fri, Jun 5, 2020 at 9:38 AM Michael Ellerman wrote: >> >> I've pushed the result of my resolution of the conflicts to the powerpc/merge >> branch, if you want to look at that, though I've also tried to describe it in >> full below. > > I ended up doing the machine_check_exception() differently, because I > felt the code itself was done wrong and I wanted to add a note about > that. > > Having the same function have completely different semantics depending > on a platform issue is just fundamentally wrong, and makes not just > for fragile code, but also means that you can't do single image > kernels. Yeah I agree it's not that nicely structured. In this case CONFIG_PPC_BOOK3S_64 is one of our top-level compile time switches anyway, so the single image thing at least isn't a concern. > It should be two different functions, possibly just > > non_nmi_fn() { ... } > > nmi_fn() { nmi_enter(); non_nmi_fn(); nmi_exit(); } > > and now you don't have odd rules for the same function that depends on > how the platform happens to call it. Agreed. > I didn't do the above. I did something that looked like the old code, > but had a comment. Oh well. Thanks, we can restructure it later. > But thanks for describing the merge, I'd have missed the place where > there was a new use of pgd_oiffset(). Yeah I missed it to begin with :} > ..and then when I actually compared whether I otherwise got the same > result as you, I realized that this all depends on the module tree. > > I'll go merge that first, and then re-do this all. Oh well. Darn it. I figured you'd have merged that by the time you saw my pull, will mention anything similar in future. cheers 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=-5.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS 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 B954AC433E0 for ; Sat, 6 Jun 2020 00:45:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8836E2064C for ; Sat, 6 Jun 2020 00:45:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="PpRZ5bzY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728498AbgFFApX (ORCPT ); Fri, 5 Jun 2020 20:45:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728402AbgFFApX (ORCPT ); Fri, 5 Jun 2020 20:45:23 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0E8EC08C5C2 for ; Fri, 5 Jun 2020 17:45:22 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49f1566Qpzz9sSc; Sat, 6 Jun 2020 10:45:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1591404320; bh=IaU5svNPQHhne20TEVlRZ0Kl72R9wx14Smw0PSgLfqw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=PpRZ5bzYtwIKvGBjTsE7uAgTTrKf58mi2pjY4JzXmNwpk062tb0AdkqDy4/SvuLyM 7pUvSDSiEw0bJQwnSXcKitUASlKYBKt9o0WseERFR8HMlCPyASqDOEzCvzczeqyjWw JpGj8nEf+7EG02SGd8auYupz7qxKQMGdhOgkSIRNsp7KGg2NpWN36py1I1geCAuxce ee3s3G5NfaHuMBqbrn48ApQism1lFWVgryRfFyOUSN2n4NYysIxZ/8QVKVwJaYe44S nj3oN2p7KiG9iJhxMW7zR2/LOvR3hu+Ywcfn8kzsHyfZdxrfArZH0EI0Gqcj/BAFyw QIHwQdTvjAkWw== From: Michael Ellerman To: Linus Torvalds Cc: Andrew Morton , ajd@linux.ibm.com, alistair@popple.id.au, "Aneesh Kumar K.V" , Arnd Bergmann , Qian Cai , chenzhou10@huawei.com, Christophe JAILLET , Christophe Leroy , christophe.leroy@csgroup.eu, clg@kaod.org, Dmitry Torokhov , ego@linux.vnet.ibm.com, Markus Elfring , emmanuel.nicolet@gmail.com, fbarrat@linux.ibm.com, geoff@infradead.org, "Gustavo A. R. Silva" , haren@linux.ibm.com, hbathini@linux.ibm.com, Herbert Xu , huhai@tj.kylinos.cn, jniethe5@gmail.com, kernelfans@gmail.com, kjain@linux.ibm.com, leobras.c@gmail.com, leonardo@linux.ibm.com, Linux Kernel Mailing List , linuxppc-dev , linuxram@us.ibm.com, mahesh@linux.ibm.com, michal.simek@xilinx.com, mikey@neuling.org, Nathan Chancellor , "Naveen N. Rao" , Nick Piggin , Oliver O'Halloran , Ravi Bangoria , rzinsly@linux.ibm.com, sbobroff@linux.ibm.com, Segher Boessenkool , Stephen Rothwell , st5pub@yandex.ru, Takashi Iwai , wangxiongfeng2@huawei.com, wsa@kernel.org Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.8-1 tag In-Reply-To: References: <87eeqth3hi.fsf@mpe.ellerman.id.au> Date: Sat, 06 Jun 2020 10:45:37 +1000 Message-ID: <87a71hggy6.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus Torvalds writes: > On Fri, Jun 5, 2020 at 9:38 AM Michael Ellerman wrote: >> >> I've pushed the result of my resolution of the conflicts to the powerpc/merge >> branch, if you want to look at that, though I've also tried to describe it in >> full below. > > I ended up doing the machine_check_exception() differently, because I > felt the code itself was done wrong and I wanted to add a note about > that. > > Having the same function have completely different semantics depending > on a platform issue is just fundamentally wrong, and makes not just > for fragile code, but also means that you can't do single image > kernels. Yeah I agree it's not that nicely structured. In this case CONFIG_PPC_BOOK3S_64 is one of our top-level compile time switches anyway, so the single image thing at least isn't a concern. > It should be two different functions, possibly just > > non_nmi_fn() { ... } > > nmi_fn() { nmi_enter(); non_nmi_fn(); nmi_exit(); } > > and now you don't have odd rules for the same function that depends on > how the platform happens to call it. Agreed. > I didn't do the above. I did something that looked like the old code, > but had a comment. Oh well. Thanks, we can restructure it later. > But thanks for describing the merge, I'd have missed the place where > there was a new use of pgd_oiffset(). Yeah I missed it to begin with :} > ..and then when I actually compared whether I otherwise got the same > result as you, I realized that this all depends on the module tree. > > I'll go merge that first, and then re-do this all. Oh well. Darn it. I figured you'd have merged that by the time you saw my pull, will mention anything similar in future. cheers