Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3325817imu; Sun, 9 Dec 2018 23:33:42 -0800 (PST) X-Google-Smtp-Source: AFSGD/W9mYQ/vlFz9CPIZ8sVifj6Vmq0/8JrDWxeDKD8PyVlwQg7hp93lPqBa1lyg42c3jRjHPhi X-Received: by 2002:a65:610d:: with SMTP id z13mr10084193pgu.427.1544427222353; Sun, 09 Dec 2018 23:33:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544427222; cv=none; d=google.com; s=arc-20160816; b=gffpZLEvtFfUA8gGCZ9Dn9+7EZEI2XL6w9gU7NkzQsB2ee/iwrKQKb5zxriiZU9y7e w6NDtQ6xaqNeYeMBdcedUHYbt+/BwcL8BjXJ8KLJciZhqWHeN4pvZh6qpQO2l/ZqWhqr nosCHgR16IMQz3BkYXOdjGD7x/74/DFKbwuyN/YMH6n+Hqm5kyvSWv+UqEpx4gK3jKhg FqzGOoM0xfNepWJV35QXgszxegu0Xls5mcOi7qBHQxDNk6GshY30FECHfsJWgLbWbhJO KUOw5iLkLPkJhWflX6wYrfxmXTHIojtBb9Cx3d1+f7K33wBBQxY2yAKLrX6Fdni2lGTo zmcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id; bh=jpiE1bbzZKY80a6oQ1DDE4bTLTvEpnLU6P1siozBGuk=; b=kVOs7jfvP+qjt/u5Kz5OOt1KnLZjdpa2EZBVo9BcEkf21fvwaNg4YhDzj8DbMpQ9MF uHeNE2bIe+7LH4fhlI8Y5eQcmJ7IiDqwcUVX/NLDN4qkZydGGEggasqTFz5XUVHJ6w9r 2MhUFnMgVPQf4cyjF24hFm5LstGHqAjT1MYmQ+9PS3hPoR7Q9cAsY5Degg2bHMc5ZsSf lYbg2vf+nefwiq2XoNYAm+wY9Mc0uN3oWTxCaC67bQeceG1+4nI68phevINnVheEAlf3 ifLaxfEGkd1Li9bUlQhDIq5JkPbt/SzD0ykYBy+O/AISxMLE1BjHJK8KtNGBoFfkU/Rw 4E2A== 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 w12si9820025pfn.212.2018.12.09.23.33.25; Sun, 09 Dec 2018 23:33:42 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726577AbeLJHSr (ORCPT + 99 others); Mon, 10 Dec 2018 02:18:47 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:59410 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726292AbeLJHSq (ORCPT ); Mon, 10 Dec 2018 02:18:46 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 43CvZD3pqsz9v6LS; Mon, 10 Dec 2018 08:18:44 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id mfOpVIKC-0A7; Mon, 10 Dec 2018 08:18:44 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 43CvZD37V8z9v6Kp; Mon, 10 Dec 2018 08:18:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id CE37C8B79A; Mon, 10 Dec 2018 08:18:44 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 3uMkxPhCRTHL; Mon, 10 Dec 2018 08:18:44 +0100 (CET) Received: from po14163vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A43C18B74C; Mon, 10 Dec 2018 08:18:44 +0100 (CET) Received: by po14163vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 8ECA3716E9; Mon, 10 Dec 2018 07:18:44 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH v10 0/9] powerpc: Switch to CONFIG_THREAD_INFO_IN_TASK To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 10 Dec 2018 07:18:44 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The purpose of this serie is to activate CONFIG_THREAD_INFO_IN_TASK which moves the thread_info into task_struct. Moving thread_info into task_struct has the following advantages: - It protects thread_info from corruption in the case of stack overflows. - Its address is harder to determine if stack addresses are leaked, making a number of attacks more difficult. Changes since v10: - Rebased on 21622a0d2023 ("Automatic merge of branches 'master', 'next' and 'fixes' into merge") ==> Fixed conflict in setup_32.S Changes since v9: - Rebased on 183cbf93be88 ("Automatic merge of branches 'master', 'next' and 'fixes' into merge") ==> Fixed conflict on xmon Changes since v8: - Rebased on e589b79e40d9 ("Automatic merge of branches 'master', 'next' and 'fixes' into merge") ==> Main impact was conflicts due to commit 9a8dd708d547 ("memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc*") Changes since v7: - Rebased on fb6c6ce7907d ("Automatic merge of branches 'master', 'next' and 'fixes' into merge") Changes since v6: - Fixed validate_sp() to exclude NULL sp in 'regain entire stack space' patch (early crash with CONFIG_KMEMLEAK) Changes since v5: - Fixed livepatch_sp setup by using end_of_stack() instead of hardcoding - Fixed PPC_BPF_LOAD_CPU() macro Changes since v4: - Fixed a build failure on 32bits SMP when include/generated/asm-offsets.h is not already existing, was due to spaces instead of a tab in the Makefile Changes since RFC v3: (based on Nick's review) - Renamed task_size.h to task_size_user64.h to better relate to what it contains. - Handling of the isolation of thread_info cpu field inside CONFIG_SMP #ifdefs moved to a separate patch. - Removed CURRENT_THREAD_INFO macro completely. - Added a guard in asm/smp.h to avoid build failure before _TASK_CPU is defined. - Added a patch at the end to rename 'tp' pointers to 'sp' pointers - Renamed 'tp' into 'sp' pointers in preparation patch when relevant - Fixed a few commit logs - Fixed checkpatch report. Changes since RFC v2: - Removed the modification of names in asm-offsets - Created a rule in arch/powerpc/Makefile to append the offset of current->cpu in CFLAGS - Modified asm/smp.h to use the offset set in CFLAGS - Squashed the renaming of THREAD_INFO to TASK_STACK in the preparation patch - Moved the modification of current_pt_regs in the patch activating CONFIG_THREAD_INFO_IN_TASK Changes since RFC v1: - Removed the first patch which was modifying header inclusion order in timer - Modified some names in asm-offsets to avoid conflicts when including asm-offsets in C files - Modified asm/smp.h to avoid having to include linux/sched.h (using asm-offsets instead) - Moved some changes from the activation patch to the preparation patch. Christophe Leroy (9): book3s/64: avoid circular header inclusion in mmu-hash.h powerpc: Only use task_struct 'cpu' field on SMP powerpc: Prepare for moving thread_info into task_struct powerpc: Activate CONFIG_THREAD_INFO_IN_TASK powerpc: regain entire stack space powerpc: 'current_set' is now a table of task_struct pointers powerpc/32: Remove CURRENT_THREAD_INFO and rename TI_CPU powerpc/64: Remove CURRENT_THREAD_INFO powerpc: clean stack pointers naming arch/powerpc/Kconfig | 1 + arch/powerpc/Makefile | 7 +++ arch/powerpc/include/asm/asm-prototypes.h | 4 +- arch/powerpc/include/asm/book3s/64/mmu-hash.h | 2 +- arch/powerpc/include/asm/exception-64s.h | 4 +- arch/powerpc/include/asm/irq.h | 14 ++--- arch/powerpc/include/asm/livepatch.h | 7 ++- arch/powerpc/include/asm/processor.h | 39 +------------ arch/powerpc/include/asm/ptrace.h | 2 +- arch/powerpc/include/asm/reg.h | 2 +- arch/powerpc/include/asm/smp.h | 17 +++++- arch/powerpc/include/asm/task_size_user64.h | 42 ++++++++++++++ arch/powerpc/include/asm/thread_info.h | 19 ------- arch/powerpc/kernel/asm-offsets.c | 10 ++-- arch/powerpc/kernel/entry_32.S | 66 ++++++++-------------- arch/powerpc/kernel/entry_64.S | 12 ++-- arch/powerpc/kernel/epapr_hcalls.S | 5 +- arch/powerpc/kernel/exceptions-64e.S | 13 +---- arch/powerpc/kernel/exceptions-64s.S | 2 +- arch/powerpc/kernel/head_32.S | 14 ++--- arch/powerpc/kernel/head_40x.S | 4 +- arch/powerpc/kernel/head_44x.S | 8 +-- arch/powerpc/kernel/head_64.S | 1 + arch/powerpc/kernel/head_8xx.S | 2 +- arch/powerpc/kernel/head_booke.h | 12 +--- arch/powerpc/kernel/head_fsl_booke.S | 16 +++--- arch/powerpc/kernel/idle_6xx.S | 8 +-- arch/powerpc/kernel/idle_book3e.S | 2 +- arch/powerpc/kernel/idle_e500.S | 8 +-- arch/powerpc/kernel/idle_power4.S | 2 +- arch/powerpc/kernel/irq.c | 77 +++++--------------------- arch/powerpc/kernel/kgdb.c | 28 ---------- arch/powerpc/kernel/machine_kexec_64.c | 6 +- arch/powerpc/kernel/misc_32.S | 17 +++--- arch/powerpc/kernel/process.c | 40 ++++++------- arch/powerpc/kernel/setup-common.c | 2 +- arch/powerpc/kernel/setup_32.c | 15 ++--- arch/powerpc/kernel/setup_64.c | 41 ++++---------- arch/powerpc/kernel/smp.c | 16 +++--- arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 6 +- arch/powerpc/kvm/book3s_hv_hmi.c | 1 + arch/powerpc/mm/hash_low_32.S | 14 ++--- arch/powerpc/net/bpf_jit32.h | 5 +- arch/powerpc/sysdev/6xx-suspend.S | 5 +- arch/powerpc/xmon/xmon.c | 2 +- 45 files changed, 240 insertions(+), 380 deletions(-) create mode 100644 arch/powerpc/include/asm/task_size_user64.h -- 2.13.3