Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp522350pxx; Wed, 28 Oct 2020 10:13:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9daF/i+n+f9BWCkVWhUgbc0R5znWxSyCy8vNWevUrvmWIPVe3d0qgGtoPTDnjJIfmFiC0 X-Received: by 2002:a17:906:1f08:: with SMTP id w8mr49344ejj.181.1603905221012; Wed, 28 Oct 2020 10:13:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603905221; cv=none; d=google.com; s=arc-20160816; b=ujYAQVqAsiq1QwRA7g5Pjmv6JqlcM1SCBSiC52Qj+32Kd/ubuvUd9+AnYPXjaeKJbw 5rkdPdkVE/yDqyDbWEjxnlNEKH/TY3I6kQs3XXh2fpraC8BUqg12pk+UkDgE0v1GSbde dnd8NNaTaFiM/3YZ2vRmIaXzfdlDst2doul1dUr3QXNW/dMsvbt0j/k7in/aJLjLDZaM M1gfg5A4uDBKhhtKrepJ4RMJDmIyoQD5FLut1/BjTSluVt9aZMQ7FV6i5zCHJw+EeC+9 AogM6XFKhLBapA+41EWIL3ErfWyW8zw2WC2ioHYNTHREgXrtSiw627ia5r+uKlStIrVJ Y5Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZyndhfXdLAsV/G+E0AluqZbcV1HVWdnYu1Ljsj9FI6c=; b=dMOAUcf5B++27WUarUpoTnrp97nqT0rnqaO4rsKhMJ0lMWozQkdiohgtpnVwRE6mbh 0ONPIVa0tv0qMtiLPA36JeyoSUdRtKhGrSWs/c8I2vnt2yWhudOWpldBNBGz1/ajYarq WaIfqb3iMl8n7fp6Dtbq4dmHVQy2EavQCUXPMCmbUvoOAHZ4HHHoCwNTccQhaBZhuwHm 9oKleFGmSeLpySimF1Rj2KvPuSoDctGMKGMp9UMPsyJ7PD5Y81V/QAKiBousi+087DZz z0qCGUbUzjk+31qJ7tTGql0HtuPopELe6LYucio0ZmtDXNy5coUKyiz/fF5i1iDSybZb cnyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yszeTTeh; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d23si10484edy.397.2020.10.28.10.13.19; Wed, 28 Oct 2020 10:13:40 -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; dkim=pass header.i=@kernel.org header.s=default header.b=yszeTTeh; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1820577AbgJ0RgL (ORCPT + 99 others); Tue, 27 Oct 2020 13:36:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:35554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760826AbgJ0Ogi (ORCPT ); Tue, 27 Oct 2020 10:36:38 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 0D5D4222C8; Tue, 27 Oct 2020 14:36:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809397; bh=n933nPjPhTwaAxa76XZlpZtEQm3PzxBaAMGkeZ3inPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yszeTTehc7r9mopXKQfy9hE4I34HWUY9C4gzly783klZQkKwKpzGYn2TrJiSGTIgr tAxFu9wEmWwf/m4pMve9yXlg1Fn5sIYAMbc3VORG1zM41mxaT1ovdr62aBcfgBrc73 y7QgFWRmFulho9Iq6JMD45KJa7x7V+VQeRjFqRmk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Mike Leach , Jeremy Linton , Suzuki K Poulose , Sasha Levin Subject: [PATCH 5.4 150/408] coresight: etm4x: Handle unreachable sink in perf mode Date: Tue, 27 Oct 2020 14:51:28 +0100 Message-Id: <20201027135502.053471876@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suzuki K Poulose [ Upstream commit 859d510e58dac94f0b204b7b5cccafbc130d2291 ] If the specified/hinted sink is not reachable from a subset of the CPUs, we could end up unable to trace the event on those CPUs. This is the best effort we could do until we support 1:1 configurations. Fail gracefully in such cases avoiding a WARN_ON, which can be easily triggered by the user on certain platforms (Arm N1SDP), with the following trace paths : CPU0 \ -- Funnel0 --> ETF0 --> / \ CPU1 \ MainFunnel CPU2 / \ / -- Funnel1 --> ETF1 --> / CPU1 $ perf record --per-thread -e cs_etm/@ETF0/u -- could trigger the following WARNING, when the event is scheduled on CPU2. [10919.513250] ------------[ cut here ]------------ [10919.517861] WARNING: CPU: 2 PID: 24021 at drivers/hwtracing/coresight/coresight-etm-perf.c:316 etm_event_start+0xf8/0x100 ... [10919.564403] CPU: 2 PID: 24021 Comm: perf Not tainted 5.8.0+ #24 [10919.570308] pstate: 80400089 (Nzcv daIf +PAN -UAO BTYPE=--) [10919.575865] pc : etm_event_start+0xf8/0x100 [10919.580034] lr : etm_event_start+0x80/0x100 [10919.584202] sp : fffffe001932f940 [10919.587502] x29: fffffe001932f940 x28: fffffc834995f800 [10919.592799] x27: 0000000000000000 x26: fffffe0011f3ced0 [10919.598095] x25: fffffc837fce244c x24: fffffc837fce2448 [10919.603391] x23: 0000000000000002 x22: fffffc8353529c00 [10919.608688] x21: fffffc835bb31000 x20: 0000000000000000 [10919.613984] x19: fffffc837fcdcc70 x18: 0000000000000000 [10919.619281] x17: 0000000000000000 x16: 0000000000000000 [10919.624577] x15: 0000000000000000 x14: 00000000000009f8 [10919.629874] x13: 00000000000009f8 x12: 0000000000000018 [10919.635170] x11: 0000000000000000 x10: 0000000000000000 [10919.640467] x9 : fffffe00108cd168 x8 : 0000000000000000 [10919.645763] x7 : 0000000000000020 x6 : 0000000000000001 [10919.651059] x5 : 0000000000000002 x4 : 0000000000000001 [10919.656356] x3 : 0000000000000000 x2 : 0000000000000000 [10919.661652] x1 : fffffe836eb40000 x0 : 0000000000000000 [10919.666949] Call trace: [10919.669382] etm_event_start+0xf8/0x100 [10919.673203] etm_event_add+0x40/0x60 [10919.676765] event_sched_in.isra.134+0xcc/0x210 [10919.681281] merge_sched_in+0xb0/0x2a8 [10919.685017] visit_groups_merge.constprop.140+0x15c/0x4b8 [10919.690400] ctx_sched_in+0x15c/0x170 [10919.694048] perf_event_sched_in+0x6c/0xa0 [10919.698130] ctx_resched+0x60/0xa0 [10919.701517] perf_event_exec+0x288/0x2f0 [10919.705425] begin_new_exec+0x4c8/0xf58 [10919.709247] load_elf_binary+0x66c/0xf30 [10919.713155] exec_binprm+0x15c/0x450 [10919.716716] __do_execve_file+0x508/0x748 [10919.720711] __arm64_sys_execve+0x40/0x50 [10919.724707] do_el0_svc+0xf4/0x1b8 [10919.728095] el0_sync_handler+0xf8/0x124 [10919.732003] el0_sync+0x140/0x180 Even though we don't support using separate sinks for the ETMs yet (e.g, for 1:1 configurations), we should at least honor the user's choice and handle the limitations gracefully, by simply skipping the tracing on ETMs which can't reach the requested sink. Fixes: f9d81a657bb8 ("coresight: perf: Allow tracing on hotplugged CPUs") Cc: Mathieu Poirier Cc: Mike Leach Reported-by: Jeremy Linton Tested-by: Jeremy Linton Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier Link: https://lore.kernel.org/r/20200916191737.4001561-11-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/hwtracing/coresight/coresight-etm-perf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index 84f1dcb698272..c4b9898e28418 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -310,6 +310,16 @@ static void etm_event_start(struct perf_event *event, int flags) if (!event_data) goto fail; + /* + * Check if this ETM is allowed to trace, as decided + * at etm_setup_aux(). This could be due to an unreachable + * sink from this ETM. We can't do much in this case if + * the sink was specified or hinted to the driver. For + * now, simply don't record anything on this ETM. + */ + if (!cpumask_test_cpu(cpu, &event_data->mask)) + goto fail_end_stop; + path = etm_event_cpu_path(event_data, cpu); /* We need a sink, no need to continue without one */ sink = coresight_get_sink(path); -- 2.25.1