Commit 59438c9f authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: rename PTE_MASK to PTE_PFN_MASK 



Rusty, in his peevish way, complained that macros defining constants
should have a name which somewhat accurately reflects the actual
purpose of the constant.

Aside from the fact that PTE_MASK gives no clue as to what's actually
being masked, and is misleadingly similar to the functionally entirely
different PMD_MASK, PUD_MASK and PGD_MASK, I don't really see what the
problem is.

But if this patch silences the incessent noise, then it will have
achieved its goal (TODO: write test-case).

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@goop.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c2e3277f

arch/x86/mm/dump_pagetables.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -148,8 +148,8 @@ static void note_page(struct seq_file *m, struct pg_state *st, 
	 * we have now. "break" is either changing perms, levels or

	 * we have now. "break" is either changing perms, levels or

	 * address space marker.

	 * address space marker.

	 */

	 */

	prot = pgprot_val(new_prot) & ~(PTE_MASK);

	prot = pgprot_val(new_prot) & ~(PTE_PFN_MASK);

	cur = pgprot_val(st->current_prot) & ~(PTE_MASK);

	cur = pgprot_val(st->current_prot) & ~(PTE_PFN_MASK);





	if (!st->level) {

	if (!st->level) {

		/* First entry */

		/* First entry */
@@ -221,7 +221,7 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr, 
	for (i = 0; i < PTRS_PER_PMD; i++) {

	for (i = 0; i < PTRS_PER_PMD; i++) {

		st->current_address = normalize_addr(P + i * PMD_LEVEL_MULT);

		st->current_address = normalize_addr(P + i * PMD_LEVEL_MULT);

		if (!pmd_none(*start)) {

		if (!pmd_none(*start)) {

			pgprotval_t prot = pmd_val(*start) & ~PTE_MASK;

			pgprotval_t prot = pmd_val(*start) & ~PTE_PFN_MASK;





			if (pmd_large(*start) || !pmd_present(*start))

			if (pmd_large(*start) || !pmd_present(*start))

				note_page(m, st, __pgprot(prot), 3);

				note_page(m, st, __pgprot(prot), 3);
@@ -253,7 +253,7 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st, pgd_t addr, 
	for (i = 0; i < PTRS_PER_PUD; i++) {

	for (i = 0; i < PTRS_PER_PUD; i++) {

		st->current_address = normalize_addr(P + i * PUD_LEVEL_MULT);

		st->current_address = normalize_addr(P + i * PUD_LEVEL_MULT);

		if (!pud_none(*start)) {

		if (!pud_none(*start)) {

			pgprotval_t prot = pud_val(*start) & ~PTE_MASK;

			pgprotval_t prot = pud_val(*start) & ~PTE_PFN_MASK;





			if (pud_large(*start) || !pud_present(*start))

			if (pud_large(*start) || !pud_present(*start))

				note_page(m, st, __pgprot(prot), 2);

				note_page(m, st, __pgprot(prot), 2);
@@ -288,7 +288,7 @@ static void walk_pgd_level(struct seq_file *m) 
	for (i = 0; i < PTRS_PER_PGD; i++) {

	for (i = 0; i < PTRS_PER_PGD; i++) {

		st.current_address = normalize_addr(i * PGD_LEVEL_MULT);

		st.current_address = normalize_addr(i * PGD_LEVEL_MULT);

		if (!pgd_none(*start)) {

		if (!pgd_none(*start)) {

			pgprotval_t prot = pgd_val(*start) & ~PTE_MASK;

			pgprotval_t prot = pgd_val(*start) & ~PTE_PFN_MASK;





			if (pgd_large(*start) || !pgd_present(*start))

			if (pgd_large(*start) || !pgd_present(*start))

				note_page(m, &st, __pgprot(prot), 1);

				note_page(m, &st, __pgprot(prot), 1);

arch/x86/xen/enlighten.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1435,7 +1435,7 @@ static unsigned long m2p(phys_addr_t maddr) 
{

{

	phys_addr_t paddr;

	phys_addr_t paddr;





	maddr &= PTE_MASK;

	maddr &= PTE_PFN_MASK;

	paddr = mfn_to_pfn(maddr >> PAGE_SHIFT) << PAGE_SHIFT;

	paddr = mfn_to_pfn(maddr >> PAGE_SHIFT) << PAGE_SHIFT;





	return paddr;

	return paddr;

arch/x86/xen/mmu.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -343,8 +343,8 @@ void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, 
static pteval_t pte_mfn_to_pfn(pteval_t val)

static pteval_t pte_mfn_to_pfn(pteval_t val)

{

{

	if (val & _PAGE_PRESENT) {

	if (val & _PAGE_PRESENT) {

		unsigned long mfn = (val & PTE_MASK) >> PAGE_SHIFT;

		unsigned long mfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;

		pteval_t flags = val & ~PTE_MASK;

		pteval_t flags = val & ~PTE_PFN_MASK;

		val = ((pteval_t)mfn_to_pfn(mfn) << PAGE_SHIFT) | flags;

		val = ((pteval_t)mfn_to_pfn(mfn) << PAGE_SHIFT) | flags;

	}

	}
@@ -354,8 +354,8 @@ static pteval_t pte_mfn_to_pfn(pteval_t val) 
static pteval_t pte_pfn_to_mfn(pteval_t val)

static pteval_t pte_pfn_to_mfn(pteval_t val)

{

{

	if (val & _PAGE_PRESENT) {

	if (val & _PAGE_PRESENT) {

		unsigned long pfn = (val & PTE_MASK) >> PAGE_SHIFT;

		unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;

		pteval_t flags = val & ~PTE_MASK;

		pteval_t flags = val & ~PTE_PFN_MASK;

		val = ((pteval_t)pfn_to_mfn(pfn) << PAGE_SHIFT) | flags;

		val = ((pteval_t)pfn_to_mfn(pfn) << PAGE_SHIFT) | flags;

	}

	}

include/asm-x86/page.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,8 +18,8 @@ 
   (ie, 32-bit PAE). */

   (ie, 32-bit PAE). */

#define PHYSICAL_PAGE_MASK	(((signed long)PAGE_MASK) & __PHYSICAL_MASK)

#define PHYSICAL_PAGE_MASK	(((signed long)PAGE_MASK) & __PHYSICAL_MASK)





/* PTE_MASK extracts the PFN from a (pte|pmd|pud|pgd)val_t */

/* PTE_PFN_MASK extracts the PFN from a (pte|pmd|pud|pgd)val_t */

#define PTE_MASK		((pteval_t)PHYSICAL_PAGE_MASK)

#define PTE_PFN_MASK		((pteval_t)PHYSICAL_PAGE_MASK)





#define PMD_PAGE_SIZE		(_AC(1, UL) << PMD_SHIFT)

#define PMD_PAGE_SIZE		(_AC(1, UL) << PMD_SHIFT)

#define PMD_PAGE_MASK		(~(PMD_PAGE_SIZE-1))

#define PMD_PAGE_MASK		(~(PMD_PAGE_SIZE-1))
@@ -146,7 +146,7 @@ static inline pteval_t native_pte_val(pte_t pte) 




static inline pteval_t native_pte_flags(pte_t pte)

static inline pteval_t native_pte_flags(pte_t pte)

{

{

	return native_pte_val(pte) & ~PTE_MASK;

	return native_pte_val(pte) & ~PTE_PFN_MASK;

}

}





#define pgprot_val(x)	((x).pgprot)

#define pgprot_val(x)	((x).pgprot)

include/asm-x86/paravirt.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1089,7 +1089,7 @@ static inline pteval_t pte_flags(pte_t pte) 
				 pte.pte);

				 pte.pte);





#ifdef CONFIG_PARAVIRT_DEBUG

#ifdef CONFIG_PARAVIRT_DEBUG

	BUG_ON(ret & PTE_MASK);

	BUG_ON(ret & PTE_PFN_MASK);

#endif

#endif

	return ret;

	return ret;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE