commit 731dca5fb51a17765e49ba2f7654137b1e9ec01b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 09 18:45:24 2018 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Mon Jul 09 18:45:24 2018 +0000
tree 9440c81daf388d1389d59ec065f2a63481003a3e
parent fd7d5f7d410b287c992bbfa5a1fa340b3f5a5695
parent 0e29b9261d2b93cd48c2685741f5709f4be3d8e1

Merge "qcacld-3.0: Not to be hard to make high order page" into android-msm-bluecross-4.9

qdf/linux/src/qdf_nbuf.c

diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c
index ba35f66..3f1edf3 100644
--- a/qdf/linux/src/qdf_nbuf.c
+++ b/qdf/linux/src/qdf_nbuf.c
@@ -295,8 +295,15 @@
 	if (align)
 		size += (align - 1);
 
-	if (in_interrupt() || irqs_disabled() || in_atomic())
-		flags = GFP_ATOMIC;
+	if (in_interrupt() || irqs_disabled() || in_atomic()) {
+		/*
+		 * Observed that kcompactd burns out CPU to make order-3 page.
+		 *__netdev_alloc_skb has 4k page fallback option just in case of
+		 * failing high order page allocation so we don't need to be
+		 * hard. Make kcompactd rest in piece.
+		 */
+		flags = GFP_ATOMIC & ~__GFP_KSWAPD_RECLAIM;
+	}
 
 	skb = __netdev_alloc_skb(NULL, size, flags);