Skip to contentSkip to conversation

Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask

PATCH In review Patrick Colp 3 participants 6 messages May 15, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask

# HG changeset patch
# User Patrick Colp <[email protected]>
# Date 1242295647 -3600
# Node ID c5098f5c5caf4174bd2e46d49d7b65109203f7c5
# Parent 2522cc95efd2f3fadf7342d18fe86e8f37f89c2a
Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask.

xen/arch/x86/mm.c +4 -3
diff -r 2522cc95efd2 -r c5098f5c5caf xen/arch/x86/mm.c
@@ -766,7 +766,7 @@
         goto could_not_pin;
 
     if ( pte_flags_to_cacheattr(l1f) !=
-         ((page->count_info >> PGC_cacheattr_base) & 7) )
+         ((page->count_info & PGC_cacheattr_mask) >> PGC_cacheattr_base) )
     {
         unsigned long x, nx, y = page->count_info;
         unsigned long cacheattr = pte_flags_to_cacheattr(l1f);
@@ -782,7 +782,7 @@
             return 0;
         }
 
-        while ( ((y >> PGC_cacheattr_base) & 7) != cacheattr )
+        while ( ((y & PGC_cacheattr_mask) >> PGC_cacheattr_base) != cacheattr )
         {
             x  = y;
             nx = (x & ~PGC_cacheattr_mask) | (cacheattr << PGC_cacheattr_base);
@@ -2389,7 +2389,8 @@
 
 void cleanup_page_cacheattr(struct page_info *page)
 {
-    uint32_t cacheattr = (page->count_info >> PGC_cacheattr_base) & 7;
+    uint32_t cacheattr =
+        (page->count_info & PGC_cacheattr_mask) >> PGC_cacheattr_base;
 
     if ( likely(cacheattr == 0) )
         return;
#1 lore raw

Re: [PATCH] Fix get_page_from_l1e andcleanup_page_cacheattr to use PGC_cacheattr_mask

Quoted 7 lines
Quoted 1 line
Quoted 1 line

Patrick Colp <[email protected]> 15.05.09 11:01 >>>

# HG changeset patch
# User Patrick Colp <[email protected]>
# Date 1242295647 -3600
# Node ID c5098f5c5caf4174bd2e46d49d7b65109203f7c5
# Parent 2522cc95efd2f3fadf7342d18fe86e8f37f89c2a
Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask.

Could you indicate what it is that you fix here?

Jan

#3 lore raw

Re: [PATCH] Fix get_page_from_l1e andcleanup_page_cacheattr to use PGC_cacheattr_mask

In reply to Keir Fraser
Quoted 9 lines · Keir Fraser
Quoted 7 lines · Jan Beulich
Quoted 7 lines
Quoted 1 line
Quoted 1 line

Patrick Colp <[email protected]> 15.05.09 11:01 >>>

# HG changeset patch
# User Patrick Colp <[email protected]>
# Date 1242295647 -3600
# Node ID c5098f5c5caf4174bd2e46d49d7b65109203f7c5
# Parent 2522cc95efd2f3fadf7342d18fe86e8f37f89c2a
Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask.

Quoted 5 lines
Quoted 1 line

Could you indicate what it is that you fix here?

I assume it's just getting rid of the open-coded 7.

-- Keir

Yes, exactly.

Patrick

#2 lore raw

Re: [PATCH] Fix get_page_from_l1e andcleanup_page_cacheattr to use PGC_cacheattr_mask

In reply to Jan Beulich
Quoted 9 lines · Jan Beulich
Quoted 7 lines
Quoted 1 line
Quoted 1 line

Patrick Colp <[email protected]> 15.05.09 11:01 >>>

# HG changeset patch
# User Patrick Colp <[email protected]>
# Date 1242295647 -3600
# Node ID c5098f5c5caf4174bd2e46d49d7b65109203f7c5
# Parent 2522cc95efd2f3fadf7342d18fe86e8f37f89c2a
Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask.

Could you indicate what it is that you fix here?

I assume it's just getting rid of the open-coded 7.

-- Keir

#4 lore raw

Re: [PATCH] Fix get_page_from_l1eandcleanup_page_cacheattr to use PGC_cacheattr_mask

Quoted 11 lines
Quoted 1 line
Quoted 1 line

Keir Fraser <[email protected]> 15.05.09 11:40 >>>

Quoted 8 lines · Jan Beulich
Quoted 7 lines
Quoted 1 line
Quoted 1 line

Patrick Colp <[email protected]> 15.05.09 11:01 >>>

# HG changeset patch
# User Patrick Colp <[email protected]>
# Date 1242295647 -3600
# Node ID c5098f5c5caf4174bd2e46d49d7b65109203f7c5
# Parent 2522cc95efd2f3fadf7342d18fe86e8f37f89c2a
Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask.

Quoted 3 lines
Quoted 1 line

Could you indicate what it is that you fix here?

I assume it's just getting rid of the open-coded 7.

So would I have thought by looking at the patch, but the word 'fix' in the subject made me thing there was something more subtle that I didn't spot...

Jan

#5 lore raw

Re: [PATCH] Fix get_page_from_l1eandcleanup_page_cacheattr to use PGC_cacheattr_mask

Quoted 10 lines · Jan Beulich
Quoted 10 lines
Quoted 1 line
Quoted 1 line

Keir Fraser <[email protected]> 15.05.09 11:40 >>>

Quoted 7 lines · Jan Beulich
Quoted 7 lines
Quoted 1 line
Quoted 1 line

Patrick Colp <[email protected]> 15.05.09 11:01 >>>

# HG changeset patch
# User Patrick Colp <[email protected]>
# Date 1242295647 -3600
# Node ID c5098f5c5caf4174bd2e46d49d7b65109203f7c5
# Parent 2522cc95efd2f3fadf7342d18fe86e8f37f89c2a
Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask.

Quoted 7 lines
Quoted 2 lines
Quoted 1 line

Could you indicate what it is that you fix here?

I assume it's just getting rid of the open-coded 7.

So would I have thought by looking at the patch, but the word 'fix' in the subject made me thing there was something more subtle that I didn't spot...

Jan

Nah, just a poor word choice. "Changed" would probably have been better.

Patrick