Skip to contentSkip to conversation

minor ptdesc updates

PATCH Applied Alexander Gordeev 1 participant 3 messages Nov 21, 2023

Subsystems (3)
Memory management MM core s390
lore
Share & tools
lore

Alexander Gordeev

author maintainer
#0 lore raw

v3 cover minor ptdesc updates

Hi Vishal, Andrew,

Please find v3 of s390-caused ptdesc updates.

Changes since v2:
- single patch split in two;
- _refcount renamed to __page_refcount;
- _refcount TABLE_MATCH() check restored;

Changes since v1:
- missing comment to _pt_pad_3 padding added;

Thanks!

Alexander Gordeev (2):
pgtable: fix s390 ptdesc field comments
pgtable: rename ptdesc _refcount field to __page_refcount

 include/linux/mm_types.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.39.2
author maintainer
#1 lore raw

PATCH v3 1/2 pgtable: fix s390 ptdesc field comments

Since commit d08d4e7cd6bf ("s390/mm: use full 4KB page for 2KB PTE") there is no fragmented page tracking on s390. Fix the corresponding comments.

Suggested-by Heiko Carstens <[email protected]>
Signed-off-by Alexander Gordeev <[email protected]>
---
 include/linux/mm_types.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/mm_types.h +2 -2
index 957ce38768b2..fbec64036baa 100644
@@ -401,11 +401,11 @@ FOLIO_MATCH(compound_head, _head_2a);
  * @pmd_huge_pte:     Protected by ptdesc->ptl, used for THPs.
  * @__page_mapping:   Aliases with page->mapping. Unused for page tables.
  * @pt_mm:            Used for x86 pgds.
- * @pt_frag_refcount: For fragmented page table tracking. Powerpc and s390 only.
+ * @pt_frag_refcount: For fragmented page table tracking. Powerpc only.
  * @_pt_pad_2:        Padding to ensure proper alignment.
  * @ptl:              Lock for the page table.
  * @__page_type:      Same as page->page_type. Unused for page tables.
- * @_refcount:        Same as page refcount. Used for s390 page tables.
+ * @_refcount:        Same as page refcount.
  * @pt_memcg_data:    Memcg data. Tracked for page tables here.
  *
  * This struct overlays struct page for now. Do not modify without a good
Signature · 1 line
2.39.2
author maintainer
#2 lore raw

PATCH v3 2/2 pgtable: rename ptdesc _refcount field to __page_refcount

In reply to Alexander Gordeev

Rename ptdesc _refcount field to __page_refcount similar to the other unused page fields.

Suggested-by Vishal Moola <[email protected]>
Signed-off-by Alexander Gordeev <[email protected]>
---
 include/linux/mm_types.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/mm_types.h +3 -3
index fbec64036baa..ef18d2b25378 100644
@@ -405,7 +405,7 @@ FOLIO_MATCH(compound_head, _head_2a);
  * @_pt_pad_2:        Padding to ensure proper alignment.
  * @ptl:              Lock for the page table.
  * @__page_type:      Same as page->page_type. Unused for page tables.
- * @_refcount:        Same as page refcount.
+ * @__page_refcount:  Same as page refcount.
  * @pt_memcg_data:    Memcg data. Tracked for page tables here.
  *
  * This struct overlays struct page for now. Do not modify without a good

@@ -438,7 +438,7 @@ struct ptdesc {
 #endif
 	};
 	unsigned int __page_type;
-	atomic_t _refcount;
+	atomic_t __page_refcount;
 #ifdef CONFIG_MEMCG
 	unsigned long pt_memcg_data;
 #endif

@@ -452,7 +452,7 @@ TABLE_MATCH(compound_head, _pt_pad_1);
 TABLE_MATCH(mapping, __page_mapping);
 TABLE_MATCH(rcu_head, pt_rcu_head);
 TABLE_MATCH(page_type, __page_type);
-TABLE_MATCH(_refcount, _refcount);
+TABLE_MATCH(_refcount, __page_refcount);
 #ifdef CONFIG_MEMCG
 TABLE_MATCH(memcg_data, pt_memcg_data);
 #endif
Signature · 1 line
2.39.2