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=-16.8 required=3.0 tests=BAYES_00, 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 459C2C47092 for ; Mon, 31 May 2021 01:29:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 185B5610A8 for ; Mon, 31 May 2021 01:29:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230006AbhEaBal (ORCPT ); Sun, 30 May 2021 21:30:41 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:2474 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbhEaBaj (ORCPT ); Sun, 30 May 2021 21:30:39 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Ftd0W3jv0z68PR; Mon, 31 May 2021 09:26:03 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 31 May 2021 09:28:58 +0800 Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 31 May 2021 09:28:57 +0800 From: Kefeng Wang To: CC: Kefeng Wang , Peter Zijlstra , Ingo Molnar , "Arnaldo Carvalho de Melo" , Mark Rutland Subject: [PATCH v2] uprobes: Use better bitmap_zalloc/free Date: Mon, 31 May 2021 09:38:14 +0800 Message-ID: <20210531013814.10409-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210529111553.186630-1-wangkefeng.wang@huawei.com> References: <20210529111553.186630-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use better bitmap_zalloc/free() to allocate and free bitmap. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Mark Rutland Signed-off-by: Kefeng Wang --- v2: fix the copy err, should found it when enable UPROBES kernel/events/uprobes.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 907d4ee00cb2..3f1b8e9d9af6 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1487,8 +1487,7 @@ static struct xol_area *__create_xol_area(unsigned long vaddr) if (unlikely(!area)) goto out; - area->bitmap = kcalloc(BITS_TO_LONGS(UINSNS_PER_PAGE), sizeof(long), - GFP_KERNEL); + area->bitmap = bitmap_zalloc(UINSNS_PER_PAGE, GFP_KERNEL); if (!area->bitmap) goto free_area; @@ -1512,7 +1511,7 @@ static struct xol_area *__create_xol_area(unsigned long vaddr) __free_page(area->pages[0]); free_bitmap: - kfree(area->bitmap); + bitmap_free(area->bitmap); free_area: kfree(area); out: @@ -1553,7 +1552,7 @@ void uprobe_clear_state(struct mm_struct *mm) return; put_page(area->pages[0]); - kfree(area->bitmap); + bitmap_free(area->bitmap); kfree(area); } -- 2.26.2