lkml.org 
[lkml]   [2007]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [RFC][PATCH 4/7] RSS accounting hooks over the code
    Cedric Le Goater wrote:
    >> --- linux-2.6.20.orig/mm/migrate.c 2007-02-04 21:44:54.000000000 +0300
    >> +++ linux-2.6.20-0/mm/migrate.c 2007-03-06 13:33:28.000000000 +0300
    >> @@ -134,6 +134,7 @@ static void remove_migration_pte(struct
    >> pte_t *ptep, pte;
    >> spinlock_t *ptl;
    >> unsigned long addr = page_address_in_vma(new, vma);
    >> + struct page_container *pcont;
    >>
    >> if (addr == -EFAULT)
    >> return;
    >> @@ -157,6 +158,11 @@ static void remove_migration_pte(struct
    >> return;
    >> }
    >>
    >> + if (container_rss_prepare(new, vma, &pcont)) {
    >> + pte_unmap(ptep);
    >> + return;
    >> + }
    >> +
    >> ptl = pte_lockptr(mm, pmd);
    >> spin_lock(ptl);
    >> pte = *ptep;
    >> @@ -175,16 +181,19 @@ static void remove_migration_pte(struct
    >> set_pte_at(mm, addr, ptep, pte);
    >>
    >> if (PageAnon(new))
    >> - page_add_anon_rmap(new, vma, addr);
    >> + page_add_anon_rmap(new, vma, addr, pcont);
    >> else
    >> - page_add_file_rmap(new);
    >> + page_add_file_rmap(new, pcont);
    >>
    >> /* No need to invalidate - it was non-present before */
    >> update_mmu_cache(vma, addr, pte);
    >> lazy_mmu_prot_update(pte);
    >> + pte_unmap_unlock(ptep, ptl);
    >> + return;
    >>
    >> out:
    >> pte_unmap_unlock(ptep, ptl);
    >> + container_rss_release(pcont);
    >> }
    >>
    >> /*
    >
    > you missed out an include in mm/migrate.c
    >
    > cheers,

    Thanks! :)

    > C.
    > Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
    > ---
    > mm/migrate.c | 1 +
    > 1 file changed, 1 insertion(+)
    >
    > Index: 2.6.20/mm/migrate.c
    > ===================================================================
    > --- 2.6.20.orig/mm/migrate.c
    > +++ 2.6.20/mm/migrate.c
    > @@ -28,6 +28,7 @@
    > #include <linux/mempolicy.h>
    > #include <linux/vmalloc.h>
    > #include <linux/security.h>
    > +#include <linux/rss_container.h>
    >
    > #include "internal.h"
    >
    > -
    > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    > Please read the FAQ at http://www.tux.org/lkml/
    >

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-03-14 16:45    [W:2.791 / U:5.524 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site