From patchwork Fri May 10 09:31:00 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: 163845 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2121130ilr; Fri, 10 May 2019 02:31:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqzR3vb0XWHPcDvbFPlMjhebE63DXbg7/yh4NRqRojP+2EwFVvVTg4FCgKk+bS6rHK9o5LOL X-Received: by 2002:a63:754b:: with SMTP id f11mr12347789pgn.32.1557480677669; Fri, 10 May 2019 02:31:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557480677; cv=none; d=google.com; s=arc-20160816; b=mDzzfRIvZnL77CA2wnSMCguaH6PMfV5EXffVLpFqSRWCORVmEbaP1RYEq8qDw1P/1j MoS32oaCPJF9DJxrCh+QdaCuhLmbVYvWCcFrKoyyt89l/JOLL3cZvWQNOQP89vbfBYGZ cI47QMRhGgcDF0WssB5jQglpUOBVXIRXnWyBQ7xu051JHaf6jeNS+Ao8EcfkGELPK5Gc 2G37puM0Ht9FLtijJnido7QNl7wxVuToGcERLn0GEgP/BPohFvVFzACMrpgmaN9ZIJ4C JKMh6jLnEUD3GjclyEr6vn7qZzP6a71Aznj0aZI/ebi8tb3rG0AWKAUwa6yDh4AMSywH 4lAg== 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=JrFm8xzc76nY4o8KabaaEDVkkgtH99nd7MwsfLV1FrE=; b=wP7REEjam+CZD4yCfccvUCSik6nxzKEM2guDaR99mLPwoT6koVKTWgDxbifk1ea06S 46TOQ3zfkCeOpJl7tnNss3dg1YcM+QoPHpPOf8XXxqm56PKGriphIaMOCbMReQi00vKr i7ogfxL0HLaKQ/JTuz9/zPn5ZwafRVjJZAIUXcoOPKn/6itQ7rxaoKavXV98hQRuhNmm DUFZG1ZHqHxMc5wpQnGNPYT/jrAVL+H2wWcC9b7rcK4/JQKBtB0/wIcb7XCkHddAy/bO LMARJiGkRGPkDXuQE1Vi5qUUYIm3SNAHN3ttjPRo6roPe7d/cuhzBU5Ch70cSiRG6G31 1u0Q== 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 cp7si5092873plb.14.2019.05.10.02.31.17; Fri, 10 May 2019 02:31:17 -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 S1727328AbfEJJbQ (ORCPT + 30 others); Fri, 10 May 2019 05:31:16 -0400 Received: from foss.arm.com ([217.140.101.70]:41120 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726992AbfEJJbP (ORCPT ); Fri, 10 May 2019 05:31:15 -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 D396A15AD; Fri, 10 May 2019 02:31:14 -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 C3E7B3F738; Fri, 10 May 2019 02:31:13 -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 1/4] coresight: tmc-etr: Do not call smp_processor_id() from preemptible Date: Fri, 10 May 2019 10:31:00 +0100 Message-Id: <1557480663-16759-2-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 Instead of using smp_processor_id() to figure out the node, use the numa_node_id() for the current CPU node to avoid splats like : BUG: using smp_processor_id() in preemptible [00000000] code: perf/1743 caller is alloc_etr_buf.isra.6+0x80/0xa0 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 alloc_etr_buf.isra.6+0x80/0xa0 tmc_alloc_etr_buffer+0x12c/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: 855ab61c16bf70b646 ("coresight: tmc-etr: Refactor function tmc_etr_setup_perf_buf()") Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-tmc-etr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c index 793639f..cae9d8a 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -1323,13 +1323,11 @@ static struct etr_perf_buffer * tmc_etr_setup_perf_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; struct etr_perf_buffer *etr_perf; - if (cpu == -1) - cpu = smp_processor_id(); - node = cpu_to_node(cpu); + node = (event->cpu == -1) ? numa_node_id() : cpu_to_node(event->cpu); etr_perf = kzalloc_node(sizeof(*etr_perf), GFP_KERNEL, node); if (!etr_perf)