From: Ma Wupeng mawupeng1@huawei.com

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I96IZH

--------------------------------

Remove unused variable.

Reported-by: kernel test robot lkp@intel.com Closes: https://lore.kernel.org/oe-kbuild-all/202403141207.Ix7wfVox-lkp@intel.com/ Signed-off-by: Ma Wupeng mawupeng1@huawei.com --- drivers/soc/hisilicon/pbha.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/soc/hisilicon/pbha.c b/drivers/soc/hisilicon/pbha.c index 30d5057d8f95..79173154bf9c 100644 --- a/drivers/soc/hisilicon/pbha.c +++ b/drivers/soc/hisilicon/pbha.c @@ -99,7 +99,7 @@ static int pbha_bit0_pte_range(pmd_t *pmd, unsigned long addr, { int *op = (int *)walk->private; struct vm_area_struct *vma = walk->vma; - pte_t *pte, ptent; + pte_t *pte; spinlock_t *ptl; bool set = (*op == SET_PBHA_BIT0_FLAG);

@@ -115,11 +115,8 @@ static int pbha_bit0_pte_range(pmd_t *pmd, unsigned long addr, return 0;

pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl); - for (; addr != end; pte++, addr += PAGE_SIZE) { - ptent = *pte; - + for (; addr != end; pte++, addr += PAGE_SIZE) pbha_bit0_update_pte_bits(vma, addr, pte, set); - } pte_unmap_unlock(pte - 1, ptl); cond_resched(); return 0;

From: Ma Wupeng mawupeng1@huawei.com

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I96IZH

--------------------------------

Do not show pbha related info during startup if pbha is not properly enabled. Param pbha is checked during efi-stub and kernel startup, however any param starts with "pbha" can lead to pbha related log info while pbha is not enabled since only "enable" or "user" is accepted by kernel. To solve this problem, only show this info if accepted args is passed to kernel.

Fixes: 3bef1e33a5dd ("arm64: mm: Introduce kernel param pbha") Signed-off-by: Ma Wupeng mawupeng1@huawei.com --- drivers/soc/hisilicon/pbha.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/hisilicon/pbha.c b/drivers/soc/hisilicon/pbha.c index 79173154bf9c..57daa5c338b5 100644 --- a/drivers/soc/hisilicon/pbha.c +++ b/drivers/soc/hisilicon/pbha.c @@ -197,7 +197,9 @@ static int __init setup_pbha(char *str) pbha_bit0_enabled = true; }

- pr_info("pbha bit_0 enabled, kernel: %d\n", pbha_bit0_kernel_enabled); + if (pbha_bit0_enabled) + pr_info("pbha bit_0 enabled, kernel: %d\n", + pbha_bit0_kernel_enabled);

return 0; }

From: Ma Wupeng mawupeng1@huawei.com

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I96IZH

--------------------------------

Bit 57 is used Commit fb8e37f35a2f ("mm/pagemap: export uffd-wp protection information"). Use bit 59 to improve future compatibility for pbha.

Signed-off-by: Ma Wupeng mawupeng1@huawei.com --- Documentation/admin-guide/mm/pagemap.rst | 4 +++- fs/proc/task_mmu.c | 15 +++++++++++++++ include/linux/pbha.h | 24 ++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/Documentation/admin-guide/mm/pagemap.rst b/Documentation/admin-guide/mm/pagemap.rst index 2f472dd3ee9f..bfaa9a2aeb67 100644 --- a/Documentation/admin-guide/mm/pagemap.rst +++ b/Documentation/admin-guide/mm/pagemap.rst @@ -21,7 +21,9 @@ There are four components to pagemap: * Bit 55 pte is soft-dirty (see :ref:`Documentation/admin-guide/mm/soft-dirty.rst <soft_dirty>`) * Bit 56 page exclusively mapped (since 4.2) - * Bits 57-60 zero + * Bits 57-58 zero + * Bit 59 PBHA bit0, used only CONFIG_ARM64_PBHA is enabled + * Bits 60 zero * Bit 61 page is file-page or shared-anon (since 3.5) * Bit 62 page swapped * Bit 63 page present diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index d54e0e3474cc..decf5e287b7e 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -20,6 +20,7 @@ #include <linux/uaccess.h> #include <linux/pkeys.h> #include <linux/module.h> +#include <linux/pbha.h>

#include <asm/elf.h> #include <asm/tlb.h> @@ -1327,6 +1328,11 @@ struct pagemapread { #define PM_PFRAME_MASK GENMASK_ULL(PM_PFRAME_BITS - 1, 0) #define PM_SOFT_DIRTY BIT_ULL(55) #define PM_MMAP_EXCLUSIVE BIT_ULL(56) +#ifdef CONFIG_ARM64_PBHA +#define PM_PBHA_BIT0 BIT_ULL(59) +#else +#define PM_PBHA_BIT0 0 +#endif #define PM_FILE BIT_ULL(61) #define PM_SWAP BIT_ULL(62) #define PM_PRESENT BIT_ULL(63) @@ -1419,6 +1425,9 @@ static pagemap_entry_t pte_to_pagemap_entry(struct pagemapread *pm, page = device_private_entry_to_page(entry); }

+ if (pte_pbha(pte)) + flags |= PM_PBHA_BIT0; + if (page && !PageAnon(page)) flags |= PM_FILE; if (page && !migration && page_mapcount(page) == 1) @@ -1479,6 +1488,9 @@ static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end, } #endif

+ if (pmd_pbha(pmd)) + flags |= PM_PBHA_BIT0; + if (page && !migration && page_mapcount(page) == 1) flags |= PM_MMAP_EXCLUSIVE;

@@ -1711,6 +1723,9 @@ static int get_pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long pmd_t pmd = *pmdp; struct page *page = NULL;

+ if (pmd_pbha(pmd)) + flags |= PM_PBHA_BIT0; + if (pmd_present(pmd)) { page = pmd_page(pmd); flags |= PM_PRESENT; diff --git a/include/linux/pbha.h b/include/linux/pbha.h index 25cb88aa3d1c..45a4b07778bf 100644 --- a/include/linux/pbha.h +++ b/include/linux/pbha.h @@ -54,6 +54,22 @@ static inline pte_t maybe_mk_pbha_bit0(pte_t pte, struct vm_area_struct *vma)

return pte; } + +static inline bool pte_pbha(pte_t pte) +{ + if (!system_support_pbha_bit0()) + return false; + + return !!(pte_val(pte) & (PBHA_VAL_BIT0 << PBHA_BITS_SHIFT)); +} + +static inline bool pmd_pbha(pmd_t pmd) +{ + if (!system_support_pbha_bit0()) + return false; + + return !!(pmd_val(pmd) & (PBHA_VAL_BIT0 << PBHA_BITS_SHIFT)); +} #else static inline bool system_support_pbha_bit0(void) { return false; } static inline pgprot_t pgprot_pbha_bit0(pgprot_t prot) { return prot; } @@ -61,6 +77,14 @@ static inline pte_t maybe_mk_pbha_bit0(pte_t pte, struct vm_area_struct *vma) { return pte; } +static inline bool pte_pbha(pte_t pte) +{ + return false; +} +static inline bool pmd_pbha(pmd_t pte) +{ + return false; +} #endif

#endif