| Message ID | 20200324134534.1570-5-yezhenyu2@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: tlb: add support for TTL feature | expand |
On Tue, 24 Mar 2020 21:45:32 +0800 Zhenyu Ye <yezhenyu2@huawei.com> wrote: > --- a/include/trace/events/mmflags.h > +++ b/include/trace/events/mmflags.h > @@ -130,6 +130,16 @@ IF_HAVE_PG_IDLE(PG_idle, "idle" ) > #define IF_HAVE_VM_SOFTDIRTY(flag,name) > #endif > > +#ifdef CONFIG_64BIT > +#define IF_HAVE_VM_LEVEL_PUD(flag,name) {flag, name} > +#define IF_HAVE_VM_LEVEL_PMD(flag,name) {flag, name} > +#define IF_HAVE_VM_LEVEL_PTE(flag,name) {flag, name} > +#else > +#define IF_HAVE_VM_LEVEL_PUD(flag,name) > +#define IF_HAVE_VM_LEVEL_PMD(flag,name) > +#define IF_HAVE_VM_LEVEL_PTE(flag,name) > +#endif > + > #define __def_vmaflag_names \ > {VM_READ, "read" }, \ > {VM_WRITE, "write" }, \ > @@ -161,7 +171,10 @@ IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, "softdirty" ) \ > {VM_MIXEDMAP, "mixedmap" }, \ > {VM_HUGEPAGE, "hugepage" }, \ > {VM_NOHUGEPAGE, "nohugepage" }, \ > - {VM_MERGEABLE, "mergeable" } \ > + {VM_MERGEABLE, "mergeable" }, \ > +IF_HAVE_VM_LEVEL_PUD(VM_LEVEL_PUD, "pud-level" ), \ > +IF_HAVE_VM_LEVEL_PMD(VM_LEVEL_PMD, "pmd-level" ), \ > +IF_HAVE_VM_LEVEL_PTE(VM_LEVEL_PTE, "pte-level" ) \ > Have you tested this on 32bit? It looks like you'll get empty commas there. Perhaps the defines need to be: #ifdef CONFIG_64BIT #define IF_HAVE_VM_LEVEL_PUD(flag,name) {flag, name}, #define IF_HAVE_VM_LEVEL_PMD(flag,name) {flag, name}, #define IF_HAVE_VM_LEVEL_PTE(flag,name) {flag, name} #else #define IF_HAVE_VM_LEVEL_PUD(flag,name) #define IF_HAVE_VM_LEVEL_PMD(flag,name) #define IF_HAVE_VM_LEVEL_PTE(flag,name) #endif And leave out the commas in the list. -- Steve
Hi Steve, On Wed, 25 Mar 2020 2:45, Steve wrote: > On Tue, 24 Mar 2020 21:45:32 +0800 > Zhenyu Ye <yezhenyu2@huawei.com> wrote: > > > --- a/include/trace/events/mmflags.h > > +++ b/include/trace/events/mmflags.h > > @@ -130,6 +130,16 @@ IF_HAVE_PG_IDLE(PG_idle, "idle" ) > > #define IF_HAVE_VM_SOFTDIRTY(flag,name) > > #endif > > > > +#ifdef CONFIG_64BIT > > +#define IF_HAVE_VM_LEVEL_PUD(flag,name) {flag, name} > > +#define IF_HAVE_VM_LEVEL_PMD(flag,name) {flag, name} > > +#define IF_HAVE_VM_LEVEL_PTE(flag,name) {flag, name} > > +#else > > +#define IF_HAVE_VM_LEVEL_PUD(flag,name) > > +#define IF_HAVE_VM_LEVEL_PMD(flag,name) > > +#define IF_HAVE_VM_LEVEL_PTE(flag,name) > > +#endif > > + > > #define __def_vmaflag_names \ > > {VM_READ, "read" }, \ > > {VM_WRITE, "write" }, \ > > @@ -161,7 +171,10 @@ IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, > "softdirty" ) \ > > {VM_MIXEDMAP, "mixedmap" }, \ > > {VM_HUGEPAGE, "hugepage" }, \ > > {VM_NOHUGEPAGE, "nohugepage" }, \ > > - {VM_MERGEABLE, "mergeable" } \ > > + {VM_MERGEABLE, "mergeable" }, \ > > +IF_HAVE_VM_LEVEL_PUD(VM_LEVEL_PUD, "pud-level" ), \ > > +IF_HAVE_VM_LEVEL_PMD(VM_LEVEL_PMD, "pmd-level" ), \ > > +IF_HAVE_VM_LEVEL_PTE(VM_LEVEL_PTE, "pte-level" ) \ > > > > Have you tested this on 32bit? It looks like you'll get empty commas there. > Perhaps the defines need to be: > > #ifdef CONFIG_64BIT > #define IF_HAVE_VM_LEVEL_PUD(flag,name) {flag, name}, > #define IF_HAVE_VM_LEVEL_PMD(flag,name) {flag, name}, > #define IF_HAVE_VM_LEVEL_PTE(flag,name) {flag, name} > #else > #define IF_HAVE_VM_LEVEL_PUD(flag,name) > #define IF_HAVE_VM_LEVEL_PMD(flag,name) > #define IF_HAVE_VM_LEVEL_PTE(flag,name) > #endif > > And leave out the commas in the list. > > -- Steve Thanks for your review. I will fix this in next version, if I could still use vm_flags at that time :). Zhenyu
diff --git a/include/linux/mm.h b/include/linux/mm.h index c54fb96cb1e6..3ff16ffa5e83 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -313,6 +313,16 @@ extern unsigned int kobjsize(const void *objp); #endif #endif /* CONFIG_ARCH_HAS_PKEYS */ +#ifdef CONFIG_64BIT +# define VM_LEVEL_PUD BIT(37) /* vma is in pud-level of page table */ +# define VM_LEVEL_PMD BIT(38) /* vma is in pmd-level of page table */ +# define VM_LEVEL_PTE BIT(39) /* vma is in pte-level of page table */ +#else +# define VM_LEVEL_PUD 0 +# define VM_LEVEL_PMD 0 +# define VM_LEVEL_PTE 0 +#endif /* CONFIG_64BIT */ + #if defined(CONFIG_X86) # define VM_PAT VM_ARCH_1 /* PAT reserves whole VMA at once (x86) */ #elif defined(CONFIG_PPC) diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index a1675d43777e..9f13cfa96f9f 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -130,6 +130,16 @@ IF_HAVE_PG_IDLE(PG_idle, "idle" ) #define IF_HAVE_VM_SOFTDIRTY(flag,name) #endif +#ifdef CONFIG_64BIT +#define IF_HAVE_VM_LEVEL_PUD(flag,name) {flag, name} +#define IF_HAVE_VM_LEVEL_PMD(flag,name) {flag, name} +#define IF_HAVE_VM_LEVEL_PTE(flag,name) {flag, name} +#else +#define IF_HAVE_VM_LEVEL_PUD(flag,name) +#define IF_HAVE_VM_LEVEL_PMD(flag,name) +#define IF_HAVE_VM_LEVEL_PTE(flag,name) +#endif + #define __def_vmaflag_names \ {VM_READ, "read" }, \ {VM_WRITE, "write" }, \ @@ -161,7 +171,10 @@ IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, "softdirty" ) \ {VM_MIXEDMAP, "mixedmap" }, \ {VM_HUGEPAGE, "hugepage" }, \ {VM_NOHUGEPAGE, "nohugepage" }, \ - {VM_MERGEABLE, "mergeable" } \ + {VM_MERGEABLE, "mergeable" }, \ +IF_HAVE_VM_LEVEL_PUD(VM_LEVEL_PUD, "pud-level" ), \ +IF_HAVE_VM_LEVEL_PMD(VM_LEVEL_PMD, "pmd-level" ), \ +IF_HAVE_VM_LEVEL_PTE(VM_LEVEL_PTE, "pte-level" ) \ #define show_vma_flags(flags) \ (flags) ? __print_flags(flags, "|", \
Add VM_LEVEL_[PUD|PMD|PTE] to vm_flags to indicate which level of the page tables the vma is in. Those flags can be used to reduce the cost of TLB invalidation. These should be common flags for all architectures, however, those flags are only available in 64-bits system currently, because the lower-order flags are fully used. These flags are only used by ARM64 architecture now. See in next patch. Signed-off-by: Zhenyu Ye <yezhenyu2@huawei.com> --- include/linux/mm.h | 10 ++++++++++ include/trace/events/mmflags.h | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-)