From patchwork Sun Dec 1 01:57:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 11268451 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC71B17E0 for ; Sun, 1 Dec 2019 01:57:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 99A5A205ED for ; Sun, 1 Dec 2019 01:57:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Y21dyyiB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99A5A205ED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 99EA56B0373; Sat, 30 Nov 2019 20:57:24 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 94F1C6B0376; Sat, 30 Nov 2019 20:57:24 -0500 (EST) 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 83EA56B0377; Sat, 30 Nov 2019 20:57:24 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0200.hostedemail.com [216.40.44.200]) by kanga.kvack.org (Postfix) with ESMTP id 6A4FD6B0373 for ; Sat, 30 Nov 2019 20:57:24 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 1EE604403 for ; Sun, 1 Dec 2019 01:57:24 +0000 (UTC) X-FDA: 76214910408.25.box31_4098480a8a944 X-Spam-Summary: 2,0,0,f3b257210b197ac9,d41d8cd98f00b204,akpm@linux-foundation.org,:akpm@linux-foundation.org:andreyknvl@google.com:aryabinin@virtuozzo.com:huyue2@yulong.com::mm-commits@vger.kernel.org:opendmb@gmail.com:peng.fan@nxp.com:rppt@linux.ibm.com:ryh.szk.cmnty@gmail.com:tglx@linutronix.de:torvalds@linux-foundation.org:yeyunfeng@huawei.com,RULES_HIT:41:355:379:800:960:966:967:973:988:989:1260:1263:1345:1381:1431:1437:1534:1541:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2525:2559:2563:2682:2685:2859:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3352:3867:3870:3871:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:5007:6119:6261:6653:6737:7514:7576:7903:9025:9036:9545:9592:10004:11026:11257:11473:11658:11914:12043:12048:12296:12297:12517:12519:12555:12679:12783:12986:13069:13311:13357:13846:14181:14384:14721:14849:21080:21451:21627:21939:30029:30054,0,RBL:error,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF :not bul X-HE-Tag: box31_4098480a8a944 X-Filterd-Recvd-Size: 3128 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Sun, 1 Dec 2019 01:57:23 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BE5702082E; Sun, 1 Dec 2019 01:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575165443; bh=+tg2i4I7sKkCCl2JudpXly90jX+u0Q9Ju38U1lCdQyE=; h=Date:From:To:Subject:From; b=Y21dyyiBO+lkYbEZjTCWEQEs8p/iuXAjxu3Vud8ovylZdCDorjhfZmzTGJ1xi6pFW 2hZgZ+qITTz9Bwt133BzefzempSjkB9Cpv50aryDk3uQ5Kxg06cw97zPISpnJcnevJ 2/6FFRPjJTlXa8S60VB/wwIAwld7O/WkCH0oauTY= Date: Sat, 30 Nov 2019 17:57:22 -0800 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, andreyknvl@google.com, aryabinin@virtuozzo.com, huyue2@yulong.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, opendmb@gmail.com, peng.fan@nxp.com, rppt@linux.ibm.com, ryh.szk.cmnty@gmail.com, tglx@linutronix.de, torvalds@linux-foundation.org, yeyunfeng@huawei.com Subject: [patch 137/158] mm/cma.c: switch to bitmap_zalloc() for cma bitmap allocation Message-ID: <20191201015722.ZKSvOZdeb%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 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: From: Yunfeng Ye Subject: mm/cma.c: switch to bitmap_zalloc() for cma bitmap allocation kzalloc() is used for cma bitmap allocation in cma_activate_area(), switch to bitmap_zalloc() for clarity. Link: http://lkml.kernel.org/r/895d4627-f115-c77a-d454-c0a196116426@huawei.com Signed-off-by: Yunfeng Ye Reviewed-by: Andrew Morton Cc: Mike Rapoport Cc: Yue Hu Cc: Peng Fan Cc: Andrey Ryabinin Cc: Ryohei Suzuki Cc: Andrey Konovalov Cc: Doug Berger Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- mm/cma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/mm/cma.c~mm-cmac-switch-to-bitmap_zalloc-for-cma-bitmap-allocation +++ a/mm/cma.c @@ -95,13 +95,11 @@ static void cma_clear_bitmap(struct cma static int __init cma_activate_area(struct cma *cma) { - int bitmap_size = BITS_TO_LONGS(cma_bitmap_maxno(cma)) * sizeof(long); unsigned long base_pfn = cma->base_pfn, pfn = base_pfn; unsigned i = cma->count >> pageblock_order; struct zone *zone; - cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL); - + cma->bitmap = bitmap_zalloc(cma_bitmap_maxno(cma), GFP_KERNEL); if (!cma->bitmap) { cma->count = 0; return -ENOMEM; @@ -139,7 +137,7 @@ static int __init cma_activate_area(stru not_in_zone: pr_err("CMA area %s could not be activated\n", cma->name); - kfree(cma->bitmap); + bitmap_free(cma->bitmap); cma->count = 0; return -EINVAL; }