* Sat, 22 Sep 2007 00:32:11 +0200 (CEST)
[]
> - flush_map(&l);
> + flush_map(&arg);
+ flush_map(&arg.l);
CC arch/x86_64/mm/pageattr.o
arch/x86_64/mm/pageattr.c: In function 'global_flush_tlb':
arch/x86_64/mm/pageattr.c:274: warning: passing argument 1 of 'flush_map' from
incompatible pointer type
(for i386 seems too)
[]
> +#define PageFlush(p) test_bit(PG_owner_priv_1, &(p)->flags)
> +#define SetPageFlush(p) set_bit(PG_owner_priv_1, &(p)->flags)
> +#define TestClearPageFlush(p) test_and_clear_bit(PG_owner_priv_1,
> &(p)->flags)
Is it worth introducing more of that Pascal style? Yes, page stuff is
all about it, but still.
[]
> +static struct page *flush_page(unsigned long address)
> {
> - if (!test_and_set_bit(PG_arch_1, &kpte_page->flags))
> - list_add(&kpte_page->lru, &df_list);
> + struct page *p;
> + if (!(pfn_valid(__pa(address) >> PAGE_SHIFT)))
> + return NULL;
> + p = virt_to_page(address);
> + if ((PageFlush(p) || PageLRU(p)) && !test_bit(PG_arch_1, &p->flags))
> + return NULL;
> + return p;
> }
Saves 16 bytes in non optimized compile (if tcc will ever do this :)
static struct page *flush_page(unsigned long address)
{
struct page *p = NULL;
if (pfn_valid(__pa(address) >> PAGE_SHIFT)) {
p = virt_to_page(address);
if (PageFlush(p) || PageLRU(p))
if (!test_bit(PG_arch_1, &p->flags))
p = NULL;
}
return p;
}
> static int
> @@ -158,6 +185,18 @@ __change_page_attr(struct page *page, pg
> kpte_page = virt_to_page(kpte);
> BUG_ON(PageLRU(kpte_page));
> BUG_ON(PageCompound(kpte_page));
> + BUG_ON(PageLRU(kpte_page));
> +
> + /* Do caching attributes change?
> + Note: this will need changes if the PAT bit is used (it isn't
> + currently) because that one varies between 2MB and 4K pages. */
> + if ((pte_val(*kpte)&_PAGE_CACHE) != (pgprot_val(prot)&_PAGE_CACHE)) {
> + struct page *p = flush_page(address);
> + if (!p)
> + full_flush = 1;
> + else
> + save_page(p, 1);
> + }
>
> if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL)) {
> if (!pte_huge(*kpte)) {
> @@ -189,7 +228,7 @@ __change_page_attr(struct page *page, pg
> * replace it with a largepage.
> */
>
> - save_page(kpte_page);
> + save_page(kpte_page, 0);
> if (!PageReserved(kpte_page)) {
> if (cpu_has_pse && (page_private(kpte_page) == 0)) {
> paravirt_release_pt(page_to_pfn(kpte_page));
> @@ -235,18 +274,22 @@ int change_page_attr(struct page *page,
>
> void global_flush_tlb(void)
> {
> - struct list_head l;
> + struct flush_arg arg;
> struct page *pg, *next;
>
> BUG_ON(irqs_disabled());
>
> spin_lock_irq(&cpa_lock);
> - list_replace_init(&df_list, &l);
> + arg.full_flush = full_flush;
> + full_flush = 0;
> + list_replace_init(&df_list, &arg.l);
> spin_unlock_irq(&cpa_lock);
> - flush_map(&l);
> - list_for_each_entry_safe(pg, next, &l, lru) {
> + flush_map(&arg);
i386 case here.
____
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
