linaro-kernel

linaro-kernel@lists.linaro.org

10095 discussions

[LSK-v3.18 PATCH] ARM: 8464/1: Update all mm structures with section adjustments

by David Brown

From: Laura Abbott <labbott(a)redhat.com> commit 08925c2f124f1bac6152a8b234268f9874fc70a5 upstream. Currently, when updating section permissions to mark areas RO or NX, the only mm updated is current->mm. This is working off the assumption that there are no additional mm structures at the time. This may not always hold true. (Example: calling modprobe early will trigger a fork/exec). Ensure all mm structres get updated with the new section information. Reviewed-by: Kees Cook <keescook(a)chromium.org> Signed-off-by: Laura Abbott <labbott(a)fedoraproject.org> Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> Signed-off-by: David Brown <david.brown(a)linaro.org> --- (resending with proper CCs) Bringing in this fix allows CONFIG_DEBUG_RODATA to work on ARM. With this patch, and this config enabled: echo WRITE_RO > /sys/kernel/debug/provoke-crash/DIRECT will provoke and exception. arch/arm/mm/init.c | 92 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 30 deletions(-) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index be92fa0..8d32f7e 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -22,6 +22,7 @@ #include <linux/memblock.h> #include <linux/dma-contiguous.h> #include <linux/sizes.h> +#include <linux/stop_machine.h> #include <asm/cp15.h> #include <asm/mach-types.h> @@ -626,12 +627,10 @@ static struct section_perm ro_perms[] = { * safe to be called with preemption disabled, as under stop_machine(). */ static inline void section_update(unsigned long addr, pmdval_t mask, - pmdval_t prot) + pmdval_t prot, struct mm_struct *mm) { - struct mm_struct *mm; pmd_t *pmd; - mm = current->active_mm; pmd = pmd_offset(pud_offset(pgd_offset(mm, addr), addr), addr); #ifdef CONFIG_ARM_LPAE @@ -655,49 +654,82 @@ static inline bool arch_has_strict_perms(void) return !!(get_cr() & CR_XP); } -#define set_section_perms(perms, field) { \ - size_t i; \ - unsigned long addr; \ - \ - if (!arch_has_strict_perms()) \ - return; \ - \ - for (i = 0; i < ARRAY_SIZE(perms); i++) { \ - if (!IS_ALIGNED(perms[i].start, SECTION_SIZE) || \ - !IS_ALIGNED(perms[i].end, SECTION_SIZE)) { \ - pr_err("BUG: section %lx-%lx not aligned to %lx\n", \ - perms[i].start, perms[i].end, \ - SECTION_SIZE); \ - continue; \ - } \ - \ - for (addr = perms[i].start; \ - addr < perms[i].end; \ - addr += SECTION_SIZE) \ - section_update(addr, perms[i].mask, \ - perms[i].field); \ - } \ +void set_section_perms(struct section_perm *perms, int n, bool set, + struct mm_struct *mm) +{ + size_t i; + unsigned long addr; + + if (!arch_has_strict_perms()) + return; + + for (i = 0; i < n; i++) { + if (!IS_ALIGNED(perms[i].start, SECTION_SIZE) || + !IS_ALIGNED(perms[i].end, SECTION_SIZE)) { + pr_err("BUG: section %lx-%lx not aligned to %lx\n", + perms[i].start, perms[i].end, + SECTION_SIZE); + continue; + } + + for (addr = perms[i].start; + addr < perms[i].end; + addr += SECTION_SIZE) + section_update(addr, perms[i].mask, + set ? perms[i].prot : perms[i].clear, mm); + } + } -static inline void fix_kernmem_perms(void) +static void update_sections_early(struct section_perm perms[], int n) { - set_section_perms(nx_perms, prot); + struct task_struct *t, *s; + + read_lock(&tasklist_lock); + for_each_process(t) { + if (t->flags & PF_KTHREAD) + continue; + for_each_thread(t, s) + set_section_perms(perms, n, true, s->mm); + } + read_unlock(&tasklist_lock); + set_section_perms(perms, n, true, current->active_mm); + set_section_perms(perms, n, true, &init_mm); +} + +int __fix_kernmem_perms(void *unused) +{ + update_sections_early(nx_perms, ARRAY_SIZE(nx_perms)); + return 0; +} + +void fix_kernmem_perms(void) +{ + stop_machine(__fix_kernmem_perms, NULL, NULL); } #ifdef CONFIG_DEBUG_RODATA +int __mark_rodata_ro(void *unused) +{ + update_sections_early(ro_perms, ARRAY_SIZE(ro_perms)); + return 0; +} + void mark_rodata_ro(void) { - set_section_perms(ro_perms, prot); + stop_machine(__mark_rodata_ro, NULL, NULL); } void set_kernel_text_rw(void) { - set_section_perms(ro_perms, clear); + set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), false, + current->active_mm); } void set_kernel_text_ro(void) { - set_section_perms(ro_perms, prot); + set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), true, + current->active_mm); } #endif /* CONFIG_DEBUG_RODATA */ -- 2.7.0

9 years, 9 months

[GIT PULL] [lsk-v3.18-android] linaro-android-3.18 topic branch updates for 16.02

by Amit Pundir

Hi Mark, Alex, Please consider following linaro-android pull request for "linux-linaro-lsk-v3.18-android" LSK branch for 16.02. I run into few conflicts while merging aosp/android-3.18 branch: Conflicts: * arch/arm/Kconfig Pick changes from AOSP commit 7514b4f5c78b "FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS." and skip changes from linaro-android commit 3daddaa28cbf "arm: enable ARCH_MMAP_RND_BITS only for MMU platforms" which are no longer needed. * arch/arm64/mm/mmap.c Pick changes from AOSP commit 527d350d5e91 "FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS." over changes from LTS commit c4a7bf89fbff "arm64/mm: Remove hack in mmap randomize layout" which are no longer valid. * include/net/sock.h LTS and AOSP both cherry-picked/backported upstream commit 1d0ab253872c "net: add sk_fullsock() helper" but AOSP removed TCPF_NEW_SYN_RECV check part from the backport. Lets stick with AOSP changes. * mm/page_alloc.c Conflict here is due to LTS and AOSP both cherrypicking upstream commit 99592d598eca "mm: when stealing freepages, also take pages created by splitting buddy page" and couple more of AOSP backported commits f34a097caa34 "UPSTREAM: mm: always steal split buddies in fallback allocations" and a4edf85a8b92 "UPSTREAM: mm: more aggressive page stealing for UNMOVABLE allocations". Resolution: Keep all of AOSP changes. I have also logged this ^^ merge conflict + resolution part in the merge commit. Regards, Amit Pundir The following changes since commit 8fa6d2e1fe937af9dbacb5aad8c43dbb67466fa0: Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android (2016-01-14 22:26:03 +0800) are available in the git repository at: git://android.git.linaro.org/kernel/linaro-android.git linaro-android-3.18-lsk for you to fetch changes up to 17aa01a7059b202f893a9e7e859032640318b458: HID: hidpp: update input_configured callback (2016-02-10 22:26:37 +0530) ---------------------------------------------------------------- Amit Pundir (10): usb: gadget: rndis: use %z format specifier for size_t Revert "HID: Add input_register callback." ion: fix page pool cache policy Revert "net: wireless: Add CONFIG_WIFI_CONTROL_FUNC option" Revert "usb: gadget: composite: Fix corruption when changing configuration" Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common kbuild: Makefile.clean: make Kbuild and Makefile optional usb: gadget: function: fix unused func warning usb: gadget: build audio_source function only if SND is enabled HID: hidpp: update input_configured callback Aniroop Mathur (1): Input: initialize device counter variables with -1 Dario Scarpa (1): Input: xpad - fix Razer Atrox Arcade Stick button mapping Dmitry Torokhov (1): UPSTREAM: HID: hid-input: allow input_configured callback return errors Eric Dumazet (3): net: add sk_fullsock() helper ipv6: inet6_sk() should use sk_fullsock() net: diag: support v4mapped sockets in inet_diag_find_one_icsk() Erik Kline (1): neigh: Better handling of transition to NUD_PROBE state Erik Lundgren (1): Input: xpad - add Covert Forces edition of the Xbox One controller John Stultz (4): Revert "mmc: block: Remove call to mmc_blk_set_blksize" Revert "mmc: mmcblk: Add support for deferred SD bus resume" mmc: Extend wakelock if bus is dead of: Fix build warnings Kees Cook (1): UPSTREAM: seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO Lorenzo Colitti (6): net: diag: split inet_diag_dump_one_icsk into two net: diag: Add the ability to destroy a socket. net: diag: Support SOCK_DESTROY for inet sockets. net: diag: Support destroying TCP sockets. net: tcp: deal with listen sockets properly in tcp_abort. selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables Mark Salyzyn (2): ANDROID: rtc-palmas: correct for bcd year android: recommended.cfg: enable taskstats Martijn Coenen (1): UPSTREAM: memcg: Only free spare array when readers are done Minchan Kim (1): BACKPORT: mm: /proc/pid/smaps:: show proportional swap share of the mapping Ming-ting Yao Wei (1): Input: xpad - add rumble support for Xbox One controller Oleg Nesterov (1): UPSTREAM: proc: actually make proc_fd_permission() thread-friendly Pavel Rojtberg (8): Input: xpad - re-send LED command on present event Input: xpad - clarify LED enumeration Input: xpad - use ida() for finding the pad_nr Input: xpad - remove needless bulk out URB used for LED setup Input: xpad - factor out URB submission in xpad_play_effect Input: xpad - x360w: report dpad as buttons and axes Input: xpad - query wireless controller state at init Input: xpad - fix clash of presence handling with LED setting Pierre-Loup A. Griffais (2): Input: xpad - set the LEDs properly on XBox Wireless controllers Input: xpad - move the input device creation to a new function Sami Tolvanen (9): ANDROID: dm verity: port upstream changes to 3.18 UPSTREAM: dm verity: clean up duplicate hashing code UPSTREAM: dm verity: separate function for parsing opt args UPSTREAM: dm verity: move dm-verity.c to dm-verity-target.c UPSTREAM: dm verity: factor out structures and functions useful to separate object UPSTREAM: dm verity: factor out verity_for_bv_block() UPSTREAM: dm verity: add support for forward error correction UPSTREAM: dm verity: add ignore_zero_blocks feature ANDROID: android: base-cfg: enable CONFIG_DM_VERITY_FEC Stephen Smalley (1): UPSTREAM: selinux: fix bug in conditional rules handling Vasily Kulikov (1): UPSTREAM: include/linux/poison.h: fix LIST_POISON{1,2} offset Vlastimil Babka (3): UPSTREAM: mm: when stealing freepages, also take pages created by splitting buddy page UPSTREAM: mm: always steal split buddies in fallback allocations UPSTREAM: mm: more aggressive page stealing for UNMOVABLE allocations Yevgeny Pats (1): UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring() dcashman (6): Revert "arm: mm: support ARCH_MMAP_RND_BITS." Revert "mm: mmap: Add new /proc tunable for mmap_base ASLR." FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR. FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS. liping.zhang (1): xt_qtaguid: fix a race condition in if_tag_stat_update Documentation/device-mapper/verity.txt | 40 ++++- Documentation/filesystems/proc.txt | 18 ++- Documentation/sysctl/kernel.txt | 14 -- Documentation/sysctl/vm.txt | 29 ++++ android/configs/android-base.cfg | 1 + android/configs/android-recommended.cfg | 4 + arch/Kconfig | 68 +++++++++ arch/arm/Kconfig | 26 +--- arch/arm/mm/mmap.c | 6 +- arch/arm64/Kconfig | 29 ++++ arch/arm64/mm/mmap.c | 11 +- arch/x86/Kconfig | 16 ++ arch/x86/mm/mmap.c | 12 +- drivers/hid/hid-appleir.c | 4 +- drivers/hid/hid-elo.c | 4 +- drivers/hid/hid-logitech-hidpp.c | 4 +- drivers/hid/hid-magicmouse.c | 8 +- drivers/hid/hid-multitouch.c | 10 +- drivers/hid/hid-ntrig.c | 6 +- drivers/hid/hid-rmi.c | 9 +- drivers/hid/hid-sony.c | 13 +- drivers/input/gameport/gameport.c | 4 +- drivers/input/joystick/xpad.c | 581 ++++++++++++++++++++++++++++++++++++++++----------------------------- drivers/input/misc/ims-pcu.c | 4 +- drivers/input/serio/serio.c | 4 +- drivers/input/serio/serio_raw.c | 4 +- drivers/md/Kconfig | 12 ++ drivers/md/Makefile | 5 + drivers/md/dm-verity-fec.c | 818 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/md/dm-verity-fec.h | 152 +++++++++++++++++++ drivers/md/{dm-verity.c => dm-verity-target.c} | 642 ++++++++++++++++++++++++++++++++++++++++++++++------------------------------- drivers/md/dm-verity.h | 130 ++++++++++++++++ drivers/net/wireless/Kconfig | 5 - drivers/rtc/rtc-palmas.c | 44 +++++- drivers/staging/android/ion/ion_system_heap.c | 2 +- drivers/usb/gadget/Kconfig | 3 +- drivers/usb/gadget/composite.c | 10 +- drivers/usb/gadget/function/f_fs.c | 2 +- drivers/usb/gadget/function/rndis.c | 2 +- fs/proc/fd.c | 14 +- fs/proc/task_mmu.c | 20 ++- include/linux/inet_diag.h | 9 ++ include/linux/ipv6.h | 4 +- include/linux/mm.h | 13 +- include/linux/poison.h | 4 +- include/linux/sock_diag.h | 2 + include/linux/swap.h | 6 + include/net/sock.h | 6 +- include/net/tcp.h | 2 + include/uapi/linux/sock_diag.h | 1 + kernel/seccomp.c | 4 +- kernel/sysctl.c | 33 ++-- mm/memcontrol.c | 11 +- mm/mmap.c | 12 ++ mm/page_alloc.c | 72 +++++---- mm/swapfile.c | 42 +++++ net/core/neighbour.c | 3 + net/core/sock_diag.c | 23 ++- net/ipv4/Kconfig | 13 ++ net/ipv4/inet_diag.c | 83 ++++++---- net/ipv4/tcp.c | 37 +++++ net/ipv4/tcp_diag.c | 19 +++ net/ipv4/tcp_ipv4.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/netfilter/xt_qtaguid.c | 7 +- scripts/Makefile.clean | 2 +- security/keys/process_keys.c | 1 + security/selinux/nlmsgtab.c | 7 +- security/selinux/ss/conditional.c | 4 +- 69 files changed, 2506 insertions(+), 706 deletions(-) create mode 100644 drivers/md/dm-verity-fec.c create mode 100644 drivers/md/dm-verity-fec.h rename drivers/md/{dm-verity.c => dm-verity-target.c} (66%) create mode 100644 drivers/md/dm-verity.h

9 years, 9 months

next-20160210 build: 2 failures 4 warnings (next-20160210)

by Build bot for Mark Brown

Tree/Branch: next-20160210 Git describe: next-20160210 Commit: b613c2bfa3 Add linux-next specific files for 20160210 Build Time: 73 min 31 sec Passed: 7 / 9 ( 77.78 %) Failed: 2 / 9 ( 22.22 %) Errors: 2 Warnings: 4 Section Mismatches: 1 Failed defconfigs: arm64-allmodconfig arm-multi_v5_defconfig Errors: arm64-allmodconfig ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' arm-multi_v5_defconfig ../drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration] ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 0 warnings 1 mismatches : arm64-allmodconfig 4 warnings 0 mismatches : arm-allmodconfig ------------------------------------------------------------------------------- Errors summary: 2 5 ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' 1 ../drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration] Warnings Summary: 4 1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=] 1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] 1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] 1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=] Section Mismatch Summary: 1 1 WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit() =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- arm64-allmodconfig : FAIL, 5 errors, 0 warnings, 1 section mismatches Errors: ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' Section Mismatches: WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit() ------------------------------------------------------------------------------- arm-allmodconfig : PASS, 0 errors, 4 warnings, 0 section mismatches Warnings: ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=] ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=] ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] ------------------------------------------------------------------------------- arm-multi_v5_defconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches Errors: ../drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration] ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm-multi_v7_defconfig x86_64-defconfig arm-allnoconfig x86_64-allnoconfig arm64-defconfig

9 years, 9 months

[GIT PULL] [lsk-v4.1-android] linaro-android-4.1 topic branch updates for 16.02

by Amit Pundir

Hi Mark, Alex, Please consider following linaro-android pull request for "linux-linaro-lsk-v4.1-android" LSK branch for 16.02. Regards, Amit Pundir The following changes since commit 7b8892bba12eba95f3e1615dfeb8ad77e3b0371a: Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-android (2016-01-22 17:09:59 +0800) are available in the git repository at: git://android.git.linaro.org/kernel/linaro-android.git linux-linaro-lsk-v4.1-android for you to fetch changes up to 1ea653bf6ee34991f855fb131c85deddc8008554: Merge branch 'android-4.1' of https://android.googlesource.com/kernel/common (2016-02-10 15:31:20 +0530) ---------------------------------------------------------------- Amit Pundir (8): Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1 net: ipv6: fix virtual tunneling build kbuild: Makefile.clean: make Kbuild and Makefile optional usb: gadget: rndis: use %z format specifier for size_t ion: fix page pool cache policy Revert "net: wireless: Add CONFIG_WIFI_CONTROL_FUNC option" Revert "usb: gadget: composite: Fix corruption when changing configuration" Merge branch 'android-4.1' of https://android.googlesource.com/kernel/common Andrew Bresticker (1): CHROMIUM: android: Unconditionally remove callbacks in sync_fence_free() Dario Scarpa (1): Input: xpad - fix Razer Atrox Arcade Stick button mapping David Hildenbrand (2): UPSTREAM: sched/preempt, arm/futex: Disable preemption in UP futex_atomic_cmpxchg_inatomic() explicitly UPSTREAM: sched/preempt, arm/futex: Disable preemption in UP futex_atomic_op_inuser() explicitly Dmitry Torokhov (1): CHROMIUM: android: fix warning when releasing active sync point Erik Lundgren (1): Input: xpad - add Covert Forces edition of the Xbox One controller Gioh Kim (1): staging: ion: debugfs to shrink pool Greg Hackmann (2): ANDROID: android: base-cfg: disable CONFIG_SYSVIPC FROMLIST: pstore-ram: add Device Tree bindings Mark Salyzyn (2): ANDROID: rtc-palmas: correct for bcd year android: recommended.cfg: enable taskstats Martijn Coenen (1): UPSTREAM: memcg: Only free spare array when readers are done Minchan Kim (1): UPSTREAM: mm: /proc/pid/smaps:: show proportional swap share of the mapping Oleg Nesterov (1): UPSTREAM: proc: actually make proc_fd_permission() thread-friendly Pavel Rojtberg (8): Input: xpad - re-send LED command on present event Input: xpad - clarify LED enumeration Input: xpad - use ida() for finding the pad_nr Input: xpad - remove needless bulk out URB used for LED setup Input: xpad - factor out URB submission in xpad_play_effect Input: xpad - x360w: report dpad as buttons and axes Input: xpad - query wireless controller state at init Input: xpad - fix clash of presence handling with LED setting Pierre-Loup A. Griffais (2): Input: xpad - set the LEDs properly on XBox Wireless controllers Input: xpad - move the input device creation to a new function Riley Andrews (1): sched: add sched blocked tracepoint which dumps out context of sleep. Robert Jarzmik (1): UPSTREAM: ARM: 8431/1: fix alignement of __bug_table section entries Russell King (19): UPSTREAM: ARM: mm: improve do_ldrd_abort macro UPSTREAM: ARM: entry: get rid of multiple macro definitions UPSTREAM: ARM: entry: provide uaccess assembly macro hooks UPSTREAM: ARM: uaccess: simplify user access assembly UPSTREAM: ARM: uaccess: provide uaccess_save_and_enable() and uaccess_restore() UPSTREAM: ARM: domains: switch to keeping domain value in register UPSTREAM: ARM: domains: provide domain_mask() BACKPORT: ARM: domains: move initial domain setting value to asm/domains.h UPSTREAM: ARM: domains: get rid of manager mode for user domain UPSTREAM: ARM: domains: keep vectors in separate domain UPSTREAM: ARM: domains: remove DOMAIN_TABLE UPSTREAM: ARM: swpan: fix nwfpe for uaccess changes UPSTREAM: ARM: uaccess: remove unneeded uaccess_save_and_disable macro UPSTREAM: ARM: uaccess: fix undefined instruction on ARMv7M/noMMU UPSTREAM: ARM: domains: thread_info.h no longer needs asm/domains.h UPSTREAM: ARM: domains: add memory dependencies to get_domain/set_domain UPSTREAM: ARM: software-based priviledged-no-access support UPSTREAM: ARM: alignment: fix alignment handling for uaccess changes UPSTREAM: ARM: fix uaccess_with_memcpy() with SW_DOMAIN_PAN Stephen Smalley (1): UPSTREAM: selinux: fix bug in conditional rules handling Vasily Kulikov (1): UPSTREAM: include/linux/poison.h: fix LIST_POISON{1,2} offset Yevgeny Pats (1): UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring() dcashman (4): FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR. FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS. liping.zhang (1): xt_qtaguid: fix a race condition in if_tag_stat_update Documentation/devicetree/bindings/misc/ramoops.txt | 43 +++++++ Documentation/filesystems/proc.txt | 18 ++- Documentation/ramoops.txt | 6 +- Documentation/sysctl/vm.txt | 29 +++++ android/configs/android-base.cfg | 2 +- android/configs/android-recommended.cfg | 4 + arch/Kconfig | 68 +++++++++++ arch/arm/Kconfig | 24 ++++ arch/arm/include/asm/assembler.h | 42 +++++++ arch/arm/include/asm/bug.h | 1 + arch/arm/include/asm/domain.h | 57 +++++++-- arch/arm/include/asm/futex.h | 32 ++++- arch/arm/include/asm/pgtable-2level-hwdef.h | 1 + arch/arm/include/asm/thread_info.h | 4 - arch/arm/include/asm/uaccess.h | 136 +++++++++++++++------- arch/arm/kernel/armksyms.c | 6 +- arch/arm/kernel/entry-armv.S | 32 +++-- arch/arm/kernel/entry-common.S | 2 + arch/arm/kernel/entry-header.S | 112 ++++++++---------- arch/arm/kernel/head.S | 5 +- arch/arm/kernel/process.c | 51 ++++++-- arch/arm/kernel/swp_emulate.c | 3 + arch/arm/kernel/traps.c | 1 - arch/arm/lib/clear_user.S | 6 +- arch/arm/lib/copy_from_user.S | 6 +- arch/arm/lib/copy_to_user.S | 6 +- arch/arm/lib/csumpartialcopyuser.S | 14 +++ arch/arm/lib/uaccess_with_memcpy.c | 33 ++++-- arch/arm/mm/abort-ev4.S | 1 + arch/arm/mm/abort-ev5t.S | 4 +- arch/arm/mm/abort-ev5tj.S | 4 +- arch/arm/mm/abort-ev6.S | 8 +- arch/arm/mm/abort-ev7.S | 1 + arch/arm/mm/abort-lv4t.S | 2 + arch/arm/mm/abort-macro.S | 14 +-- arch/arm/mm/alignment.c | 30 ++++- arch/arm/mm/mmap.c | 3 +- arch/arm/mm/mmu.c | 4 +- arch/arm/mm/pgd.c | 10 ++ arch/arm/nwfpe/entry.S | 3 +- arch/arm64/Kconfig | 29 +++++ arch/arm64/mm/mmap.c | 8 +- arch/x86/Kconfig | 16 +++ arch/x86/mm/mmap.c | 12 +- drivers/dma-buf/fence.c | 6 +- drivers/input/joystick/xpad.c | 596 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------- drivers/net/wireless/Kconfig | 5 - drivers/rtc/rtc-palmas.c | 44 ++++++- drivers/staging/android/ion/ion.c | 22 ++-- drivers/staging/android/ion/ion_system_heap.c | 2 +- drivers/staging/android/sync.c | 14 ++- drivers/usb/gadget/composite.c | 10 +- drivers/usb/gadget/function/rndis.c | 2 +- fs/proc/fd.c | 14 ++- fs/proc/task_mmu.c | 18 ++- fs/pstore/ram.c | 110 +++++++++++++++++- include/linux/fence.h | 2 + include/linux/mm.h | 11 ++ include/linux/poison.h | 4 +- include/linux/swap.h | 6 + include/trace/events/sched.h | 26 ++++- kernel/sched/fair.c | 1 + kernel/sysctl.c | 22 ++++ mm/memcontrol.c | 11 +- mm/mmap.c | 12 ++ mm/swapfile.c | 42 +++++++ net/netfilter/xt_qtaguid.c | 7 +- scripts/Makefile.clean | 2 +- security/keys/process_keys.c | 1 + security/selinux/ss/conditional.c | 4 +- 70 files changed, 1366 insertions(+), 521 deletions(-) create mode 100644 Documentation/devicetree/bindings/misc/ramoops.txt

9 years, 9 months

[PATCH V4 0/6] cpufreq: Fix ABBA lockdeps

by Viresh Kumar

Hi Rafael, As suggested, I have kept only what you suggested and fixed them based on your review comments. @Juri and Shilpa: I have also added your Tested-by's, please let me know if you don't prefer to add them here. V3->V4: - Keep only relevant patches for lockdep, will send cleanups patches separately. - kobj_name is dropped - Comment over update_sampling_rate is kept intact, with minor additions. - s/global/common for common tunables Viresh Kumar (6): cpufreq: governor: Create generic macro for global tuners cpufreq: governor: Move common tunables to 'struct dbs_data' cpufreq: governor: New sysfs show/store callbacks for governor tunables cpufreq: governor: Drop unused macros for creating governor tunable attributes Revert "cpufreq: Drop rwsem lock around CPUFREQ_GOV_POLICY_EXIT" cpufreq: governor: Create and traverse list of policy_dbs to fix lockdep drivers/cpufreq/cpufreq.c | 5 - drivers/cpufreq/cpufreq_conservative.c | 102 +++++++---------- drivers/cpufreq/cpufreq_governor.c | 127 ++++++++++++++------- drivers/cpufreq/cpufreq_governor.h | 143 ++++++++---------------- drivers/cpufreq/cpufreq_ondemand.c | 194 ++++++++++++--------------------- include/linux/cpufreq.h | 4 - 6 files changed, 239 insertions(+), 336 deletions(-) -- 2.7.1.370.gb2aa7f8

9 years, 9 months

master build: 0 failures 5 warnings (v4.5-rc3-23-g2178cbc)

by Build bot for Mark Brown

Tree/Branch: master Git describe: v4.5-rc3-23-g2178cbc Commit: 2178cbc68f Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux Build Time: 83 min 12 sec Passed: 9 / 9 (100.00 %) Failed: 0 / 9 ( 0.00 %) Errors: 0 Warnings: 5 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 1 warnings 0 mismatches : arm64-allmodconfig 1 warnings 0 mismatches : arm-multi_v7_defconfig 5 warnings 0 mismatches : arm-allmodconfig 1 warnings 0 mismatches : arm64-defconfig ------------------------------------------------------------------------------- Warnings Summary: 5 4 ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] 1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=] 1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] 1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] 1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=] =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- arm64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] ------------------------------------------------------------------------------- arm-multi_v7_defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] ------------------------------------------------------------------------------- arm-allmodconfig : PASS, 0 errors, 5 warnings, 0 section mismatches Warnings: ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=] ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=] ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] ------------------------------------------------------------------------------- arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: x86_64-allnoconfig arm64-allnoconfig arm-allnoconfig arm-multi_v5_defconfig x86_64-defconfig

9 years, 9 months

[PATCH] scsi: fdomain: add missing CONFIG_ to PCMCIA

by Yang Shi

There are some "#ifdef PCMCIA" in the driver code, but all of them missed CONFIG_ prefix. Correct PCMCIA to CONFIG_PCMCIA. Signed-off-by: Yang Shi <yang.shi(a)linaro.org> --- I happened to find this problem when I was tracking down another problem, however this driver looks very old, not sure if anybody cares about it or not. Anyway, it is harmless to come up with a patch to get it corrected. drivers/scsi/fdomain.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index eefe14d..ffc9187 100644 --- a/drivers/scsi/fdomain.c +++ b/drivers/scsi/fdomain.c @@ -290,7 +290,7 @@ #include <scsi/scsi_ioctl.h> #include "fdomain.h" -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA MODULE_AUTHOR("Rickard E. Faith"); MODULE_DESCRIPTION("Future domain SCSI driver"); MODULE_LICENSE("GPL"); @@ -414,7 +414,7 @@ static irqreturn_t do_fdomain_16x0_intr( int irq, void *dev_id ); static char * fdomain = NULL; module_param(fdomain, charp, 0); -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA static unsigned long addresses[] = { 0xc8000, @@ -432,7 +432,7 @@ static unsigned short ports[] = { 0x140, 0x150, 0x160, 0x170 }; static unsigned short ints[] = { 3, 5, 10, 11, 12, 14, 15, 0 }; -#endif /* !PCMCIA */ +#endif /* !CONFIG_PCMCIA */ /* @@ -466,7 +466,7 @@ static unsigned short ints[] = { 3, 5, 10, 11, 12, 14, 15, 0 }; */ -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA static struct signature { const char *signature; @@ -513,7 +513,7 @@ static struct signature { #define SIGNATURE_COUNT ARRAY_SIZE(signatures) -#endif /* !PCMCIA */ +#endif /* !CONFIG_PCMCIA */ static void print_banner( struct Scsi_Host *shpnt ) { @@ -645,7 +645,7 @@ static int fdomain_test_loopback( void ) return 0; } -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA /* fdomain_get_irq assumes that we have a valid MCA ID for a TMC-1660/TMC-1680 Future Domain board. Now, check to be sure the @@ -801,7 +801,7 @@ found: return 1; /* success */ } -#else /* PCMCIA */ +#else /* CONFIG_PCMCIA */ static int fdomain_isa_detect( int *irq, int *iobase ) { @@ -812,7 +812,7 @@ static int fdomain_isa_detect( int *irq, int *iobase ) return 0; } -#endif /* !PCMCIA */ +#endif /* !CONFIG_PCMCIA */ /* PCI detection function: int fdomain_pci_bios_detect(int* irq, int* @@ -1767,7 +1767,7 @@ struct scsi_host_template fdomain_driver_template = { .use_clustering = DISABLE_CLUSTERING, }; -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA #ifdef CONFIG_PCI static struct pci_device_id fdomain_pci_tbl[] = { -- 2.0.2

9 years, 9 months

master build: 0 failures 5 warnings (v4.5-rc3-19-g7cf91ad)

by Build bot for Mark Brown

Tree/Branch: master Git describe: v4.5-rc3-19-g7cf91ad Commit: 7cf91adc0d Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Build Time: 83 min 13 sec Passed: 9 / 9 (100.00 %) Failed: 0 / 9 ( 0.00 %) Errors: 0 Warnings: 5 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 1 warnings 0 mismatches : arm64-allmodconfig 1 warnings 0 mismatches : arm-multi_v7_defconfig 5 warnings 0 mismatches : arm-allmodconfig 1 warnings 0 mismatches : arm64-defconfig ------------------------------------------------------------------------------- Warnings Summary: 5 4 ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] 1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=] 1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] 1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] 1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=] =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- arm64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] ------------------------------------------------------------------------------- arm-multi_v7_defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] ------------------------------------------------------------------------------- arm-allmodconfig : PASS, 0 errors, 5 warnings, 0 section mismatches Warnings: ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=] ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=] ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] ------------------------------------------------------------------------------- arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable] ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: x86_64-allnoconfig arm64-allnoconfig arm-allnoconfig arm-multi_v5_defconfig x86_64-defconfig

9 years, 9 months

[PATCH V2 0/7] cpufreq: governors: Fix ABBA lockups

by Viresh Kumar

Hi Rafael, Here is the V2 with updated patches as suggested by you guys. These are pushed here: git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq/governor-kobject The first four patches are for 4.5, if possible and others you can keep for 4.6. V1->V2: - Improved changelogs, thanks Rafael. - Added new dbs_data->mutex to avoid concurrent updates to tunables. - Moved kobj_type to common_dbs_data. - Updated macros to static inline routines - s/show/governor_show - s/store/governor_store - Improved comments @Juri: More testing requested :) Viresh Kumar (7): cpufreq: governor: Treat min_sampling_rate as a governor-specific tunable cpufreq: governor: New sysfs show/store callbacks for governor tunables cpufreq: governor: Drop unused macros for creating governor tunable attributes Revert "cpufreq: Drop rwsem lock around CPUFREQ_GOV_POLICY_EXIT" cpufreq: Merge cpufreq_offline_prepare/finish routines cpufreq: Call __cpufreq_governor() with policy->rwsem held cpufreq: Remove cpufreq_governor_lock drivers/cpufreq/cpufreq.c | 93 +++++++++++++---------------- drivers/cpufreq/cpufreq_conservative.c | 79 +++++++++---------------- drivers/cpufreq/cpufreq_governor.c | 105 +++++++++++++++++++++++++-------- drivers/cpufreq/cpufreq_governor.h | 104 ++++++++------------------------ drivers/cpufreq/cpufreq_ondemand.c | 79 +++++++++---------------- include/linux/cpufreq.h | 4 -- 6 files changed, 203 insertions(+), 261 deletions(-) -- 2.7.0.79.gdc08a19

9 years, 9 months

[PATCH V3 00/13] cpufreq: governors: Fix ABBA lockups

by Viresh Kumar

Hi Rafael, Things look much much better now. I have rebased this series over pm/bleeding-edge, that has all your patches. I have moved ahead and done few more changes in this series, that should get rid of all the lockdeps we were getting earlier, that includes fixing lockdep issue in update_sampling_rate() that we were chasing. These are pushed here again: git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq/governor-kobject @Juri/Shilpa: Can you please confirm if all the issues got resolved now ? V2->V3: - The first patch from V2, that was moving min_sampling_rate to per governor structure was dropped, as you suggested. - Also, I have moved common tunables to struct dbs_data now, which you also suggested sometime back. - Last 5 patches are all new and fix rest of the issues we were facing. -- viresh Viresh Kumar (13): cpufreq: governor: Create generic macro for global tuners cpufreq: governor: Move common tunables to 'struct dbs_data' cpufreq: governor: New sysfs show/store callbacks for governor tunables cpufreq: governor: Drop unused macros for creating governor tunable attributes Revert "cpufreq: Drop rwsem lock around CPUFREQ_GOV_POLICY_EXIT" cpufreq: Merge cpufreq_offline_prepare/finish routines cpufreq: Call __cpufreq_governor() with policy->rwsem held cpufreq: Remove cpufreq_governor_lock cpufreq: governor: Move common sysfs tunables to cpufreq_governor.c cpufreq: governor: No need to manage state machine now cpufreq: governor: Keep list of policy_dbs within dbs_data cpufreq: ondemand: Traverse list of policy_dbs in update_sampling_rate() cpufreq: conservative: Update sample_delay_ns immediately drivers/cpufreq/cpufreq.c | 98 ++++++------ drivers/cpufreq/cpufreq_conservative.c | 143 ++++-------------- drivers/cpufreq/cpufreq_governor.c | 266 +++++++++++++++++++++++++-------- drivers/cpufreq/cpufreq_governor.h | 156 ++++++++----------- drivers/cpufreq/cpufreq_ondemand.c | 241 +++++------------------------ include/linux/cpufreq.h | 4 - 6 files changed, 381 insertions(+), 527 deletions(-) -- 2.7.1.370.gb2aa7f8

9 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel