From patchwork Fri Jun 19 14:30:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191243 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp667206ilo; Fri, 19 Jun 2020 09:10:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxfNW+sTjtP1a9HcCyIU1bjoEdcGzCtXjFwQCZYSOeOIpbELQF+4JklcVTsTm2rR/DP80F X-Received: by 2002:a17:906:6bc4:: with SMTP id t4mr4648559ejs.354.1592583059293; Fri, 19 Jun 2020 09:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592583059; cv=none; d=google.com; s=arc-20160816; b=lnHkzmihIWkVdI62KPqX8NbuyI/FRpsX8ZQJHpY/A9i8VM7WjgV+URORAHGSuqHIfF iGMsEcOxCecCD/L3m891+OsSRvvEcu4+lJMyezJNQxTb+kCnsgdACryaXPv9D/t2hOFo HTG7JqImeHAZ4+4zhyVVv2nHo95LtnD7a3U9vPic7ytARCmPItMnJpkIfrOZKU43/Cjl gDpuUZ+FvZkOcrP6UG+izUdwtkQILfDOHflJqcgEWYFWBWURT5FDpGHUEGGG1Mz4e8T1 C7m2axnGjocI4mEwOqyKcmcx2jaGNnOCotcMNFjOsxcfVDLtof7VJyiS5HMQrMaB3mJc 30AA== 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=JaYWC+rwkqnbmlm9ADwdfgoeXhxGuArVivPNhoBVLy4=; b=hJo4nJBpsbH5gCk/qv60/xKlSeq2d+aO3t51bD5nXOhx6Md80yKF0NgTa9WAkmOiMR nr5EXbbxK1gCF1QwDckLV9OpxzNs8E5mkubGGjY64TgQ1jiHJmYsqpEVrszXkE7wN+ER oqRmXxBhLrykPd7Z7ilEsfpPg0r1Jda6iEvQMiBEyD4ELSlO3YtuFJi9ssFg8UeSY4Q7 udibqRIst6kZoXMIhsTNe1159nlJtD5dKjFKv7/niM1Id9MWZ29BB+1wU2OsccAoZU8N mRXNUlyKHSuKMV6OMr1HwgNNu/ro8wQx1pEcaoEp7MViwkbZvzefN8X7hTPCze3ju40L 4hiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="LK/03S2Z"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v26si4196973ejb.491.2020.06.19.09.10.59; Fri, 19 Jun 2020 09:10:59 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="LK/03S2Z"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391768AbgFSQKv (ORCPT + 15 others); Fri, 19 Jun 2020 12:10:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:35396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389518AbgFSPGV (ORCPT ); Fri, 19 Jun 2020 11:06:21 -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 0DB1E21852; Fri, 19 Jun 2020 15:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579180; bh=eVIpr8/ofo5takKWsPqMw/Pep/g6XXz7jFfvgEA1vCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LK/03S2Zbyb50BttlLsH0JHjpGkZA2hQVW/p6X8qJGB/nFA2uDG/IjF9K7yFXgDW2 DIKaIKnn0/75mMDf/JtF9/TC+43Q1k2DOrVOuM5Ll2LlXhyuLamGQ4Dxcv+9oHp15D TepqCf5AER0UIbNkkPuMFY7scZVOvQ9vq390vZkI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jean-Philippe Brucker , Will Deacon , Sasha Levin Subject: [PATCH 5.4 038/261] pmu/smmuv3: Clear IRQ affinity hint on device removal Date: Fri, 19 Jun 2020 16:30:49 +0200 Message-Id: <20200619141651.744559142@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141649.878808811@linuxfoundation.org> References: <20200619141649.878808811@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: Jean-Philippe Brucker [ Upstream commit 10f6cd2af21bb44faab31a50ec3361d7649e5a39 ] Currently when trying to remove the SMMUv3 PMU module we get a WARN_ON_ONCE from free_irq(), because the affinity hint set during probe hasn't been properly cleared. [ 238.878383] WARNING: CPU: 0 PID: 175 at kernel/irq/manage.c:1744 free_irq+0x324/0x358 ... [ 238.897263] Call trace: [ 238.897998] free_irq+0x324/0x358 [ 238.898792] devm_irq_release+0x18/0x28 [ 238.899189] release_nodes+0x1b0/0x228 [ 238.899984] devres_release_all+0x38/0x60 [ 238.900779] device_release_driver_internal+0x10c/0x1d0 [ 238.901574] driver_detach+0x50/0xe0 [ 238.902368] bus_remove_driver+0x5c/0xd8 [ 238.903448] driver_unregister+0x30/0x60 [ 238.903958] platform_driver_unregister+0x14/0x20 [ 238.905075] arm_smmu_pmu_exit+0x1c/0xecc [arm_smmuv3_pmu] [ 238.905547] __arm64_sys_delete_module+0x14c/0x260 [ 238.906342] el0_svc_common.constprop.0+0x74/0x178 [ 238.907355] do_el0_svc+0x24/0x90 [ 238.907932] el0_sync_handler+0x11c/0x198 [ 238.908979] el0_sync+0x158/0x180 Just like the other perf drivers, clear the affinity hint before releasing the device. Fixes: 7d839b4b9e00 ("perf/smmuv3: Add arm64 smmuv3 pmu driver") Signed-off-by: Jean-Philippe Brucker Link: https://lore.kernel.org/r/20200422084805.237738-1-jean-philippe@linaro.org Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/arm_smmuv3_pmu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c index 2f8787276d9b..3269232ff570 100644 --- a/drivers/perf/arm_smmuv3_pmu.c +++ b/drivers/perf/arm_smmuv3_pmu.c @@ -815,7 +815,7 @@ static int smmu_pmu_probe(struct platform_device *pdev) if (err) { dev_err(dev, "Error %d registering hotplug, PMU @%pa\n", err, &res_0->start); - return err; + goto out_clear_affinity; } err = perf_pmu_register(&smmu_pmu->pmu, name, -1); @@ -834,6 +834,8 @@ static int smmu_pmu_probe(struct platform_device *pdev) out_unregister: cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node); +out_clear_affinity: + irq_set_affinity_hint(smmu_pmu->irq, NULL); return err; } @@ -843,6 +845,7 @@ static int smmu_pmu_remove(struct platform_device *pdev) perf_pmu_unregister(&smmu_pmu->pmu); cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node); + irq_set_affinity_hint(smmu_pmu->irq, NULL); return 0; }