mm: ptdump: expand type of 'val' in note_page()
The page table entry is passed in the 'val' argument to note_page(), however this was previously an "unsigned long" which is fine on 64-bit platforms. But for 32 bit x86 it is not always big enough to contain a page table entry which may be 64 bits. Change the type to u64 to ensure that it is always big enough. [akpm@linux-foundation.org: fix riscv] Reported-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Steven Price <steven.price@arm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20200521152308.33096-3-steven.price@arm.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
1494e0c38e
Коммит
99395ee3f7
|
@ -247,7 +247,7 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level,
|
static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level,
|
||||||
unsigned long val)
|
u64 val)
|
||||||
{
|
{
|
||||||
struct pg_state *st = container_of(pt_st, struct pg_state, ptdump);
|
struct pg_state *st = container_of(pt_st, struct pg_state, ptdump);
|
||||||
static const char units[] = "KMGTPE";
|
static const char units[] = "KMGTPE";
|
||||||
|
|
|
@ -204,7 +204,7 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void note_page(struct ptdump_state *pt_st, unsigned long addr,
|
static void note_page(struct ptdump_state *pt_st, unsigned long addr,
|
||||||
int level, unsigned long val)
|
int level, u64 val)
|
||||||
{
|
{
|
||||||
struct pg_state *st = container_of(pt_st, struct pg_state, ptdump);
|
struct pg_state *st = container_of(pt_st, struct pg_state, ptdump);
|
||||||
u64 pa = PFN_PHYS(pte_pfn(__pte(val)));
|
u64 pa = PFN_PHYS(pte_pfn(__pte(val)));
|
||||||
|
|
|
@ -273,7 +273,7 @@ static void effective_prot(struct ptdump_state *pt_st, int level, u64 val)
|
||||||
* print what we collected so far.
|
* print what we collected so far.
|
||||||
*/
|
*/
|
||||||
static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level,
|
static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level,
|
||||||
unsigned long val)
|
u64 val)
|
||||||
{
|
{
|
||||||
struct pg_state *st = container_of(pt_st, struct pg_state, ptdump);
|
struct pg_state *st = container_of(pt_st, struct pg_state, ptdump);
|
||||||
pgprotval_t new_prot, new_eff;
|
pgprotval_t new_prot, new_eff;
|
||||||
|
|
|
@ -13,7 +13,7 @@ struct ptdump_range {
|
||||||
struct ptdump_state {
|
struct ptdump_state {
|
||||||
/* level is 0:PGD to 4:PTE, or -1 if unknown */
|
/* level is 0:PGD to 4:PTE, or -1 if unknown */
|
||||||
void (*note_page)(struct ptdump_state *st, unsigned long addr,
|
void (*note_page)(struct ptdump_state *st, unsigned long addr,
|
||||||
int level, unsigned long val);
|
int level, u64 val);
|
||||||
void (*effective_prot)(struct ptdump_state *st, int level, u64 val);
|
void (*effective_prot)(struct ptdump_state *st, int level, u64 val);
|
||||||
const struct ptdump_range *range;
|
const struct ptdump_range *range;
|
||||||
};
|
};
|
||||||
|
|
Загрузка…
Ссылка в новой задаче