Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/291436/?format=api
{ "id": 291436, "url": "http://patchwork.ozlabs.org/api/patches/291436/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1384487159-43032-5-git-send-email-fenghua@phytium.com.cn/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1384487159-43032-5-git-send-email-fenghua@phytium.com.cn>", "list_archive_url": null, "date": "2013-11-15T03:45:53", "name": "[U-Boot,v15,04/10] arm64: Add tool to statically apply RELA relocations", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e203081cbd30e7facfd8b07b9e6383294ded9f15", "submitter": { "id": 34808, "url": "http://patchwork.ozlabs.org/api/people/34808/?format=api", "name": null, "email": "fenghua@phytium.com.cn" }, "delegate": { "id": 1694, "url": "http://patchwork.ozlabs.org/api/users/1694/?format=api", "username": "aaribaud", "first_name": "Albert", "last_name": "ARIBAUD", "email": "albert.aribaud@free.fr" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1384487159-43032-5-git-send-email-fenghua@phytium.com.cn/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/291436/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/291436/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Received": [ "from theia.denx.de (theia.denx.de [85.214.87.163])\n\tby ozlabs.org (Postfix) with ESMTP id 982382C00BC\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 15 Nov 2013 14:47:58 +1100 (EST)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 6564A4ADA4;\n\tFri, 15 Nov 2013 04:47:36 +0100 (CET)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id JoHXN23qKiNe; Fri, 15 Nov 2013 04:47:36 +0100 (CET)", "from theia.denx.de (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 063974ADB5;\n\tFri, 15 Nov 2013 04:47:27 +0100 (CET)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id C6F8D4ADB9\n\tfor <u-boot@lists.denx.de>; Fri, 15 Nov 2013 04:47:23 +0100 (CET)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id JbuCWrxzlEpX for <u-boot@lists.denx.de>;\n\tFri, 15 Nov 2013 04:47:20 +0100 (CET)", "from mail.corpease.net (mail10.corpease.net [61.145.121.76])\n\tby theia.denx.de (Postfix) with ESMTP id 59FE84AD7F\n\tfor <u-boot@lists.denx.de>; Fri, 15 Nov 2013 04:47:11 +0100 (CET)", "from localhost (unknown [220.202.153.92])\n\tby mail10.corpease.net (Coremail) with SMTP id\n\tTAGowJALPQcqmYVS6Bw2AA--.31400S3; \n\tFri, 15 Nov 2013 11:46:52 +0800 (CST)" ], "X-Virus-Scanned": [ "Debian amavisd-new at theia.denx.de", "Debian amavisd-new at theia.denx.de" ], "X-policyd-weight": "NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5\n\tNOT_IN_BL_NJABL=-1.5 (only DNSBL check requested)", "From": "fenghua@phytium.com.cn", "To": "u-boot@lists.denx.de", "Date": "Fri, 15 Nov 2013 11:45:53 +0800", "Message-Id": "<1384487159-43032-5-git-send-email-fenghua@phytium.com.cn>", "X-Mailer": "git-send-email 1.7.9.5", "In-Reply-To": "<1384487159-43032-4-git-send-email-fenghua@phytium.com.cn>", "References": "<1384487159-43032-1-git-send-email-fenghua@phytium.com.cn>\n\t<1384487159-43032-2-git-send-email-fenghua@phytium.com.cn>\n\t<1384487159-43032-3-git-send-email-fenghua@phytium.com.cn>\n\t<1384487159-43032-4-git-send-email-fenghua@phytium.com.cn>", "X-CM-TRANSID": "TAGowJALPQcqmYVS6Bw2AA--.31400S3", "X-Coremail-Antispam": "1UD129KBjvJXoW3XrW5Cw4kGr1DtF4DKrW3Wrg_yoW3KFy5pF\n\tZxZF1Yka95Jry7A3s3Jw1YgFySkws29F15WFy7Kr1kAF1fAFWvgrWIqFWDJrykWr1ftF45\n\tZrsFyFWjkF4rJ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2\n\t9KBjDU0xBIdaVrnRJUUUdGb7IF0VCYb41lb7IF0VCFI7km07C26c804VAKzcIF0wAYjxAI\n\t6xZILanIXVAFwwAYjxAI6IIYrVAFwwAYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr\n\t1l1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK\n\t0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4\n\tx0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r1j6r4UM28E\n\tF7xvwVC2z280aVCY1x0267AKxVW8JVW8Jr1ln4vE4IxY62xKV4CY8xCE548m6r4UJryUGw\n\tAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCqF7xvr2I5Mc02F40EFcxC0VAKzVAqx4xG\n\t6I80ewAv7VC0I7IYx2IY67AKxVWUAVWUtwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV\n\tCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwAKzVCY\n\t07xG64k0F24lc2xSY4AK67AK6r48MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r\n\t1j6r4UMxCIbVAxMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl\n\tx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r\n\t1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_\n\tJF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcS\n\tsGvfC2KfnxnUUI43ZEXa7x5xrUlUUUUUU==", "X-Originating-IP": "[220.202.153.92]", "X-CM-SenderInfo": "pihqwxdxd61x51wl3zoofrzhdfq/", "Cc": "trini@ti.com, scottwood@freescale.com", "Subject": "[U-Boot] [PATCH v15 04/10] arm64: Add tool to statically apply RELA\n\trelocations", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.11", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<http://lists.denx.de/mailman/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<http://lists.denx.de/mailman/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "u-boot-bounces@lists.denx.de", "Errors-To": "u-boot-bounces@lists.denx.de" }, "content": "From: Scott Wood <scottwood@freescale.com>\n\nARM64 uses the newer RELA-style relocations rather than the older REL.\nRELA relocations have an addend in the relocation struct, rather than\nexpecting the loader to read a value from the location to be updated.\n\nWhile this is beneficial for ordinary program loading, it's problematic\nfor U-Boot because the location to be updated starts out with zero,\nrather than a pre-relocation value. Since we need to be able to run C\ncode before relocation, we need a tool to apply the relocations at\nbuild time.\n\nIn theory this tool is applicable to other newer architectures (mainly\n64-bit), but currently the only relocations it supports are for arm64,\nand it assumes a 64-bit little-endian target. If the latter limitation\nis ever to be changed, we'll need a way to tell the tool what format\nthe image is in. Eventually this may be replaced by a tool that uses\nlibelf or similar and operates directly on the ELF file. I've written\nsome code for such an approach but libelf does not make it easy to poke\naddresses by memory address (rather than by section), and I was\nhesitant to write code to manually parse the program headers and do the\nupdate outside of libelf (or to iterate over sections) -- especially\nsince it wouldn't get test coverage on things like binaries with\nmultiple PT_LOAD segments. This should be good enough for now to let\nthe manual relocation stuff be removed from the arm64 patches.\n\nSigned-off-by: Scott Wood <scottwood@freescale.com>\nSigned-off-by: David Feng <fenghua@phytium.com.cn>\n---\n Makefile | 12 ++++\n tools/Makefile | 6 ++\n tools/relocate-rela.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 207 insertions(+)\n create mode 100644 tools/relocate-rela.c", "diff": "diff --git a/Makefile b/Makefile\nindex 1f499c5..1dbe796 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -355,6 +355,17 @@ else\n BOARD_SIZE_CHECK =\n endif\n \n+# Statically apply RELA-style relocations (currently arm64 only)\n+ifneq ($(CONFIG_STATIC_RELA),)\n+# $(1) is u-boot ELF, $(2) is u-boot bin, $(3) is text base\n+DO_STATIC_RELA = \\\n+\tstart=$$($(NM) $(1) | grep __rel_dyn_start | cut -f 1 -d ' '); \\\n+\tend=$$($(NM) $(1) | grep __rel_dyn_end | cut -f 1 -d ' '); \\\n+\t$(obj)tools/relocate-rela $(2) $(3) $$start $$end\n+else\n+DO_STATIC_RELA =\n+endif\n+\n # Always append ALL so that arch config.mk's can add custom ones\n ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map\n \n@@ -397,6 +408,7 @@ $(obj)u-boot.srec:\t$(obj)u-boot\n \n $(obj)u-boot.bin:\t$(obj)u-boot\n \t\t$(OBJCOPY) ${OBJCFLAGS} -O binary $< $@\n+\t\t$(call DO_STATIC_RELA,$<,$@,$(CONFIG_SYS_TEXT_BASE))\n \t\t$(BOARD_SIZE_CHECK)\n \n $(obj)u-boot.ldr:\t$(obj)u-boot\ndiff --git a/tools/Makefile b/tools/Makefile\nindex 14d94e3..6d40398 100644\n--- a/tools/Makefile\n+++ b/tools/Makefile\n@@ -59,6 +59,7 @@ BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)\n BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)\n BIN_FILES-$(CONFIG_KIRKWOOD) += kwboot$(SFX)\n BIN_FILES-y += proftool(SFX)\n+BIN_FILES-$(CONFIG_STATIC_RELA) += relocate-rela$(SFX)\n \n # Source files which exist outside the tools directory\n EXT_OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += common/env_embedded.o\n@@ -84,6 +85,7 @@ NOPED_OBJ_FILES-y += os_support.o\n NOPED_OBJ_FILES-y += pblimage.o\n NOPED_OBJ_FILES-y += proftool.o\n NOPED_OBJ_FILES-y += ublimage.o\n+NOPED_OBJ_FILES-y += relocate-rela.o\n OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o\n OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o\n OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o\n@@ -250,6 +252,10 @@ $(obj)kwboot$(SFX): $(obj)kwboot.o\n \t$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^\n \t$(HOSTSTRIP) $@\n \n+$(obj)relocate-rela$(SFX): $(obj)relocate-rela.o\n+\t$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^\n+\t$(HOSTSTRIP) $@\n+\n # Some of the tool objects need to be accessed from outside the tools directory\n $(obj)%.o: $(SRCTREE)/common/%.c\n \t$(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<\ndiff --git a/tools/relocate-rela.c b/tools/relocate-rela.c\nnew file mode 100644\nindex 0000000..93b4c39\n--- /dev/null\n+++ b/tools/relocate-rela.c\n@@ -0,0 +1,189 @@\n+/*\n+ * Copyright 2013 Freescale Semiconductor, Inc.\n+ *\n+ * SPDX-License-Identifier:\tGPL-2.0+ BSD-2-Clause\n+ *\n+ * 64-bit and little-endian target only until we need to support a different\n+ * arch that needs this.\n+ */\n+\n+#include <elf.h>\n+#include <errno.h>\n+#include <inttypes.h>\n+#include <stdarg.h>\n+#include <stdbool.h>\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+\n+#ifndef R_AARCH64_RELATIVE\n+#define R_AARCH64_RELATIVE\t1027\n+#endif\n+\n+static const bool debug_en;\n+\n+static void debug(const char *fmt, ...)\n+{\n+\tva_list args;\n+\n+\tva_start(args, fmt);\n+\tif (debug_en)\n+\t\tvprintf(fmt, args);\n+}\n+\n+static bool supported_rela(Elf64_Rela *rela)\n+{\n+\tuint64_t mask = 0xffffffffULL; /* would be different on 32-bit */\n+\tuint32_t type = rela->r_info & mask;\n+\n+\tswitch (type) {\n+#ifdef R_AARCH64_RELATIVE\n+\tcase R_AARCH64_RELATIVE:\n+\t\treturn true;\n+#endif\n+\tdefault:\n+\t\tfprintf(stderr, \"warning: unsupported relocation type %\"\n+\t\t\t\tPRIu32 \" at %\" PRIx64 \"\\n\",\n+\t\t\ttype, rela->r_offset);\n+\n+\t\treturn false;\n+\t}\n+}\n+\n+static inline uint64_t swap64(uint64_t val)\n+{\n+\treturn ((val >> 56) & 0x00000000000000ffULL) |\n+\t ((val >> 40) & 0x000000000000ff00ULL) |\n+\t ((val >> 24) & 0x0000000000ff0000ULL) |\n+\t ((val >> 8) & 0x00000000ff000000ULL) |\n+\t ((val << 8) & 0x000000ff00000000ULL) |\n+\t ((val << 24) & 0x0000ff0000000000ULL) |\n+\t ((val << 40) & 0x00ff000000000000ULL) |\n+\t ((val << 56) & 0xff00000000000000ULL);\n+}\n+\n+#if __BYTE_ORDER == __LITTLE_ENDIAN\n+static inline uint64_t be64(uint64_t val)\n+{\n+\treturn swap64(val);\n+}\n+\n+static inline uint64_t le64(uint64_t val)\n+{\n+\treturn val;\n+}\n+#else\n+static inline uint64_t le64(uint64_t val)\n+{\n+\treturn swap64(val);\n+}\n+\n+static inline uint64_t be64(uint64_t val)\n+{\n+\treturn val;\n+}\n+#endif\n+\n+static bool read_num(const char *str, uint64_t *num)\n+{\n+\tchar *endptr;\n+\t*num = strtoull(str, &endptr, 16);\n+\treturn str[0] && !endptr[0];\n+}\n+\n+int main(int argc, char **argv)\n+{\n+\tFILE *f;\n+\tint i, num;\n+\tuint64_t rela_start, rela_end, text_base;\n+\n+\tif (argc != 5) {\n+\t\tfprintf(stderr, \"Statically apply ELF rela relocations\\n\");\n+\t\tfprintf(stderr, \"Usage: %s <bin file> <text base> \" \\\n+\t\t\t\t\"<rela start> <rela end>\\n\", argv[0]);\n+\t\tfprintf(stderr, \"All numbers in hex.\\n\");\n+\t\treturn 1;\n+\t}\n+\n+\tf = fopen(argv[1], \"r+b\");\n+\tif (!f) {\n+\t\tfprintf(stderr, \"%s: Cannot open %s: %s\\n\",\n+\t\t\targv[0], argv[1], strerror(errno));\n+\t\treturn 2;\n+\t}\n+\n+\tif (!read_num(argv[2], &text_base) ||\n+\t !read_num(argv[3], &rela_start) ||\n+\t !read_num(argv[4], &rela_end)) {\n+\t\tfprintf(stderr, \"%s: bad number\\n\", argv[0]);\n+\t\treturn 3;\n+\t}\n+\n+\tif (rela_start > rela_end || rela_start < text_base ||\n+\t (rela_end - rela_start) % 24) {\n+\t\tfprintf(stderr, \"%s: bad rela bounds\\n\", argv[0]);\n+\t\treturn 3;\n+\t}\n+\n+\trela_start -= text_base;\n+\trela_end -= text_base;\n+\n+\tnum = (rela_end - rela_start) / sizeof(Elf64_Rela);\n+\n+\tfor (i = 0; i < num; i++) {\n+\t\tElf64_Rela rela, swrela;\n+\t\tuint64_t pos = rela_start + sizeof(Elf64_Rela) * i;\n+\t\tuint64_t addr;\n+\n+\t\tif (fseek(f, pos, SEEK_SET) < 0) {\n+\t\t\tfprintf(stderr, \"%s: %s: seek to %\" PRIx64\n+\t\t\t\t\t\" failed: %s\\n\",\n+\t\t\t\targv[0], argv[1], pos, strerror(errno));\n+\t\t}\n+\n+\t\tif (fread(&rela, sizeof(rela), 1, f) != 1) {\n+\t\t\tfprintf(stderr, \"%s: %s: read rela failed at %\"\n+\t\t\t\t\tPRIx64 \"\\n\",\n+\t\t\t\targv[0], argv[1], pos);\n+\t\t\treturn 4;\n+\t\t}\n+\n+\t\tswrela.r_offset = le64(rela.r_offset);\n+\t\tswrela.r_info = le64(rela.r_info);\n+\t\tswrela.r_addend = le64(rela.r_addend);\n+\n+\t\tif (!supported_rela(&swrela))\n+\t\t\tcontinue;\n+\n+\t\tdebug(\"Rela %\" PRIx64 \" %\" PRIu64 \" %\" PRIx64 \"\\n\",\n+\t\t swrela.r_offset, swrela.r_info, swrela.r_addend);\n+\n+\t\tif (swrela.r_offset < text_base) {\n+\t\t\tfprintf(stderr, \"%s: %s: bad rela at %\" PRIx64 \"\\n\",\n+\t\t\t\targv[0], argv[1], pos);\n+\t\t\treturn 4;\n+\t\t}\n+\n+\t\taddr = swrela.r_offset - text_base;\n+\n+\t\tif (fseek(f, addr, SEEK_SET) < 0) {\n+\t\t\tfprintf(stderr, \"%s: %s: seek to %\"\n+\t\t\t\t\tPRIx64 \" failed: %s\\n\",\n+\t\t\t\targv[0], argv[1], addr, strerror(errno));\n+\t\t}\n+\n+\t\tif (fwrite(&rela.r_addend, sizeof(rela.r_addend), 1, f) != 1) {\n+\t\t\tfprintf(stderr, \"%s: %s: write failed at %\" PRIx64 \"\\n\",\n+\t\t\t\targv[0], argv[1], addr);\n+\t\t\treturn 4;\n+\t\t}\n+\t}\n+\n+\tif (fclose(f) < 0) {\n+\t\tfprintf(stderr, \"%s: %s: close failed: %s\\n\",\n+\t\t\targv[0], argv[1], strerror(errno));\n+\t\treturn 4;\n+\t}\n+\n+\treturn 0;\n+}\n", "prefixes": [ "U-Boot", "v15", "04/10" ] }