From patchwork Wed Feb 28 11:54:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wu X-Patchwork-Id: 207797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3292855dyb; Wed, 28 Feb 2024 03:54:36 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWPHaZmR3gm8ci+4G4xVIFQU6ZvQ9/DHVIH2PsDjwdXV8mN+GDbSyvOvDnSdCARipEqIceTwnMBjvdKCHqBEYC+AWicrA== X-Google-Smtp-Source: AGHT+IEPLQA89or+47WlXsFU73V6+d28J5U823rxjlOVmF190DXaCJ0nldQZNz4KcVUIt/H9EPm7 X-Received: by 2002:a05:6358:9208:b0:17b:7c6c:665 with SMTP id d8-20020a056358920800b0017b7c6c0665mr10525585rwb.15.1709121275832; Wed, 28 Feb 2024 03:54:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709121275; cv=pass; d=google.com; s=arc-20160816; b=b45PmKLQvDvrgQjk4glTd0vabDsyIJVhLsG/rO62yqqPCLYBykT/sJEIybE40tzhJV wpEiIJflsAUHBm0xviXe3Us44odIQ+fLIQayqL8zujM2dz021ITJaljMMTUZejFNQ9KW 5HDnPL/x1o8jOAKabyzkz6xmpntu6OnMF95gr0i/gkzhRbe6eHStO3yCDDZU39YBHGx4 yOznurB5Abo86pVA+gnfNbYZxBZ+nZgCcZEv3BEqSquoHo+QGHuamEPpLZARBOBP9T4l AwAeDPxs4h3dTjBdH8f8W+3gxhn1UXbAOOhAQn6eZXU5lO1cJRDuqLvb5r+IdYkx6TEW jfcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=2NMY0KRGJL6ufTpTxlP0HRK9+QX/98dtveDjljMYq2s=; fh=bT9tpgo+hlOWwUYkqr20rUeKejkhNgtCOJ0KTwIsW8k=; b=vguK3/pCtqXeO27WdQc04oZRO/Xsry0uOGqchUCOmggi1keOJrpD+AScIDma7ZIwOU 6ykYTk5bMjbqXiUfxioSsIT4K5SpFsQcTBsJBZXDjDZYFUF+jJGj3LVSOT62UpyUySTr 2GJYPaS9Z2BUrbbUtjX7+QoyXcxP+cGMu08WJQchFjrwNunhHIslmVE+3r0vPAyv4lKj G647dV4D1Z6d5IStwLiWxcddstNkLp7ao0dPTLVP6GI+75IntjjoOb9MbmY18Ms1+Axz wnn1y2s0r3/m0i6R9Nf6+edVThQXDhjit+y8sNBGCnCOaFOmpy2uF8/90GC2fS0A5qNe Yf1g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Gl4HU8aJ; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-84960-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84960-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id bp6-20020a05620a458600b007871f7dff88si10413266qkb.760.2024.02.28.03.54.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 03:54:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84960-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Gl4HU8aJ; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-84960-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84960-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 9ACC71C23796 for ; Wed, 28 Feb 2024 11:54:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B9485156979; Wed, 28 Feb 2024 11:49:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Gl4HU8aJ" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3028B6CDD9 for ; Wed, 28 Feb 2024 11:49:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709120978; cv=none; b=cSqtxlkBiZnOw47jgubH/Tvxr0DUfeLKZPxBG8maghNloYonQsiOMx7TOW3d9t1/wlL/17QNFgDK7eWMGfWb1+5JYpAD/XMVCpbWarAE88Ty+T1VJlXDASIjhr9qCrlkshUQwGuSJ7vW9qIZ5PCVX8pPAFwChyn4R7AQKBcmrUg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709120978; c=relaxed/simple; bh=Qcal8Ty64aIwuJm9sMzxN+fh8PzyQM8kaqQ/aZv5CWY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=R07pMxpv+olhpOAtSflu2JlRMHMagdipPQ4JSVmmN1WCSaeQT1JOHNmevNqNIn7/DvwwAc8tZqJYmoIS/6UwtNg9N3zeDdApGS2Z81ddahDkGk6zLIf4X5MJO6/qmDZvScnSC5TnxpZQJIbJQUwp39HEy72XJXlvGnVbOuNoQ1Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Gl4HU8aJ; arc=none smtp.client-ip=198.175.65.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709120976; x=1740656976; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Qcal8Ty64aIwuJm9sMzxN+fh8PzyQM8kaqQ/aZv5CWY=; b=Gl4HU8aJ3hyusOlSYuJ/PI+Rkt2iY/at+VmtnaVwKC+1TUcvv7YYsFX6 aC/vmy+Rkci9yZSiIs5ujZsbGyO7huEni/EJjQUM0sneIlzA/CliQZMzD ixRJPEYPIuEdyd7AlIuWPp/qX5J6NttSpyjPrUmOFcm/HVe5R2RjBDEOB H23Kn4BGjJ0iJeO+zMODRnjyZJJtW0ioHMCUx/rI6VQuvOswZyPlPlu6h +qV72tGABx8W5MgRA47yUj596p77xBeXe4REAy3t0jQo6y8Y7O+qVjUS+ 7noxAprhBmXvzgntznx9GcRfDZN24xZx71T9pNhQsjdWAJLwbicquXB5R A==; X-IronPort-AV: E=McAfee;i="6600,9927,10996"; a="3633242" X-IronPort-AV: E=Sophos;i="6.06,190,1705392000"; d="scan'208";a="3633242" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2024 03:49:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,190,1705392000"; d="scan'208";a="7619107" Received: from wufei-optiplex-7090.sh.intel.com ([10.239.158.51]) by fmviesa006.fm.intel.com with ESMTP; 28 Feb 2024 03:49:32 -0800 From: Fei Wu To: atishp@atishpatra.org, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Alexandre Ghiti Cc: Fei Wu , Alexandre Ghiti , Atish Patra Subject: [PATCH v4] perf: RISCV: Fix panic on pmu overflow handler Date: Wed, 28 Feb 2024 19:54:25 +0800 Message-Id: <20240228115425.2613856-1-fei2.wu@intel.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792143550748983697 X-GMAIL-MSGID: 1792143550748983697 (1 << idx) of int is not desired when setting bits in unsigned long overflowed_ctrs, use BIT() instead. This panic happens when running 'perf record -e branches' on sophgo sg2042. [ 273.311852] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000098 [ 273.320851] Oops [#1] [ 273.323179] Modules linked in: [ 273.326303] CPU: 0 PID: 1475 Comm: perf Not tainted 6.6.0-rc3+ #9 [ 273.332521] Hardware name: Sophgo Mango (DT) [ 273.336878] epc : riscv_pmu_ctr_get_width_mask+0x8/0x62 [ 273.342291] ra : pmu_sbi_ovf_handler+0x2e0/0x34e [ 273.347091] epc : ffffffff80aecd98 ra : ffffffff80aee056 sp : fffffff6e36928b0 [ 273.354454] gp : ffffffff821f82d0 tp : ffffffd90c353200 t0 : 0000002ade4f9978 [ 273.361815] t1 : 0000000000504d55 t2 : ffffffff8016cd8c s0 : fffffff6e3692a70 [ 273.369180] s1 : 0000000000000020 a0 : 0000000000000000 a1 : 00001a8e81800000 [ 273.376540] a2 : 0000003c00070198 a3 : 0000003c00db75a4 a4 : 0000000000000015 [ 273.383901] a5 : ffffffd7ff8804b0 a6 : 0000000000000015 a7 : 000000000000002a [ 273.391327] s2 : 000000000000ffff s3 : 0000000000000000 s4 : ffffffd7ff8803b0 [ 273.398773] s5 : 0000000000504d55 s6 : ffffffd905069800 s7 : ffffffff821fe210 [ 273.406139] s8 : 000000007fffffff s9 : ffffffd7ff8803b0 s10: ffffffd903f29098 [ 273.413660] s11: 0000000080000000 t3 : 0000000000000003 t4 : ffffffff8017a0ca [ 273.421022] t5 : ffffffff8023cfc2 t6 : ffffffd9040780e8 [ 273.426437] status: 0000000200000100 badaddr: 0000000000000098 cause: 000000000000000d [ 273.434512] [] riscv_pmu_ctr_get_width_mask+0x8/0x62 [ 273.441169] [] handle_percpu_devid_irq+0x98/0x1ee [ 273.447562] [] generic_handle_domain_irq+0x28/0x36 [ 273.454151] [] riscv_intc_irq+0x36/0x4e [ 273.459659] [] handle_riscv_irq+0x4a/0x74 [ 273.465442] [] do_irq+0x62/0x92 [ 273.470360] Code: 0420 60a2 6402 5529 0141 8082 0013 0000 0013 0000 (6d5c) b783 [ 273.477921] ---[ end trace 0000000000000000 ]--- [ 273.482630] Kernel panic - not syncing: Fatal exception in interrupt Reviewed-by: Alexandre Ghiti Reviewed-by: Atish Patra Signed-off-by: Fei Wu --- drivers/perf/riscv_pmu_sbi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c index 16acd4dcdb96..452aab49db1e 100644 --- a/drivers/perf/riscv_pmu_sbi.c +++ b/drivers/perf/riscv_pmu_sbi.c @@ -512,7 +512,7 @@ static void pmu_sbi_set_scounteren(void *arg) if (event->hw.idx != -1) csr_write(CSR_SCOUNTEREN, - csr_read(CSR_SCOUNTEREN) | (1 << pmu_sbi_csr_index(event))); + csr_read(CSR_SCOUNTEREN) | BIT(pmu_sbi_csr_index(event))); } static void pmu_sbi_reset_scounteren(void *arg) @@ -521,7 +521,7 @@ static void pmu_sbi_reset_scounteren(void *arg) if (event->hw.idx != -1) csr_write(CSR_SCOUNTEREN, - csr_read(CSR_SCOUNTEREN) & ~(1 << pmu_sbi_csr_index(event))); + csr_read(CSR_SCOUNTEREN) & ~BIT(pmu_sbi_csr_index(event))); } static void pmu_sbi_ctr_start(struct perf_event *event, u64 ival) @@ -731,14 +731,14 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) /* compute hardware counter index */ hidx = info->csr - CSR_CYCLE; /* check if the corresponding bit is set in sscountovf */ - if (!(overflow & (1 << hidx))) + if (!(overflow & BIT(hidx))) continue; /* * Keep a track of overflowed counters so that they can be started * with updated initial value. */ - overflowed_ctrs |= 1 << lidx; + overflowed_ctrs |= BIT(lidx); hw_evt = &event->hw; riscv_pmu_event_update(event); perf_sample_data_init(&data, 0, hw_evt->last_period);