From patchwork Thu Dec 6 15:57:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153042 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp10695957ljp; Thu, 6 Dec 2018 07:59:52 -0800 (PST) X-Google-Smtp-Source: AFSGD/XJIyq1TkTeiekl8dtPh3c5BaUovDOozdLXwgEwDCE4y9JpixpRgh5jbUu6334kxCHYpp0Z X-Received: by 2002:a17:902:d70b:: with SMTP id w11mr29235133ply.294.1544111991919; Thu, 06 Dec 2018 07:59:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544111991; cv=none; d=google.com; s=arc-20160816; b=Ww5Iy/MlqyCk840vyEImt+yEUg8owGRhUWXR627wrvHl4O+uNsaiUe6+hJKN4AlBWZ Y6OeXgLLcDpejUY3MK+lqbuCXaMiZSWmhpEQCeLgMekds0a6WJ+DaYilw50zL7g8sHR5 xBcUnEIvma+257/AeJhrNur34xz6DcJc+TQAT09a1VydyUU7Z55m9ULMKnFHhKr+d/1D wCJNOWhIWi/KWxzqLWZ9+XuzE/CNIgCI8quzE8FixyZEbBTEsXBZd2yuVlCCaZ+ayVBU JVOy3OTcRskCBo+iVTXiMId2a3jJT4DDAIr1+k1obvM6gYKlixw13+9aGmMwren6LYTq clhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EBf2ddABzNmUATNTkk2NnIWCCRz0jpWPHKnmmJ2ur1E=; b=teuNMnJx0JZLScZhtiZtVu6XnegztAzZ7IDC5Wqq3qhDQOUsWxT5EUW0Lp4Sk8UhuD 3AyT7J7jCg9TGxGw5EJE79MoympGe++zLF6s2+fO8D5XsZq81etjF3yszoNRxHB0TTBN hbC7O5XBcydqJeRDYACchByS3Q9/SIto38DSfz9rsbd9jzFaFW87N+NO4bmhFNaK9PHQ 3W1Xj9c2Ac7eW0c4OuBK3VZgDGKEJzGenQYz8CcGvbravyHZZH1Olhw+GGhbwDF6dg0L lKafJkb5cQuZd9iKxFan7zzCnASwAprGQ1t5VHATgdjsU5jriBp4aPCtHDnzscR9Ylas DV3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cikb10eS; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u188si541179pfb.232.2018.12.06.07.59.51; Thu, 06 Dec 2018 07:59:51 -0800 (PST) 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=@linaro.org header.s=google header.b=cikb10eS; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726310AbeLFP7u (ORCPT + 31 others); Thu, 6 Dec 2018 10:59:50 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43950 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726090AbeLFP7r (ORCPT ); Thu, 6 Dec 2018 10:59:47 -0500 Received: by mail-wr1-f68.google.com with SMTP id r10so970406wrs.10 for ; Thu, 06 Dec 2018 07:59:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EBf2ddABzNmUATNTkk2NnIWCCRz0jpWPHKnmmJ2ur1E=; b=cikb10eScMgEpPy7mtJP4RXIN8T1QZq9WVgYZi95AR+i7To5iS+heCKoRM9014xRYT Ur1lV8CjLtLPaiHFc7wRUaDcfjjrmA9TvhtO503Qjkft00Bz8qad0RgXK+dBAKCNrjXj FchhmDN30ABh9EurnN30vGYzRdHREgSGwqJ1Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EBf2ddABzNmUATNTkk2NnIWCCRz0jpWPHKnmmJ2ur1E=; b=oruKmnO+eKiKzFTrrQg1A2P22rrb0TqGdFJQwprfDyAKCW4wZxbD+8X6SDxOPpVB4S rApT61DQa5CvAdGrsucXNtOuZS7qnRNyXEt2xqOk4sD5cjRIzbyk9XCpu7Sg2tcDcI0x DUAR7+GuvvdA1sp4phEtOI59p96Qq5zoFT+QJJJN/xvTQV5Cu6O93YUfvtHr2/QQ6T+X 9G1rl2iOhcot+QV6BWn0AEDksXmPd6ghQebvpRyFQ5I6hG+hyP+ckCOAgZ1VOedGVkTg Upp2lETQKTJ9PwkIgCaxBuvLI08Sy5x9nkqmKWn3GFLneOWwov6f39w16qvzPnQ0/SsS zrNQ== X-Gm-Message-State: AA+aEWYsR9llxRGitWQBUmxajL3/shxnnMk1Pul2dY5WrdTymVIJ7bff I/7OwM2WoRbinJ/LFj/oSj/Ly/4YG3PJ8w== X-Received: by 2002:adf:b201:: with SMTP id u1mr25976578wra.165.1544111985333; Thu, 06 Dec 2018 07:59:45 -0800 (PST) Received: from localhost.localdomain (laubervilliers-657-1-83-120.w92-154.abo.wanadoo.fr. [92.154.90.120]) by smtp.gmail.com with ESMTPSA id y34sm1525233wrd.68.2018.12.06.07.59.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 07:59:44 -0800 (PST) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Robin Murphy , Will Deacon , Catalin Marinas , Marc Zyngier , Suzuki Poulose , Dave Martin Subject: [PATCH 3/5] arm64/alternative_cb: add support for alternative sequences Date: Thu, 6 Dec 2018 16:57:37 +0100 Message-Id: <20181206155739.20229-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206155739.20229-1-ard.biesheuvel@linaro.org> References: <20181206155739.20229-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Permit callback type alternatives to carry a sequence of alternative instructions, and leave it up to the callback handler to decide how to use them. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/alternative.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.19.2 diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h index 987c1514183a..6b7726ee6b0a 100644 --- a/arch/arm64/include/asm/alternative.h +++ b/arch/arm64/include/asm/alternative.h @@ -156,7 +156,7 @@ static inline void apply_alternatives_module(void *start, size_t length) { } .popsection .pushsection .altinstr_replacement, "ax" 663: .word \cb - . -664: .popsection + .popsection 661: .endm @@ -185,10 +185,21 @@ static inline void apply_alternatives_module(void *start, size_t length) { } .org . - (662b-661b) + (664b-663b) .endm +.macro alternative_cb_alt + .set .Lasm_alt_mode, 1 + .pushsection .altinstr_replacement, "ax" + .org 663b + AARCH64_INSN_SIZE +.endm + /* * Callback-based alternative epilogue */ .macro alternative_cb_end + .if .Lasm_alt_mode==0 + .pushsection .altinstr_replacement, "ax" + .org 663b + AARCH64_INSN_SIZE + .endif +664: .popsection 662: .endm