From patchwork Tue Jan 5 15:19:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 59189 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp6027246lbb; Tue, 5 Jan 2016 07:20:31 -0800 (PST) X-Received: by 10.66.220.196 with SMTP id py4mr135236026pac.135.1452007231400; Tue, 05 Jan 2016 07:20:31 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 17si73863076pfn.249.2016.01.05.07.20.30; Tue, 05 Jan 2016 07:20:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752302AbcAEPUX (ORCPT + 29 others); Tue, 5 Jan 2016 10:20:23 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:38672 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752125AbcAEPUQ (ORCPT ); Tue, 5 Jan 2016 10:20:16 -0500 Received: by mail-wm0-f41.google.com with SMTP id b14so34019212wmb.1 for ; Tue, 05 Jan 2016 07:20:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OxOMMrHHPbi9qO8acfu7VvV16gehA4tfu9I0XgAw3GQ=; b=EjmkEvDL94T2jPPduN0yh+UGU8f3weRhwIQmtqR9Z8CJAib8oiikP5qrY2niGj3BJp Qx1QmgCNvVMrjfB87GXHKRhxr/ExIiyy5+Uu4gO7AjAL90PxSidSGjRLYjYP+aHRDB7K x2ttF9I5k4r6YiMTobkDfyp0e1wud4WFMPBc0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OxOMMrHHPbi9qO8acfu7VvV16gehA4tfu9I0XgAw3GQ=; b=A0I+ty8NoZV1OPEuJ3iC1wTSPdh1/zHvkSXjvKatoTTE3wiea1yvvxpjRLPEHJf2H+ DCIJR47mLxTGDz8mrx94mctthglRYJtr0+ItvJpCT3bCauoXAnhDv3etzcyd2QVttrQI R1RVU85y4W4rRlUkk3INOQzqYv8zlO/xhTOswKvJTzrc7c0kAiQJ8fwOKol84xbP0Kay 8mRZ/Vc6lD/zJjnrqZ86QFevpM7Ur8RzeEuhgbZX9qEjUeXAiXaCWhapGBpZqLaNV5Sp jez7hcvxg4RgWs/Te9DDaivV+LGk8FCYWzwL/YNh2Au3yIMcPrDV1EZkCnpfjMSRdAea XVeQ== X-Gm-Message-State: ALoCoQmiyMqkwLr2uHBYNMQkK8essH8NOHWUdyUR9gqjdjJR0nRhYx/lbPtz2w68Yajl86GBnXLWxnxlgfrtkCDfS+bvM7+Lew== X-Received: by 10.194.179.71 with SMTP id de7mr100583286wjc.119.1452007214831; Tue, 05 Jan 2016 07:20:14 -0800 (PST) Received: from localhost.localdomain (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by smtp.gmail.com with ESMTPSA id c203sm4058303wmd.5.2016.01.05.07.20.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Jan 2016 07:20:14 -0800 (PST) From: Ard Biesheuvel To: akpm@linux-foundation.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-s390@vger.kernel.org, x86@kernel.org, hpa@zytor.com, mingo@redhat.com, heiko.carstens@de.ibm.com, schwidefsky@de.ibm.com, mattst88@gmail.com, ink@jurassic.park.msu.ru, rth@twiddle.net, tony.luck@intel.com, fenghua.yu@intel.com, catalin.marinas@arm.com, will.deacon@arm.com, arnd@arndb.de Cc: deller@gmx.de, mark.rutland@arm.com, Ard Biesheuvel Subject: [PATCH v2 4/6] x86/extable: use generic search and sort routines Date: Tue, 5 Jan 2016 16:19:38 +0100 Message-Id: <1452007180-27411-5-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452007180-27411-1-git-send-email-ard.biesheuvel@linaro.org> References: <1452007180-27411-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace the arch specific versions of search_extable() and sort_extable() with calls to the generic ones, which now support relative exception tables as well. Acked-by: H. Peter Anvin Signed-off-by: Ard Biesheuvel --- arch/x86/include/asm/uaccess.h | 5 +- arch/x86/mm/extable.c | 106 +------------------- 2 files changed, 4 insertions(+), 107 deletions(-) -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 09b1b0ab94b7..6d130c4cb7de 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -106,9 +106,8 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un struct exception_table_entry { int insn, fixup; }; -/* This is not the generic standard exception_table_entry format */ -#define ARCH_HAS_SORT_EXTABLE -#define ARCH_HAS_SEARCH_EXTABLE + +#define ARCH_HAS_RELATIVE_EXTABLE extern int fixup_exception(struct pt_regs *regs); extern int early_fixup_exception(unsigned long *ip); diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 903ec1e9c326..0b172b656f43 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -1,14 +1,9 @@ + #include -#include -#include + #include static inline unsigned long -ex_insn_addr(const struct exception_table_entry *x) -{ - return (unsigned long)&x->insn + x->insn; -} -static inline unsigned long ex_fixup_addr(const struct exception_table_entry *x) { return (unsigned long)&x->fixup + x->fixup; @@ -70,100 +65,3 @@ int __init early_fixup_exception(unsigned long *ip) return 0; } - -/* - * Search one exception table for an entry corresponding to the - * given instruction address, and return the address of the entry, - * or NULL if none is found. - * We use a binary search, and thus we assume that the table is - * already sorted. - */ -const struct exception_table_entry * -search_extable(const struct exception_table_entry *first, - const struct exception_table_entry *last, - unsigned long value) -{ - while (first <= last) { - const struct exception_table_entry *mid; - unsigned long addr; - - mid = ((last - first) >> 1) + first; - addr = ex_insn_addr(mid); - if (addr < value) - first = mid + 1; - else if (addr > value) - last = mid - 1; - else - return mid; - } - return NULL; -} - -/* - * The exception table needs to be sorted so that the binary - * search that we use to find entries in it works properly. - * This is used both for the kernel exception table and for - * the exception tables of modules that get loaded. - * - */ -static int cmp_ex(const void *a, const void *b) -{ - const struct exception_table_entry *x = a, *y = b; - - /* - * This value will always end up fittin in an int, because on - * both i386 and x86-64 the kernel symbol-reachable address - * space is < 2 GiB. - * - * This compare is only valid after normalization. - */ - return x->insn - y->insn; -} - -void sort_extable(struct exception_table_entry *start, - struct exception_table_entry *finish) -{ - struct exception_table_entry *p; - int i; - - /* Convert all entries to being relative to the start of the section */ - i = 0; - for (p = start; p < finish; p++) { - p->insn += i; - i += 4; - p->fixup += i; - i += 4; - } - - sort(start, finish - start, sizeof(struct exception_table_entry), - cmp_ex, NULL); - - /* Denormalize all entries */ - i = 0; - for (p = start; p < finish; p++) { - p->insn -= i; - i += 4; - p->fixup -= i; - i += 4; - } -} - -#ifdef CONFIG_MODULES -/* - * If the exception table is sorted, any referring to the module init - * will be at the beginning or the end. - */ -void trim_init_extable(struct module *m) -{ - /*trim the beginning*/ - while (m->num_exentries && - within_module_init(ex_insn_addr(&m->extable[0]), m)) { - m->extable++; - m->num_exentries--; - } - /*trim the end*/ - while (m->num_exentries && - within_module_init(ex_insn_addr(&m->extable[m->num_exentries-1]), m)) - m->num_exentries--; -} -#endif /* CONFIG_MODULES */