From patchwork Thu Jun 30 10:03:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12901557 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FCEAC43334 for ; Thu, 30 Jun 2022 10:04:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234759AbiF3KEc (ORCPT ); Thu, 30 Jun 2022 06:04:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234753AbiF3KEY (ORCPT ); Thu, 30 Jun 2022 06:04:24 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8C094443D9 for ; Thu, 30 Jun 2022 03:04:16 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B057A1BF7; Thu, 30 Jun 2022 03:04:16 -0700 (PDT) Received: from godel.lab.cambridge.arm.com (godel.lab.cambridge.arm.com [10.7.66.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 81FFB3F5A1; Thu, 30 Jun 2022 03:04:15 -0700 (PDT) From: Nikos Nikoleris To: kvm@vger.kernel.org Cc: andrew.jones@linux.dev, drjones@redhat.com, pbonzini@redhat.com, jade.alglave@arm.com, alexandru.elisei@arm.com, ricarkol@google.com Subject: [kvm-unit-tests PATCH v3 23/27] lib: Avoid external dependency in libelf Date: Thu, 30 Jun 2022 11:03:20 +0100 Message-Id: <20220630100324.3153655-24-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220630100324.3153655-1-nikos.nikoleris@arm.com> References: <20220630100324.3153655-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org There is just a small number of definitions we need from uapi/linux/elf.h and asm/elf.h and the relocation code is self-contained. Signed-off-by: Nikos Nikoleris Reviewed-by: Ricardo Koller --- lib/elf.h | 57 +++++++++++++++++++++++++++++++++++++++++ arm/efi/reloc_aarch64.c | 3 +-- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 lib/elf.h diff --git a/lib/elf.h b/lib/elf.h new file mode 100644 index 0000000..abd5cf4 --- /dev/null +++ b/lib/elf.h @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: LGPL-2.0-or-later */ +/* + * Relevant definitions from uapi/linux/elf.h and asm/elf.h + */ + +#ifndef _ELF_H_ +#define _ELF_H_ + +#include + +/* 64-bit ELF base types. */ +typedef u64 Elf64_Addr; +typedef u64 Elf64_Xword; +typedef s64 Elf64_Sxword; + +typedef struct { + Elf64_Sxword d_tag; /* entry tag value */ + union { + Elf64_Xword d_val; + Elf64_Addr d_ptr; + } d_un; +} Elf64_Dyn; + +typedef struct elf64_rel { + Elf64_Addr r_offset; /* Location at which to apply the action */ + Elf64_Xword r_info; /* index and type of relocation */ +} Elf64_Rel; + +typedef struct elf64_rela { + Elf64_Addr r_offset; /* Location at which to apply the action */ + Elf64_Xword r_info; /* index and type of relocation */ + Elf64_Sxword r_addend; /* Constant addend used to compute value */ +} Elf64_Rela; + +/* This is the info that is needed to parse the dynamic section of the file */ +#define DT_NULL 0 +#define DT_RELA 7 +#define DT_RELASZ 8 +#define DT_RELAENT 9 + +/* x86 relocation types. */ +#define R_X86_64_NONE 0 /* No reloc */ +#define R_X86_64_RELATIVE 8 /* Adjust by program base */ + + +/* + * AArch64 static relocation types. + */ + +/* Miscellaneous. */ +#define R_AARCH64_NONE 256 +#define R_AARCH64_RELATIVE 1027 + +/* The following are used with relocations */ +#define ELF64_R_TYPE(i) ((i) & 0xffffffff) + +#endif /* _ELF_H_ */ diff --git a/arm/efi/reloc_aarch64.c b/arm/efi/reloc_aarch64.c index fa0cd6b..3f6d9a6 100644 --- a/arm/efi/reloc_aarch64.c +++ b/arm/efi/reloc_aarch64.c @@ -34,8 +34,7 @@ SUCH DAMAGE. */ -#include "efi.h" -#include +#include efi_status_t _relocate(long ldbase, Elf64_Dyn *dyn, efi_handle_t image, efi_system_table_t *sys_tab)