From 84919aed2248501a5a2be0c1614618d603d6f5e3 Mon Sep 17 00:00:00 2001
From: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Date: Mon, 13 May 2019 22:39:40 +0800
Subject: [PATCH] mm: Ignore madvise(MADV_MERGEABLE) request for VM_CDM marked
 VMAs

euler inclusion
category: feature
bugzilla: 11082
CVE: NA
-------------------

VMA containing CDM memory should be excluded from KSM merging. This change
makes madvise(MADV_MERGEABLE) request on target VMA to be ignored.

Signed-off-by: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Signed-off-by: Lijun Fang <fanglijun3@huawei.com>
Reviewed-by: zhong jiang <zhongjiang@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 mm/ksm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mm/ksm.c b/mm/ksm.c
index cb46fd7890be..e0f85ee99d32 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -39,6 +39,7 @@
 #include <linux/freezer.h>
 #include <linux/oom.h>
 #include <linux/numa.h>
+#include <linux/mempolicy.h>
 
 #include <asm/tlbflush.h>
 #include "internal.h"
@@ -2458,6 +2459,9 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
 		if (vma_is_dax(vma))
 			return 0;
 
+		if (is_cdm_vma(vma))
+			return 0;
+
 #ifdef VM_SAO
 		if (*vm_flags & VM_SAO)
 			return 0;
-- 
GitLab