From patchwork Thu May 30 16:54:26 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: 165447 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1220440ili; Thu, 30 May 2019 09:54:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqyvBqQqlWVeI13Tl3AhD1pzw0o1H87TJeaVl/t6/pShk+ya5Cjijmz8Ujsa8Dn5ENeCQe+b X-Received: by 2002:a63:4d5d:: with SMTP id n29mr4680453pgl.235.1559235292718; Thu, 30 May 2019 09:54:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559235292; cv=none; d=google.com; s=arc-20160816; b=dG1Ktguf2ngAPdxWxVOF5Rhg9lhtFALoSdLs/O8Nw8poTj6pA2pe7zs/PcAB2CfaDe pH1WB1XZ7+vDhEjjzbu79d0WQ38bx2nz7nmId+VAH60OKI4BWcA4My62IcYQ83vmM5wJ HiZWj5BMp2LG7JGdyH7OEQWWjKmB3bzBihFMpiSJVWkcE3a5d8x86bWqlbZRwvV/+CF2 WmmQ1LokYK59+0fyFJlTTVCR9eqnMl9eyMMql+j6gmKWlBgJtNPGKJwpvS1bxk2oi1Ny fkwyISXkp0vcn+yjtWRXRJ4io8lFs3A4IeEcY89IVxYaDjkZgq5Fgi6ZVQrzervU8cZ2 eHJw== 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=N5sMMceUKXaWVwuzfKPXkG/XyaX37Rb+rEBE0sEh+kY=; b=ltGqA6ul929pBx1K/+/2pjpvYCJCtcJZQLkF9F3+b67HTPTa0zG7XY8Au5MVR5exT3 U/3IXQYxGxq5Qo1RJg3kQuCzfei9Tz7MRvfj0QA2tbwq9giaMhHq/uEdgTgguimz9TEZ cUPfi1rbqrgB77/f9m4ndk5aooW9AMhmQ7YJXoNQWk2/oJfkdld5MwIyEygJ5SCGRHFn LNuQ39SOaYmFCJHTejAhcetnDTSRIvPHJxkELxd34Mxh2wvhesUvsDCHyG5kCoqsJDwa rqocuZAB0IpYpV2IxPE0YNQF8OX7OXMzUp0bacf3hSywQbsmq9tAiLrpbXQaNUbZFEag fKPw== 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 f189si914014pfg.3.2019.05.30.09.54.52; Thu, 30 May 2019 09:54:52 -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 S1727806AbfE3Qyr (ORCPT + 30 others); Thu, 30 May 2019 12:54:47 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:39790 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727788AbfE3Qyn (ORCPT ); Thu, 30 May 2019 12:54:43 -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 6135E341; Thu, 30 May 2019 09:54:43 -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 2E1373F5AF; Thu, 30 May 2019 09:54:42 -0700 (PDT) From: Suzuki K Poulose To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, coresight@lists.linaro.org, mathieu.poirier@linaro.org, robin.murphy@arm.com, Suzuki K Poulose Subject: [PATCH v3 3/4] coresight: tmc-etf: Do not call smp_processor_id from preemptible Date: Thu, 30 May 2019 17:54:26 +0100 Message-Id: <1559235267-25232-4-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1559235267-25232-1-git-send-email-suzuki.poulose@arm.com> References: <1559235267-25232-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 b89e29c..23b7ff0 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_NO_NODE : cpu_to_node(event->cpu); /* Allocate memory structure for interaction with Perf */ buf = kzalloc_node(sizeof(struct cs_buffers), GFP_KERNEL, node);