From patchwork Fri Nov 16 10:24:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Murray X-Patchwork-Id: 10685859 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6C2E14BD for ; Fri, 16 Nov 2018 10:25:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5B6A2CE37 for ; Fri, 16 Nov 2018 10:25:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A94162CE80; Fri, 16 Nov 2018 10:25:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5C7DB2CE37 for ; Fri, 16 Nov 2018 10:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=BmZTHKXNFd7RvdN++cmCIpQ2Zo+J+zLwLa2ULbxJ7bY=; b=sDhCAy9JRKPsZy6c2k8xrcjdg0 HWg1jJhG5AGZV/bLniorP4O0LWassm8VkmIU91gKQv9HiHmvCSzo9a9VDb7wIwG3y3CXk5dIQPWbO 9gu1aBvvKmsKCP9B4QiTkYLSilOmF8DWRVDa/3o+vZK+Jm838urEmLBWU4RaR5fTbuXw2Od7ZhETQ ODmMJvUez6SXRaYZL87oAKXWGbrGHoi6G11o4DIVo27K9Kj9lyrr5vpf22t32LL0obmOW5kmQ3M8m GyHW4JTS/ZevYOZ1iqXFrHuWAAHB1b+puOJKnYNnxOhH2dhM2F+LTrhGP/ld50xQM+Vty0KLwTwdU iNs0a7cw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNbJg-0003SL-CY; Fri, 16 Nov 2018 10:25:36 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNbIk-0001LH-V5 for linux-arm-kernel@bombadil.infradead.org; Fri, 16 Nov 2018 10:24:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=rI+Iyi09qtVhd6YSiXdwXGLKZoVI8yjtaib7YEevy2A=; b=sTzyw9do1Ht2dt62lPMuqflpr luQZaUlEuKecnPoiioPA2mFGsK0fOfgD9TY/jL18zGHCzwHrqY9ObZzT2SJFTo+TtVc9qnyxyc3sY q5A8mj/3oOiCNIdlcYsdb3DLKGprtNmhxU4Eye7pb/b/3eJS0KDj7aZqzqfvGfmqNhEhxO2ID4/gv wb2go+mBJNC/q/1uZ6GkGMM2hz8cEdzoFX0WEe3TIPojQYgjL8PUA3sschMfXGD/tT0xhsFYLyDG+ 8KgqsnruhvBO7Tj8181P04cbqn8TCOVC2qB3dR2mX+l73Fe+0PgIfH+G6eiHByFP5lyffInUrBQLu ekFqPFbnA==; Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNbIg-00054N-FA for linux-arm-kernel@lists.infradead.org; Fri, 16 Nov 2018 10:24:37 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8C3BB15BF; Fri, 16 Nov 2018 02:24:33 -0800 (PST) Received: from e119886-lin.cambridge.arm.com (unknown [10.37.6.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 851C23F5BD; Fri, 16 Nov 2018 02:24:30 -0800 (PST) From: Andrew Murray To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Shawn Guo , Sascha Hauer , Will Deacon , Mark Rutland , Benjamin Herrenschmidt , Thomas Gleixner , Borislav Petkov , x86@kernel.org Subject: [PATCH 03/10] arm: perf: add additional validation to set_event_filter Date: Fri, 16 Nov 2018 10:24:06 +0000 Message-Id: <1542363853-13849-4-git-send-email-andrew.murray@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542363853-13849-1-git-send-email-andrew.murray@arm.com> References: <1542363853-13849-1-git-send-email-andrew.murray@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181116_102434_650932_D52C4889 X-CRM114-Status: GOOD ( 11.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-alpha@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The armv7pmu driver doesn't support host/guest mode exclusion so let's report this when set_event_filter is called with these exclusion flags set. Signed-off-by: Andrew Murray --- arch/arm/kernel/perf_event_v7.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c index a4fb0f8..c4c9fbb 100644 --- a/arch/arm/kernel/perf_event_v7.c +++ b/arch/arm/kernel/perf_event_v7.c @@ -1074,6 +1074,8 @@ static int armv7pmu_set_event_filter(struct hw_perf_event *event, if (attr->exclude_idle) return -EPERM; + if (attr->exclude_host || attr->exclude_guest) + return -EPERM; if (attr->exclude_user) config_base |= ARMV7_EXCLUDE_USER; if (attr->exclude_kernel)