Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp773045ybz; Wed, 22 Apr 2020 07:45:44 -0700 (PDT) X-Google-Smtp-Source: APiQypLVc/Eb1/7xDxzyRzCIxH8uMAoPdMxTUosoLgNxP/9ZnESyyJ9s4lP5Fu9tuRbfZiF678S+ X-Received: by 2002:a17:906:288b:: with SMTP id o11mr27077481ejd.237.1587566744044; Wed, 22 Apr 2020 07:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587566744; cv=none; d=google.com; s=arc-20160816; b=mf0DkOWVTZPYcdjZV3jmZYqU3kPYNVdOojRU39WbuEQWw2a6zdmOaFNnsiIR5KaEnG +VKKdoplgOgXxV79Nqs61M5fudEIMnQAK9RHhxkAQgf3gF+LTbicmQvxMoypvPZt1LDM 5daDu0+b8/r3XN3mznn0wkOkh+85xL3O8BOFGEMQQWh0d1glxR47wPBrhDkFqDZpEEMK aVDuxQIFu5Eonrv/QyTQvtX91gT24+r01kpZaxdPMUWI1DfENJtKh5qVnw29PjIeHe5C Q0rBYl9YyWKyDg5dXKE9UVrzcgpyHENrX5i9ea4cSMecNQ845tms+uWUGUdTtMehoMgx whsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:references:cc:to:from:subject:ironport-sdr :ironport-sdr; bh=TnJWW24Z9+ILr2mqLylsG41mv6qLJv1FQEDe/BSOYWo=; b=H0DGzt2f3uUlsPrhZ5vzrxXKW540OltcjSBxf+fuSptXUiu36rdSEkfJN55tJMPDYE EgA8rVSTvtra/Er77GAGeT3/cRpu/OYw+bboZKAN6jifWyLsk6Bxojk+r0b7RsZWmF1L TiquwXsqpZiZaYhjGBo5VaOGbl2dtcHrKHhZRhNC/01rGxsgnzEbXkdmtR9llHY/CWGu nn5vSUZ3VpODVD0FhoaiRg/9R7ctAQw8YWd3HdbGlReSomLbNl9nwZzDP7twkWNyfxHO B3mmpQgcFEZj0OlzEMGATjKGmMe+GTy56simyREbtL98EHOrjLJYvcu44Q6wwn0nUOSk ux0w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g14si3166731eje.287.2020.04.22.07.45.19; Wed, 22 Apr 2020 07:45:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726702AbgDVOoH (ORCPT + 99 others); Wed, 22 Apr 2020 10:44:07 -0400 Received: from mga05.intel.com ([192.55.52.43]:61020 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726066AbgDVOoH (ORCPT ); Wed, 22 Apr 2020 10:44:07 -0400 IronPort-SDR: vypBW5ngPsnXF4APKXfI2fXCT9I12TfORsgJj9Hr5FRfxZ3SD/eDgaQKT44xk5bkDoq6HBZGck 6O7ZJIodn6RA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2020 07:44:06 -0700 IronPort-SDR: tLSeGNEbtY+85s7yBaxF7jZJh/mZinNLoZ7gHB8m1WmRElRkeWeEIgkV4+xWqIVsA9DifsKRT8 O01TQ7miLIJw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,414,1583222400"; d="scan'208";a="429936844" Received: from linux.intel.com ([10.54.29.200]) by orsmga005.jf.intel.com with ESMTP; 22 Apr 2020 07:44:06 -0700 Received: from [10.249.227.181] (abudanko-mobl.ccr.corp.intel.com [10.249.227.181]) by linux.intel.com (Postfix) with ESMTP id B23335802C9; Wed, 22 Apr 2020 07:44:03 -0700 (PDT) Subject: [PATCH v2 1/4] perf trace: substitute CAP_SYS_ADMIN with CAP_PERFMON in error message From: Alexey Budankov To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Ingo Molnar , Andi Kleen , linux-kernel , "selinux@vger.kernel.org" , "linux-security-module@vger.kernel.org" References: <66f2975b-4a69-b428-7dc5-d9aa40b3c673@linux.intel.com> Organization: Intel Corp. Message-ID: <450d035a-c192-10e5-1c28-664ccae3e46e@linux.intel.com> Date: Wed, 22 Apr 2020 17:44:02 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <66f2975b-4a69-b428-7dc5-d9aa40b3c673@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update error message to mention CAP_PERFMON only. CAP_SYS_ADMIN still works in keeping with user space backward compatibility approach. Signed-off-by: Alexey Budankov --- tools/perf/builtin-ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 55eda54240fb..39d43ad02f30 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -288,7 +288,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv) perf_cap__capable(CAP_SYS_ADMIN))) { pr_err("ftrace only works for %s!\n", #ifdef HAVE_LIBCAP_SUPPORT - "users with the CAP_PERFMON or CAP_SYS_ADMIN capability" + "users with the CAP_PERFMON capability" #else "root" #endif -- 2.24.1