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=-16.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,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 4FA52C433E0 for ; Tue, 5 Jan 2021 18:06:02 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id B10E222D50 for ; Tue, 5 Jan 2021 18:06:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B10E222D50 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 5DAD54B361; Tue, 5 Jan 2021 13:06:01 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0QN-8qYp5v4A; Tue, 5 Jan 2021 13:06:00 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 5AD954B363; Tue, 5 Jan 2021 13:06:00 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id CEF6D4B360 for ; Tue, 5 Jan 2021 13:05:58 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o-9xLxVoG1Kc for ; Tue, 5 Jan 2021 13:05:57 -0500 (EST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 2B6384B367 for ; Tue, 5 Jan 2021 13:05:57 -0500 (EST) Received: by mail-wm1-f41.google.com with SMTP id e25so402438wme.0 for ; Tue, 05 Jan 2021 10:05:57 -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=e94JJkBmM315zR7tSS2fmjutiqg6/FlKXQGhzLSTTYOQaw6YtTXq++zdYdVIiAkNR1 P6PVKd19oum4N6KdFPZQIJwDT4qRLrv8j4m6NHl0s7hithovrXFgcnYshTyVKTnPCh/P sm2IEyg9mUmnaW08F9/jLwC8szqcB8DOcMisziPGlgKtkD8+UFMDSQ9cdqJ0DSG3uilc bE2qrE/VqOKal8OjVhbXWJbFhklotCEjBdyR2V9JczS64ZV1No7eiaWvTnL6h8aVkL0X Hz+GAp2aSqP+9nop317bWiXJqWE01NYmKC7gUPjjxCxw2SblX97Hft6pbtRpVPzHhhWm +3XA== X-Gm-Message-State: AOAM531GcXyrEc9dZCOD6/roeZMecc3BQMXREb1fW9ujUjxa+HY05mb7 5UM9UiIt7Rsxfb4QCQGBVd1+6LxG0+DpAw== 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 Cc: Catalin Marinas , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Marc Zyngier , Will Deacon , Ard Biesheuvel X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu 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 -- 2.29.2.729.g45daf8777d-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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=-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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 -- 2.29.2.729.g45daf8777d-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-26.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 68035C43381 for ; Tue, 5 Jan 2021 18:06:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2CF6B22CF8 for ; Tue, 5 Jan 2021 18:06:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730706AbhAESGj (ORCPT ); Tue, 5 Jan 2021 13:06:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727971AbhAESGh (ORCPT ); Tue, 5 Jan 2021 13:06:37 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17EABC061795 for ; Tue, 5 Jan 2021 10:05:57 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id c133so360933wme.4 for ; Tue, 05 Jan 2021 10:05:57 -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=OmbsZMBkUDEIn33gQHENvMIgnF8Notg6VJEEZs2Qt+hU4169p1dZp3DSXVzW+hFzXn UBjKwCmYPsSKixvykugubHUlLJTFn4+dfEph9F2dUD/gqRFfh0SlDo4ahlonR3Jc/4bb dWvMcop3/Ak7xyAia5RQTbPDX9gW6u85ZnoA49SoWYPLXdL3YobYqM9FjibwxkiK9HxE 8S6x/mfovuxBoILYwOUFLILHXR9n1c66iEsLK1W5eF7hfkdykBTBhlcW8TUnodKmcpGi aOy/nxsLG7LCtp+iVooMXGWiYscGg3bYy3HXPUaRbHWP0r/gv/5tlqsGhmhKMvtdXfP5 edQg== X-Gm-Message-State: AOAM530FdZKu7jBKfjXOTeV+hk/SU+8d/rj6RDcSIarAtxWbNy7Vj0HN QTMk2Jed/5g8J81ETgEvYbmWEQ== 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 Cc: Catalin Marinas , Will Deacon , Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose , Ard Biesheuvel , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, David Brazdil 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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 -- 2.29.2.729.g45daf8777d-goog