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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 794BAC4361B for ; Mon, 14 Dec 2020 09:37:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0DFF1204EF for ; Mon, 14 Dec 2020 09:37:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0DFF1204EF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6893C6B005D; Mon, 14 Dec 2020 04:37:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 63C386B0068; Mon, 14 Dec 2020 04:37:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54F656B006C; Mon, 14 Dec 2020 04:37:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0058.hostedemail.com [216.40.44.58]) by kanga.kvack.org (Postfix) with ESMTP id 3B7056B005D for ; Mon, 14 Dec 2020 04:37:23 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id BAE1E181CBDDB for ; Mon, 14 Dec 2020 09:37:22 +0000 (UTC) X-FDA: 77591384724.19.roof12_4d0c32327419 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 98F5E1ACEBC for ; Mon, 14 Dec 2020 09:37:22 +0000 (UTC) X-HE-Tag: roof12_4d0c32327419 X-Filterd-Recvd-Size: 3330 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Mon, 14 Dec 2020 09:37:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607938641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jJITYNcYZy9bWpFBf8qUIxMVsU06tfqMpCOlk/PORM0=; b=Z642t3QKGaBm9OjuQ/W+fPsV6UiMBWdZNtaqUu/d0Yg7XPS296t1ZvSAwcG2WP7yU8V5hu ojv8kJ41pVB3hgthQ97FL5VHoCUKJlRcR/fTkuYIRTXK8ZfPcf9cyZO7Hi+t4w4OymALch Nzm8ZOHkhKMddJwfED37TO1aDpzG6cw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-103-k6keiBBsOGicQk8iwCCIgA-1; Mon, 14 Dec 2020 04:37:17 -0500 X-MC-Unique: k6keiBBsOGicQk8iwCCIgA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5AC5107ACE4; Mon, 14 Dec 2020 09:37:15 +0000 (UTC) Received: from [10.36.114.184] (ovpn-114-184.ams2.redhat.com [10.36.114.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70A1062467; Mon, 14 Dec 2020 09:37:13 +0000 (UTC) Subject: Re: [PATCH] hugetlb: Fix an error code in hugetlb_reserve_pages() To: Dan Carpenter , Mike Kravetz , Mina Almasry Cc: Andrew Morton , David Rientjes , linux-mm@kvack.org, kernel-janitors@vger.kernel.org References: From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <2a7ac28f-3623-a1ad-951f-58cf143a75b8@redhat.com> Date: Mon, 14 Dec 2020 10:37:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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: On 11.12.20 11:13, Dan Carpenter wrote: > Preserve the error code from region_add() instead of returning success. > > Fixes: 0db9d74ed884 ("hugetlb: disable region_add file_region coalescing") > Signed-off-by: Dan Carpenter > --- > From static analysis. Untested. > > mm/hugetlb.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 1f3bf1710b66..ac2e48b9f1d7 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -5113,6 +5113,7 @@ int hugetlb_reserve_pages(struct inode *inode, > > if (unlikely(add < 0)) { > hugetlb_acct_memory(h, -gbl_reserve); > + ret = add; > goto out_put_pages; > } else if (unlikely(chg > add)) { > /* > Was wioing if something like return ret ? ret : add; would be cleaner, but then I spotted "chg" ... Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb