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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 6E167C282C4 for ; Tue, 12 Feb 2019 15:52:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39CC620842 for ; Tue, 12 Feb 2019 15:52:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jwMhbbst" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728585AbfBLPwn (ORCPT ); Tue, 12 Feb 2019 10:52:43 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:37995 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728347AbfBLPwn (ORCPT ); Tue, 12 Feb 2019 10:52:43 -0500 Received: by mail-pf1-f193.google.com with SMTP id q1so1487386pfi.5 for ; Tue, 12 Feb 2019 07:52:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8XB7MBUhh6/xdflfPQZbtb2FVRFm9Ohv0huDxNv9fNQ=; b=jwMhbbst25mf/PZyFpA9DTrjHpJ6gjQl19X5B7NwJMPOy2JUCHzaG+V65oo9J/cIm8 cVj7ovQNfPKyusFllXkycrNt8+WxQPSrlXnLjp+N459TRclXKurW+LRv2qpIHyFeFUW8 tRyggEwIYHBmTraHLq1Hcew7ZmXx4615bUhu+foI3RAiaEaHkmKcbfDYAN85j6DoJBqe smSq+NSRCez+24J2Hpn/b+jKI1mqA+61SZQg9RvPoY809FzeTc7rGE6aEhbbnCDmS70M qihyebnYdOK/MKUg0KgB9qQCCOymCNcChPo2WlrgC31EvpaXXxQemzkujZnQ67xciS4L /GSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8XB7MBUhh6/xdflfPQZbtb2FVRFm9Ohv0huDxNv9fNQ=; b=DGr7lem+UDXWvZVxl/T4o9bWpnJ8/L06/bZF63D9Fal+WEuxIDqvclrgcevrTdBNbf FJhc+iTpgM5CUypVHs949Dh8KhsC5hohLIhOp2M4hiN9zVAwVt9xlIcpc6idC8+ycNoj IeLNhyTAmHY3GDGXno5QLxgBRSIKITs3CNnYARpikJrqDLOCkx5rLAU/mN8wVsfY0g7n RIACWuFwJOA9/fbjguPspj0wakOnWFtMQXj9LLXRyaMxrtt9uWGH3Y6xr676wmo6Iwnd 2yy2rhgTE3uY3Goa6J1Uu/DPFaN+kipCL1z1N36z0nv9diqDln+b/VIpTvn7Oxeg3MbZ v7xw== X-Gm-Message-State: AHQUAuarow8L/XrlvoBT3b1Kk6DEwqVr5t1GaWbyYBA301mixZgQjefE laIm0/g8xWXIh4KLNS7xoj4= X-Google-Smtp-Source: AHgI3IYexHbyac8kDsUkOjp92nb3Vx8Iy6gbk8q3iSTgeLpKIured83oyGqjDwrolwZMJiH4tsqeGg== X-Received: by 2002:a65:6397:: with SMTP id h23mr4046610pgv.347.1549986762433; Tue, 12 Feb 2019 07:52:42 -0800 (PST) Received: from localhost.localdomain ([2408:84e1:122:dee0:e47e:f4ef:cce4:a98c]) by smtp.gmail.com with ESMTPSA id z1sm21819070pfi.155.2019.02.12.07.52.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 07:52:41 -0800 (PST) From: Changbin Du To: peterz@infradead.org, mingo@redhat.com Cc: acme@kernel.org, Changbin Du , Mark Rutland , Julien Thierry , Linus Torvalds , Jiri Olsa , Alexander Shishkin , stable@vger.kernel.org Subject: [PATCH] perf/core: Fix mmap failure caused by bad size check Date: Tue, 12 Feb 2019 23:52:21 +0800 Message-Id: <20190212155221.32753-1-changbin.du@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Perf tool now is broken by commit 9dff0aa95a32 ("perf/core: Don't WARN() for impossible ring-buffer sizes"). The get_order() should be used but not the order_base_2(). This mistake makes mmap() on perf fd always fail. Fixes: 9dff0aa95a32 ("perf/core: Don't WARN() for impossible ring-buffer sizes") Signed-off-by: Changbin Du Cc: Mark Rutland Cc: Julien Thierry Cc: Linus Torvalds Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Alexander Shishkin Cc: --- kernel/events/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index 309ef5a64af5..55faafca4a6e 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -734,7 +734,7 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) size = sizeof(struct ring_buffer); size += nr_pages * sizeof(void *); - if (order_base_2(size) >= MAX_ORDER) + if (get_order(size) >= MAX_ORDER) goto fail; rb = kzalloc(size, GFP_KERNEL); -- 2.19.1