From patchwork Wed Mar 20 20:33:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 10862607 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 CBCEC1575 for ; Wed, 20 Mar 2019 20:33:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF92129EAC for ; Wed, 20 Mar 2019 20:33:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A38EF29EAE; Wed, 20 Mar 2019 20:33:56 +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,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 5D4CB29EAC for ; Wed, 20 Mar 2019 20:33:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0439A6B0003; Wed, 20 Mar 2019 16:33:54 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F35456B0006; Wed, 20 Mar 2019 16:33:53 -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 E22C76B0007; Wed, 20 Mar 2019 16:33:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by kanga.kvack.org (Postfix) with ESMTP id C04806B0003 for ; Wed, 20 Mar 2019 16:33:53 -0400 (EDT) Received: by mail-qk1-f197.google.com with SMTP id r9so22219117qkl.4 for ; Wed, 20 Mar 2019 13:33:53 -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; bh=AaIGgQ6l0pg6MA+6fDH4Ohm3I1c+gTXhunmzDnC08GQ=; b=R33sGuqIUN7NnKyxM2hVceelBfBhQFhsLoYci7cy26oYdom22GYhQkTwyBBtlDPQIA qffmv26wGFwD/GQByHroS68FYjUWOKCECRry/fERyTltgnO0ERYe0tl6VedOVptLuR3N vOrbnMEQCjICtBOC1JlZ1KnII6IN8GxEpAFAXgKenCGcFpPVubPirDbbjiHSk95zUOtT xMWgs20eKvo7IPwDUXJZflk8Olf1O2zAB51rSKTXTUpdBLy7810AhdJLhlqnvQsvV964 JCgH1uVykhdJFQqZZQOdx6vRU5IpRQi2VngEJQfsFAuC/RKU0RjK3DBRKl1QIDBdcStX gPMQ== X-Gm-Message-State: APjAAAVlYU09XSKJeWh/aX2+MYvhONEeB5ZoM1io/cFh1klIgznRG3zJ PRcHdNP1Cr6Ap5vtihLUI+wYCbRJu8f35QlnKqPGX4sj1C8CBgpTkuvWqKYPRuwAAZVKmTOl73O rGHa7ACLOy6QGEoZyPwr0437s1D/rv46lqBlIAVN1mQdXtDvv8B/tkhYDXiHe9rXdqQ== X-Received: by 2002:a37:9e0d:: with SMTP id h13mr8247376qke.135.1553114033487; Wed, 20 Mar 2019 13:33:53 -0700 (PDT) X-Received: by 2002:a37:9e0d:: with SMTP id h13mr8247309qke.135.1553114032308; Wed, 20 Mar 2019 13:33:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553114032; cv=none; d=google.com; s=arc-20160816; b=O30swSaykdW6ph4/j8tO0nqZR2mGY72VnjtCz6oy21fkFiFborsw6BKYTzCkyg/2OR yEwc/iyk8sGaK6xdtOkaMwn1DVOkwKjYELO1wmeXJw7IZX3des9qAOsuqtM4AkCiMmJT EYOgIhvuilknx8YZU5AZQPobuLep0FGl3ADpUBBFk8cVkOlXeRUXRO2RfpcXPT0X5Z2U Gk1hHxMBTgrOU1ukkhBaI4YHnPcZnw+LEtFAyNvaDkWHZ9bKBT1zMzL837agBVLzpdkC vqDdzz4loVpuVtTnCn9yezrGxEVq5LPqMlTqmdykAdZbQXB7GC54fPRg5eDEr08hlOxl inaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=AaIGgQ6l0pg6MA+6fDH4Ohm3I1c+gTXhunmzDnC08GQ=; b=K9vuRfYfYRjBXbK16HWeAblBoq4HIeHrzneR21JkYeu5QBew3ZzSJjCdHWHvH3ie5p hgkbYHCCn/da17xmWFxuNo1Lq2NwmWTylzzY4mbmUprt2+UxP0h0z+2/1wyAkEVdy4L0 /Xo+SRxrlb22PTu3u17hb2mKCC3AlrAcM+JssyrEbNJinKjO2v6wUKUE4sYEWTugocKx 9cU6/PBXRuMFx3CoZbZUdzIfOWZxdWBxRAFU/qVWo5dFemT4FsIzmRQGCrrBt+1UxkUZ zXHwuxmkRgvBRR7oKdTI2L6YvhBmQ8fy34qVCbY/ZZXoMOBK5mN+EOIG0CnkOsTNKRLN gtDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lca.pw header.s=google header.b=sUDzCgc3; spf=pass (google.com: domain of cai@lca.pw designates 209.85.220.65 as permitted sender) smtp.mailfrom=cai@lca.pw Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 192sor550120qkh.23.2019.03.20.13.33.52 for (Google Transport Security); Wed, 20 Mar 2019 13:33:52 -0700 (PDT) Received-SPF: pass (google.com: domain of cai@lca.pw designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@lca.pw header.s=google header.b=sUDzCgc3; spf=pass (google.com: domain of cai@lca.pw designates 209.85.220.65 as permitted sender) smtp.mailfrom=cai@lca.pw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id; bh=AaIGgQ6l0pg6MA+6fDH4Ohm3I1c+gTXhunmzDnC08GQ=; b=sUDzCgc3g92zkPjp5gZaZsgMuUoKcHlZ+BerWXrs4Tun7VHg2liJUyZdDUJnbmPsJQ 06U3Vj8H93WY78f9zi2h/VUxscRkk4oLad5dy+D8J1hLUd+fZ7oAE0yOl8b2XZwNZ0Hh da7o6hPLVxFtra69mx1b+/EV9/xHT4o+aPVc0hErHbvEVZ8mtcz9F3EyhvfMe0KdyGNI C/udn1N+uX0H4h1uvJtmzC288wB5Vh/QeU6jMwUxIPE1I9LnoXq91oYwZx2FMe9TdVC6 BXQ1a0eIT8rLU9+rwzKkaHGxFyER9BapoVuK3NwHVJQdeoVYqAE4kwDAfkz5N4K32750 2PVQ== X-Google-Smtp-Source: APXvYqy4ygr9/xFHWmOkEa7gumgHQNm9Ra0ihtvJ5bWpOtSJ5zM6W8U9kmJykElEjNpBdlRfZ/KMog== X-Received: by 2002:a37:5d06:: with SMTP id r6mr8206494qkb.148.1553114031984; Wed, 20 Mar 2019 13:33:51 -0700 (PDT) Received: from ovpn-120-94.rdu2.redhat.com (pool-71-184-117-43.bstnma.fios.verizon.net. [71.184.117.43]) by smtp.gmail.com with ESMTPSA id t12sm2094634qkl.58.2019.03.20.13.33.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 13:33:50 -0700 (PDT) From: Qian Cai To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, vbabka@suse.cz, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [RESEND#2 PATCH] mm/compaction: fix an undefined behaviour Date: Wed, 20 Mar 2019 16:33:38 -0400 Message-Id: <20190320203338.53367-1-cai@lca.pw> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, 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 In a low-memory situation, cc->fast_search_fail can keep increasing as it is unable to find an available page to isolate in fast_isolate_freepages(). As the result, it could trigger an error below, so just compare with the maximum bits can be shifted first. UBSAN: Undefined behaviour in mm/compaction.c:1160:30 shift exponent 64 is too large for 64-bit type 'unsigned long' CPU: 131 PID: 1308 Comm: kcompactd1 Kdump: loaded Tainted: G W L 5.0.0+ #17 Call trace: dump_backtrace+0x0/0x450 show_stack+0x20/0x2c dump_stack+0xc8/0x14c __ubsan_handle_shift_out_of_bounds+0x7e8/0x8c4 compaction_alloc+0x2344/0x2484 unmap_and_move+0xdc/0x1dbc migrate_pages+0x274/0x1310 compact_zone+0x26ec/0x43bc kcompactd+0x15b8/0x1a24 kthread+0x374/0x390 ret_from_fork+0x10/0x18 Fixes: 70b44595eafe ("mm, compaction: use free lists to quickly locate a migration source") Acked-by: Vlastimil Babka Acked-by: Mel Gorman Signed-off-by: Qian Cai --- mm/compaction.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/compaction.c b/mm/compaction.c index e1a08fc92353..0d1156578114 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1157,7 +1157,9 @@ static bool suitable_migration_target(struct compact_control *cc, static inline unsigned int freelist_scan_limit(struct compact_control *cc) { - return (COMPACT_CLUSTER_MAX >> cc->fast_search_fail) + 1; + return (COMPACT_CLUSTER_MAX >> + min((unsigned short)(BITS_PER_LONG - 1), cc->fast_search_fail)) + + 1; } /*