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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 02DB7C4332E for ; Mon, 23 Mar 2020 12:09:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 CD69020788 for ; Mon, 23 Mar 2020 12:09:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hacYBqJL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD69020788 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=remlab.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=P5/uf/v+O80Thq993iq4E0bt0mUa0lEhjgLC25sD6AI=; b=hacYBqJL7DxyV8 60CKfHg1JJE2sf1iIBpLWweCrGt7CJYF3sxDxSAIeR4k2mYrzBrFiPRQWTact0RS4HL2unTcSS6Nu XJdR7Ig7oCC2HbKFaSEVy3/Gm83IfykXvv83N6PVpJqkJQP9XxhNhlzEET9yHqj9CvdWbXSirQCwx zBj7du/yfW3MvI3o+2SZ9sBjdeRKayF8fD//P+YOk9UTZ+TpNuCcVzzH10DQ9oDGJ4csAPs3F484z CaaNozg+OKvADtvFrE9id/4UGzNtmosJDtV8ZqHMj+ko01CMcVTTC385OsGHBZWWBGFEW48iKsuJQ G9eTeRZVn+eQ10u4A9TQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jGLtN-0002yZ-AS; Mon, 23 Mar 2020 12:09:17 +0000 Received: from poy.remlab.net ([2001:41d0:2:5a1a::] helo=ns207790.ip-94-23-215.eu) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jGLtJ-0002xv-8Y for linux-arm-kernel@lists.infradead.org; Mon, 23 Mar 2020 12:09:15 +0000 Received: from basile.remlab.net (87-92-31-51.bb.dnainternet.fi [87.92.31.51]) (Authenticated sender: remi) by ns207790.ip-94-23-215.eu (Postfix) with ESMTPSA id 0E6085FCA2; Mon, 23 Mar 2020 13:08:54 +0100 (CET) From: =?ISO-8859-1?Q?R=E9mi?= Denis-Courmont To: Mark Rutland Subject: Re: [PATCH 1/3] arm64: clean up trampoline vector loads Date: Mon, 23 Mar 2020 14:08:53 +0200 Message-ID: <2345780.q8flsOIESp@basile.remlab.net> Organization: Remlab In-Reply-To: <20200323120700.GB2597@C02TD0UTHF1T.local> References: <1938400.7m7sAWtiY1@basile.remlab.net> <20200319091407.51449-1-remi@remlab.net> <20200323120700.GB2597@C02TD0UTHF1T.local> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200323_050913_443555_42D133A1 X-CRM114-Status: GOOD ( 14.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: catalin.marinas@arm.com, will@kernel.org, james.morse@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org TGUgbWFhbmFudGFpbmEgMjMuIG1hYWxpc2t1dXRhIDIwMjAsIDE0LjA3LjAwIEVFVCBNYXJrIFJ1 dGxhbmQgYSDDqWNyaXQgOgo+IE9uIFRodSwgTWFyIDE5LCAyMDIwIGF0IDExOjE0OjA1QU0gKzAy MDAsIFLDqW1pIERlbmlzLUNvdXJtb250IHdyb3RlOgo+ID4gRnJvbTogUsOpbWkgRGVuaXMtQ291 cm1vbnQgPHJlbWkuZGVuaXMuY291cm1vbnRAaHVhd2VpLmNvbT4KPiA+IAo+ID4gVGhpcyBzd2l0 Y2hlcyBmcm9tIGN1c3RvbSBpbnN0cnVjdGlvbiBwYXR0ZXJucyB0byB0aGUgcmVndWxhciBsYXJn ZQo+ID4gbWVtb3J5IG1vZGVsIHNlcXVlbmNlIHdpdGggQURSUCBhbmQgTERSLiBJbiBkb2luZyBz bywgdGhlIEFERAo+ID4gaW5zdHJ1Y3Rpb24gY2FuIGJlIGVsaW1pbmF0ZWQgaW4gdGhlIFNERUkg aGFuZGxlciwgYW5kIHRoZSBjb2RlIG5vCj4gPiBsb25nZXIgYXNzdW1lcyB0aGF0IHRoZSB0cmFt cG9saW5lIHZlY3RvcnMgYW5kIHRoZSB2ZWN0b3JzIGFkZHJlc3MgYm90aAo+ID4gc3RhcnQgb24g YSBwYWdlIGJvdW5kYXJ5Lgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5OiBSw6ltaSBEZW5pcy1Db3Vy bW9udCA8cmVtaS5kZW5pcy5jb3VybW9udEBodWF3ZWkuY29tPgo+ID4gLS0tCj4gPiAKPiA+ICBh cmNoL2FybTY0L2tlcm5lbC9lbnRyeS5TIHwgOSArKysrLS0tLS0KPiA+ICAxIGZpbGUgY2hhbmdl ZCwgNCBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEv YXJjaC9hcm02NC9rZXJuZWwvZW50cnkuUyBiL2FyY2gvYXJtNjQva2VybmVsL2VudHJ5LlMKPiA+ IGluZGV4IGU1ZDRlMzBlZTI0Mi4uMjRmODI4NzM5Njk2IDEwMDY0NAo+ID4gLS0tIGEvYXJjaC9h cm02NC9rZXJuZWwvZW50cnkuUwo+ID4gKysrIGIvYXJjaC9hcm02NC9rZXJuZWwvZW50cnkuUwo+ ID4gQEAgLTgwNSw5ICs4MDUsOSBAQCBhbHRlcm5hdGl2ZV9lbHNlX25vcF9lbmRpZgo+ID4gCj4g PiAgMjoKPiA+ICAJdHJhbXBfbWFwX2tlcm5lbAl4MzAKPiA+ICAKPiA+ICAjaWZkZWYgQ09ORklH X1JBTkRPTUlaRV9CQVNFCj4gPiAKPiA+IC0JYWRyCXgzMCwgdHJhbXBfdmVjdG9ycyArIFBBR0Vf U0laRQo+ID4gKwlhZHJwCXgzMCwgdHJhbXBfdmVjdG9ycyArIFBBR0VfU0laRQo+ID4gCj4gPiAg YWx0ZXJuYXRpdmVfaW5zbiBpc2IsIG5vcCwgQVJNNjRfV09SS0FST1VORF9RQ09NX0ZBTEtPUl9F MTAwMwo+ID4gCj4gPiAtCWxkcgl4MzAsIFt4MzBdCj4gPiArCWxkcgl4MzAsIFt4MzAsICM6bG8x MjpfX2VudHJ5X3RyYW1wX2RhdGFfc3RhcnRdCj4gCj4gSSB0aGluayB0aGlzIGlzIGJ1c3RlZCBm b3IgITRLIGtlcm5lbHMgb25jZSB3ZSByZWR1Y2UgdGhlIGFsaWdubWVudCBvZgo+IF9fZW50cnlf dHJhbXBfZGF0YV9zdGFydC4KPiAKPiBUaGUgQURSUCBnaXZlcyB1cyBhIDY0SyBhbGlnbmVkIGFk ZHJlc3MgKHdpdGggYml0cyAxNTowIGNsZWFyKS4gVGhlIGxvMTIKPiByZWxvY2F0aW9uIGdpdmVz IHVzIGJpdHMgMTE6MCwgc28gd2UgaGF2ZW4ndCBhY2NvdW50ZWQgZm9yIGJpdHMgMTU6MTIuCgpJ TVUsIEFEUlAgZ2l2ZXMgYSA0SyBhbGlnbmVkIHZhbHVlLCByZWdhcmRsZXNzIG9mIE1NVSAoVENS KSBzZXR0aW5ncy4KCkkgcmF0aGVyIHN1c3BlY3QgdGhhdCB0aGUgcHJvYmxlbSBpcyB3aXRoIG15 IEMgY29kZSBkaWZmIGFzc3VtaW5nIHRoYXQgClBBR0VfTUFTSyBpcyA0MDk1LgoKLS0gClLDqW1p IERlbmlzLUNvdXJtb250Cmh0dHA6Ly93d3cucmVtbGFiLm5ldC8KCgoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGlu ZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMu aW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 A6932C4332B for ; Mon, 23 Mar 2020 12:08:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84A1B20788 for ; Mon, 23 Mar 2020 12:08:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727425AbgCWMI6 convert rfc822-to-8bit (ORCPT ); Mon, 23 Mar 2020 08:08:58 -0400 Received: from poy.remlab.net ([94.23.215.26]:57246 "EHLO ns207790.ip-94-23-215.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726204AbgCWMI5 (ORCPT ); Mon, 23 Mar 2020 08:08:57 -0400 Received: from basile.remlab.net (87-92-31-51.bb.dnainternet.fi [87.92.31.51]) (Authenticated sender: remi) by ns207790.ip-94-23-215.eu (Postfix) with ESMTPSA id 0E6085FCA2; Mon, 23 Mar 2020 13:08:54 +0100 (CET) From: =?ISO-8859-1?Q?R=E9mi?= Denis-Courmont To: Mark Rutland Cc: catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/3] arm64: clean up trampoline vector loads Date: Mon, 23 Mar 2020 14:08:53 +0200 Message-ID: <2345780.q8flsOIESp@basile.remlab.net> Organization: Remlab In-Reply-To: <20200323120700.GB2597@C02TD0UTHF1T.local> References: <1938400.7m7sAWtiY1@basile.remlab.net> <20200319091407.51449-1-remi@remlab.net> <20200323120700.GB2597@C02TD0UTHF1T.local> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le maanantaina 23. maaliskuuta 2020, 14.07.00 EET Mark Rutland a écrit : > On Thu, Mar 19, 2020 at 11:14:05AM +0200, Rémi Denis-Courmont wrote: > > From: Rémi Denis-Courmont > > > > This switches from custom instruction patterns to the regular large > > memory model sequence with ADRP and LDR. In doing so, the ADD > > instruction can be eliminated in the SDEI handler, and the code no > > longer assumes that the trampoline vectors and the vectors address both > > start on a page boundary. > > > > Signed-off-by: Rémi Denis-Courmont > > --- > > > > arch/arm64/kernel/entry.S | 9 ++++----- > > 1 file changed, 4 insertions(+), 5 deletions(-) > > > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > > index e5d4e30ee242..24f828739696 100644 > > --- a/arch/arm64/kernel/entry.S > > +++ b/arch/arm64/kernel/entry.S > > @@ -805,9 +805,9 @@ alternative_else_nop_endif > > > > 2: > > tramp_map_kernel x30 > > > > #ifdef CONFIG_RANDOMIZE_BASE > > > > - adr x30, tramp_vectors + PAGE_SIZE > > + adrp x30, tramp_vectors + PAGE_SIZE > > > > alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 > > > > - ldr x30, [x30] > > + ldr x30, [x30, #:lo12:__entry_tramp_data_start] > > I think this is busted for !4K kernels once we reduce the alignment of > __entry_tramp_data_start. > > The ADRP gives us a 64K aligned address (with bits 15:0 clear). The lo12 > relocation gives us bits 11:0, so we haven't accounted for bits 15:12. IMU, ADRP gives a 4K aligned value, regardless of MMU (TCR) settings. I rather suspect that the problem is with my C code diff assuming that PAGE_MASK is 4095. -- Rémi Denis-Courmont http://www.remlab.net/