From patchwork Mon Nov 21 07:57:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 83194 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp1369084qge; Mon, 21 Nov 2016 00:10:22 -0800 (PST) X-Received: by 10.13.193.70 with SMTP id c67mr12054459ywd.8.1479715822278; Mon, 21 Nov 2016 00:10:22 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z29si4414032ybi.215.2016.11.21.00.10.22; Mon, 21 Nov 2016 00:10:22 -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=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753589AbcKUIKR (ORCPT + 26 others); Mon, 21 Nov 2016 03:10:17 -0500 Received: from mail-pg0-f52.google.com ([74.125.83.52]:34103 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753518AbcKUIKM (ORCPT ); Mon, 21 Nov 2016 03:10:12 -0500 Received: by mail-pg0-f52.google.com with SMTP id x23so125379819pgx.1 for ; Mon, 21 Nov 2016 00:10:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TuP8FkTSQW9WzNHZ0PW3kk3+FJ+VQP/33AOLzfwrUEw=; b=GqD+WuP/tl1Wmezx/E74j/FPp0AmqYCmXe7BZSuJrQAyty3eWY5Yppu3rQYZ6lD0dQ LG5cJbkOMRtqBhDBdKSWZH9u1VTp3dqKqB+EUzOHCERkxd1Hg9EZN1queAXKTs+EypqE g5BB9K8b0sqs0Wxk5HOfJ7b2iF8FSNLWcdP3o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TuP8FkTSQW9WzNHZ0PW3kk3+FJ+VQP/33AOLzfwrUEw=; b=AuKV8G7ydGgqWG1pLnweOi8DR8GXPlVuEb3mnstl38EtOTomKvOHipASyxfF3ag5+B TyHJ7JMvk3QNfmPFN9CeApbrgOO3HDzcWcmN6ns/Hq8BEBOoRpe3qrmt+OPLe62SFp+M kisx5d7gT0JNc1gF472MG9VZupTv2jQImYxdLdJaAiQd4gXv0kQdTLQkscx/7yW/lhUu 3e5CA0p+KDQdMWmXwSNXXdWQzpajihmBdytAamD2rNzYiNQ/dPQTRLz/xob6ZfzLotPd zDAQRsPX76OSwvuM9OWgOAXYzh8FLTgxgI7FYMykLbduSCWmH2X8vozmDWWUA6oqCIJr V+6Q== X-Gm-Message-State: AKaTC03Blc0oxbHZdJz1eRGcbWC5rcG5IfDh4UeHVR7dFZYEZJdWWoAgb/ocsqEHQwzBl3Sg X-Received: by 10.99.127.16 with SMTP id a16mr29410637pgd.27.1479715811309; Mon, 21 Nov 2016 00:10:11 -0800 (PST) Received: from localhost.localdomain ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id s2sm35183093pfi.10.2016.11.21.00.10.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Nov 2016 00:10:10 -0800 (PST) From: Chunyan Zhang To: rostedt@goodmis.org, mathieu.poirier@linaro.org, alexander.shishkin@linux.intel.com, mingo@redhat.com Cc: mike.leach@arm.com, tor@ti.com, philippe.langlais@st.com, nicolas.guion@st.com, felipe.balbi@linux.intel.com, zhang.lyra@gmail.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH V9 6/6] stm: Mark the functions of writing STM with notrace Date: Mon, 21 Nov 2016 15:57:23 +0800 Message-Id: <1479715043-6534-7-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479715043-6534-1-git-send-email-zhang.chunyan@linaro.org> References: <1479715043-6534-1-git-send-email-zhang.chunyan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If CONFIG_STM_SOURCE_FTRACE is selected, Function trace data can be writen to sink via STM, all functions that related to writing data packets to STM should be marked 'notrace' to avoid being traced by Ftrace, otherwise the program would stall into an endless loop. Signed-off-by: Chunyan Zhang Acked-by: Alexander Shishkin --- drivers/hwtracing/stm/core.c | 7 ++++--- include/linux/stm.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 51f81d6..37d3bcb 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -425,7 +425,7 @@ static int stm_file_assign(struct stm_file *stmf, char *id, unsigned int width) return ret; } -static ssize_t stm_write(struct stm_data *data, unsigned int master, +static ssize_t notrace stm_write(struct stm_data *data, unsigned int master, unsigned int channel, const char *buf, size_t count) { unsigned int flags = STP_PACKET_TIMESTAMPED; @@ -1121,8 +1121,9 @@ void stm_source_unregister_device(struct stm_source_data *data) } EXPORT_SYMBOL_GPL(stm_source_unregister_device); -int stm_source_write(struct stm_source_data *data, unsigned int chan, - const char *buf, size_t count) +int notrace stm_source_write(struct stm_source_data *data, + unsigned int chan, + const char *buf, size_t count) { struct stm_source_device *src = data->src; struct stm_device *stm; diff --git a/include/linux/stm.h b/include/linux/stm.h index 8369d8a..210ff22 100644 --- a/include/linux/stm.h +++ b/include/linux/stm.h @@ -133,7 +133,7 @@ int stm_source_register_device(struct device *parent, struct stm_source_data *data); void stm_source_unregister_device(struct stm_source_data *data); -int stm_source_write(struct stm_source_data *data, unsigned int chan, - const char *buf, size_t count); +int notrace stm_source_write(struct stm_source_data *data, unsigned int chan, + const char *buf, size_t count); #endif /* _STM_H_ */