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=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 C12FEC3F68F for ; Sat, 15 Feb 2020 01:17:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9BFD42081E for ; Sat, 15 Feb 2020 01:17:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="ipYruDIP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728021AbgBOBR0 (ORCPT ); Fri, 14 Feb 2020 20:17:26 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:51340 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727602AbgBOBRZ (ORCPT ); Fri, 14 Feb 2020 20:17:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=BGvB+FUoLlv3HEvXBrhnN6JC/LJ+icLfki58Vl6nukc=; b=ipYruDIPj+zk6cpFBRObvJS06t isg4YhZtjLeVW5eANUzKiagfCMgZN7EByJnT7ohok/+UsWjhxyxzrFq0jahiqPl+rmYWktsIzxzp9 ojbtGe4koFplx0wlQN2DgCQEJ1w0Whuwbo1ECTPacv+hQK4w0hioXsah9oWDPPtScrxClhuA4XXUr kQHVJViJq73EoU+GihPEr5nit1FuU+ahQiqSFDmFKf+ltK/eBfqH4iCTbXSXcvoRbTH/IaivA6iFv kEPTnVWoz+xXBbkbn6zOeBhH+piiLwuItzGAY+9UejAH1WU61yqgk4StQBiJmgSDcGjPSs6EHfiiG biprHyjA==; Received: from [2601:1c0:6280:3f0::19c2] by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1j2m5D-00088W-MI; Sat, 15 Feb 2020 01:17:23 +0000 Subject: Re: [PATCH] hugetlb: fix CONFIG_CGROUP_HUGETLB ifdefs To: Mina Almasry , linux-mm@kvack.org, linux-next@vger.kernel.org, open list Cc: David Rientjes , Greg Thelen , Mike Kravetz , Shakeel Butt , Andrew Morton References: <7ff9e944-1c6c-f7c1-d812-e12817c7a317@oracle.com> <20200214204544.231482-1-almasrymina@google.com> From: Randy Dunlap Message-ID: <5237b9bc-2614-0a3a-afa5-5015f30d28bc@infradead.org> Date: Fri, 14 Feb 2020 17:17:21 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/14/20 1:00 PM, Mina Almasry wrote: > On Fri, Feb 14, 2020 at 12:46 PM Mina Almasry wrote: >> >> Fixes an #ifdef bug in the patch referred to below that was >> causing a build error when CONFIG_DEBUG_VM && >> !CONFIG_CCGROUP_HUGETLB. Hi Mina, I don't know if this was supposed to fix the 2 build reports that I made, but this does not apply cleanly to mmotm (and it's a reply email so it's more difficult to apply anyway): Applying patch mm-hugetlb-fix-CONFIG_CGROUP_HUGETLB.patch patching file mm/hugetlb.c Hunk #1 succeeded at 289 with fuzz 1. Hunk #2 succeeded at 325 with fuzz 2. Hunk #3 FAILED at 435. 1 out of 3 hunks FAILED -- rejects in file mm/hugetlb.c >> Fixes: b5f16a533ce8a ("hugetlb: support file_region coalescing again") >> Signed-off-by: Mina Almasry >> Cc: David Rientjes >> Cc: Greg Thelen >> Cc: Mike Kravetz >> Cc: Shakeel Butt >> Cc: Andrew Morton >> --- >> mm/hugetlb.c | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/mm/hugetlb.c b/mm/hugetlb.c >> index ee6d262fe6ac0..95d34c58981d2 100644 >> --- a/mm/hugetlb.c >> +++ b/mm/hugetlb.c >> @@ -289,7 +289,7 @@ static bool has_same_uncharge_info(struct file_region *rg, >> #endif >> } >> >> -#ifdef CONFIG_DEBUG_VM >> +#if defined(CONFIG_DEBUG_VM) && defined(CONFIG_CGROUP_HUGETLB) >> static void dump_resv_map(struct resv_map *resv) >> { >> struct list_head *head = &resv->regions; >> @@ -325,6 +325,10 @@ static void check_coalesce_bug(struct resv_map *resv) >> } >> } >> } >> +#else >> +static void check_coalesce_bug(struct resv_map *resv) >> +{ >> +} >> #endif >> >> static void coalesce_file_region(struct resv_map *resv, struct file_region *rg) >> @@ -431,9 +435,7 @@ static long add_reservation_in_range(struct resv_map *resv, long f, long t, >> } >> >> VM_BUG_ON(add < 0); >> -#ifdef CONFIG_DEBUG_VM >> check_coalesce_bug(resv); >> -#endif >> return add; >> } >> >> -- >> 2.25.0.265.gbab2e86ba0-goog thanks. -- ~Randy