Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3969450pxu; Wed, 9 Dec 2020 05:22:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUkVvRXMwqKi65vh1/Hgful/aHE5G/OpMMbDmYMmppIQ0HPhOKC2Hoip+X3zswzSxQyhmY X-Received: by 2002:a05:6402:1a54:: with SMTP id bf20mr1969757edb.65.1607520160547; Wed, 09 Dec 2020 05:22:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607520160; cv=none; d=google.com; s=arc-20160816; b=mpZLFEIzf7MlE+vn3n6HFvC7YVTv0x4aN3ZPUssEHsbGW84hDTiK2l+cM1UClvkft1 vP8/wPaocyFcjePC+YsT3v607c13s1pV1oXsrCSxWPKFTGFxNc/sDb2ND8Lpmj1tErxG wuA9Cz+VVq3vEOXMPFo0SrjuNebv3LE5LFcNXmBfTvvKml36N8ashsyvCpMxSvpA+2S8 zIRbIAAdyI7G8+fWlPfhaYCPKB6f+Jy4oRmK/YToCfNACnphR8RrqfVDdPXT0BpkoODq D109gS+o3yuVVeNQ2VCVA0T/Vda6RZkQxy/7a0RqOwiLYdHKv47SyEvXKOA9kv6f+n4a 90pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ODR//cwk6hwl4QVv9WxKniuODKXuHa0De3QF5nrHIF8=; b=uEjHwdiA2oBJHtuu0UVlnPbV/Djqzv02ThKnH2jx8iAtm2YubAHYsbMSx1e7JHWa0Q lvbHJDVAauHfJJ/0Dk5t4BsWRA50S5oNuS6TbXl61R8OaR2+V2FBx1RCl47Rha2Yeei9 ZdtYgDHgfpkBXc2GZHtUavuSFr/qvkE2JZ/F5QuQDm8voeTyL4dnoToVX1IP5+EHaDu9 frIR5+LY/r1y+WwVfrFQwNeNgbTdqBr+EemlIBq0twgwXRJ5xYobKk04dwysgIWJhlOm lm72pW+cqSTJfpaeXXfLEVUybV5x1dqXY/BuimB4zhRo8uiKn2cy52jC5mL0k4ZOdt47 uUyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=D9l4XlNV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i7si808871eds.423.2020.12.09.05.22.17; Wed, 09 Dec 2020 05:22:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=D9l4XlNV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732275AbgLINSs (ORCPT + 99 others); Wed, 9 Dec 2020 08:18:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731994AbgLINSg (ORCPT ); Wed, 9 Dec 2020 08:18:36 -0500 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC72AC061793 for ; Wed, 9 Dec 2020 05:17:55 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id v14so1452051wml.1 for ; Wed, 09 Dec 2020 05:17:55 -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=ODR//cwk6hwl4QVv9WxKniuODKXuHa0De3QF5nrHIF8=; b=D9l4XlNV7e+nqwFqjwgoM8i0tZtjPXnV/1t9K4p0LHGAHrDPuK6Uh4KI0K1Ccf4rYR RyzWt8rtG2bUkWDMfweQh4sRU//DySGqA6cTqBEqWrjCga2vPp0k8VLsnHuhaRz8WW0p PIh6vQZhhs+WknKoOizMB6X9fo2KSgguJmaznyyhXFHP3tg8lgDhJP4ZEDwdn+hc3nwc CJe6Say+NGiW2MOE3ooxvI8ONCt2j+yYmQP9X7HEsWluFyovewhRwyv7SS9kVpnRoZi9 Xsgl/EBsv8L0ZK5fNxVuQD0bOcT1j24yA9hR6pEk1+ESD99B5RZPMzRIQimFBNqgTeTp wicg== 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=ODR//cwk6hwl4QVv9WxKniuODKXuHa0De3QF5nrHIF8=; b=JsNjGS0ecm7REPs3WyUAc0oeO9vbSnmFT0G7MQ3Q4onwglAtyEMK+/0P7Ev5jlcdZV uYPfxaXsP0asJ0StzTL2V4c+RyYgopcJgNq+/y3wvgrS7taqLX4z0qoJVLb/d0vx/Ze3 xzz+kXLtczlBQO0KrkiswlC3lQsHLq4BMuHOl1CkhM6AlOVjYiP06tEJYRc7LPfd6N26 qPLZ3pf0VbAX6AdefvmgoFyWyyJojBSBdBl2N0BzFC8k1ZUzB6lfuxv4ae2kHgI2Pv0V dAq9MtR8vZeYHQElTfO0tZ900P6jlABKE9eXrQnmvzjbvcdEnuoMVnZItO4BzC/ts1xv ++sw== X-Gm-Message-State: AOAM5329Dyko7rxAUw0TzKATWnrT+pgM00ODpczDDIy5kzOEZaMTSWRd dsPC1CLf96B5FGVLwebSJ1J3wQ== X-Received: by 2002:a7b:c843:: with SMTP id c3mr2777094wml.100.1607519874381; Wed, 09 Dec 2020 05:17:54 -0800 (PST) Received: from localhost ([2a01:4b00:8523:2d03:9d1b:d0eb:db43:6cd2]) by smtp.gmail.com with ESMTPSA id q25sm3750194wmq.37.2020.12.09.05.17.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Dec 2020 05:17:53 -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 , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, David Brazdil Subject: [PATCH 2/9] KVM: arm64: Rename .idmap.text in hyp linker script Date: Wed, 9 Dec 2020 13:17:39 +0000 Message-Id: <20201209131746.85622-3-dbrazdil@google.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201209131746.85622-1-dbrazdil@google.com> References: <20201209131746.85622-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.576.ga3fc446d84-goog