From patchwork Tue Jan 26 03:10:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12045185 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 53D45C433DB for ; Tue, 26 Jan 2021 03:17:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B637922583 for ; Tue, 26 Jan 2021 03:17:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B637922583 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3CE178D0078; Mon, 25 Jan 2021 22:17:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3A5E88D0076; Mon, 25 Jan 2021 22:17:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2BACB8D0078; Mon, 25 Jan 2021 22:17:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0068.hostedemail.com [216.40.44.68]) by kanga.kvack.org (Postfix) with ESMTP id 13A1E8D0076 for ; Mon, 25 Jan 2021 22:17:38 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id CACCD8249980 for ; Tue, 26 Jan 2021 03:17:37 +0000 (UTC) X-FDA: 77746466154.20.tub15_041066c2758b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 9D502180C07A3 for ; Tue, 26 Jan 2021 03:17:37 +0000 (UTC) X-HE-Tag: tub15_041066c2758b X-Filterd-Recvd-Size: 4017 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Tue, 26 Jan 2021 03:17:36 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id z21so10644105pgj.4 for ; Mon, 25 Jan 2021 19:17:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WtFgKdR1zjiiMUBUqPm6k1kFKyYgh6EYu3v9cVSqtNg=; b=sF2eUBaye/dI0ORb+IJysE7/kIYxkBm/QMObpU+MUJZOrBp6kYvodeYp2+/6R4d8Ky veYIGeTldP9GIH+ZjLtGdEYpDt5BQG1w3Db2expTGEvQKwojiz/U3M6jWPQiesrZ4r4L U1kRgxxLL/gkrH4xPOfrVpjmFtrqnGINACEaC+Qe90jkH5vT2mlrfRCuK9fI8q/+acJX DLnNw8/xEW9x/ie/wPvyN3tGT3zco2Ml8BrNoO9CjaqvPFZClPS0aAUqesDvlB8fVmBk /HPpJXB2Pl0CmkgOoEKVIAjPJBLgLRT+aIZbTtnlj8QHIGzfdEpHF62I1IIIeIA04SIQ OyBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WtFgKdR1zjiiMUBUqPm6k1kFKyYgh6EYu3v9cVSqtNg=; b=YLvwD/3Qj/zUFGGAlRxLQxC6gHQpEXgO9blXVo9ftw+K7tQ+V7TeWy2Q6FFZZ927M1 U2pIAdG0PDWJo8ar4dpMcyu1qHxqLBIHxEK/uu9V+slHHMzWs1oJddwZwd+XORcWfDHq 2Y9yHUZREsh6lTLARm2mDjBC/FgMVBzge/pqrx4RmX2W+J3hNrYlwSqz8gWN81p/lUz7 EUdfloByYRBhbnrMzdwIrPRTYYUT7NAUXac58LmvNYdDT+DVNKfF+OKfL3T8jT+Dm5Fc pu71dC+awaw2HKHoWbTOk3sT+c+2ZfKNGDTJGHwe5owxEqva/nwMiYom4nWCDbaDBn0U Zruw== X-Gm-Message-State: AOAM530myCYHxLV4LyjsrqbuCbn2n56PQzQTGdKZWGWNTUMvN6rlX2l1 pljqAdu+SvBVVl0nZqEuaQVmaw== X-Google-Smtp-Source: ABdhPJwWnnS4E0Ae7GCEUQPpPqdK8Q740j7chsbzcZJz2wQZQj2JkkLhhH44+ynxVV8IrPQkZt85CA== X-Received: by 2002:a62:1c84:0:b029:1c4:f959:7b29 with SMTP id c126-20020a621c840000b02901c4f9597b29mr61452pfc.34.1611631055566; Mon, 25 Jan 2021 19:17:35 -0800 (PST) Received: from localhost.localdomain ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id m195sm18419305pfd.215.2021.01.25.19.17.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jan 2021 19:17:34 -0800 (PST) From: Muchun Song To: mike.kravetz@oracle.com, akpm@linux-foundation.org Cc: sh_def@163.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song , stable@vger.kernel.org Subject: [PATCH] mm: hugetlb: fix missing put_page in gather_surplus_pages() Date: Tue, 26 Jan 2021 11:10:09 +0800 Message-Id: <20210126031009.96266-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) 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: The VM_BUG_ON_PAGE avoids the generation of any code, even if that expression has side-effects when !CONFIG_DEBUG_VM. Fixes: e5dfacebe4a4 ("mm/hugetlb.c: just use put_page_testzero() instead of page_count()") Signed-off-by: Muchun Song Cc: Reviewed-by: Mike Kravetz Reviewed-by: Miaohe Lin --- mm/hugetlb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index a6bad1f686c5..082ed643020b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2047,13 +2047,16 @@ static int gather_surplus_pages(struct hstate *h, long delta) /* Free the needed pages to the hugetlb pool */ list_for_each_entry_safe(page, tmp, &surplus_list, lru) { + int zeroed; + if ((--needed) < 0) break; /* * This page is now managed by the hugetlb allocator and has * no users -- drop the buddy allocator's reference. */ - VM_BUG_ON_PAGE(!put_page_testzero(page), page); + zeroed = put_page_testzero(page); + VM_BUG_ON_PAGE(!zeroed, page); enqueue_huge_page(h, page); } free: