From patchwork Fri Mar 11 22:30:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 12778636 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E564C433F5 for ; Fri, 11 Mar 2022 22:51:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229788AbiCKWwT (ORCPT ); Fri, 11 Mar 2022 17:52:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229962AbiCKWwL (ORCPT ); Fri, 11 Mar 2022 17:52:11 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C4AC8ECB1B; Fri, 11 Mar 2022 14:30:32 -0800 (PST) Received: from localhost.localdomain (c-73-140-2-214.hsd1.wa.comcast.net [73.140.2.214]) by linux.microsoft.com (Postfix) with ESMTPSA id 4260520B7178; Fri, 11 Mar 2022 14:30:32 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4260520B7178 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1647037832; bh=N1x1V2sY7mMppzWbWx3qgkpf7QBnkkPjK7jq4FHoask=; h=From:To:Cc:Subject:Date:From; b=NJ+BUV1i55rgsecezhByakHPZ4Hzs5zerEkLc++lG+THztYBUCt9sJxZPHAwh3Tx9 BlSJVyCIivEa8CeF1nXyI4ylhSpouIuWNL1g61LVAJ4DonI3AF0YNovCTNJQ7mjSFb QPSISgmiIx2mrTPp7SHZ+7/QaGyAwLbCjibUXvVM= From: Beau Belgrave To: rostedt@goodmis.org, mhiramat@kernel.org Cc: anders.roxell@linaro.org, linux-trace-devel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, beaub@linux.microsoft.com Subject: [PATCH] user_events: Use alloc_pages instead of kzalloc for register pages Date: Fri, 11 Mar 2022 14:30:28 -0800 Message-Id: <20220311223028.1865-1-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org kzalloc virtual addresses do not work with SetPageReserved, use the actual page virtual addresses instead via alloc_pages. The issue is reported when booting with user_events and DEBUG_VM_PGFLAGS=y. Link: https://lore.kernel.org/linux-trace-devel/CADYN=9+xY5Vku3Ws5E9S60SM5dCFfeGeRBkmDFbcxX0ZMoFing@mail.gmail.com/#R Reported-by: Anders Roxell Signed-off-by: Beau Belgrave --- kernel/trace/trace_events_user.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) base-commit: 864ea0e10cc90416a01b46f0d47a6f26dc020820 diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 2b5e9fdb63a0..59c900789757 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1587,16 +1587,20 @@ static void set_page_reservations(bool set) static int __init trace_events_user_init(void) { int ret; + struct page *register_pages; /* Zero all bits beside 0 (which is reserved for failures) */ bitmap_zero(page_bitmap, MAX_EVENTS); set_bit(0, page_bitmap); - register_page_data = kzalloc(MAX_EVENTS, GFP_KERNEL); + register_pages = alloc_pages(GFP_KERNEL | __GFP_ZERO, + get_order(MAX_EVENTS)); - if (!register_page_data) + if (!register_pages) return -ENOMEM; + register_page_data = page_address(register_pages); + set_page_reservations(true); ret = create_user_tracefs(); @@ -1604,7 +1608,7 @@ static int __init trace_events_user_init(void) if (ret) { pr_warn("user_events could not register with tracefs\n"); set_page_reservations(false); - kfree(register_page_data); + __free_pages(register_pages, get_order(MAX_EVENTS)); return ret; }