From patchwork Mon Feb 22 20:54:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 62635 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1472748lbl; Mon, 22 Feb 2016 13:01:15 -0800 (PST) X-Received: by 10.98.32.150 with SMTP id m22mr40828886pfj.27.1456174874968; Mon, 22 Feb 2016 13:01:14 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id q79si29489478pfi.230.2016.02.22.13.01.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Feb 2016 13:01:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aXxaY-0008Mx-Po; Mon, 22 Feb 2016 21:00:14 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aXxWJ-0004ex-9y for linux-arm-kernel@lists.infradead.org; Mon, 22 Feb 2016 20:55:58 +0000 Received: by mail-wm0-x231.google.com with SMTP id b205so172985931wmb.1 for ; Mon, 22 Feb 2016 12:55:31 -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; bh=c3l0i6i1/mMBzHmtqIUTJSvZeNJ5E3/2lJAlWtr6GDw=; b=eYfeRUCK04AGHdZ5O437BxMx4qOQ0otD4NXSykiguji3IvZIxRcXUK5LxVMfrWv0Xv J7WQP4XkwAmQSjCfUyQl7dE2/Yrl42xpF9CyWWnA/fe4IlsUuqQKYF0F96WxvNVZKdBZ yo2MExUZyRBXXJWwQPV4vqlW7Ks9esghMJ4kU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=c3l0i6i1/mMBzHmtqIUTJSvZeNJ5E3/2lJAlWtr6GDw=; b=BWLyi143rDsNYWSDTBDmFzf0OR9K5mmPquk/QD8O5655+3s/9jaFXkWKLPXSGQRclP UQNkQSmIfVKMRb7bJ6KNyy0FXyRlIKbfYGbWHVhU3JI53vfmDwmvtPxdBuKIX2usL7Iu j/vbY2YSfDNV7be1bdmXMnwkkabE7Z4Iqi/uE6T9PEIgv5io+IUWSD4xHpyxVd0CmvgG Nl6kfz7u5D+xszrzkQ/yiFW5ZNskbOyQjDPKimR8cK4j070IKCWfvrSRZqCM3kf/AIgX /PX5Y6iIJYeXr7ba8NuDjQMwim47IIXL71ZozIyk46dw33qKjpOuVJBzhzam4bvrQ/Bj R97w== X-Gm-Message-State: AG10YOREHOTmem0dy6M1IYbR2ChQDq3+t47CU3bxBgZARldq4PLOlyF4m2gVCodLnrYJA9lZ X-Received: by 10.28.49.3 with SMTP id x3mr14162333wmx.4.1456174530068; Mon, 22 Feb 2016 12:55:30 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id k8sm15012530wjr.38.2016.02.22.12.55.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Feb 2016 12:55:29 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, will.deacon@arm.com, catalin.marinas@arm.com, mark.rutland@arm.com Subject: [RFC PATCH 09/10] arm64: insn: avoid __pa translations Date: Mon, 22 Feb 2016 21:54:31 +0100 Message-Id: <1456174472-30028-10-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456174472-30028-1-git-send-email-ard.biesheuvel@linaro.org> References: <1456174472-30028-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160222_125551_917298_73CDCA80 X-CRM114-Status: GOOD ( 11.12 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:231 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org When taking the physical address of something that is known to be covered by the kernel text, use __kimg_to_phys() not virt_to_phys() Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/insn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.5.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c index 7371455160e5..bc91e3c2cdb1 100644 --- a/arch/arm64/kernel/insn.c +++ b/arch/arm64/kernel/insn.c @@ -96,7 +96,7 @@ static void __kprobes *patch_map(void *addr, int fixmap) if (module && IS_ENABLED(CONFIG_DEBUG_SET_MODULE_RONX)) page = vmalloc_to_page(addr); else if (!module && IS_ENABLED(CONFIG_DEBUG_RODATA)) - page = virt_to_page(addr); + page = phys_to_page(__kimg_to_phys(addr)); else return addr;