From patchwork Fri May 10 09:31:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 163848 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2121260ilr; Fri, 10 May 2019 02:31:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqyStdIzEtjP+KwEObMtjx813FIZlBUw2fBDI38TbpVW51ZNr2jM2yH+C1GRFZsEUX7Bzxa2 X-Received: by 2002:a17:902:720a:: with SMTP id ba10mr11645160plb.192.1557480685789; Fri, 10 May 2019 02:31:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557480685; cv=none; d=google.com; s=arc-20160816; b=zUtxbS5G9AeduEEexh5ZCq3e4B9hJHZz7qboBiMNOuYq6lb6qj5BY/4LKA3a9IUr05 QiinLjVij5ZIMp8ELn8RpSBCStmy7qQbFeGTULxIiL8/PC2q6g6GwhQzMcEM2DhFxcki O+02h3vvQhJD9wWosgZfCc7GjotV02JGfDU9cfCZFVVRbHbSeYJd68JFEcHK0UIl8mjB MDgUlqwqmnV9uBBHat/1s7WqR6Sa02fxGWfnOz7eHlfaiyJEE/gJNz7uOS9bsCF5Sk4e 9gVe85HbzH657KyUfKEHfWoG8mqGSCaGCsbwNjCfMUenj8Bdt9z2q6/fYnM/CJdx0Ml4 Ot8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=eJPrKWtRiFxnnQzGIhq7/Yc8KZ1BmubqWOm6dfohKg4=; b=Scw9wo2J1DxPQxHNJee3l3ys9GvRElIEgJrecKef7/cFVToRxa43HagZuSWUxhcBGe 18ZqMHFP0rSL+Q6v33lW8xIL9YZbwD2ytxRpCf8OQEd+gLTqBg+KvmZLfbXQ3h2LqX+n y14G6AhOPv4AK99HpljT7aqw8gIIp4LupkNtdfFCmOqJysvt29CzkSFMz/OmV01ifVKe 4hy4kW/jYYyHqmcWXZm+xvDQTFnhivPuX0ZE6+0rKPRkzFdz7lu0QPwqxlkWm9EJzltu gAFCfWSIUDtSa0N7en9LRhxHhdJP/ekLH1BqtS16ddWoFSVFBAYtJJpAIeXkVWeNlF2D kohg== ARC-Authentication-Results: i=1; mx.google.com; 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 t13si6363053pgp.569.2019.05.10.02.31.25; Fri, 10 May 2019 02:31:25 -0700 (PDT) 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; 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 S1727375AbfEJJbU (ORCPT + 30 others); Fri, 10 May 2019 05:31:20 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:41140 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727342AbfEJJbS (ORCPT ); Fri, 10 May 2019 05:31:18 -0400 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 77487169E; Fri, 10 May 2019 02:31:17 -0700 (PDT) Received: from en101.cambridge.arm.com (en101.cambridge.arm.com [10.1.196.93]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 67D713F738; Fri, 10 May 2019 02:31:16 -0700 (PDT) From: Suzuki K Poulose To: mathieu.poirier@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, Suzuki K Poulose Subject: [PATCH 3/4] coresight: tmc-etf: Do not call smp_processor_id from preemptible Date: Fri, 10 May 2019 10:31:02 +0100 Message-Id: <1557480663-16759-4-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557480663-16759-1-git-send-email-suzuki.poulose@arm.com> References: <1557480663-16759-1-git-send-email-suzuki.poulose@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We find the current CPU using smp_processor_id() if the event is not bound to a CPU, to find the node for memory allocation. Use the safe numa_node_id() instead, to avoid BUG(). e.g: BUG: using smp_processor_id() in preemptible [00000000] code: perf/2544 caller is tmc_alloc_etf_buffer+0x5c/0x60 CPU: 2 PID: 2544 Comm: perf Not tainted 5.1.0-rc6-147786-g116841e #344 Hardware name: ARM LTD ARM Juno Development Platform/ARM Juno Development Platform, BIOS EDK II Feb 1 2019 Call trace: dump_backtrace+0x0/0x150 show_stack+0x14/0x20 dump_stack+0x9c/0xc4 debug_smp_processor_id+0x10c/0x110 tmc_alloc_etf_buffer+0x5c/0x60 etm_setup_aux+0x1c4/0x230 rb_alloc_aux+0x1b8/0x2b8 perf_mmap+0x35c/0x478 mmap_region+0x34c/0x4f0 do_mmap+0x2d8/0x418 vm_mmap_pgoff+0xd0/0xf8 ksys_mmap_pgoff+0x88/0xf8 __arm64_sys_mmap+0x28/0x38 el0_svc_handler+0xd8/0x138 el0_svc+0x8/0xc Fixes: 2e499bbc1a929ac ("coresight: tmc: implementing TMC-ETF AUX space API") Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-tmc-etf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c index 31093de..5d0e594 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c @@ -377,12 +377,10 @@ static void *tmc_alloc_etf_buffer(struct coresight_device *csdev, struct perf_event *event, void **pages, int nr_pages, bool overwrite) { - int node, cpu = event->cpu; + int node; struct cs_buffers *buf; - if (cpu == -1) - cpu = smp_processor_id(); - node = cpu_to_node(cpu); + node = (event->cpu == -1) ? numa_node_id() : cpu_to_node(event->cpu); /* Allocate memory structure for interaction with Perf */ buf = kzalloc_node(sizeof(struct cs_buffers), GFP_KERNEL, node);