Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp661480ybl; Wed, 28 Aug 2019 03:32:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1VFbZzJQv5Us7plw3ynw1W/vWhExQqnSD6pvXlB3sGl+AMbjOxeosUe18u7OZQ2UplM3a X-Received: by 2002:a63:5920:: with SMTP id n32mr2745949pgb.352.1566988323665; Wed, 28 Aug 2019 03:32:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566988323; cv=none; d=google.com; s=arc-20160816; b=vBGXMdfTF3jJ0bJ+hrFhwo992pfto5xGuHIUVVxL6NBAD4kq34fRMcKu8ybK0sJ8ci QDcFxRMnyMPe+4dmnUdr7s8629i4AVQa2kNnS/gWHuBBuyh+dmV+je/P0tWr7WwypeZH b0SpmDs8KGYnTXfN/+dzJnTcJynhIuVBLvX8YnDJDGg3DyfElp2vmNrnzZ5Og6Wl2PZe FvvB4ljC6yTeM/ZXMV5Kwx2rSCw80ZTJR3dLETSPgzddvYyHMR7H5vQI0fxWG07xrGWp w5lQck0v0GnWrsn8MaX+SNsbAJ21vKQrQWTUOWzi0oyEvXbj18q5ixVtoyccqfI2an4m nqYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=uomNf9YYmVW56T6Yj0GxhOgic9GQCXjIww4AjQr3Al4=; b=Pz9SX6DwZehwLWeRfp/79g9bbjGAFE+jf/KHQXf/0vI+d8HRQr4sewljygoOtvQFrz 1srqrgdZOGg84F7YyKnjkw7rOrGcrwKkwTV5nrxTlzB2kUeqinck58XamfRIIwGc7lb5 ze2L3r6qOZ+2ISzb2/qDSnv2GU+dZNa++t07ljhQQOnsqpMTsxEO81uZ5XGK6d16arry V/V36z24auRrTFwjaDQ0JYar80lWf8shaEf9SKBOgjQA/aSwbvPtap0P4s2dFJOiz/m5 wleVW8VSAccsE8apCvRDSZTYmxznx2XqFXNYi65dIf+DSoxilKz63xSguMiKZbxVn+OD VmvA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h187si1903473pgc.6.2019.08.28.03.31.47; Wed, 28 Aug 2019 03:32:03 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726805AbfH1Kar (ORCPT + 99 others); Wed, 28 Aug 2019 06:30:47 -0400 Received: from mx2.suse.de ([195.135.220.15]:39774 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726259AbfH1Kan (ORCPT ); Wed, 28 Aug 2019 06:30:43 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 26CEAB090; Wed, 28 Aug 2019 10:30:42 +0000 (UTC) From: Michal Suchanek To: linuxppc-dev@lists.ozlabs.org Cc: Michal Suchanek , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Alexander Viro , "Dmitry V. Levin" , Thomas Gleixner , "Steven Rostedt" , Max Filippov , Firoz Khan , Christophe Leroy , Nicholas Piggin , Hari Bathini , Joel Stanley , Andrew Donnellan , Breno Leitao , "Eric W. Biederman" , Allison Randal , Michael Neuling , Andrew Morton , David Hildenbrand , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2 3/4] powerpc/64: make buildable without CONFIG_COMPAT Date: Wed, 28 Aug 2019 12:30:28 +0200 Message-Id: X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are numerous references to 32bit functions in generic and 64bit code so ifdef them out. Signed-off-by: Michal Suchanek --- v2: - fix 32bit ifdef condition in signal.c - simplify the compat ifdef condition in vdso.c - 64bit is redundant - simplify the compat ifdef condition in callchain.c - 64bit is redundant --- arch/powerpc/include/asm/syscall.h | 2 ++ arch/powerpc/kernel/Makefile | 15 ++++++++++++--- arch/powerpc/kernel/entry_64.S | 2 ++ arch/powerpc/kernel/signal.c | 5 +++-- arch/powerpc/kernel/syscall_64.c | 5 +++-- arch/powerpc/kernel/vdso.c | 4 +++- arch/powerpc/perf/callchain.c | 14 ++++++++++---- 7 files changed, 35 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h index 38d62acfdce7..3ed3b75541a1 100644 --- a/arch/powerpc/include/asm/syscall.h +++ b/arch/powerpc/include/asm/syscall.h @@ -16,7 +16,9 @@ /* ftrace syscalls requires exporting the sys_call_table */ extern const unsigned long sys_call_table[]; +#ifdef CONFIG_COMPAT extern const unsigned long compat_sys_call_table[]; +#endif static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 1d646a94d96c..b0db365b83d8 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -44,16 +44,25 @@ CFLAGS_btext.o += -DDISABLE_BRANCH_PROFILING endif obj-y := cputable.o ptrace.o syscalls.o \ - irq.o align.o signal_32.o pmc.o vdso.o \ + irq.o align.o pmc.o vdso.o \ process.o systbl.o idle.o \ signal.o sysfs.o cacheinfo.o time.o \ prom.o traps.o setup-common.o \ udbg.o misc.o io.o misc_$(BITS).o \ of_platform.o prom_parse.o -obj-$(CONFIG_PPC64) += setup_64.o sys_ppc32.o \ - signal_64.o ptrace32.o \ +ifndef CONFIG_PPC64 +obj-y += signal_32.o +else +ifdef CONFIG_COMPAT +obj-y += signal_32.o +endif +endif +obj-$(CONFIG_PPC64) += setup_64.o signal_64.o \ paca.o nvram_64.o firmware.o \ syscall_64.o +ifdef CONFIG_COMPAT +obj-$(CONFIG_PPC64) += sys_ppc32.o ptrace32.o +endif obj-$(CONFIG_VDSO32) += vdso32/ obj-$(CONFIG_PPC_WATCHDOG) += watchdog.o obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 2ec825a85f5b..a2dbf216f607 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -51,8 +51,10 @@ SYS_CALL_TABLE: .tc sys_call_table[TC],sys_call_table +#ifdef CONFIG_COMPAT COMPAT_SYS_CALL_TABLE: .tc compat_sys_call_table[TC],compat_sys_call_table +#endif /* This value is used to mark exception frames on the stack. */ exception_marker: diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index 60436432399f..ffd045e9fb57 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -277,14 +277,15 @@ static void do_signal(struct task_struct *tsk) rseq_signal_deliver(&ksig, tsk->thread.regs); +#if !defined(CONFIG_PPC64) || defined(CONFIG_COMPAT) if (is32) { if (ksig.ka.sa.sa_flags & SA_SIGINFO) ret = handle_rt_signal32(&ksig, oldset, tsk); else ret = handle_signal32(&ksig, oldset, tsk); - } else { + } else +#endif /* 32bit */ ret = handle_rt_signal64(&ksig, oldset, tsk); - } tsk->thread.regs->trap = 0; signal_setup_done(ret, &ksig, test_thread_flag(TIF_SINGLESTEP)); diff --git a/arch/powerpc/kernel/syscall_64.c b/arch/powerpc/kernel/syscall_64.c index 98ed970796d5..3f48262b512d 100644 --- a/arch/powerpc/kernel/syscall_64.c +++ b/arch/powerpc/kernel/syscall_64.c @@ -100,6 +100,7 @@ long system_call_exception(long r3, long r4, long r5, long r6, long r7, long r8, /* May be faster to do array_index_nospec? */ barrier_nospec(); +#ifdef CONFIG_COMPAT if (unlikely(ti_flags & _TIF_32BIT)) { f = (void *)compat_sys_call_table[r0]; @@ -110,9 +111,9 @@ long system_call_exception(long r3, long r4, long r5, long r6, long r7, long r8, r7 &= 0x00000000ffffffffULL; r8 &= 0x00000000ffffffffULL; - } else { + } else +#endif /* CONFIG_COMPAT */ f = (void *)sys_call_table[r0]; - } return f(r3, r4, r5, r6, r7, r8); } diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index d60598113a9f..a991b5d69010 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c @@ -667,7 +667,7 @@ static void __init vdso_setup_syscall_map(void) { unsigned int i; extern unsigned long *sys_call_table; -#ifdef CONFIG_PPC64 +#ifdef CONFIG_COMPAT extern unsigned long *compat_sys_call_table; #endif extern unsigned long sys_ni_syscall; @@ -678,9 +678,11 @@ static void __init vdso_setup_syscall_map(void) if (sys_call_table[i] != sys_ni_syscall) vdso_data->syscall_map_64[i >> 5] |= 0x80000000UL >> (i & 0x1f); +#ifdef CONFIG_COMPAT if (compat_sys_call_table[i] != sys_ni_syscall) vdso_data->syscall_map_32[i >> 5] |= 0x80000000UL >> (i & 0x1f); +#endif /* CONFIG_COMPAT */ #else /* CONFIG_PPC64 */ if (sys_call_table[i] != sys_ni_syscall) vdso_data->syscall_map_32[i >> 5] |= diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c index c84bbd4298a0..b3dacc8bc98d 100644 --- a/arch/powerpc/perf/callchain.c +++ b/arch/powerpc/perf/callchain.c @@ -15,7 +15,7 @@ #include #include #include -#ifdef CONFIG_PPC64 +#ifdef CONFIG_COMPAT #include "../kernel/ppc32.h" #endif #include @@ -165,6 +165,7 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret) return read_user_stack_slow(ptr, ret, 8); } +#ifdef CONFIG_COMPAT static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) { if ((unsigned long)ptr > TASK_SIZE - sizeof(unsigned int) || @@ -180,6 +181,7 @@ static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) return read_user_stack_slow(ptr, ret, 4); } +#endif static inline int valid_user_sp(unsigned long sp, int is_64) { @@ -341,6 +343,7 @@ static inline int valid_user_sp(unsigned long sp, int is_64) #endif /* CONFIG_PPC64 */ +#if !defined(CONFIG_PPC64) || defined(CONFIG_COMPAT) /* * Layout for non-RT signal frames */ @@ -482,12 +485,15 @@ static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, sp = next_sp; } } +#endif /* 32bit */ void perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) { - if (current_is_64bit()) - perf_callchain_user_64(entry, regs); - else +#if !defined(CONFIG_PPC64) || defined(CONFIG_COMPAT) + if (!current_is_64bit()) perf_callchain_user_32(entry, regs); + else +#endif + perf_callchain_user_64(entry, regs); } -- 2.22.0