From patchwork Mon Apr 7 15:04:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Pihet X-Patchwork-Id: 27903 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5CFBC20490 for ; Mon, 7 Apr 2014 15:06:19 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp18sf27853909obc.4 for ; Mon, 07 Apr 2014 08:06:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=JHw8WfB1pwtFgqR5mTY/WCcgNSTM0yX2GHHW5o9imIs=; b=G197HQqDQFXct9XXLi6T5qGQ887Bp+9Ckexz3dwC+kk8/sH8uK4W/+RFX1qOGye83q QnFJVsL5TTggjzh2hN6M2lvAbCgfO6Vzwd4uUQfgcw6MlpE0++FCQVsN3/zuYqv7Tmt8 LoNy/btH3sSJZjXO+FARQSPbE6el3CwRlPaecc9HAlMcYYwxV+9ZTFeqwRsU4m78UvPf A2dBJoloAeuGUmgLHffoBCvC38ntJH3W4GHbren3Y37AWySPbpw2wzlU6nioxRqHvlDf KqM1fcn+1icCYjoq4w9+Rev/GIzBGK05Hv92a8NWbelxIGJDs7EbNQ2F4joScgd6xe1L slrQ== X-Gm-Message-State: ALoCoQkdxEk4RcrP5BIaOeBKFYYtK80PskSCUvbBaZIwVF07X1GUmXadhl1i45xu+QnZqo5WB2rw X-Received: by 10.50.79.197 with SMTP id l5mr10503648igx.0.1396883178775; Mon, 07 Apr 2014 08:06:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.100.137 with SMTP id s9ls1766582qge.57.gmail; Mon, 07 Apr 2014 08:06:18 -0700 (PDT) X-Received: by 10.220.106.84 with SMTP id w20mr13423211vco.18.1396883178681; Mon, 07 Apr 2014 08:06:18 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id is3si2165678vec.99.2014.04.07.08.06.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Apr 2014 08:06:18 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so5497560vcb.15 for ; Mon, 07 Apr 2014 08:06:18 -0700 (PDT) X-Received: by 10.221.37.1 with SMTP id tc1mr589947vcb.32.1396883178542; Mon, 07 Apr 2014 08:06:18 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp169690vcv; Mon, 7 Apr 2014 08:06:17 -0700 (PDT) X-Received: by 10.68.242.68 with SMTP id wo4mr31823629pbc.32.1396883177468; Mon, 07 Apr 2014 08:06:17 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ta1si8504924pab.236.2014.04.07.08.06.16; Mon, 07 Apr 2014 08:06:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755539AbaDGPGG (ORCPT + 27 others); Mon, 7 Apr 2014 11:06:06 -0400 Received: from mail-ee0-f47.google.com ([74.125.83.47]:55211 "EHLO mail-ee0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755384AbaDGPFc (ORCPT ); Mon, 7 Apr 2014 11:05:32 -0400 Received: by mail-ee0-f47.google.com with SMTP id b15so746234eek.20 for ; Mon, 07 Apr 2014 08:05:31 -0700 (PDT) X-Received: by 10.15.102.74 with SMTP id bq50mr3515697eeb.21.1396883131452; Mon, 07 Apr 2014 08:05:31 -0700 (PDT) Received: from localhost.localdomain (201-179-62-37.mobileinternet.proximus.be. [37.62.179.201]) by mx.google.com with ESMTPSA id o4sm42287649eef.20.2014.04.07.08.05.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 07 Apr 2014 08:05:30 -0700 (PDT) From: Jean Pihet To: Borislav Petkov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa , linux-kernel@vger.kernel.org, Robert Richter Cc: Robert Richter , Jean Pihet Subject: [PATCH 16/16] perf tools: Retry mapping buffers readonly on EACCES Date: Mon, 7 Apr 2014 17:04:38 +0200 Message-Id: <1396883078-25320-17-git-send-email-jean.pihet@linaro.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1396883078-25320-1-git-send-email-jean.pihet@linaro.org> References: <1396883078-25320-1-git-send-email-jean.pihet@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: jean.pihet@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Robert Richter Persistent event buffers may only be mmapped readonly. Thus, retry mapping it readonly if mmap returns EACCES after trying to mmap writable. [ namhyung: Don't write to readonly mmap'ed buffers. ] Signed-off-by: Robert Richter Signed-off-by: Robert Richter Signed-off-by: Jean Pihet --- tools/perf/builtin-record.c | 11 ++++++++--- tools/perf/builtin-top.c | 8 ++++++-- tools/perf/perf.h | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index eb524f9..ede3af1 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -133,8 +133,8 @@ static int record__mmap_read(struct record *rec, struct perf_mmap *md) } md->prev = old; - perf_mmap__write_tail(md, old); - + if (!rec->opts.mmap_ro) + perf_mmap__write_tail(md, old); out: return rc; } @@ -207,7 +207,12 @@ try_again: goto out; } - if (perf_evlist__mmap(evlist, opts->mmap_pages, false) < 0) { +try_again2: + if (perf_evlist__mmap(evlist, opts->mmap_pages, opts->mmap_ro) < 0) { + if (!opts->mmap_ro && errno == EACCES) { + opts->mmap_ro = true; + goto try_again2; + } if (errno == EPERM) { pr_err("Permission error mapping pages.\n" "Consider increasing " diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 65aaa5b..479356f 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -868,8 +868,12 @@ try_again: goto out_err; } } - - if (perf_evlist__mmap(evlist, opts->mmap_pages, false) < 0) { +try_again2: + if (perf_evlist__mmap(evlist, opts->mmap_pages, opts->mmap_ro) < 0) { + if (!opts->mmap_ro && errno == EACCES) { + opts->mmap_ro = true; + goto try_again2; + } ui__error("Failed to mmap with %d (%s)\n", errno, strerror(errno)); goto out_err; diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 1138c41..a8ffaba4 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -282,6 +282,7 @@ struct record_opts { bool sample_weight; bool sample_time; bool period; + bool mmap_ro; unsigned int freq; unsigned int mmap_pages; unsigned int user_freq;