From patchwork Wed Jan 27 10:55:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 60610 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2508376lbb; Wed, 27 Jan 2016 02:55:48 -0800 (PST) X-Received: by 10.66.142.73 with SMTP id ru9mr41564657pab.121.1453892148166; Wed, 27 Jan 2016 02:55:48 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bm5si8802304pad.107.2016.01.27.02.55.47; Wed, 27 Jan 2016 02:55:48 -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=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754588AbcA0Kzp (ORCPT + 30 others); Wed, 27 Jan 2016 05:55:45 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35943 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754455AbcA0Kzh (ORCPT ); Wed, 27 Jan 2016 05:55:37 -0500 Received: by mail-wm0-f49.google.com with SMTP id l65so139901308wmf.1 for ; Wed, 27 Jan 2016 02:55:37 -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=FmjfKRS0Zvi26xVAizeTbciOzUnnzVCoh8w5GpLbiyE=; b=Q0sgYNGbAYKqapUrspiS72lNy2ri5UCil6m+ilFr9vLMLUYMFnDe+ZfVdkNtbTpoWb Ad/4Iz/bqdAO/DcsOXAWaTJBWvhe//l6WQ3s76Xwn7D1I6rEKcHeVwFvIEDEdhEQBYjH QmAVOJ3RHJaJuLVuZ/h9/W0Uw0PRg7gf/xeLk= 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=FmjfKRS0Zvi26xVAizeTbciOzUnnzVCoh8w5GpLbiyE=; b=FVfQ4t8r6ALKoKbXu7KI9Cw1bGZ0lLrPcAd/wiLWfjTlW4zME3CdvKai49ilhwi/wl X7pKTdytaK9Rhe7BOhtT6WibXTkFl48c6r++We8Bm1xToRpoGQGuONOJiLbkk4qePjI8 pYD7N/uao1J2oi3ERRQFVzwIsr47CoFzbGu/6eHuyEpD2t6k3X5tp8Xcd4EH/Jy9wF2o kANY21bBoWBstj6fVtJPPHyM/CCuXbArOzfU0lz/C89DIMNbiAQBQGyBOulpqiHKmfno 7tnWTKObwRih0caQg+kMqVAaw7eOlEg7Yv0x9HW96KzliPVNYRgIshmyGc6dizQJ4/m7 4fFw== X-Gm-Message-State: AG10YOQ+igRaTJ3Umb4eFEflm8G2HjIyKAO4zYZCLVpP/OO8IXjzRS3y7qzzIljZ1hLEzYYf X-Received: by 10.194.79.194 with SMTP id l2mr14376451wjx.160.1453892136357; Wed, 27 Jan 2016 02:55:36 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id x186sm1199196wmg.19.2016.01.27.02.55.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jan 2016 02:55:35 -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, heiko.carstens@de.ibm.com, rth@twiddle.net, tony.luck@intel.com, will.deacon@arm.com Cc: deller@gmx.de, Ard Biesheuvel Subject: [PATCH v2 resend 3/6] s390/extable: use generic search and sort routines Date: Wed, 27 Jan 2016 11:55:20 +0100 Message-Id: <1453892123-17973-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453892123-17973-1-git-send-email-ard.biesheuvel@linaro.org> References: <1453892123-17973-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: Heiko Carstens Signed-off-by: Ard Biesheuvel --- arch/s390/include/asm/uaccess.h | 8 +- arch/s390/mm/Makefile | 2 +- arch/s390/mm/extable.c | 85 -------------------- 3 files changed, 2 insertions(+), 93 deletions(-) -- 2.5.0 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h index 9dd4cc47ddc7..e0900ddf91dd 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h @@ -79,18 +79,12 @@ struct exception_table_entry int insn, fixup; }; -static inline unsigned long extable_insn(const struct exception_table_entry *x) -{ - return (unsigned long)&x->insn + x->insn; -} - static inline unsigned long extable_fixup(const struct exception_table_entry *x) { return (unsigned long)&x->fixup + x->fixup; } -#define ARCH_HAS_SORT_EXTABLE -#define ARCH_HAS_SEARCH_EXTABLE +#define ARCH_HAS_RELATIVE_EXTABLE /** * __copy_from_user: - Copy a block of data from user space, with less checking. diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile index 839592ca265c..479550dae80e 100644 --- a/arch/s390/mm/Makefile +++ b/arch/s390/mm/Makefile @@ -3,7 +3,7 @@ # obj-y := init.o fault.o extmem.o mmap.o vmem.o pgtable.o maccess.o -obj-y += page-states.o gup.o extable.o pageattr.o mem_detect.o +obj-y += page-states.o gup.o pageattr.o mem_detect.o obj-$(CONFIG_CMM) += cmm.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o diff --git a/arch/s390/mm/extable.c b/arch/s390/mm/extable.c deleted file mode 100644 index 18c8b819b0aa..000000000000 --- a/arch/s390/mm/extable.c +++ /dev/null @@ -1,85 +0,0 @@ -#include -#include -#include - -/* - * 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) -{ - const struct exception_table_entry *mid; - unsigned long addr; - - while (first <= last) { - mid = ((last - first) >> 1) + first; - addr = extable_insn(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 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; - - /* Normalize entries to being relative to the start of the section */ - for (p = start, i = 0; p < finish; p++, i += 8) { - p->insn += i; - p->fixup += i + 4; - } - sort(start, finish - start, sizeof(*start), cmp_ex, NULL); - /* Denormalize all entries */ - for (p = start, i = 0; p < finish; p++, i += 8) { - p->insn -= i; - p->fixup -= 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(extable_insn(&m->extable[0]), m)) { - m->extable++; - m->num_exentries--; - } - /* Trim the end */ - while (m->num_exentries && - within_module_init(extable_insn(&m->extable[m->num_exentries-1]), m)) - m->num_exentries--; -} -#endif /* CONFIG_MODULES */