From nobody Wed Jun 15 11:38:44 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 13A80856253; Wed, 15 Jun 2022 11:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LNNc471mjz3l4S; Wed, 15 Jun 2022 11:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655293125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVrVGEiDNaSWG1kY14Ddy3leHaKecMyeXUu3IllTAuY=; b=jhipIFwKLTAlFiUo/q1165C2aaC0x9rAazBTjKX3ylqFGMd0rXwcns0RsGaZRnlFxcectx NeXm9w9FxKVkGUKcJJppNaqkzafiP4hOtZZtZCnlRT3UGszHve3aeobGlLVC2v63u2JFMH /a/Rt9xIw5BpVWuAAvK+p3JuyixewCCLVlpxQc/Zu+G+pTlal8f7KNtN9PhkSt0193F1UH XpNFDuO8RE15UcuRsxaOQUAL94PAWks2/dd+iEA2ogCsOtEWvSHXtcW3AAYoTpEqz399Rg 9mM8ulMQrbLm9Ahw2eVCUjCEKI7RW1SUhkUPJdT7Z2LyTN1skHuBDm1mkpmu1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CD33B1DFA6; Wed, 15 Jun 2022 11:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25FBcina062071; Wed, 15 Jun 2022 11:38:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25FBciBr062070; Wed, 15 Jun 2022 11:38:44 GMT (envelope-from git) Date: Wed, 15 Jun 2022 11:38:44 GMT Message-Id: <202206151138.25FBciBr062070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: d87fad36330b - main - linuxkpi: Acquire giant when adding/removing i2c adapters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d87fad36330b6faf657e7ee8faaa52feeaaff68a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655293125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVrVGEiDNaSWG1kY14Ddy3leHaKecMyeXUu3IllTAuY=; b=WTD+Qu0cQfD0t5yS4RzMDfTthHvMbm+GmJF7eOFJJFiB6lC+qoM+I08++Eh2sv2K6S3wQg CnQDrxNR7iPFN4tr10m6UxA1lUKHJwsxJou5TrcNsGtsC1SVjDaYyXXDwLWw1aHjXbnCPQ dtQImLM+IFHvtwAXkwRJPoDDHOEmjrej+Vd1Jd085xyLaodutC7LrBQav6oFD777uSFrFB AZbKIdq5+MPyRfK04T02i6P6pcx1sKnPlPJhQrasHrO6bEJbWe/RqFyyvQR8RHhyPALdem 4nFhrgpEbHbe3m5Rjz8p57riSVi7pL9WvOoN8U/zZcuDE3nAXnNzdqELkLrsJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655293125; a=rsa-sha256; cv=none; b=o+8KGKljOUEyPzkxrstW+bbkRlWmO4MABsI35Z9xY5BMtbT7H+ecxXo9pN2+TLVVRPdXxU TFNsVI2HyS4/c3HGns4U/TvCvCqKbWk9tt25rTA9yoS5HCYfKU7QLQNqZDWOxww+FgClbd SSmk3wh6hXvdHqBRVKMN/lmlXmto1+pv6tr94laW68tWBMd1pz+Fl22aop5pWWVXtoSGC0 fNzgGJrafZmpwfASaR/i4HqV4OEY0wHNQtusrLdYbRxKgNyIhTbUi7umF5+YCCNVgrzW7Y 2ymYvERoLd0iF47b7CByCTDxepUA+ja2zMBvnqeb/BihyChhVXvWXeHVZH4t1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d87fad36330b6faf657e7ee8faaa52feeaaff68a commit d87fad36330b6faf657e7ee8faaa52feeaaff68a Author: Emmanuel Vadot AuthorDate: 2022-06-14 11:23:26 +0000 Commit: Emmanuel Vadot CommitDate: 2022-06-15 11:37:43 +0000 linuxkpi: Acquire giant when adding/removing i2c adapters We need Giant as we run in a taskqueue_thread via linux_work. This fix detaching amdgpu and i915kms. Reviewed by: bz, hselasky, imp Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D35478 --- sys/compat/linuxkpi/common/src/linux_i2c.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_i2c.c b/sys/compat/linuxkpi/common/src/linux_i2c.c index c2c4977eb9ba..bdf381f8a032 100644 --- a/sys/compat/linuxkpi/common/src/linux_i2c.c +++ b/sys/compat/linuxkpi/common/src/linux_i2c.c @@ -221,7 +221,9 @@ lkpi_i2c_add_adapter(struct i2c_adapter *adapter) return (ENXIO); } + bus_topo_lock(); error = bus_generic_attach(adapter->dev.parent->bsddev); + bus_topo_unlock(); if (error) { device_printf(adapter->dev.parent->bsddev, "failed to attach child: error %d\n", error); @@ -249,7 +251,9 @@ lkpi_i2c_del_adapter(struct i2c_adapter *adapter) while ((child = device_find_child(adapter->dev.parent->bsddev, "lkpi_iic", unit++)) != NULL) { if (adapter == LKPI_IIC_GET_ADAPTER(child)) { + bus_topo_lock(); device_delete_child(adapter->dev.parent->bsddev, child); + bus_topo_unlock(); rv = 0; goto out; } @@ -259,7 +263,9 @@ lkpi_i2c_del_adapter(struct i2c_adapter *adapter) while ((child = device_find_child(adapter->dev.parent->bsddev, "lkpi_iicbb", unit++)) != NULL) { if (adapter == LKPI_IIC_GET_ADAPTER(child)) { + bus_topo_lock(); device_delete_child(adapter->dev.parent->bsddev, child); + bus_topo_unlock(); rv = 0; goto out; }