From patchwork Thu May 30 16:54:25 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: 165446 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1220432ili; Thu, 30 May 2019 09:54:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqyFoytju8ekcM04gK9WuS67zP/KXpFOq+0zL4aFpSqESfgb4CV/D5BYuI6OVKTX4/4dsyaM X-Received: by 2002:aa7:9212:: with SMTP id 18mr4754327pfo.120.1559235292342; 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=PQBNN9bFYJRfmwBt7VJzXiAgbOiHv/T1YnYq5Om0DJJynJ2iL4V/AeEN8QLuw91Dla fWg1osBMC26UdXWcxVv6h78XqGWlIPxAzbvhJAJNm1GbT/fcKXpOoWkcvp3hwKMg03In ZXAOnYwhZ9r3Im5BB99U1qrtk0YTEUZW5YINR9RflDkVesMVAdJ0TPKdlkh0I6/chjNO 9GhUYydtVxNBAkj1shp17u4AI9UlGhhScwIgM5/YdSwaJ7NOsRTOtQq5F+vjU0SFEBIk UVZqJW+8o9do23RkSGyUJ95qZ+irNiIlwD3XvViSiAsRVUE9bgAqpOWoNFREXNTGp3XX rCKw== 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=3cxuBmVrz+alIEaOHH/bws4ch0YZ/E2S6epyTcglB8w=; b=fRg5CTD8z/0iUlWgLgU40n9jljUhLtcVUGwcvCjRF/hMwqqrCRQ2Y83X+IDeWZYb2Z IJxH0IO5LHbt1KvGpGqSUPaRmciV/1mwK/AfiAc5Kks21oTKnuFTqy9mS4T3HdfWOxUv KxfkoVXDh8SoIGdbnMdylPOWsRDJ/4LUscJrGgou2S95HgtcTs0xs8Yw7IRFogDMnLKP dbMBT1phxOaqLhjsJoO5Z+uNpwNlaQII0JGQDpMCGxjFXYBlfHkN74XPdyJi4JlCAY7M ipuoN9zA4r1r0DdeMII01NhVWrKYEMwJaZZl2ltPIYdq0DrErjmUX4HLnf+ulXG8c8IX rMhQ== 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 S1727789AbfE3Qyn (ORCPT + 30 others); Thu, 30 May 2019 12:54:43 -0400 Received: from foss.arm.com ([217.140.101.70]:39780 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727769AbfE3Qym (ORCPT ); Thu, 30 May 2019 12:54:42 -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 E5A2B165C; Thu, 30 May 2019 09:54:41 -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 B21FF3F5AF; Thu, 30 May 2019 09:54:40 -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 2/4] coresight: tmc-etr: alloc_perf_buf: Do not call smp_processor_id from preemptible Date: Thu, 30 May 2019 17:54:25 +0100 Message-Id: <1559235267-25232-3-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(). 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 7c81f63..5d2bf6d 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_NO_NODE : cpu_to_node(event->cpu); /* * Try to match the perf ring buffer size if it is larger * than the size requested via sysfs.