add static PMD zero page support

[blktests-ci]

Pull request for series with
subject: add static PMD zero page support
version: 2
url: https://patchwork.kernel.org/project/linux-block/list/?series=979706

[blktests-ci]

Upstream branch: 8c2e52e
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: bc9ff19
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: bc9ff19
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: bc9ff19
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: 40f92e7
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: 40f92e7
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: 89be9a8
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: 25fae0b
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: 260f6f4
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: cbbf0a7
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

[blktests-ci]

Upstream branch: 6a68cec
series: https://patchwork.kernel.org/project/linux-block/list/?series=979706
version: 2

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=979706
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: mm: move huge_zero_page declaration from huge_mm.h to mm.h
Using index info to reconstruct a base tree...
M	include/linux/huge_mm.h
M	include/linux/mm.h
Falling back to patching base and 3-way merge...
Auto-merging include/linux/mm.h
Auto-merging include/linux/huge_mm.h
CONFLICT (content): Merge conflict in include/linux/huge_mm.h
Patch failed at 0001 mm: move huge_zero_page declaration from huge_mm.h to mm.h'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc include/linux/huge_mm.h
index 7748489fde1b,3e887374892c..000000000000
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@@ -472,29 -473,11 +472,32 @@@ static inline bool folio_test_pmd_mappa
  	return folio_order(folio) >= HPAGE_PMD_ORDER;
  }
  
 -struct page *follow_devmap_pmd(struct vm_area_struct *vma, unsigned long addr,
 -		pmd_t *pmd, int flags, struct dev_pagemap **pgmap);
 -
  vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf);
  
++<<<<<<< HEAD
 +extern struct folio *huge_zero_folio;
 +extern unsigned long huge_zero_pfn;
 +
 +static inline bool is_huge_zero_folio(const struct folio *folio)
 +{
 +	return READ_ONCE(huge_zero_folio) == folio;
 +}
 +
 +static inline bool is_huge_zero_pfn(unsigned long pfn)
 +{
 +	return READ_ONCE(huge_zero_pfn) == (pfn & ~(HPAGE_PMD_NR - 1));
 +}
 +
 +static inline bool is_huge_zero_pmd(pmd_t pmd)
 +{
 +	return pmd_present(pmd) && is_huge_zero_pfn(pmd_pfn(pmd));
 +}
 +
 +struct folio *mm_get_huge_zero_folio(struct mm_struct *mm);
 +void mm_put_huge_zero_folio(struct mm_struct *mm);
 +
++=======
++>>>>>>> mm: move huge_zero_page declaration from huge_mm.h to mm.h
  static inline bool thp_migration_supported(void)
  {
  	return IS_ENABLED(CONFIG_ARCH_ENABLE_THP_MIGRATION);
@@@ -632,26 -615,6 +635,29 @@@ static inline vm_fault_t do_huge_pmd_nu
  	return 0;
  }
  
++<<<<<<< HEAD
 +static inline bool is_huge_zero_folio(const struct folio *folio)
 +{
 +	return false;
 +}
 +
 +static inline bool is_huge_zero_pfn(unsigned long pfn)
 +{
 +	return false;
 +}
 +
 +static inline bool is_huge_zero_pmd(pmd_t pmd)
 +{
 +	return false;
 +}
 +
 +static inline void mm_put_huge_zero_folio(struct mm_struct *mm)
 +{
 +	return;
 +}
 +
++=======
++>>>>>>> mm: move huge_zero_page declaration from huge_mm.h to mm.h
  static inline struct page *follow_devmap_pmd(struct vm_area_struct *vma,
  	unsigned long addr, pmd_t *pmd, int flags, struct dev_pagemap **pgmap)
  {

[blktests-ci]

At least one diff in series https://patchwork.kernel.org/project/linux-block/list/?series=979706 irrelevant now for [{'archived': False, 'project': 241}] search patterns