This is a note to let you know that I've just added the patch titled
sparc64: Fix bugs in get_user_pages_fast() wrt. THP.
to the 3.14-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-fix-bugs-in-get_user_pages_fast-wrt.-thp.patch
and it can be found in the queue-3.14 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 Fri Aug 8 08:54:13 PDT 2014
From: "David S. Miller" <davem@xxxxxxxxxxxxx>
Date: Fri, 25 Apr 2014 10:21:12 -0700
Subject: sparc64: Fix bugs in get_user_pages_fast() wrt. THP.
From: "David S. Miller" <davem@xxxxxxxxxxxxx>
[ Upstream commit 04df419de34104d8818b8c5cffaa062fa36d20ea ]
The large PMD path needs to check _PAGE_VALID not _PAGE_PRESENT, to
decide if it needs to bail and return 0.
pmd_large() should therefore just check _PAGE_PMD_HUGE.
Calls to gup_huge_pmd() are guarded with a check of pmd_large(), so we
just need to add a valid bit check.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/sparc/include/asm/pgtable_64.h | 2 +-
arch/sparc/mm/gup.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -633,7 +633,7 @@ static inline unsigned long pmd_large(pm
{
pte_t pte = __pte(pmd_val(pmd));
- return (pte_val(pte) & _PAGE_PMD_HUGE) && pte_present(pte);
+ return pte_val(pte) & _PAGE_PMD_HUGE;
}
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
--- a/arch/sparc/mm/gup.c
+++ b/arch/sparc/mm/gup.c
@@ -73,7 +73,7 @@ static int gup_huge_pmd(pmd_t *pmdp, pmd
struct page *head, *page, *tail;
int refs;
- if (!pmd_large(pmd))
+ if (!(pmd_val(pmd) & _PAGE_VALID))
return 0;
if (write && !pmd_write(pmd))
Patches currently in stable-queue which might be from davem@xxxxxxxxxxxxx are
queue-3.14/sctp-fix-possible-seqlock-seadlock-in-sctp_packet_transmit.patch
queue-3.14/sparc64-add-basic-validations-to-pud-pmd-_bad.patch
queue-3.14/net-sendmsg-fix-null-pointer-dereference.patch
queue-3.14/sparc64-ldc_connect-should-not-return-einval-when-handshake-is-in-progress.patch
queue-3.14/sparc64-do-not-insert-non-valid-ptes-into-the-tsb-hash-table.patch
queue-3.14/iovec-make-sure-the-caller-actually-wants-anything-in-memcpy_fromiovecend.patch
queue-3.14/net-phy-re-apply-phy-fixups-during-phy_register_device.patch
queue-3.14/sparc64-fix-hex-values-in-comment-above-pte_modify.patch
queue-3.14/sparc64-don-t-bark-so-loudly-about-32-bit-tasks-generating-64-bit-fault-addresses.patch
queue-3.14/sparc64-fix-argument-sign-extension-for-compat_sys_futex.patch
queue-3.14/arch-sparc-math-emu-math_32.c-drop-stray-break-operator.patch
queue-3.14/net-correctly-set-segment-mac_len-in-skb_segment.patch
queue-3.14/sparc64-fix-executable-bit-testing-in-set_pmd_at-paths.patch
queue-3.14/ip-make-ip-identifiers-less-predictable.patch
queue-3.14/sparc64-fix-top-level-fault-handling-bugs.patch
queue-3.14/sparc64-fix-huge-tsb-mapping-on-pre-ultrasparc-iii-cpus.patch
queue-3.14/sparc64-give-more-detailed-information-in-pgd-pmd-_error-and-kill-pte_error.patch
queue-3.14/bnx2x-fix-crash-during-tso-tunneling.patch
queue-3.14/sparc64-don-t-use-_page_present-in-pte_modify-mask.patch
queue-3.14/sparc64-make-itc_sync_lock-raw.patch
queue-3.14/bbc-i2c-fix-bbc-i2c-envctrl-on-sunblade-2000.patch
queue-3.14/sparc64-handle-32-bit-tasks-properly-in-compute_effective_address.patch
queue-3.14/sunsab-fix-detection-of-break-on-sunsab-serial-console.patch
queue-3.14/ip_tunnel-ipv4-fix-tunnels-with-local-any-remote-remote_ip.patch
queue-3.14/net-sctp-inherit-auth_capable-on-init-collisions.patch
queue-3.14/sparc64-fix-bugs-in-get_user_pages_fast-wrt.-thp.patch
queue-3.14/sparc64-fix-huge-pmd-invalidation.patch
queue-3.14/macvlan-initialize-vlan_features-to-turn-on-offload-support.patch
queue-3.14/tcp-fix-integer-overflow-in-tcp-vegas.patch
queue-3.14/inetpeer-get-rid-of-ip_id_count.patch
queue-3.14/sparc64-use-ilog2_4mb-instead-of-constant-22.patch
queue-3.14/bna-fix-performance-regression.patch
queue-3.14/sparc64-add-membar-to-niagara2-memcpy-code.patch
queue-3.14/sparc64-fix-range-check-in-kern_addr_valid.patch
queue-3.14/sparc64-guard-against-flushing-openfirmware-mappings.patch
queue-3.14/tcp-fix-integer-overflows-in-tcp-veno.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