From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF5E7C433E0 for ; Tue, 9 Jun 2020 09:51:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4E7D32074B for ; Tue, 9 Jun 2020 09:51:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="H4OPaiw8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E7D32074B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9669E6B0002; Tue, 9 Jun 2020 05:51:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8EFE36B0005; Tue, 9 Jun 2020 05:51:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 790006B0006; Tue, 9 Jun 2020 05:51:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0120.hostedemail.com [216.40.44.120]) by kanga.kvack.org (Postfix) with ESMTP id 540E16B0002 for ; Tue, 9 Jun 2020 05:51:47 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 001A1807CBFC for ; Tue, 9 Jun 2020 09:51:46 +0000 (UTC) X-FDA: 76909206654.14.scene57_250358526dc1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id CB6B218229835 for ; Tue, 9 Jun 2020 09:51:46 +0000 (UTC) X-HE-Tag: scene57_250358526dc1 X-Filterd-Recvd-Size: 16682 Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Tue, 9 Jun 2020 09:51:45 +0000 (UTC) Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20200609095142epoutp04bf10c9522fdc8226a386ac1823c22835~W11qCuKVq0317203172epoutp04Z for ; Tue, 9 Jun 2020 09:51:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20200609095142epoutp04bf10c9522fdc8226a386ac1823c22835~W11qCuKVq0317203172epoutp04Z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1591696302; bh=krYLO/8hSYpX5t0NO3J8DEtwTRahG9uEhbNAH8HEU+A=; h=From:To:Cc:Subject:Date:References:From; b=H4OPaiw8QAzCvrqLsFEEwxjoOHgKwrcyLMhRYzM3nrsDMAqZtcAy9ZM4y0IDpyTV0 NK+K3m6l2rqNm9ttAE0ZgQZa49/voMf/eG8bQxntr9kM+DCso95YNgRV+e0hbDnILD RoSJ0jLgUk9QjOFKTDXLpZJHywMXiAPVpPBdGTRo= Received: from epsnrtp2.localdomain (unknown [182.195.42.163]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20200609095140epcas1p33b6949057f8378ea50110c0c54477edb~W11o-2qKN2805628056epcas1p34; Tue, 9 Jun 2020 09:51:40 +0000 (GMT) Received: from epsmges1p4.samsung.com (unknown [182.195.40.164]) by epsnrtp2.localdomain (Postfix) with ESMTP id 49h54D00fHzMqYkV; Tue, 9 Jun 2020 09:51:40 +0000 (GMT) Received: from epcas1p4.samsung.com ( [182.195.41.48]) by epsmges1p4.samsung.com (Symantec Messaging Gateway) with SMTP id FD.2F.28581.BAB5FDE5; Tue, 9 Jun 2020 18:51:39 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200609095139epcas1p17f9c213de6daf25fe848921bc70481c0~W11npAn5M3027930279epcas1p1B; Tue, 9 Jun 2020 09:51:39 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200609095139epsmtrp1905a70d6220d45185eca20569742058c~W11noMjvo0829208292epsmtrp1N; Tue, 9 Jun 2020 09:51:39 +0000 (GMT) X-AuditID: b6c32a38-2e3ff70000006fa5-11-5edf5babd1ae Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id F7.02.08382.BAB5FDE5; Tue, 9 Jun 2020 18:51:39 +0900 (KST) Received: from jaewon-linux.10.32.193.11 (unknown [10.253.104.82]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200609095139epsmtip23666d3d7285d3a4a6dbd9d13624c40f0~W11nYn-Ld1299212992epsmtip2W; Tue, 9 Jun 2020 09:51:39 +0000 (GMT) From: Jaewon Kim To: mgorman@techsingularity.net, minchan@kernel.org, mgorman@suse.de, hannes@cmpxchg.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, jaewon31.kim@gmail.com, ytk.lee@samsung.com, cmlaika.kim@samsung.com, Jaewon Kim Subject: [PATCH] page_alloc: consider highatomic reserve in wmartermark fast Date: Tue, 9 Jun 2020 18:51:28 +0900 Message-Id: <20200609095128.8112-1-jaewon31.kim@samsung.com> X-Mailer: git-send-email 2.13.7 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMKsWRmVeSWpSXmKPExsWy7bCmge7q6PtxBlO+mVnMWb+GzWLlvHNs Fqs3+Vp0b57JaNH7/hWTxeVdc9gs7q35z2ox+d0zRosdS/cxWSz7+p7d4vF6bgduj8Nv3jN7 7Jx1l91j06pONo9Nnyaxe5yY8ZvFo2/LKkaPzaerPbb+svP4vEkugDMqxyYjNTEltUghNS85 PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMH6FQlhbLEnFKgUEBicbGSvp1N UX5pSapCRn5xia1SakFKToGhQYFecWJucWleul5yfq6VoYGBkSlQZUJOxrz7OgVbQyp6Xr5l a2Ds8ehi5OSQEDCReHn7MlMXIxeHkMAORomTc6azQjifGCUWt+1ig3C+MUq82H+XEaZl8dJT jBCJvYwS6xpuQbV8Z5R4Nnc7E0gVm4C2xPsFk1hBbBGBUomm+evAljALLGWUuHzrBnsXIweH sICPxLdbtSA1LAKqEgv3X2MBsXkFbCSuftjMBlIiISAvsfA/M0irhMBLdompR2+zQ1zhIrH/ 7C0WCFtY4tXxLVBxKYmX/W1Qdr3Env1/mSHsBkaJ/x8FIGxjifktC5lB5jMLaEqs36UPEVaU 2Pl7LtiTzAJ8Eu++9rBCnMAr0dEmBFGiJtHy7CsrhC0j8fffMyjbQ2Jb82+wTUICsRJTV+5j msAoOwthwQJGxlWMYqkFxbnpqcWGBSbIcbSJEZz6tCx2MM59+0HvECMTB+MhRgkOZiUR3uoH d+KEeFMSK6tSi/Lji0pzUosPMZoCg2sis5Rocj4w+eaVxBuaGhkbG1uYmJmbmRorifOetLoQ JySQnliSmp2aWpBaBNPHxMEp1cDkpDb9sntA4Jz2+C33fWLWPnzYkHr8itidb8kqv7eFu3Mf d18YcFBis0yDYEDbvF+uNd/jMtTD99lJuWfOYMzWWfAsau3LU3s8+63F/H2uhuzo33bQ+Lrd s4Pu17keySxrer0qqvBwg5P3cW+NVU271oRt6fv4jpvFpTevLeLVLb5ny3Lr74ZY7pu7p6HC xueROvs+hW2p4hJ3l634u0dE7ZdDgHRXYZOo48Oy7ZkuGx3ZZ19uv6TDqPZdauqmYHZm8WCx RKetSTEsa873GS1d8/222s/us+XJh/2aPMNmTXjXn3qM4Vpa08xpyX3nuRfWvJjOXMvNGiRz os+kvLpy0dnM4mc8257knJy32lqJpTgj0VCLuag4EQBEnfrABgQAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrALMWRmVeSWpSXmKPExsWy7bCSvO7q6PtxBssPC1vMWb+GzWLlvHNs Fqs3+Vp0b57JaNH7/hWTxeVdc9gs7q35z2ox+d0zRosdS/cxWSz7+p7d4vF6bgduj8Nv3jN7 7Jx1l91j06pONo9Nnyaxe5yY8ZvFo2/LKkaPzaerPbb+svP4vEkugDOKyyYlNSezLLVI3y6B K2PefZ2CrSEVPS/fsjUw9nh0MXJySAiYSCxeeoqxi5GLQ0hgN6PE8bbf7BAJGYk355+ydDFy ANnCEocPF0PUfGWU2NR8B6yGTUBb4v2CSawgtohAtcTmebfZQIqYBVYzSjz8cJgZpFlYwEfi 261akBoWAVWJhfuvsYDYvAI2Elc/bGaDmC8vsfA/8wRGngWMDKsYJVMLinPTc4sNCwzzUsv1 ihNzi0vz0vWS83M3MYIDUUtzB+P2VR/0DjEycTAeYpTgYFYS4a1+cCdOiDclsbIqtSg/vqg0 J7X4EKM0B4uSOO+NwoVxQgLpiSWp2ampBalFMFkmDk6pBqYMs1eitZU3SopspbKMjwmtWJXz 8knsqRXqXQtYDAzfFOuFLOTe0fq9TpdproBW7clOQ+lX7ZJHjnFyimSmGcdv5dl0lH/h3dNH 108UXNuvemDdS8ur4Z+cNb75JX85KnM1ff7uB4uYjR5NWifZ7nL9q0GZi4/Kf76JDWEWSfvj Fz6TeOXf9c++S/Jh3/34zfsmP4iP2Bf6nk936522ifu+vJNrl/o5YdNVN+29wW4bleytLmzS lxY3CBETNXQz016a9snu6+L1iy79enprUc8G9W9RXlujO24c2vT0OlOG9jqTvxOOp/wVDtu+ RnDvPcfLkyN1Zl302h9+fOWHtq7lIYWnsmSUVUISPG4rlUgpsRRnJBpqMRcVJwIAfZXPbbMC AAA= X-CMS-MailID: 20200609095139epcas1p17f9c213de6daf25fe848921bc70481c0 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20200609095139epcas1p17f9c213de6daf25fe848921bc70481c0 References: X-Rspamd-Queue-Id: CB6B218229835 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: zone_watermark_fast was introduced by commit 48ee5f3696f6 ("mm, page_alloc: shortcut watermark checks for order-0 pages"). The commit simply checks if free pages is bigger than watermark without additional calculation such like reducing watermark. It considered free cma pages but it did not consider highatomic reserved. This may incur exhaustion of free pages except high order atomic free pages. Assume that reserved_highatomic pageblock is bigger than watermark min, and there are only few free pages except high order atomic free. Because zone_watermark_fast passes the allocation without considering high order atomic free, normal reclaimable allocation like GFP_HIGHUSER will consume all the free pages. Then finally order-0 atomic allocation may fail on allocation. This means watermark min is not protected against non-atomic allocation. The order-0 atomic allocation with ALLOC_HARDER unwantedly can be failed. Additionally the __GFP_MEMALLOC allocation with ALLOC_NO_WATERMARKS also can be failed. To avoid the problem, zone_watermark_fast should consider highatomic reserve. If the actual size of high atomic free is counted accurately like cma free, we may use it. On this patch just use nr_reserved_highatomic. This is trace log which shows GFP_HIGHUSER consumes free pages right before ALLOC_NO_WATERMARKS. <...>-22275 [006] .... 889.213383: mm_page_alloc: page=00000000d2be5665 pfn=970744 order=0 migratetype=0 nr_free=3650 gfp_flags=GFP_HIGHUSER|__GFP_ZERO <...>-22275 [006] .... 889.213385: mm_page_alloc: page=000000004b2335c2 pfn=970745 order=0 migratetype=0 nr_free=3650 gfp_flags=GFP_HIGHUSER|__GFP_ZERO <...>-22275 [006] .... 889.213387: mm_page_alloc: page=00000000017272e1 pfn=970278 order=0 migratetype=0 nr_free=3650 gfp_flags=GFP_HIGHUSER|__GFP_ZERO <...>-22275 [006] .... 889.213389: mm_page_alloc: page=00000000c4be79fb pfn=970279 order=0 migratetype=0 nr_free=3650 gfp_flags=GFP_HIGHUSER|__GFP_ZERO <...>-22275 [006] .... 889.213391: mm_page_alloc: page=00000000f8a51d4f pfn=970260 order=0 migratetype=0 nr_free=3650 gfp_flags=GFP_HIGHUSER|__GFP_ZERO <...>-22275 [006] .... 889.213393: mm_page_alloc: page=000000006ba8f5ac pfn=970261 order=0 migratetype=0 nr_free=3650 gfp_flags=GFP_HIGHUSER|__GFP_ZERO <...>-22275 [006] .... 889.213395: mm_page_alloc: page=00000000819f1cd3 pfn=970196 order=0 migratetype=0 nr_free=3650 gfp_flags=GFP_HIGHUSER|__GFP_ZERO <...>-22275 [006] .... 889.213396: mm_page_alloc: page=00000000f6b72a64 pfn=970197 order=0 migratetype=0 nr_free=3650 gfp_flags=GFP_HIGHUSER|__GFP_ZERO kswapd0-1207 [005] ...1 889.213398: mm_page_alloc: page= (null) pfn=0 order=0 migratetype=1 nr_free=3650 gfp_flags=GFP_NOWAIT|__GFP_HIGHMEM|__GFP_NOWARN|__GFP_MOVABLE This is an example of ALLOC_HARDER allocation failure. <4>[ 6207.637280] [3: Binder:9343_3:22875] Binder:9343_3: page allocation failure: order:0, mode:0x480020(GFP_ATOMIC), nodemask=(null) <4>[ 6207.637311] [3: Binder:9343_3:22875] Call trace: <4>[ 6207.637346] [3: Binder:9343_3:22875] [] dump_stack+0xb8/0xf0 <4>[ 6207.637356] [3: Binder:9343_3:22875] [] warn_alloc+0xd8/0x12c <4>[ 6207.637365] [3: Binder:9343_3:22875] [] __alloc_pages_nodemask+0x120c/0x1250 <4>[ 6207.637374] [3: Binder:9343_3:22875] [] new_slab+0x128/0x604 <4>[ 6207.637381] [3: Binder:9343_3:22875] [] ___slab_alloc+0x508/0x670 <4>[ 6207.637387] [3: Binder:9343_3:22875] [] __kmalloc+0x2f8/0x310 <4>[ 6207.637396] [3: Binder:9343_3:22875] [] context_struct_to_string+0x104/0x1cc <4>[ 6207.637404] [3: Binder:9343_3:22875] [] security_sid_to_context_core+0x74/0x144 <4>[ 6207.637412] [3: Binder:9343_3:22875] [] security_sid_to_context+0x10/0x18 <4>[ 6207.637421] [3: Binder:9343_3:22875] [] selinux_secid_to_secctx+0x20/0x28 <4>[ 6207.637430] [3: Binder:9343_3:22875] [] security_secid_to_secctx+0x3c/0x70 <4>[ 6207.637442] [3: Binder:9343_3:22875] [] binder_transaction+0xe68/0x454c <4>[ 6207.637569] [3: Binder:9343_3:22875] Mem-Info: <4>[ 6207.637595] [3: Binder:9343_3:22875] active_anon:102061 inactive_anon:81551 isolated_anon:0 <4>[ 6207.637595] [3: Binder:9343_3:22875] active_file:59102 inactive_file:68924 isolated_file:64 <4>[ 6207.637595] [3: Binder:9343_3:22875] unevictable:611 dirty:63 writeback:0 unstable:0 <4>[ 6207.637595] [3: Binder:9343_3:22875] slab_reclaimable:13324 slab_unreclaimable:44354 <4>[ 6207.637595] [3: Binder:9343_3:22875] mapped:83015 shmem:4858 pagetables:26316 bounce:0 <4>[ 6207.637595] [3: Binder:9343_3:22875] free:2727 free_pcp:1035 free_cma:178 <4>[ 6207.637616] [3: Binder:9343_3:22875] Node 0 active_anon:408244kB inactive_anon:326204kB active_file:236408kB inactive_file:275696kB unevictable:2444kB isolated(anon):0kB isolated(file):256kB mapped:332060kB dirty:252kB writeback:0kB shmem:19432kB writeback_tmp:0kB unstable:0kB all_unreclaimable? no <4>[ 6207.637627] [3: Binder:9343_3:22875] Normal free:10908kB min:6192kB low:44388kB high:47060kB active_anon:409160kB inactive_anon:325924kB active_file:235820kB inactive_file:276628kB unevictable:2444kB writepending:252kB present:3076096kB managed:2673676kB mlocked:2444kB kernel_stack:62512kB pagetables:105264kB bounce:0kB free_pcp:4140kB local_pcp:40kB free_cma:712kB <4>[ 6207.637632] [3: Binder:9343_3:22875] lowmem_reserve[]: 0 0 <4>[ 6207.637637] [3: Binder:9343_3:22875] Normal: 505*4kB (H) 357*8kB (H) 201*16kB (H) 65*32kB (H) 1*64kB (H) 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 10236kB <4>[ 6207.637655] [3: Binder:9343_3:22875] 138826 total pagecache pages <4>[ 6207.637663] [3: Binder:9343_3:22875] 5460 pages in swap cache <4>[ 6207.637668] [3: Binder:9343_3:22875] Swap cache stats: add 8273090, delete 8267506, find 1004381/4060142 This is an example of ALLOC_NO_WATERMARKS allocation failure. <6>[ 156.701551] [4: kswapd0: 1209] kswapd0 cpuset=/ mems_allowed=0 <4>[ 156.701563] [4: kswapd0: 1209] CPU: 4 PID: 1209 Comm: kswapd0 Tainted: G W 4.14.113-18113966 #1 <4>[ 156.701572] [4: kswapd0: 1209] Call trace: <4>[ 156.701605] [4: kswapd0: 1209] [<0000000000000000>] dump_stack+0x68/0x90 <4>[ 156.701612] [4: kswapd0: 1209] [<0000000000000000>] warn_alloc+0x104/0x198 <4>[ 156.701617] [4: kswapd0: 1209] [<0000000000000000>] __alloc_pages_nodemask+0xdc0/0xdf0 <4>[ 156.701623] [4: kswapd0: 1209] [<0000000000000000>] zs_malloc+0x148/0x3d0 <4>[ 156.701630] [4: kswapd0: 1209] [<0000000000000000>] zram_bvec_rw+0x250/0x568 <4>[ 156.701634] [4: kswapd0: 1209] [<0000000000000000>] zram_rw_page+0x8c/0xe0 <4>[ 156.701640] [4: kswapd0: 1209] [<0000000000000000>] bdev_write_page+0x70/0xbc <4>[ 156.701645] [4: kswapd0: 1209] [<0000000000000000>] __swap_writepage+0x58/0x37c <4>[ 156.701649] [4: kswapd0: 1209] [<0000000000000000>] swap_writepage+0x40/0x4c <4>[ 156.701654] [4: kswapd0: 1209] [<0000000000000000>] shrink_page_list+0xc3c/0xf54 <4>[ 156.701659] [4: kswapd0: 1209] [<0000000000000000>] shrink_inactive_list+0x2b0/0x61c <4>[ 156.701664] [4: kswapd0: 1209] [<0000000000000000>] shrink_node_memcg+0x23c/0x618 <4>[ 156.701668] [4: kswapd0: 1209] [<0000000000000000>] shrink_node+0x1c8/0x304 <4>[ 156.701673] [4: kswapd0: 1209] [<0000000000000000>] kswapd+0x680/0x7c4 <4>[ 156.701679] [4: kswapd0: 1209] [<0000000000000000>] kthread+0x110/0x120 <4>[ 156.701684] [4: kswapd0: 1209] [<0000000000000000>] ret_from_fork+0x10/0x18 <4>[ 156.701689] [4: kswapd0: 1209] Mem-Info: <4>[ 156.701712] [4: kswapd0: 1209] active_anon:88690 inactive_anon:88630 isolated_anon:0 <4>[ 156.701712] [4: kswapd0: 1209] active_file:99173 inactive_file:169305 isolated_file:32 <4>[ 156.701712] [4: kswapd0: 1209] unevictable:48292 dirty:538 writeback:38 unstable:0 <4>[ 156.701712] [4: kswapd0: 1209] slab_reclaimable:15131 slab_unreclaimable:47762 <4>[ 156.701712] [4: kswapd0: 1209] mapped:274654 shmem:2824 pagetables:25088 bounce:0 <4>[ 156.701712] [4: kswapd0: 1209] free:2489 free_pcp:444 free_cma:3 <4>[ 156.701728] [4: kswapd0: 1209] Node 0 active_anon:354760kB inactive_anon:354520kB active_file:396692kB inactive_file:677220kB unevictable:193168kB isolated(anon):0kB isolated(file):128kB mapped:1098616kB dirty:2152kB writeback:152kB shmem:11296kB writeback_tmp:0kB unstable:0kB all_unreclaimable? no <4>[ 156.701738] [4: kswapd0: 1209] Normal free:9956kB min:7428kB low:93440kB high:97032kB active_anon:355176kB inactive_anon:354580kB active_file:396196kB inactive_file:677284kB unevictable:193168kB writepending:2304kB present:4081664kB managed:3593324kB mlocked:193168kB kernel_stack:55008kB pagetables:100352kB bounce:0kB free_pcp:1776kB local_pcp:656kB free_cma:12kB <4>[ 156.701741] [4: kswapd0: 1209] lowmem_reserve[]: 0 0 <4>[ 156.701747] [4: kswapd0: 1209] Normal: 196*4kB (H) 141*8kB (H) 109*16kB (H) 63*32kB (H) 20*64kB (H) 8*128kB (H) 2*256kB (H) 1*512kB (H) 0*1024kB 0*2048kB 0*4096kB = 9000kB Signed-off-by: Jaewon Kim Reported-by: Yong-Taek Lee --- mm/page_alloc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 13cc653122b7..00869378d387 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3553,6 +3553,11 @@ static inline bool zone_watermark_fast(struct zone *z, unsigned int order, { long free_pages = zone_page_state(z, NR_FREE_PAGES); long cma_pages = 0; + long highatomic = 0; + const bool alloc_harder = (alloc_flags & (ALLOC_HARDER|ALLOC_OOM)); + + if (likely(!alloc_harder)) + highatomic = z->nr_reserved_highatomic; #ifdef CONFIG_CMA /* If allocation can't use CMA areas don't use free CMA pages */ @@ -3567,8 +3572,12 @@ static inline bool zone_watermark_fast(struct zone *z, unsigned int order, * the caller is !atomic then it'll uselessly search the free * list. That corner case is then slower but it is harmless. */ - if (!order && (free_pages - cma_pages) > mark + z->lowmem_reserve[classzone_idx]) - return true; + if (!order) { + long fast_free = free_pages - cma_pages - highatomic; + + if (fast_free > mark + z->lowmem_reserve[classzone_idx]) + return true; + } return __zone_watermark_ok(z, order, mark, classzone_idx, alloc_flags, free_pages); -- 2.17.1