From c0f0bb55676138cea3871da4e6c84ac1f728f4c2 Mon Sep 17 00:00:00 2001
From: guomengqi <guomengqi3@huawei.com>
Date: Sat, 30 Oct 2021 17:22:38 +0800
Subject: [PATCH] share_pool: k2u hugepage READONLY prot bug fix

ascend inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4EUVI
CVE: NA

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

Modified hugetlb_insert_hugepage_pte_by_pa to assure
k2u hugepages can be set as READONLY.

Signed-off-by: guomengqi <guomengqi3@huawei.com>
Reviewed-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: Zhou Guanghui <zhouguanghui1@huawei.com>
Reviewed-by: Weilong Chen <chenweilong@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 mm/hugetlb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 89404e28b251..5190154de3b0 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -5374,7 +5374,8 @@ int hugetlb_insert_hugepage_pte_by_pa(struct mm_struct *mm,
 
 	entry = pfn_pte(phy_addr >> PAGE_SHIFT, prot);
 	entry = huge_pte_mkdirty(entry);
-	entry = huge_pte_mkwrite(entry);
+	if (!(pgprot_val(prot) & PTE_RDONLY))
+		entry = huge_pte_mkwrite(entry);
 	entry = pte_mkyoung(entry);
 	entry = pte_mkhuge(entry);
 	entry = pte_mkspecial(entry);
-- 
GitLab