From patchwork Fri Jul 12 12:20:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 168947 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp829314ilk; Fri, 12 Jul 2019 05:36:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqxw0MwuKLSkbqIJkIn9N2XGCoLZKIKey84Hw0xCHzFN6sGJqlK549wAwnA7JYCo6PgqMJ7m X-Received: by 2002:a17:90a:db44:: with SMTP id u4mr11552906pjx.52.1562935001255; Fri, 12 Jul 2019 05:36:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562935001; cv=none; d=google.com; s=arc-20160816; b=wU/Mt9LeyXCN0XuIJRy0AoLWj+1q2Zd4B5QdX1i7UEsSyaFpxSpwY3E4YhLy8O0WM+ 6PL0LCQJT5ytTTxr1DJ5o9tj5J7yFsDySMlbvIinLoESrw8HL+kYUv/+N5qMtdbtuQzq GX9JKGUHQhp4PhWTtjv5625FAk1g/mIWBIgtzj8UejktM9nOzgpiKTAL/n2kXTvJ2Q54 Kzslb4izsBdl6aGpkKNp4Jt4/Xp6WjKWxQOw9gZIvjk+4vPYeBKeP/VZXWpQ1DetVJde Q5JhH5ln76avcbNiKDvlth+scYP2fhqCO490MAphAX+W6nLZ2xrmStFw62JHNj7STMP8 D6zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yrl3w5vVslwd3VSGzi2nGf7set2yuXlAn2tkeYzPS+0=; b=jhmzui6rubymznIyDjIUHVb/I45vpzO8VjD/eIowAiRWwip9BAyRmG5Gu9S+hXDMM6 uIEkNY4HNT7JdMx7hoZp/cuW6T4HbjeRvyBYGXsfedK1EZSGBnB61iWzrAdSx+ICM3tJ cE9kU3o9/x1J9GZwPYVOLx9jNWXRc/pNiXwcHnwUKXOfG97PuMdbcUBGiGGTNQmb8QFo 4hGCsptSu7cfK+QQJkKHS/1swYVPNt6zEdkk2enm3RkXOY3zqt9TWgCrln8kDDailrdw HGFvPDgLDohWZe2B6iodMaOa5NBSuZCQpSpTTAZWBS+Uwb3LJOxmM0HGVPlcn0EQj3oB vgog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="MLf/vkLK"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 v16si8368635pfi.142.2019.07.12.05.36.39; Fri, 12 Jul 2019 05:36:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="MLf/vkLK"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729522AbfGLMeu (ORCPT + 13 others); Fri, 12 Jul 2019 08:34:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:54948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729785AbfGLMet (ORCPT ); Fri, 12 Jul 2019 08:34:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2224F21019; Fri, 12 Jul 2019 12:34:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934888; bh=BKlA4wVcFUt/TCMgw1qZXZnd3pCfWL8lN5nCZOm9q3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MLf/vkLKzEV8kG1Nh5rGnnlEAdKaCvdP2zQPYuuVHQaxNaVD7GBrPGEulmzIJDLPU mNi9530IURW+ZdHak89ROmIAeWamuOXpIrqkgEM/12Hl3R6Bfi8IuPh51rV9KMzVUX VBvcQGmGR7B+gcRhK7qrhdXkj91ZXaVMuyuGEGfw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Suzuki K Poulose Subject: [PATCH 5.2 47/61] coresight: tmc-etr: Do not call smp_processor_id() from preemptible Date: Fri, 12 Jul 2019 14:20:00 +0200 Message-Id: <20190712121623.164723729@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121620.632595223@linuxfoundation.org> References: <20190712121620.632595223@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suzuki K Poulose commit 3ff44563dbb02456a33f2a42000f04db4ef19a8f upstream. During a perf session we try to allocate buffers on the "node" associated with the CPU the event is bound to. If it's not bound to a CPU, we use the current CPU node, using smp_processor_id(). However this is unsafe in a pre-emptible context and could generate the splats as below : 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 Use NUMA_NO_NODE hint instead of using the current node for events not bound to CPUs. Fixes: 855ab61c16bf70b646 ("coresight: tmc-etr: Refactor function tmc_etr_setup_perf_buf()") Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier Cc: stable Link: https://lore.kernel.org/r/20190620221237.3536-2-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/hwtracing/coresight/coresight-tmc-etr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -1317,13 +1317,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_NO_NODE : cpu_to_node(event->cpu); etr_perf = kzalloc_node(sizeof(*etr_perf), GFP_KERNEL, node); if (!etr_perf)