Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3406355pxf; Mon, 22 Mar 2021 05:51:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAgPkZeyfmCGacf1w536UQp8Iq0nSDvOf4A12ntird9u3/jWsbRzqlySN6k9i3RDyvVAKf X-Received: by 2002:aa7:c804:: with SMTP id a4mr25043815edt.251.1616417519368; Mon, 22 Mar 2021 05:51:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616417519; cv=none; d=google.com; s=arc-20160816; b=VHHwQl2XQtaD7nptXMeizDXNFshNQBVLYrWHye8nN6flifC9YGG0zMIJXcqlYZ3fJ8 lEf1iG8++3vO7l7Y55PwSh28iIvGk9JffTgsT7DBIEYoHDB3VcrNG+3t0I8Nzxf4Efbu +bRDsh4y4KRvnHZBNIxjFtI4OTByWyZ9Grtv+X64xDNx48xCF+pQerbvf0qYxDVOijdq b4nluhvXi6rwRm7owleyTv5FNzFjyYSQlS3W6Ut6yBym7QGBtHutVGJ5Lris3rwvrSCh mO3zwpz1a443a64Kx6ckxIIYwYHsDVYB0s6Lt2xtPzqcfaryc64VnEhFXlVzjbvsOoxO pjuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=w65PIndD/qwK+sfPUY+eRrJcBOv4WGo+NU218r98hos=; b=cUeVgFee7TXXrBa0uIvKNDtVxNiMMFnEZgEfDi4+DLKWDUHTIe6m/C0lPh0c8IjFOe 2EktDuJkQhJEtb1LcEswVtdGEiPfLCKUfWL/PKvPIyEuiY4JhxO7Isn5mAeosAWNCn3Y EOGIic9StTq0agoX+DbxY8FDvmvbAIpdicMMd6qWS2psPsMr5NaW72DUvExCFhHEBjZ8 HFiDG0j2o9XMe6zCE8lH9jquMEvq3a92gOYU/h1G+KTyAIVg9/L3P9cK+b627gOHZO94 oEfOc+YPIHZZ/BdXuc8etdFRHxzEif+1C3pqjIPB3niM2K8ZZVgPEaj5fr4XVX6ja6kJ xQig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=M0frp3Qu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w10si11130059edd.483.2021.03.22.05.51.37; Mon, 22 Mar 2021 05:51:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@linuxfoundation.org header.s=korg header.b=M0frp3Qu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230482AbhCVMuu (ORCPT + 99 others); Mon, 22 Mar 2021 08:50:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:33572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232308AbhCVMmM (ORCPT ); Mon, 22 Mar 2021 08:42:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A24DD619D6; Mon, 22 Mar 2021 12:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616416789; bh=lTC7GfRDeCQltQlwDK/9E+urkbSQpvLbOIs2+bwax/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M0frp3QuTGpwOh0WkvwK520P2DGoiM8kZNtMORaJ6oLqwG0zc+Nf4cNWo/tXUEaon x/cWUr1VNFpyMKRTmWGOz92XUsWOCS9msHY7x0dFPW50vaJFELicR9Fk96FIiCxt9t 8+hzDGlm6iaJ8pvVDbDXN25SJppiQyumRJxj6JPk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chiranjeevi Rapolu , Mika Westerberg Subject: [PATCH 5.10 123/157] thunderbolt: Initialize HopID IDAs in tb_switch_alloc() Date: Mon, 22 Mar 2021 13:28:00 +0100 Message-Id: <20210322121937.663501796@linuxfoundation.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210322121933.746237845@linuxfoundation.org> References: <20210322121933.746237845@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mika Westerberg commit 781e14eaa7d168dc07d2a2eea5c55831a5bb46f3 upstream. If there is a failure before the tb_switch_add() is called the switch object is released by tb_switch_release() but at that point HopID IDAs have not yet been initialized. So we see splat like this: BUG: spinlock bad magic on CPU#2, kworker/u8:5/115 ... Workqueue: thunderbolt0 tb_handle_hotplug Call Trace: dump_stack+0x97/0xdc ? spin_bug+0x9a/0xa7 do_raw_spin_lock+0x68/0x98 _raw_spin_lock_irqsave+0x3f/0x5d ida_destroy+0x4f/0x127 tb_switch_release+0x6d/0xfd device_release+0x2c/0x7d kobject_put+0x9b/0xbc tb_handle_hotplug+0x278/0x452 process_one_work+0x1db/0x396 worker_thread+0x216/0x375 kthread+0x14d/0x155 ? pr_cont_work+0x58/0x58 ? kthread_blkcg+0x2e/0x2e ret_from_fork+0x1f/0x40 Fix this by always initializing HopID IDAs in tb_switch_alloc(). Fixes: 0b2863ac3cfd ("thunderbolt: Add functions for allocating and releasing HopIDs") Cc: stable@vger.kernel.org Reported-by: Chiranjeevi Rapolu Signed-off-by: Mika Westerberg Signed-off-by: Greg Kroah-Hartman --- drivers/thunderbolt/switch.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -761,12 +761,6 @@ static int tb_init_port(struct tb_port * tb_dump_port(port->sw->tb, &port->config); - /* Control port does not need HopID allocation */ - if (port->port) { - ida_init(&port->in_hopids); - ida_init(&port->out_hopids); - } - INIT_LIST_HEAD(&port->list); return 0; @@ -1764,10 +1758,8 @@ static void tb_switch_release(struct dev dma_port_free(sw->dma_port); tb_switch_for_each_port(sw, port) { - if (!port->disabled) { - ida_destroy(&port->in_hopids); - ida_destroy(&port->out_hopids); - } + ida_destroy(&port->in_hopids); + ida_destroy(&port->out_hopids); } kfree(sw->uuid); @@ -1947,6 +1939,12 @@ struct tb_switch *tb_switch_alloc(struct /* minimum setup for tb_find_cap and tb_drom_read to work */ sw->ports[i].sw = sw; sw->ports[i].port = i; + + /* Control port does not need HopID allocation */ + if (i) { + ida_init(&sw->ports[i].in_hopids); + ida_init(&sw->ports[i].out_hopids); + } } ret = tb_switch_find_vse_cap(sw, TB_VSE_CAP_PLUG_EVENTS);