From patchwork Wed Nov 23 19:38:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 13054157 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 71176C43219 for ; Wed, 23 Nov 2022 19:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=yoD168Jemkwk5zZiyvlz2LcId1W1WUZ/DBC85t5BTiQ=; b=qRo3V80k8Cp1h0 XXsYisnRk7ljrgF0EJAZ0Pa6PvLsvqXC7O6KnVEm0ZzYQ4d+0mbmTYcI97eDHM6Ya/4dvXexNV7m7 w+hkuLXSYWxuO+VjPHzSpWrbvvGDzaLCx39bVULVQ/3Ff2NiKoxtd8qwLT13ey2CU0Bx1APeoLNC5 M4/x9VLGiZQI6lRFUWL02CWRuxVv1v9PjVvVxZRvfkUiZskvJMq8yGgkvF3kPJRlyK70nr1gQVHTe sB4/Ui1zl96R4EwnDbkXDMH4dFc/dE0kvU9UmRsaVXzQu8rZF0uWgHKxIpaUdhmYd8Q6+fMdal3MG L3BXYDFxb+5uUS0ep6Hg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxva2-0020Tg-19; Wed, 23 Nov 2022 19:38:46 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxvZz-0020RW-Ky for linux-arm-kernel@lists.infradead.org; Wed, 23 Nov 2022 19:38:45 +0000 Received: by mail-wm1-x32f.google.com with SMTP id i64-20020a1c3b43000000b003d016c21100so2263886wma.3 for ; Wed, 23 Nov 2022 11:38:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qA1TxnCI4aGjZIOXtnNz0T0s8Q9jNSPBYnICWkTbI38=; b=cEKZO+LqY/b+Azmi1mie8YZvHvVtdHyjovX4gtNAenqcxgFrJtJXWWtKI0FhXXBTNb UlxrJKXLyd4E2xz9jKo129BwTISIEvXAGZ1/fE3/6wz5/UA7FCxJNlT1hzunXygzf00L eRbkHYSKt48Qi+kwOtuKHePKVi8XPWbtzo0Q6YeAWhjTfW8Ir6Ff5hpIbjNxlq5eFRms UJNyu7J3tVvqHXA1i1rakesVNrdZWIRJ/ebdkhXFRfK6KB72EbD8Oa5m1zWb1Sbc9hfb ue3aq0A7ka0tHvvo9JqVClOBEeUnfqJk5jVGlAxLXbv/hIqfpoyUf2TAWlSjakd0RYxp Di1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qA1TxnCI4aGjZIOXtnNz0T0s8Q9jNSPBYnICWkTbI38=; b=LfDS03hh9VB27/4wH6SsV9VCkWlxWEadJ74ur/t4o+qMdJ/N9t/YysmTmDqrnBrCyj Pj+huYOEs/B6rKGNJvS3voed7rGMFPk8fmWi9lRXJHablhojC0AvqL/4W7GxHK3CzwVA Ukcu7kr0k2Y2d7VeaQEHKJ3ZK9UjtPzwxj3ZrlZC94h7pmpJJvnW5Nz5vV68mBJJKsV4 CbQSqTv5EAq347ArWhO+1eeg1KCRka4hJS0rFgHUrUlNCl4t6expT59hARw3mF8GIF5v ydJ3+nl88TZEderVK/iubkIBdWHpFaiRWn9bNEj0cAlCK32OA7R13GezZ6yvRBp1pZZT +0Jw== X-Gm-Message-State: ANoB5plej2ml7gWA/iYaMWGwOJELz49C7sJm/x6MYknOc0g/InZGFSgX gtXqoH3WfRlapGjOr+Trcy0eIdcueXdGuQ== X-Google-Smtp-Source: AA0mqf7ZSt1rSGF1YqE7COxjrjursOSSTsUwt13ItIc/EsU8/0abpA3W0v7xlVBFFkakcDJUH1CxjA== X-Received: by 2002:a05:600c:1e1a:b0:3cf:7959:d8be with SMTP id ay26-20020a05600c1e1a00b003cf7959d8bemr13496374wmb.85.1669232320798; Wed, 23 Nov 2022 11:38:40 -0800 (PST) Received: from linaro.org ([2a00:23c5:6809:2201:fcbc:7b5d:8d6c:43a4]) by smtp.gmail.com with ESMTPSA id q2-20020adff502000000b00241cfa9333fsm11222353wro.5.2022.11.23.11.38.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 11:38:39 -0800 (PST) From: Mike Leach To: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org, linux-kernel@vger.kernel.org Cc: mathieu.poirier@linaro.org, suzuki.poulose@arm.com, leo.yan@linaro.org, acme@kernel.org, Mike Leach Subject: [PATCH] coresight: cti: Fix null pointer error on CTI init before ETM Date: Wed, 23 Nov 2022 19:38:18 +0000 Message-Id: <20221123193818.6253-1-mike.leach@linaro.org> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221123_113843_713397_10D87116 X-CRM114-Status: GOOD ( 14.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When CTI is discovered first then the function coresight_set_assoc_ectdev_mutex() is called to set the association between CTI and ETM device. Recent lockdep fix passes a null pointer. This patch passes the correct pointer. Before patch: log of boot oops sequence with CTI discovered first: [ 12.424091] cs_system_cfg: CoreSight Configuration manager initialised [ 12.483474] coresight cti_sys0: CTI initialized [ 12.488109] coresight cti_sys1: CTI initialized [ 12.503594] coresight cti_cpu0: CTI initialized [ 12.517877] coresight-cpu-debug 850000.debug: Coresight debug-CPU0 initialized [ 12.523479] coresight-cpu-debug 852000.debug: Coresight debug-CPU1 initialized [ 12.529926] coresight-cpu-debug 854000.debug: Coresight debug-CPU2 initialized [ 12.541808] coresight stm0: STM32 initialized [ 12.544421] coresight-cpu-debug 856000.debug: Coresight debug-CPU3 initialized [ 12.585639] coresight cti_cpu1: CTI initialized [ 12.614028] coresight cti_cpu2: CTI initialized [ 12.631679] CSCFG registered etm0 [ 12.633920] coresight etm0: CPU0: etm v4.0 initialized [ 12.656392] coresight cti_cpu3: CTI initialized ... [ 12.708383] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000348 ... [ 12.755094] Internal error: Oops: 0000000096000044 [#1] SMP [ 12.761817] Modules linked in: coresight_etm4x(+) coresight_tmc coresight_cpu_debug coresight_replicator coresight_funnel coresight_cti coresight_tpiu coresight_stm coresight [ 12.767210] CPU: 3 PID: 1346 Comm: systemd-udevd Not tainted 6.1.0-rc3tid-v6tid-v6-235166-gf7f7d7a2204a-dirty #498 [ 12.782827] Hardware name: Qualcomm Technologies, Inc. APQ 8016 SBC (DT) [ 12.793154] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 12.800010] pc : coresight_set_assoc_ectdev_mutex+0x30/0x50 [coresight] [ 12.806694] lr : coresight_set_assoc_ectdev_mutex+0x30/0x50 [coresight] ... [ 12.885064] Call trace: [ 12.892352] coresight_set_assoc_ectdev_mutex+0x30/0x50 [coresight] [ 12.894693] cti_add_assoc_to_csdev+0x144/0x1b0 [coresight_cti] [ 12.900943] coresight_register+0x2c8/0x320 [coresight] [ 12.906844] etm4_add_coresight_dev.isra.27+0x148/0x280 [coresight_etm4x] [ 12.912056] etm4_probe+0x144/0x1c0 [coresight_etm4x] [ 12.918998] etm4_probe_amba+0x40/0x78 [coresight_etm4x] [ 12.924032] amba_probe+0x11c/0x1f0 After patch: similar log [ 12.444467] cs_system_cfg: CoreSight Configuration manager initialised [ 12.456329] coresight-cpu-debug 850000.debug: Coresight debug-CPU0 initialized [ 12.456754] coresight-cpu-debug 852000.debug: Coresight debug-CPU1 initialized [ 12.469672] coresight-cpu-debug 854000.debug: Coresight debug-CPU2 initialized [ 12.476098] coresight-cpu-debug 856000.debug: Coresight debug-CPU3 initialized [ 12.532409] coresight stm0: STM32 initialized [ 12.533708] coresight cti_sys0: CTI initialized [ 12.539478] coresight cti_sys1: CTI initialized [ 12.550106] coresight cti_cpu0: CTI initialized [ 12.633931] coresight cti_cpu1: CTI initialized [ 12.634664] coresight cti_cpu2: CTI initialized [ 12.638090] coresight cti_cpu3: CTI initialized [ 12.721136] CSCFG registered etm0 ... [ 12.762643] CSCFG registered etm1 [ 12.762666] coresight etm1: CPU1: etm v4.0 initialized [ 12.776258] CSCFG registered etm2 [ 12.776282] coresight etm2: CPU2: etm v4.0 initialized [ 12.784357] CSCFG registered etm3 [ 12.785455] coresight etm3: CPU3: etm v4.0 initialized Error can also be triggered by manually starting the modules using modprobe in the following order: root@linaro-developer:/home/linaro/cs-mods# modprobe coresight root@linaro-developer:/home/linaro/cs-mods# modprobe coresight-cti root@linaro-developer:/home/linaro/cs-mods# modprobe coresight-etm4x Tested on Dragonboard DB410c Applies to coresight/next Fixes: 23722fb46725 ("coresight: Fix possible deadlock with lock dependency") Signed-off-by: Mike Leach --- drivers/hwtracing/coresight/coresight-cti-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwtracing/coresight/coresight-cti-core.c b/drivers/hwtracing/coresight/coresight-cti-core.c index c6e8c6542f24..d2cf4f4848e1 100644 --- a/drivers/hwtracing/coresight/coresight-cti-core.c +++ b/drivers/hwtracing/coresight/coresight-cti-core.c @@ -564,7 +564,7 @@ static void cti_add_assoc_to_csdev(struct coresight_device *csdev) * if we found a matching csdev then update the ECT * association pointer for the device with this CTI. */ - coresight_set_assoc_ectdev_mutex(csdev->ect_dev, + coresight_set_assoc_ectdev_mutex(csdev, ect_item->csdev); break; }