From patchwork Tue Nov 19 05:19:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179673 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp160462ilf; Mon, 18 Nov 2019 21:39:56 -0800 (PST) X-Google-Smtp-Source: APXvYqwhg8jd8xWmbxyHY4Mg2Ygao+Gig5wu0lAhTgM3tYbyIC6RmMXfWGcrYVJkPl4oBlRKoTsi X-Received: by 2002:a17:906:52c4:: with SMTP id w4mr30949819ejn.99.1574141996167; Mon, 18 Nov 2019 21:39:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141996; cv=none; d=google.com; s=arc-20160816; b=AF/t8N0ZYKt/NdFuepJUOhibFOtiie1jBKth7rcB8PWh1DFb3DaqCc5Xv6hmNyplnD 04k2UBmXJzXO4jNb3sTOWFzD8K83kc16ZZa/YbDIePXvrCSIGjLkrwJDuwN5xIbJipWs cARuUArTInEANtkt/+QRSboTvq+J+NnwUWuASqPHanG+jruv/yDdwMX/YNXkrM9nqrBL cwD9W4/En6oC6XpdFi0t3HiHFsmrHo5O+Ogq+LuyxjNx6tDcoMtSMUUliY9TNcast0Hl xOa94T7V5iwakr82wTKNFI4HxGJWx0NZQAE7QrrnvqVOVgV3Z0/qAudq8K36gtt5mm1r wdQg== 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:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=98CtDxdf7IHNPYkRNFxaQrO+3m0k8YdUOwJpQhunvpg=; b=UxwHHVyt0whKtCc4vFS+IR+lpw4r2xefDGqPINAX7GnIN4iFB2Vo+gfLS72aaSLNmU ChmaA52R8BWSJNlbBx+s+Qi5TRKoc9kics3SG4beLdV/kQ5DPmfZj2f1Y64+2AsFMIp1 xhGCUgQBK0G0V2vZPTPOb/V57Q4tc6IUl+HjRbdGDIuGby+y/AJjBxqtOlChNHQYF7X0 j5h7fOZCYJrHjYHO57rVuCP0+hzWuUJgLhWSK2JlJ/D0g2HU2vCjaqh6N4dI+XVFLrE0 GmFY28LQRepIy/zoJsmxoCrnKJFfl7WGPq/jkmdCENHdDFBkFTc1ILlyLImKJZMuDQTQ iR8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f2AqO7p8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h23si14132320ede.355.2019.11.18.21.39.55; Mon, 18 Nov 2019 21:39:56 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f2AqO7p8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729473AbfKSFjx (ORCPT + 26 others); Tue, 19 Nov 2019 00:39:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:33846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730005AbfKSFjq (ORCPT ); Tue, 19 Nov 2019 00:39:46 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9C8722071A; Tue, 19 Nov 2019 05:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141986; bh=QJxa5nK1H1nKWLhJmsQHhMbrd/v7Of9YYRk/3G1Mo8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f2AqO7p8tIEMhSZdy+wsFXEHzJwO+ILZ1XppSHOPaT/+RQcE/iyDGQ9LILz1zSCg7 okiBXbUg01ME/t8od1vjvQueDEhu3CkBrElUq0weZWFF9FboTR2GJOxDBApSosAPSv 8YXd9S6BjcQZ4ZQlHfV4iiNmuk63jIs6/u/feLNk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Suzuki K Poulose , Sasha Levin Subject: [PATCH 4.19 347/422] coresight: perf: Disable trace path upon source error Date: Tue, 19 Nov 2019 06:19:04 +0100 Message-Id: <20191119051421.497738470@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suzuki K Poulose [ Upstream commit 4f8ef21007531c3d7cb5b826e7b2c8999b65ecae ] We enable the trace path, before activating the source. If we fail to enable the source, we must disable the path to make sure it is available for another session. Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/hwtracing/coresight/coresight-etm-perf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index 4b53d55788a07..c3c6452015142 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -306,11 +306,13 @@ static void etm_event_start(struct perf_event *event, int flags) /* Finally enable the tracer */ if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF)) - goto fail_end_stop; + goto fail_disable_path; out: return; +fail_disable_path: + coresight_disable_path(path); fail_end_stop: perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED); perf_aux_output_end(handle, 0);