Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754093AbcLFRIn (ORCPT ); Tue, 6 Dec 2016 12:08:43 -0500 Received: from mail-wj0-f196.google.com ([209.85.210.196]:36076 "EHLO mail-wj0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752035AbcLFRHZ (ORCPT ); Tue, 6 Dec 2016 12:07:25 -0500 From: Abel Vesa To: linux@armlinux.org.uk, jpoimboe@redhat.com, jeyu@redhat.com, jikos@kernel.org, mbenes@suse.cz, pmladek@suse.com Cc: rostedt@goodmis.org, mingo@redhat.com, gregkh@linuxfoundation.org, geert+renesas@glider.be, davem@davemloft.net, akpm@linux-foundation.org, emil.l.velikov@gmail.com, mchehab@kernel.org, linux@roeck-us.net, ard.biesheuvel@linaro.org, jens.wiklander@linaro.org, jean-philippe.brucker@arm.com, viro@zeniv.linux.org.uk, stefano.stabellini@eu.citrix.com, chris.brandt@renesas.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, live-patching@vger.kernel.org, Abel Vesa Subject: [PATCH 1/7] arm: Add livepatch arch specific code Date: Tue, 6 Dec 2016 17:06:01 +0000 Message-Id: <1481043967-15602-2-git-send-email-abelvesa@linux.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481043967-15602-1-git-send-email-abelvesa@linux.com> References: <1481043967-15602-1-git-send-email-abelvesa@linux.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4720 Lines: 139 klp_get_ftrace_location is used by ftrace to get the entry for a specific function from the mcount list. klp_arch_set_pc is used to set the pc from the regs passed as an argument to the ftrace_ops_no_ops function to the starting address of the patched function. klp_write_module_reloc is not doing anything at this moment. Signed-off-by: Abel Vesa --- MAINTAINERS | 3 +++ arch/arm/include/asm/livepatch.h | 46 ++++++++++++++++++++++++++++++++++++++++ arch/arm/kernel/livepatch.c | 43 +++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 arch/arm/include/asm/livepatch.h create mode 100644 arch/arm/kernel/livepatch.c diff --git a/MAINTAINERS b/MAINTAINERS index bd182a1..d43b790 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7466,12 +7466,15 @@ M: Josh Poimboeuf M: Jessica Yu M: Jiri Kosina M: Miroslav Benes +M: Abel Vesa R: Petr Mladek S: Maintained F: kernel/livepatch/ F: include/linux/livepatch.h F: arch/x86/include/asm/livepatch.h F: arch/x86/kernel/livepatch.c +F: arch/arm/include/asm/livepatch.h +F: arch/arm/kernel/livepatch.c F: Documentation/livepatch/ F: Documentation/ABI/testing/sysfs-kernel-livepatch F: samples/livepatch/ diff --git a/arch/arm/include/asm/livepatch.h b/arch/arm/include/asm/livepatch.h new file mode 100644 index 0000000..d4e3ff0 --- /dev/null +++ b/arch/arm/include/asm/livepatch.h @@ -0,0 +1,46 @@ +/* + * livepatch.h - arm specific Kernel Live Patching Core + * + * Copyright (C) 2016 Abel Vesa + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#ifndef _ASM_ARM_LIVEPATCH_H +#define _ASM_ARM_LIVEPATCH_H + +#include +#include +#include + +static inline int klp_check_compiler_support(void) +{ + return 0; +} + +int klp_write_module_reloc(struct module *mod, unsigned long type, + unsigned long loc, unsigned long value); + +static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) +{ + regs->uregs[15] = ip; +} + +#define klp_get_ftrace_location klp_get_ftrace_location +static inline unsigned long klp_get_ftrace_location(unsigned long faddr) +{ + return ftrace_location_range(faddr, faddr + 24); +} + +#endif /* _ASM_ARM_LIVEPATCH_H */ diff --git a/arch/arm/kernel/livepatch.c b/arch/arm/kernel/livepatch.c new file mode 100644 index 0000000..0656cd6 --- /dev/null +++ b/arch/arm/kernel/livepatch.c @@ -0,0 +1,43 @@ +/* + * livepatch.c - arm specific Kernel Live Patching Core + * + * Copyright (C) 2016 Abel Vesa + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include +#include +#include +#include +#include +#include +#include + +/** + * klp_write_module_reloc() - write a relocation in a module + * @mod: module in which the section to be modified is found + * @type: ELF relocation type (see asm/elf.h) + * @loc: address that the relocation should be written to + * @value: relocation value (sym address + addend) + * + * This function writes a relocation to the specified location for + * a particular module. + */ +int klp_write_module_reloc(struct module *mod, unsigned long type, + unsigned long loc, unsigned long value) +{ + /* Not implemented yet */ + return 0; +} -- 2.7.4