This is a note to let you know that I've just added the patch titled sparc64: Do not insert non-valid PTEs into the TSB hash table. to the 3.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: sparc64-do-not-insert-non-valid-ptes-into-the-tsb-hash-table.patch and it can be found in the queue-3.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Thu Aug 7 22:33:35 PDT 2014 From: "David S. Miller" <davem@xxxxxxxxxxxxx> Date: Mon, 4 Aug 2014 16:34:01 -0700 Subject: sparc64: Do not insert non-valid PTEs into the TSB hash table. From: "David S. Miller" <davem@xxxxxxxxxxxxx> [ Upstream commit 18f38132528c3e603c66ea464727b29e9bbcb91b ] The assumption was that update_mmu_cache() (and the equivalent for PMDs) would only be called when the PTE being installed will be accessible by the user. This is not true for code paths originating from remove_migration_pte(). There are dire consequences for placing a non-valid PTE into the TSB. The TLB miss frramework assumes thatwhen a TSB entry matches we can just load it into the TLB and return from the TLB miss trap. So if a non-valid PTE is in there, we will deadlock taking the TLB miss over and over, never satisfying the miss. Just exit early from update_mmu_cache() and friends in this situation. Based upon a report and patch from Christopher Alexander Tobias Schulze. Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/sparc/mm/init_64.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -308,6 +308,10 @@ void update_mmu_cache(struct vm_area_str tsb_index = MM_TSB_BASE; tsb_hash_shift = PAGE_SHIFT; + /* Don't insert a non-valid PTE into the TSB, we'll deadlock. */ + if (!(pte_val(pte) & _PAGE_VALID)) + return; + spin_lock_irqsave(&mm->context.lock, flags); #ifdef CONFIG_HUGETLB_PAGE Patches currently in stable-queue which might be from davem@xxxxxxxxxxxxx are queue-3.4/sparc64-add-membar-to-niagara2-memcpy-code.patch queue-3.4/ip-make-ip-identifiers-less-predictable.patch queue-3.4/sunsab-fix-detection-of-break-on-sunsab-serial-console.patch queue-3.4/tcp-fix-integer-overflow-in-tcp-vegas.patch queue-3.4/tcp-fix-integer-overflows-in-tcp-veno.patch queue-3.4/sparc64-fix-huge-tsb-mapping-on-pre-ultrasparc-iii-cpus.patch queue-3.4/sparc64-handle-32-bit-tasks-properly-in-compute_effective_address.patch queue-3.4/macvlan-initialize-vlan_features-to-turn-on-offload-support.patch queue-3.4/inetpeer-get-rid-of-ip_id_count.patch queue-3.4/arch-sparc-math-emu-math_32.c-drop-stray-break-operator.patch queue-3.4/sparc64-do-not-insert-non-valid-ptes-into-the-tsb-hash-table.patch queue-3.4/sparc64-fix-argument-sign-extension-for-compat_sys_futex.patch queue-3.4/bbc-i2c-fix-bbc-i2c-envctrl-on-sunblade-2000.patch queue-3.4/sparc64-guard-against-flushing-openfirmware-mappings.patch queue-3.4/sparc64-ldc_connect-should-not-return-einval-when-handshake-is-in-progress.patch queue-3.4/sparc64-fix-top-level-fault-handling-bugs.patch queue-3.4/sparc64-don-t-bark-so-loudly-about-32-bit-tasks-generating-64-bit-fault-addresses.patch queue-3.4/net-sendmsg-fix-null-pointer-dereference.patch queue-3.4/net-sctp-inherit-auth_capable-on-init-collisions.patch queue-3.4/sparc64-make-itc_sync_lock-raw.patch queue-3.4/sctp-fix-possible-seqlock-seadlock-in-sctp_packet_transmit.patch queue-3.4/iovec-make-sure-the-caller-actually-wants-anything-in-memcpy_fromiovecend.patch queue-3.4/net-correctly-set-segment-mac_len-in-skb_segment.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html