From patchwork Fri May 10 09:31:01 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: 163846 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2121147ilr; Fri, 10 May 2019 02:31:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoFD8aWuxpK+Vmy10HG2kEL7W4Wom9zICbZKa8a5kP2lbCDElN2qUhmQRSFxcoQmvVokiL X-Received: by 2002:a63:b706:: with SMTP id t6mr6135497pgf.305.1557480679096; Fri, 10 May 2019 02:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557480679; cv=none; d=google.com; s=arc-20160816; b=IKH4sw9mdr71bJQ8u/ZU7ps1vozwdhF2Gy5ZHzcK8J20pjWgO5EJT1NVO8bg26To80 zBxco6SjF1nIbhn92QOdIpbZ/n5Zr561g7KcVH5aDxo4ZvJuMtgn+U1qymm174Kf0dyB cu2YBNAGOHtRPDhHK+rcjVxDlVUsQGRqiKLATTC67OtTCrivC9CvAUcRZzaHyTD5NVGm 6MU5+hv2Nf+saQ0ZnZE2HoFY8YbS4jP/t4Mj/meaeeS4hDSE4fdfp/VA8qboNw5SNjam hUxJj3DrTHYXG+sh/XjCgvM72cXf2udHpLeL32rS2BXVRHSquVsgo2fzPIQSZ8yEdjSH 1W9Q== 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=i8bhmbEetvuknLCg0LksGJSUcs2I5Gnn2f78Ia6IV7U=; b=dbHfFMSaWKlxxLbd7svdaefZ3OwIuKeJqepdHKdhsxqGQu+zzc2DloZ5Cve53spiRI KSWG8iMeHdrzIRq0gSd1PqPrr4mKMLfPPjDsYQz83j5JhK15yTUOKYAxEpyPEKgx25lk TCxPB2iK0YfBhZMIzTBamxf6d//dAWquzzps060fxpuTeQ0u5nbl+oCFPYX4jBl4SKTn aD4UTYyvZkj/RhJGHPExJOyRBy/lk85kW4WS9BuEDpjI3i2lP1IVDUEXAcms2l/m870w BfUYshk/93zGz67aIm53NEu86bGgmzGIv8viHIHDZ1UJJtbgilBaGvseMpJ2wEobVg1O 38gQ== 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 36si7167148pgw.281.2019.05.10.02.31.18; Fri, 10 May 2019 02:31:19 -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 S1727346AbfEJJbR (ORCPT + 30 others); Fri, 10 May 2019 05:31:17 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:41130 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727310AbfEJJbQ (ORCPT ); Fri, 10 May 2019 05:31:16 -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 2B5B815BF; Fri, 10 May 2019 02:31:16 -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 1BF713F738; Fri, 10 May 2019 02:31:14 -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 2/4] coresight: tmc-etr: alloc_perf_buf: Do not call smp_processor_id from preemptible Date: Fri, 10 May 2019 10:31:01 +0100 Message-Id: <1557480663-16759-3-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(). BUG: using smp_processor_id() in preemptible [00000000] code: perf/1743 caller is tmc_alloc_etr_buffer+0x1bc/0x1f0 CPU: 1 PID: 1743 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_etr_buffer+0x1bc/0x1f0 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: 22f429f19c4135d51e9 ("coresight: etm-perf: Add support for ETR backend") Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-tmc-etr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c index cae9d8a..e2932f5 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -1184,14 +1184,11 @@ static struct etr_buf * alloc_etr_buf(struct tmc_drvdata *drvdata, struct perf_event *event, int nr_pages, void **pages, bool snapshot) { - int node, cpu = event->cpu; + int node; struct etr_buf *etr_buf; unsigned long size; - if (cpu == -1) - cpu = smp_processor_id(); - node = cpu_to_node(cpu); - + node = (event->cpu == -1) ? numa_node_id() : cpu_to_node(event->cpu); /* * Try to match the perf ring buffer size if it is larger * than the size requested via sysfs.