From patchwork Sun Jan 3 16:05:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 59106 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp4917061lbb; Sun, 3 Jan 2016 08:08:07 -0800 (PST) X-Received: by 10.66.101.3 with SMTP id fc3mr79850756pab.2.1451837283015; Sun, 03 Jan 2016 08:08:03 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c17si19183762pfd.90.2016.01.03.08.08.02; Sun, 03 Jan 2016 08:08:02 -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 S1752252AbcACQGp (ORCPT + 29 others); Sun, 3 Jan 2016 11:06:45 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:34380 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751986AbcACQGX (ORCPT ); Sun, 3 Jan 2016 11:06:23 -0500 Received: by mail-wm0-f42.google.com with SMTP id u188so122806761wmu.1 for ; Sun, 03 Jan 2016 08:06:23 -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=xKD9r9Wk09UdAF5wrHmxybydU1mlXcRjcQC8ma7+aJ8=; b=XI63UcnCnZ2qN6ay19yHfVm70HVr+3BwlD24rUHifF/hWIXdmQeE9FCA+R+UIIS6oO ABn6mAN9Xaf1/qTzixWC0gUi/GoES0lCb4bJy90GrA9LnC9WESo7CRbqOKNz5sInRJC4 AW2lboXipokW9A1XlruCLx8hVyTvPxQH+f2ZI= 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=xKD9r9Wk09UdAF5wrHmxybydU1mlXcRjcQC8ma7+aJ8=; b=jb599S9Ga6OVMyNnRMFQH1BY5Ng0FJkOAbAQngGaXozlLWmrlPdMSNhwVo3CjBAKRV xpWfRHm7C1vLmD78YX3l0xdI9IPTFjdH2hMicFaVsTtMaavof+cMEJiDON5goD49slKS LpCe1B+YEfkXlECMWM6zbirvgltlg785vN0k/wd6DSCdmmzqUqRbHVQW/YfjKGaC6r61 CI/M1/rwKF7K/GeXhkFzIiBkUrhUS/Tz1PHEcqSi5E110xqlXQgL0oSBl8vKuLfnkvVw 2Qwz0NMv9tDxclJ469vqNBc/JBEMYup3xZOtTumZ8IT8EgzVer9bVXqddpQjMLPipQBp 5Hog== X-Gm-Message-State: ALoCoQkzQ6vNJuFiWjQb1ieh/i2eTpYFAQLxNki6f8hV2vj72K/ZZ+Y3muPeTlU9FsXT1eenoIMR35rK/qCEoCcBrlUxyzpWYw== X-Received: by 10.28.137.135 with SMTP id l129mr38673784wmd.38.1451837182714; Sun, 03 Jan 2016 08:06:22 -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 i196sm62524801wmf.23.2016.01.03.08.06.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 03 Jan 2016 08:06:22 -0800 (PST) From: Ard Biesheuvel To: 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, akpm@linux-foundation.org Cc: mark.rutland@arm.com, marc.zyngier@arm.com, Ard Biesheuvel Subject: [PATCH 3/6] s390/extable: use generic search and sort routines Date: Sun, 3 Jan 2016 17:05:54 +0100 Message-Id: <1451837157-447-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451837157-447-1-git-send-email-ard.biesheuvel@linaro.org> References: <1451837157-447-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. Cc: Martin Schwidefsky Cc: 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(-) -- 1.9.1 -- 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/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 */