From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C95DFC433EF for ; Tue, 7 Sep 2021 20:24:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB4686113D for ; Tue, 7 Sep 2021 20:24:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346463AbhIGUZu (ORCPT ); Tue, 7 Sep 2021 16:25:50 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:45696 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235701AbhIGUZt (ORCPT ); Tue, 7 Sep 2021 16:25:49 -0400 Message-ID: <20210907200848.297057150@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1631046282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=TJTU5kToNJvJJu5pxC6HknMZgPHnhFaDFVPd5v0iGXo=; b=Kk/db7h8U7GT++Vq4cFBS6l6RJezc8cvoESNaKGoR+lz25aoebBtB6d1HUxJPeeaI/Xf/X m9rbpkGPLCgFAKfCFiGu4TAqpHu7PQUatqm9bNX6u1gNT3xgch2C5vNC/RtlWefU3pbOrD jL8+2Rh2rQCAVI8kCDJugMUY/8FN4fBeuef9fzjnuWlz95ZAgMvZoyzXqkGPNAyQWGkxB2 qWgfHbCPFVQHAV2yxAbObPpIbgEqcXe26bq6JHSNgmTSa0TdMXNod7S+/5z61ZT/SQIH69 /YwJGNMLCpsHD4z0UoGwaoc9pcsk0Apoftk/ahBTu/MYuLf92ItJoR9ib4+yRg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1631046282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=TJTU5kToNJvJJu5pxC6HknMZgPHnhFaDFVPd5v0iGXo=; b=BXwPOkt3MzsdYlA3bTQyN1+1/lzW+LMbMAQDuwp0IlI6T37oVER3GqkkoBUykMCXwCfNzz X/2KbY7Ec40VwIBA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Al Viro , Linus Torvalds , Tony Luck , Song Liu , Alexei Starovoitov , Daniel Borkmann , Peter Ziljstra Subject: [patch V2.1 01/20] x86/extable: Tidy up redundant handler functions References: <20210907200722.067068005@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Tue, 7 Sep 2021 22:24:41 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No need to have the same code all over the place. Signed-off-by: Thomas Gleixner --- V2: New patch --- arch/x86/mm/extable.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -39,9 +39,8 @@ EXPORT_SYMBOL(ex_handler_default); unsigned long error_code, unsigned long fault_addr) { - regs->ip = ex_fixup_addr(fixup); regs->ax = trapnr; - return true; + return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr); } EXPORT_SYMBOL_GPL(ex_handler_fault); @@ -76,8 +75,7 @@ EXPORT_SYMBOL_GPL(ex_handler_fprestore); unsigned long fault_addr) { WARN_ONCE(trapnr == X86_TRAP_GP, "General protection fault in user access. Non-canonical address?"); - regs->ip = ex_fixup_addr(fixup); - return true; + return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr); } EXPORT_SYMBOL(ex_handler_uaccess); @@ -87,9 +85,7 @@ EXPORT_SYMBOL(ex_handler_uaccess); unsigned long fault_addr) { WARN_ONCE(trapnr == X86_TRAP_GP, "General protection fault in user access. Non-canonical address?"); - regs->ip = ex_fixup_addr(fixup); - regs->ax = trapnr; - return true; + return ex_handler_fault(fixup, regs, trapnr, error_code, fault_addr); } EXPORT_SYMBOL(ex_handler_copy); @@ -103,10 +99,9 @@ EXPORT_SYMBOL(ex_handler_copy); show_stack_regs(regs); /* Pretend that the read succeeded and returned 0. */ - regs->ip = ex_fixup_addr(fixup); regs->ax = 0; regs->dx = 0; - return true; + return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr); } EXPORT_SYMBOL(ex_handler_rdmsr_unsafe); @@ -121,8 +116,7 @@ EXPORT_SYMBOL(ex_handler_rdmsr_unsafe); show_stack_regs(regs); /* Pretend that the write succeeded. */ - regs->ip = ex_fixup_addr(fixup); - return true; + return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr); } EXPORT_SYMBOL(ex_handler_wrmsr_unsafe);