Skip to content

Commit 9b08818

Browse files
btw616jmberg-intel
authored andcommitted
um: Rename _PAGE_NEWPAGE to _PAGE_NEEDSYNC
The _PAGE_NEWPAGE bit does not really indicate that this is a new page, but rather whether this entry needs to be synced or not. Renaming it to _PAGE_NEEDSYNC will make it more clear how everything ties together. Suggested-by: Benjamin Berg <[email protected]> Signed-off-by: Tiwei Bie <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent 2717c6b commit 9b08818

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

arch/um/include/asm/page.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ typedef struct { unsigned long pud; } pud_t;
5656
#define pte_set_bits(p, bits) ((p).pte |= (bits))
5757
#define pte_clear_bits(p, bits) ((p).pte &= ~(bits))
5858
#define pte_copy(to, from) ((to).pte = (from).pte)
59-
#define pte_is_zero(p) (!((p).pte & ~_PAGE_NEWPAGE))
59+
#define pte_is_zero(p) (!((p).pte & ~_PAGE_NEEDSYNC))
6060
#define pte_set_val(p, phys, prot) (p).pte = (phys | pgprot_val(prot))
6161

6262
typedef unsigned long phys_t;

arch/um/include/asm/pgtable-2level.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
printk("%s:%d: bad pgd %p(%08lx).\n", __FILE__, __LINE__, &(e), \
3232
pgd_val(e))
3333

34-
static inline int pgd_newpage(pgd_t pgd) { return 0; }
34+
static inline int pgd_needsync(pgd_t pgd) { return 0; }
3535
static inline void pgd_mkuptodate(pgd_t pgd) { }
3636

3737
#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))

arch/um/include/asm/pgtable-4level.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@
5555
printk("%s:%d: bad pgd %p(%016lx).\n", __FILE__, __LINE__, &(e), \
5656
pgd_val(e))
5757

58-
#define pud_none(x) (!(pud_val(x) & ~_PAGE_NEWPAGE))
58+
#define pud_none(x) (!(pud_val(x) & ~_PAGE_NEEDSYNC))
5959
#define pud_bad(x) ((pud_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
6060
#define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
6161
#define pud_populate(mm, pud, pmd) \
6262
set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
6363

6464
#define set_pud(pudptr, pudval) (*(pudptr) = (pudval))
6565

66-
#define p4d_none(x) (!(p4d_val(x) & ~_PAGE_NEWPAGE))
66+
#define p4d_none(x) (!(p4d_val(x) & ~_PAGE_NEEDSYNC))
6767
#define p4d_bad(x) ((p4d_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
6868
#define p4d_present(x) (p4d_val(x) & _PAGE_PRESENT)
6969
#define p4d_populate(mm, p4d, pud) \
@@ -72,23 +72,23 @@
7272
#define set_p4d(p4dptr, p4dval) (*(p4dptr) = (p4dval))
7373

7474

75-
static inline int pgd_newpage(pgd_t pgd)
75+
static inline int pgd_needsync(pgd_t pgd)
7676
{
77-
return(pgd_val(pgd) & _PAGE_NEWPAGE);
77+
return pgd_val(pgd) & _PAGE_NEEDSYNC;
7878
}
7979

80-
static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEWPAGE; }
80+
static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEEDSYNC; }
8181

8282
#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))
8383

8484
static inline void pud_clear (pud_t *pud)
8585
{
86-
set_pud(pud, __pud(_PAGE_NEWPAGE));
86+
set_pud(pud, __pud(_PAGE_NEEDSYNC));
8787
}
8888

8989
static inline void p4d_clear (p4d_t *p4d)
9090
{
91-
set_p4d(p4d, __p4d(_PAGE_NEWPAGE));
91+
set_p4d(p4d, __p4d(_PAGE_NEEDSYNC));
9292
}
9393

9494
#define pud_page(pud) phys_to_page(pud_val(pud) & PAGE_MASK)

arch/um/include/asm/pgtable.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <asm/fixmap.h>
1212

1313
#define _PAGE_PRESENT 0x001
14-
#define _PAGE_NEWPAGE 0x002
14+
#define _PAGE_NEEDSYNC 0x002
1515
#define _PAGE_RW 0x020
1616
#define _PAGE_USER 0x040
1717
#define _PAGE_ACCESSED 0x080
@@ -79,22 +79,22 @@ extern unsigned long end_iomem;
7979
*/
8080
#define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page)
8181

82-
#define pte_clear(mm,addr,xp) pte_set_val(*(xp), (phys_t) 0, __pgprot(_PAGE_NEWPAGE))
82+
#define pte_clear(mm, addr, xp) pte_set_val(*(xp), (phys_t) 0, __pgprot(_PAGE_NEEDSYNC))
8383

84-
#define pmd_none(x) (!((unsigned long)pmd_val(x) & ~_PAGE_NEWPAGE))
84+
#define pmd_none(x) (!((unsigned long)pmd_val(x) & ~_PAGE_NEEDSYNC))
8585
#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
8686

8787
#define pmd_present(x) (pmd_val(x) & _PAGE_PRESENT)
88-
#define pmd_clear(xp) do { pmd_val(*(xp)) = _PAGE_NEWPAGE; } while (0)
88+
#define pmd_clear(xp) do { pmd_val(*(xp)) = _PAGE_NEEDSYNC; } while (0)
8989

90-
#define pmd_newpage(x) (pmd_val(x) & _PAGE_NEWPAGE)
91-
#define pmd_mkuptodate(x) (pmd_val(x) &= ~_PAGE_NEWPAGE)
90+
#define pmd_needsync(x) (pmd_val(x) & _PAGE_NEEDSYNC)
91+
#define pmd_mkuptodate(x) (pmd_val(x) &= ~_PAGE_NEEDSYNC)
9292

93-
#define pud_newpage(x) (pud_val(x) & _PAGE_NEWPAGE)
94-
#define pud_mkuptodate(x) (pud_val(x) &= ~_PAGE_NEWPAGE)
93+
#define pud_needsync(x) (pud_val(x) & _PAGE_NEEDSYNC)
94+
#define pud_mkuptodate(x) (pud_val(x) &= ~_PAGE_NEEDSYNC)
9595

96-
#define p4d_newpage(x) (p4d_val(x) & _PAGE_NEWPAGE)
97-
#define p4d_mkuptodate(x) (p4d_val(x) &= ~_PAGE_NEWPAGE)
96+
#define p4d_needsync(x) (p4d_val(x) & _PAGE_NEEDSYNC)
97+
#define p4d_mkuptodate(x) (p4d_val(x) &= ~_PAGE_NEEDSYNC)
9898

9999
#define pmd_pfn(pmd) (pmd_val(pmd) >> PAGE_SHIFT)
100100
#define pmd_page(pmd) phys_to_page(pmd_val(pmd) & PAGE_MASK)
@@ -145,9 +145,9 @@ static inline int pte_young(pte_t pte)
145145
return pte_get_bits(pte, _PAGE_ACCESSED);
146146
}
147147

148-
static inline int pte_newpage(pte_t pte)
148+
static inline int pte_needsync(pte_t pte)
149149
{
150-
return pte_get_bits(pte, _PAGE_NEWPAGE);
150+
return pte_get_bits(pte, _PAGE_NEEDSYNC);
151151
}
152152

153153
/*
@@ -200,25 +200,25 @@ static inline pte_t pte_mkwrite_novma(pte_t pte)
200200

201201
static inline pte_t pte_mkuptodate(pte_t pte)
202202
{
203-
pte_clear_bits(pte, _PAGE_NEWPAGE);
203+
pte_clear_bits(pte, _PAGE_NEEDSYNC);
204204
return pte;
205205
}
206206

207-
static inline pte_t pte_mknewpage(pte_t pte)
207+
static inline pte_t pte_mkneedsync(pte_t pte)
208208
{
209-
pte_set_bits(pte, _PAGE_NEWPAGE);
209+
pte_set_bits(pte, _PAGE_NEEDSYNC);
210210
return(pte);
211211
}
212212

213213
static inline void set_pte(pte_t *pteptr, pte_t pteval)
214214
{
215215
pte_copy(*pteptr, pteval);
216216

217-
/* If it's a swap entry, it needs to be marked _PAGE_NEWPAGE so
217+
/* If it's a swap entry, it needs to be marked _PAGE_NEEDSYNC so
218218
* update_pte_range knows to unmap it.
219219
*/
220220

221-
*pteptr = pte_mknewpage(*pteptr);
221+
*pteptr = pte_mkneedsync(*pteptr);
222222
}
223223

224224
#define PFN_PTE_SHIFT PAGE_SHIFT
@@ -258,7 +258,7 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr,
258258
#define __HAVE_ARCH_PTE_SAME
259259
static inline int pte_same(pte_t pte_a, pte_t pte_b)
260260
{
261-
return !((pte_val(pte_a) ^ pte_val(pte_b)) & ~_PAGE_NEWPAGE);
261+
return !((pte_val(pte_a) ^ pte_val(pte_b)) & ~_PAGE_NEEDSYNC);
262262
}
263263

264264
/*
@@ -308,7 +308,7 @@ extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);
308308
* <--------------- offset ----------------> E < type -> 0 0 0 1 0
309309
*
310310
* E is the exclusive marker that is not stored in swap entries.
311-
* _PAGE_NEWPAGE (bit 1) is always set to 1 in set_pte().
311+
* _PAGE_NEEDSYNC (bit 1) is always set to 1 in set_pte().
312312
*/
313313
#define __swp_type(x) (((x).val >> 5) & 0x1f)
314314
#define __swp_offset(x) ((x).val >> 11)

arch/um/kernel/tlb.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static inline int update_pte_range(pmd_t *pmd, unsigned long addr,
5757

5858
pte = pte_offset_kernel(pmd, addr);
5959
do {
60-
if (!pte_newpage(*pte))
60+
if (!pte_needsync(*pte))
6161
continue;
6262

6363
if (pte_present(*pte)) {
@@ -101,7 +101,7 @@ static inline int update_pmd_range(pud_t *pud, unsigned long addr,
101101
do {
102102
next = pmd_addr_end(addr, end);
103103
if (!pmd_present(*pmd)) {
104-
if (pmd_newpage(*pmd)) {
104+
if (pmd_needsync(*pmd)) {
105105
ret = ops->unmap(ops->mm_idp, addr,
106106
next - addr);
107107
pmd_mkuptodate(*pmd);
@@ -124,7 +124,7 @@ static inline int update_pud_range(p4d_t *p4d, unsigned long addr,
124124
do {
125125
next = pud_addr_end(addr, end);
126126
if (!pud_present(*pud)) {
127-
if (pud_newpage(*pud)) {
127+
if (pud_needsync(*pud)) {
128128
ret = ops->unmap(ops->mm_idp, addr,
129129
next - addr);
130130
pud_mkuptodate(*pud);
@@ -147,7 +147,7 @@ static inline int update_p4d_range(pgd_t *pgd, unsigned long addr,
147147
do {
148148
next = p4d_addr_end(addr, end);
149149
if (!p4d_present(*p4d)) {
150-
if (p4d_newpage(*p4d)) {
150+
if (p4d_needsync(*p4d)) {
151151
ret = ops->unmap(ops->mm_idp, addr,
152152
next - addr);
153153
p4d_mkuptodate(*p4d);
@@ -181,7 +181,7 @@ int um_tlb_sync(struct mm_struct *mm)
181181
do {
182182
next = pgd_addr_end(addr, mm->context.sync_tlb_range_to);
183183
if (!pgd_present(*pgd)) {
184-
if (pgd_newpage(*pgd)) {
184+
if (pgd_needsync(*pgd)) {
185185
ret = ops.unmap(ops.mm_idp, addr,
186186
next - addr);
187187
pgd_mkuptodate(*pgd);

0 commit comments

Comments
 (0)