From patchwork Tue Jan 5 18:05:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brazdil X-Patchwork-Id: 12000015 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 4A097C433E0 for ; Tue, 5 Jan 2021 18:07:43 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 0ED4A22D06 for ; Tue, 5 Jan 2021 18:07:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0ED4A22D06 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.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=HXaODzuL0U+HnwEMA0mTkPRBB/cXKzpbR1WwTVttjT8=; b=2TaZuBodoT8UPWyRBmsAaYLxZ CLdgSxs4G1nB02XBwR/0aqbo8D5ILehB0qko+z9PqZ+EOSKJ3meRKxLEl2qzbxd6aQIIC01po1Ovj nx5JTaSGRJ79STCL6pt/NheKZErz5fdLSyMxWc2eSOzFDL9wDSBS57X1/+PD55H1fbOXx4B1Jwlhz cPd4u/kaseJBd9EbDcp4JKfoWrnUkgpxI5xeWwaoAunOmiD7aLg6yCTTqdvFhK2F3/TJyQxBGOYit sc/D2FL1TFE9eZj+kFUCtfO+/ZPXNSz3SC699fjmN0vUgCkYLfcntOLeecXhbPFqXMNXO3t2qatj1 qlt+wZiOg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwqiZ-0001PT-Ra; Tue, 05 Jan 2021 18:06:03 +0000 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwqiT-0001NF-3o for linux-arm-kernel@lists.infradead.org; Tue, 05 Jan 2021 18:05:59 +0000 Received: by mail-wm1-x329.google.com with SMTP id 190so381787wmz.0 for ; Tue, 05 Jan 2021 10:05:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X/13wAME+aCvCn5cqIsjPJwjMTVT6zNfbY7h8F95inU=; b=wN3JmV9nSFl9HK96BxwqTYn8/5UMJbxbz7CdJ8zLp9QDqHWYIr3oZGc4uAOw8rjKLq ETvqki58TnkhhMU0ZfEFIV77MlBPFlzO6+h17IU+14xd8Nsin6C9PEw8brMKfiL0DRb5 7c0MmBmJFCilyM6rPfjXrkmU/QT25TSvmBKGpQWse1fdHtSTRTkIM8yVIv4cysMFfPBs N7woQ89PdailPKQd2ASmnmkRfySg0Vp79bgqYLXO0vzza6WKA4zV8jVJ66sIbeiIknVw grv9cfR0BaqYEdtyf/Z5tWlBNvt83zbHFsqtKqM2QMqAywqAU1MTqHg5LhwoynxmvWgW lwZA== 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=X/13wAME+aCvCn5cqIsjPJwjMTVT6zNfbY7h8F95inU=; b=NKpCgZ4FQ5VxHjkYnabJz02Yn7yiq1jgCCtH8+fpL771EIcuo/UzdQ9b77uhEY9SWA H4HZdCWhD1gcALMppMgvAmXnBDqFcsbwk7c9b8uOtCtF12v86vRxF+sZpyEl9AYicEP2 SAMgRI1CBpyiJUZesg/Lq3XDs0rDStSFq1EIolDXpUrjurXVoiGync2fRZujpTgSLzEL Mco8chbD7GxDWNIUnOqFuvvzzuOc4Xvl/Erkehu1ZvwXhNcJzpSSiRk4DHcNQmwFc3ZC TGkRvVCP521nmmjpAvnSA/lCkkr1qK5P0qq9hM6KP9Bu5nJAO2AMXLg3gq4L4KKjvVg6 BWgA== X-Gm-Message-State: AOAM533ck5iBmi1eeTrVERpbJF9VYAjBpcmJP9sY7W5ZM3MmQbFkBbHi Os4lVFSmRBzBwK1lTmHf4dSDtA== X-Google-Smtp-Source: ABdhPJz/PuVzjxuGEJSY0xr4tIJRO9R+UGeZ8GgQutDB2H8aMEedZEEpe4b16RKs/VWV9FRUwnJ//A== X-Received: by 2002:a7b:c849:: with SMTP id c9mr312455wml.11.1609869955809; Tue, 05 Jan 2021 10:05:55 -0800 (PST) Received: from localhost ([2a01:4b00:8523:2d03:4957:71a5:7b5c:c94f]) by smtp.gmail.com with ESMTPSA id j15sm718938wrr.85.2021.01.05.10.05.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Jan 2021 10:05:54 -0800 (PST) From: David Brazdil To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v2 1/8] KVM: arm64: Rename .idmap.text in hyp linker script Date: Tue, 5 Jan 2021 18:05:34 +0000 Message-Id: <20210105180541.65031-2-dbrazdil@google.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210105180541.65031-1-dbrazdil@google.com> References: <20210105180541.65031-1-dbrazdil@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210105_130557_179868_FB8E7C3C X-CRM114-Status: GOOD ( 16.33 ) 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: Mark Rutland , Suzuki K Poulose , Catalin Marinas , linux-kernel@vger.kernel.org, James Morse , linux-arm-kernel@lists.infradead.org, Marc Zyngier , David Brazdil , Will Deacon , Ard Biesheuvel , Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org So far hyp-init.S created a .hyp.idmap.text section directly, without relying on the hyp linker script to prefix its name. Change it to create .idmap.text and add a HYP_SECTION entry to hyp.lds.S. This way all .hyp* sections go through the linker script and can be instrumented there. Signed-off-by: David Brazdil --- arch/arm64/kvm/hyp/nvhe/hyp-init.S | 2 +- arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-init.S b/arch/arm64/kvm/hyp/nvhe/hyp-init.S index 31b060a44045..68fd64f2313e 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S @@ -18,7 +18,7 @@ #include .text - .pushsection .hyp.idmap.text, "ax" + .pushsection .idmap.text, "ax" .align 11 diff --git a/arch/arm64/kvm/hyp/nvhe/hyp.lds.S b/arch/arm64/kvm/hyp/nvhe/hyp.lds.S index 1206d0d754d5..70ac48ccede7 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp.lds.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp.lds.S @@ -12,6 +12,7 @@ #include SECTIONS { + HYP_SECTION(.idmap.text) HYP_SECTION(.text) /* * .hyp..data..percpu needs to be page aligned to maintain the same