From patchwork Fri Jun 21 15:31:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Jenkins X-Patchwork-Id: 11010305 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B5DD86C5 for ; Fri, 21 Jun 2019 15:31:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2F9C228C8 for ; Fri, 21 Jun 2019 15:31:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96CC82893F; Fri, 21 Jun 2019 15:31:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E74B628676 for ; Fri, 21 Jun 2019 15:31:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 001C18E0003; Fri, 21 Jun 2019 11:31:47 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ECD508E0001; Fri, 21 Jun 2019 11:31:46 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D6DF48E0003; Fri, 21 Jun 2019 11:31:46 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by kanga.kvack.org (Postfix) with ESMTP id 8720A8E0001 for ; Fri, 21 Jun 2019 11:31:46 -0400 (EDT) Received: by mail-wr1-f69.google.com with SMTP id s4so2799621wrn.1 for ; Fri, 21 Jun 2019 08:31:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JWWG2zIxOmDWYe8rHXUBcArY9/ATsP/XYEP3DtcCOfs=; b=Sxyh1f+WTHC+ip8uwzzhZG8yhQ6zFnmUg0jxyqJJlqILnSk2fHnvkspx3UNntPxBEG sIxk6V2gztpc501yiTf/u2QhE0A2t6Z21mebUGdTjFappMhj+nKKwb54T5BFwvk9qoO+ w6zaUT0GbvnbaHFtxM1SZAXDHZGvqmA/mgiuL3ir0wbX+h2MOcU9B4i1bCVll1n/KU3n s4sjpOylOZZ9D/Zmm2qPSlhtS7JKlup9MpGkfpivkGxjOMC+cpkWZBlVG0sBdg39nouL korC2f69Vii/OtlNvfcCY6YjeIHKmI5RDPomVn8EQD9Lot2oSiL5wYr/LTX5ijINKQRu /Ubg== X-Gm-Message-State: APjAAAX4WDgyD5wbhDFuBfWU4wmRCOBNwmTQjw9sna9f5G+6icZNPE7W 38EE+mUQF9D4igs7NiyrAa6cVlpQSRauC4bQUzoHbqF7xSfhAgrcx4IJA4hjRzplLSz2S6g2BEY CIn8u+Fl0g/b8Lwr6EBYtiqgg6ZtMka46Q9IXRKa54aU1Ifu4xNvYdJgzCyXrmk34ig== X-Received: by 2002:a1c:40c6:: with SMTP id n189mr4476645wma.118.1561131105962; Fri, 21 Jun 2019 08:31:45 -0700 (PDT) X-Received: by 2002:a1c:40c6:: with SMTP id n189mr4476408wma.118.1561131101619; Fri, 21 Jun 2019 08:31:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561131101; cv=none; d=google.com; s=arc-20160816; b=Ezymu06Xed/DGenf4BI9eP/uTxN67XLZnZ2FrbGVDdDj0sJAJqtS3wkrZhqAcyE9EK 7svScj+SYDjUv9fR7aPzPIIoSTkx0t13x3nNT9lOragz/hRaShXje/S2M4eVtwi/s7Wo 0+sd7a5gwxKRsFO04gASb8kvt/ocaHDjFcLc/L50Kel4vVU0kzlDIfXcvcheb2qvXl1d WBamIat7+zbRGaJgkJdqE3CdEq0sX2DJClqoLq8wgKxNKViEdgN2KaAsuZ7EVIMwWXZ9 vpjAXFD9hM2Yogu4+gvphhmfmfn5xQo2f+QlgYI4o53Xe8bOXFnmPFfPsNjxjsQHnmnZ vMeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=JWWG2zIxOmDWYe8rHXUBcArY9/ATsP/XYEP3DtcCOfs=; b=eszq97AWZEQ1Y1vgLFl+oKRXuAYkGx4F8hku/ymXqSF/8O6btxOvUOv8LLzjg0kO12 n87mU1XnPeWsn4kVV7L8pP2DPc+/bqNG0ybw0uweKVlrzuuhH+e7jboam+jyOmU24rdU q67npH7/2yUPW/pkHzD51dgfjDQrAkw5pxPBG3yfLZvNY6TAQasI+IM0ATQyvwoCN+Kl D+NWzdAXOXbLSowzwL9jJvtoZ8D870bv/IqvaGWQimyWtn2LiiIubG7vrhObchtZo/Ez iY8mK2LrG+eNn5bfkVy7K/OCHoTGEiDhG5Z4xcz15jpkVNv7BpBDoD0EZbBm1lDopDDs GqOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=fuK4lB9+; spf=pass (google.com: domain of alan.christopher.jenkins@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=alan.christopher.jenkins@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a2sor955573wrw.20.2019.06.21.08.31.41 for (Google Transport Security); Fri, 21 Jun 2019 08:31:41 -0700 (PDT) Received-SPF: pass (google.com: domain of alan.christopher.jenkins@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=fuK4lB9+; spf=pass (google.com: domain of alan.christopher.jenkins@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=alan.christopher.jenkins@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JWWG2zIxOmDWYe8rHXUBcArY9/ATsP/XYEP3DtcCOfs=; b=fuK4lB9+T6YbLmGR8I6IvaXx2bH3xYDajvtykVso1Deqa/GAPTE2u1PcDkunMYy2R3 ZJvzG53ItaL9ykdD4/oHfzGHlSkmVHAow0ABQIzYkddwz+vkwryxLl6FRX4kx95bCcDE lbnycNMPLK8H1r9htlyqL6H1J89aE+CJ4gHtmJDQJ1ovCveulFbyH2P9m+YWoQmXl8fR CMAoPXCbMIH6qYV30dK4VgkMbV7ASvpe3mGZi217hLkf+6jA6d/WvEAF6bzFqxhCSNhx e2s3TVPiP8stSQc8/e04ZO2UWQpoeft+m0qbGqYqe7HHtaUqI4Q9AaqU37CNuLe0TJxl 96ng== X-Google-Smtp-Source: APXvYqyAW9yR+tYHSa53pZVTsEE/Hg18IvMwVe9mKGLtmJpJfqWcKoJHDeXBjtxQq4c5ys7FoD0kUw== X-Received: by 2002:adf:ebc4:: with SMTP id v4mr795012wrn.113.1561131101120; Fri, 21 Jun 2019 08:31:41 -0700 (PDT) Received: from alan-laptop.carrier.duckdns.org (host-89-243-246-11.as13285.net. [89.243.246.11]) by smtp.gmail.com with ESMTPSA id 5sm5505682wrc.76.2019.06.21.08.31.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 21 Jun 2019 08:31:40 -0700 (PDT) From: Alan Jenkins To: linux-mm@kvack.org Cc: Vlastimil Babka , Mel Gorman , linux-kernel@vger.kernel.org, Bharath Vedartham , Alan Jenkins Subject: [PATCH v2] mm: avoid inconsistent "boosts" when updating the high and low watermarks Date: Fri, 21 Jun 2019 16:31:07 +0100 Message-Id: <20190621153107.23667-1-alan.christopher.jenkins@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <3d15b808-b7cd-7379-a6a9-d3cf04b7dcec@suse.cz> References: <3d15b808-b7cd-7379-a6a9-d3cf04b7dcec@suse.cz> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP When setting the low and high watermarks we use min_wmark_pages(zone). I guess this was to reduce the line length. Then this macro was modified to include zone->watermark_boost. So we needed to set watermark_boost before we set the high and low watermarks... but we did not. It seems mostly harmless. It might set the watermarks a bit higher than needed: when 1) the watermarks have been "boosted" and 2) you then triggered __setup_per_zone_wmarks() (by setting one of the sysctls, or hotplugging memory...). I noticed it because it also breaks the documented equality (high - low == low - min). Below is an example of reproducing the bug. First sample. Equality is met (high - low == low - min): Node 0, zone Normal pages free 11962 min 9531 low 11913 high 14295 spanned 1173504 present 1173504 managed 1134235 A later sample. Something has caused us to boost the watermarks: Node 0, zone Normal pages free 12614 min 10043 low 12425 high 14807 Now trigger the watermarks to be recalculated. "cd /proc/sys/vm" and "cat watermark_scale_factor > watermark_scale_factor". Then the watermarks are boosted inconsistently. The equality is broken: Node 0, zone Normal pages free 12412 min 9531 low 12425 high 14807 14807 - 12425 = 2382 12425 - 9531 = 2894 Co-developed-by: Vlastimil Babka Signed-off-by: Vlastimil Babka Signed-off-by: Alan Jenkins Fixes: 1c30844d2dfe ("mm: reclaim small amounts of memory when an external fragmentation event occurs") Acked-by: Mel Gorman Acked-by: David Rientjes --- Changes since v1: Use Vlastimil's suggested code. It is much cleaner, thanks :-). I considered this "Co-developed-by" and s-o-b credit. Update commit message to be specific about expected effects. Node data is always allocated with kzalloc(). So there is no risk of the code reading arbitrary unintialized data from ->watermark_boost, the first time it is run. AFAICT the bug is mostly harmless. I do not require a -stable port. I leave it to anyone else, if they think it's worth adding "Cc: stable@vger.kernel.org". mm/page_alloc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c02cff1ed56e..01233705e490 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7570,6 +7570,7 @@ static void __setup_per_zone_wmarks(void) for_each_zone(zone) { u64 tmp; + unsigned long wmark_min; spin_lock_irqsave(&zone->lock, flags); tmp = (u64)pages_min * zone_managed_pages(zone); @@ -7588,13 +7589,13 @@ static void __setup_per_zone_wmarks(void) min_pages = zone_managed_pages(zone) / 1024; min_pages = clamp(min_pages, SWAP_CLUSTER_MAX, 128UL); - zone->_watermark[WMARK_MIN] = min_pages; + wmark_min = min_pages; } else { /* * If it's a lowmem zone, reserve a number of pages * proportionate to the zone's size. */ - zone->_watermark[WMARK_MIN] = tmp; + wmark_min = tmp; } /* @@ -7606,8 +7607,9 @@ static void __setup_per_zone_wmarks(void) mult_frac(zone_managed_pages(zone), watermark_scale_factor, 10000)); - zone->_watermark[WMARK_LOW] = min_wmark_pages(zone) + tmp; - zone->_watermark[WMARK_HIGH] = min_wmark_pages(zone) + tmp * 2; + zone->_watermark[WMARK_MIN] = wmark_min; + zone->_watermark[WMARK_LOW] = wmark_min + tmp; + zone->_watermark[WMARK_HIGH] = wmark_min + tmp * 2; zone->watermark_boost = 0; spin_unlock_irqrestore(&zone->lock, flags);