Commit 012a4163 authored Feb 05, 2016 by Nicolai Stange Committed by Linus Torvalds Feb 05, 2016

um: asm/page.h: remove the pte_high member from struct pte_t



Commit 16da3068 ("um: kill pfn_t") introduced a compile warning for
defconfig (SUBARCH=i386):

  arch/um/kernel/skas/mmu.c:38:206:
      warning: right shift count >= width of type [-Wshift-count-overflow]

Aforementioned patch changes the definition of the phys_to_pfn() macro
from

  ((pfn_t) ((p) >> PAGE_SHIFT))

to

  ((p) >> PAGE_SHIFT)

This effectively changes the phys_to_pfn() expansion's type from
unsigned long long to unsigned long.

Through the callchain init_stub_pte() => mk_pte(), the expansion of
phys_to_pfn() is (indirectly) fed into the 'phys' argument of the
pte_set_val(pte, phys, prot) macro, eventually leading to

  (pte).pte_high = (phys) >> 32;

This results in the warning from above.

Since UML only deals with 32 bit addresses, the upper 32 bits from
'phys' used to be always zero anyway.  Also, all page protection flags
defined by UML don't use any bits beyond bit 9.  Since the contents of a
PTE are defined within architecture scope only, the ->pte_high member
can be safely removed.

Remove the ->pte_high member from struct pte_t.
Rename ->pte_low to ->pte.
Adapt the pte helper macros in arch/um/include/asm/page.h.

Noteworthy is the pte_copy() macro where a smp_wmb() gets dropped.  This
write barrier doesn't seem to be paired with any read barrier though and
thus, was useless anyway.

Fixes: 16da3068 ("um: kill pfn_t")
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 080fe206

arch/um/include/asm/page.h

+10 −13

Original line number	Diff line number	Diff line
		@@ -34,21 +34,18 @@ struct page;

		#if defined(CONFIG_3_LEVEL_PGTABLES) && !defined(CONFIG_64BIT)

		typedef struct { unsigned long pte_low, pte_high; } pte_t;
		typedef struct { unsigned long pte; } pte_t;
		typedef struct { unsigned long pmd; } pmd_t;
		typedef struct { unsigned long pgd; } pgd_t;
		#define pte_val(x) ((x).pte_low \| ((unsigned long long) (x).pte_high << 32))

		#define pte_get_bits(pte, bits) ((pte).pte_low & (bits))
		#define pte_set_bits(pte, bits) ((pte).pte_low \|= (bits))
		#define pte_clear_bits(pte, bits) ((pte).pte_low &= ~(bits))
		#define pte_copy(to, from) ({ (to).pte_high = (from).pte_high; \
		smp_wmb(); \
		(to).pte_low = (from).pte_low; })
		#define pte_is_zero(pte) (!((pte).pte_low & ~_PAGE_NEWPAGE) && !(pte).pte_high)
		#define pte_set_val(pte, phys, prot) \
		({ (pte).pte_high = (phys) >> 32; \
		(pte).pte_low = (phys) \| pgprot_val(prot); })
		#define pte_val(p) ((p).pte)

		#define pte_get_bits(p, bits) ((p).pte & (bits))
		#define pte_set_bits(p, bits) ((p).pte \|= (bits))
		#define pte_clear_bits(p, bits) ((p).pte &= ~(bits))
		#define pte_copy(to, from) ({ (to).pte = (from).pte; })
		#define pte_is_zero(p) (!((p).pte & ~_PAGE_NEWPAGE))
		#define pte_set_val(p, phys, prot) \
		({ (p).pte = (phys) \| pgprot_val(prot); })

		#define pmd_val(x) ((x).pmd)
		#define __pmd(x) ((pmd_t) { (x) } )

Admin message