lkml.org 
[lkml]   [2015]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 20/48] powerpc/mm: Recompute hash value after a failed update
    Date
    3.13.11-ckt29 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>

    commit 36b35d5d807b7e57aff7d08e63de8b17731ee211 upstream.

    If we had secondary hash flag set, we ended up modifying hash value in
    the updatepp code path. Hence with a failed updatepp we will be using
    a wrong hash value for the following hash insert. Fix this by
    recomputing hash before insert.

    Without this patch we can end up with using wrong slot number in linux
    pte. That can result in us missing an hash pte update or invalidate
    which can cause memory corruption or even machine check.

    Fixes: 6d492ecc6489 ("powerpc/THP: Add code to handle HPTE faults for hugepages")
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Reviewed-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    arch/powerpc/mm/hugepage-hash64.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/powerpc/mm/hugepage-hash64.c b/arch/powerpc/mm/hugepage-hash64.c
    index 7d86c86..9836e80 100644
    --- a/arch/powerpc/mm/hugepage-hash64.c
    +++ b/arch/powerpc/mm/hugepage-hash64.c
    @@ -136,7 +136,6 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,
    BUG_ON(index >= 4096);

    vpn = hpt_vpn(ea, vsid, ssize);
    - hash = hpt_hash(vpn, shift, ssize);
    hpte_slot_array = get_hpte_slot_array(pmdp);
    if (psize == MMU_PAGE_4K) {
    /*
    @@ -151,6 +150,7 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,
    valid = hpte_valid(hpte_slot_array, index);
    if (valid) {
    /* update the hpte bits */
    + hash = hpt_hash(vpn, shift, ssize);
    hidx = hpte_hash_index(hpte_slot_array, index);
    if (hidx & _PTEIDX_SECONDARY)
    hash = ~hash;
    @@ -176,6 +176,7 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,
    if (!valid) {
    unsigned long hpte_group;

    + hash = hpt_hash(vpn, shift, ssize);
    /* insert new entry */
    pa = pmd_pfn(__pmd(old_pmd)) << PAGE_SHIFT;
    new_pmd |= _PAGE_HASHPTE;
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-10-27 23:01    [W:4.413 / U:1.836 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site