Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp557270yba; Wed, 15 May 2019 06:10:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7C/LmDDLG1qLG4hdNY0jzotPqCMxzAzsso77cw8O+VTXcNBc8J4YNFwJQWDQqj9Vm0ILV X-Received: by 2002:a17:902:21:: with SMTP id 30mr27973089pla.302.1557925829077; Wed, 15 May 2019 06:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557925829; cv=none; d=google.com; s=arc-20160816; b=WGaUkkEjfA2CCqxxu2SS+0ime8a0zCcD9Ny6nIw2WJxPN/qeUVA4RvOF2b/LSqI67z p6rWax5et2JXfi0OwXiF40EtDRE8epVz7bUgFfrHNmuzxTSRduKtk3AH97HbRhU6gMBs Vjua30JFmyFVqe9dzbGaEvo1lCMrHqvhETDq4z/AloRM/jfOukBsF/QGFXejJksNB70H DLCuXcPuhjjDxG8Tv2VAYFgUXrza3KYZ7fuxOCQvRbpflHxkCEaaLydkrlehvN+2MxJp XsDtm6sWfL+nDFGjNSe1JyUcyJAHteM+lz8lXQ2EZsuwLR+IwLIcmz2cof6IWuRdAWSq 6MXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=KUdDPlgFepcuhJLrPAAYuYUVnzL52uvfKFRWOULyN3M=; b=YsTDLhsw8rJlVpF7XFGMwkSY7g6f6dirIU26vACQ8VB/xMHUOLpIUqZx4/aCQkDUx5 Lhc2fBrk86ZW38JmF13jbP+1iu8u0cZcznqEhD67IBpDNk0O3qK7RkVMXmGzSU9z4kIC cEMDEFC8JPocogVhqeP4+iv0kp2ftKrVKpIx8LTVfS6h6SAzwakEXtzwOCK0kxPkMSCF /jOIeEeFuMjmK93I3ir1kvCQ2k/RIraj6Crnu49LwxSX2aVL4sNGL3ZngWiVWI0Y0Rzq mUpUElW0KGXhdimK/8b32oXlXIAMouIPyqM59de6wqg4OxZv7srYhBjzfUNRiCXLKG5U Dphw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NaTpMBcw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t13si1755083pgh.548.2019.05.15.06.10.05; Wed, 15 May 2019 06:10:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NaTpMBcw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727442AbfEONI3 (ORCPT + 99 others); Wed, 15 May 2019 09:08:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:39722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725977AbfEONI2 (ORCPT ); Wed, 15 May 2019 09:08:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8CED420843; Wed, 15 May 2019 13:08:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557925708; bh=P/T1WxbT7QsT7n7T6kKsFUprJ4xg3X1OufDN3pOJn6s=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=NaTpMBcwvLyk0lxuChYO5NCNr6wrhTgRpvZ3Te9tvINP1yrMpr8UTn0dGzFkqQbPh dyIQga3BTA4d9o+md+t0r51V1Pj+KITYxqtB4BAnmeSHiUy0pFJqe13Iv2rRP47qHt wrrz+EgagCu310C8uIhsaCn2RElw6r2qgoVZDYmU= Date: Wed, 15 May 2019 15:08:25 +0200 From: Greg KH To: Christophe Leroy Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , erhard_f@mailbox.org, Michael Neuling , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, "stable@vger.kernel.org" Subject: Re: [PATCH stable 4.9] powerpc/lib: fix book3s/32 boot failure due to code patching Message-ID: <20190515130825.GA3794@kroah.com> References: <629c2acb1fcd09c2d2e3352370c3d9853372cf39.1557902321.git.christophe.leroy@c-s.fr> <20190515082931.GA28349@kroah.com> <9e58348f-da2d-34bc-d016-7817b3566e01@c-s.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <9e58348f-da2d-34bc-d016-7817b3566e01@c-s.fr> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 15, 2019 at 02:35:36PM +0200, Christophe Leroy wrote: > > > Le 15/05/2019 ? 10:29, Greg KH a ?crit?: > > On Wed, May 15, 2019 at 06:40:47AM +0000, Christophe Leroy wrote: > > > [Backport of upstream commit b45ba4a51cde29b2939365ef0c07ad34c8321789] > > > > > > On powerpc32, patch_instruction() is called by apply_feature_fixups() > > > which is called from early_init() > > > > > > There is the following note in front of early_init(): > > > * Note that the kernel may be running at an address which is different > > > * from the address that it was linked at, so we must use RELOC/PTRRELOC > > > * to access static data (including strings). -- paulus > > > > > > Therefore init_mem_is_free must be accessed with PTRRELOC() > > > > > > Fixes: 1c38a84d4586 ("powerpc: Avoid code patching freed init sections") > > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=203597 > > > Signed-off-by: Christophe Leroy > > > > > > --- > > > Can't apply the upstream commit as such due to several other unrelated stuff > > > like for instance STRICT_KERNEL_RWX which are missing. > > > So instead, using same approach as for commit 252eb55816a6f69ef9464cad303cdb3326cdc61d > > > > Now queued up, thanks. > > > > Should go to 4.4 as well since the commit it fixes is now queued for 4.4 > ([PATCH 4.4 056/266] powerpc: Avoid code patching freed init sections) Ok, can someone send me a backport that actually applies there? thanks, greg k-h