From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E4582198E96; Wed, 6 Nov 2024 12:30:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730896236; cv=none; b=MmDGdx299ZTCJ+eOKHq/LJrQh+s4Oap0DDLW7DbdvKZskHfH0bDxSjBYJhYrX78fdUYC0pfppxarH9tZRnUguNz1C8n6VzVc8dTE0RNOO4ohkNLCSC6u4nHbVeOG44eCjVdE3UXSf+/dhgVS4TpJhUIh3oAOJfPiNWLmqnEQP8E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730896236; c=relaxed/simple; bh=ItySo/jevHd2cXBAkifpr4rtkU9vA1p7lMnvRhP+FTM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g6d093Ep2uHsRUIUpi+B+AGxe1OoI4OtGVQ7N5qkM5khVMIAc/GVY/msggw2ZN6Zge9GWbIwRa0KxKRh1z8YIdTVr1w6k0pHjZO5i7gCVcnUI1nNLMiS0c4XQUkP8Qj5qmjS25oTZY9Z3gGwmEHoA5NkgLh6FF1KDjjSXaOacX8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=byaocdBJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="byaocdBJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33A03C4CECD; Wed, 6 Nov 2024 12:30:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730896235; bh=ItySo/jevHd2cXBAkifpr4rtkU9vA1p7lMnvRhP+FTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=byaocdBJvcXdl5576I9s7LFcAZkyArXSPOxOmWyUr/lG/BvHnJOxJTFdINV08iZtn 7U6oQwa3CTjATFykFeVqFUlnfIZ3M1nL2ZJ+sGPm8xWzuq2mi0GIfmyZvm76N+2z+x YLDO7EOaAiC2kwerqvvD1aAzaMMJDsppegcTN+vQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Ashish Sangwan , Namjae Jeon , Dirk Behme , "Rafael J. Wysocki" , Dan Williams Subject: [PATCH 6.11 118/245] Revert "driver core: Fix uevent_show() vs driver detach race" Date: Wed, 6 Nov 2024 13:02:51 +0100 Message-ID: <20241106120322.125064437@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120319.234238499@linuxfoundation.org> References: <20241106120319.234238499@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman commit 9a71892cbcdb9d1459c84f5a4c722b14354158a5 upstream. This reverts commit 15fffc6a5624b13b428bb1c6e9088e32a55eb82c. This commit causes a regression, so revert it for now until it can come back in a way that works for everyone. Link: https://lore.kernel.org/all/172790598832.1168608.4519484276671503678.stgit@dwillia2-xfh.jf.intel.com/ Fixes: 15fffc6a5624 ("driver core: Fix uevent_show() vs driver detach race") Cc: stable Cc: Ashish Sangwan Cc: Namjae Jeon Cc: Dirk Behme Cc: Greg Kroah-Hartman Cc: Rafael J. Wysocki Cc: Dan Williams Signed-off-by: Greg Kroah-Hartman --- drivers/base/core.c | 13 +++++-------- drivers/base/module.c | 4 ---- 2 files changed, 5 insertions(+), 12 deletions(-) --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -2641,7 +2640,6 @@ static const char *dev_uevent_name(const static int dev_uevent(const struct kobject *kobj, struct kobj_uevent_env *env) { const struct device *dev = kobj_to_dev(kobj); - struct device_driver *driver; int retval = 0; /* add device node properties if present */ @@ -2670,12 +2668,8 @@ static int dev_uevent(const struct kobje if (dev->type && dev->type->name) add_uevent_var(env, "DEVTYPE=%s", dev->type->name); - /* Synchronize with module_remove_driver() */ - rcu_read_lock(); - driver = READ_ONCE(dev->driver); - if (driver) - add_uevent_var(env, "DRIVER=%s", driver->name); - rcu_read_unlock(); + if (dev->driver) + add_uevent_var(env, "DRIVER=%s", dev->driver->name); /* Add common DT information about the device */ of_device_uevent(dev, env); @@ -2745,8 +2739,11 @@ static ssize_t uevent_show(struct device if (!env) return -ENOMEM; + /* Synchronize with really_probe() */ + device_lock(dev); /* let the kset specific function add its keys */ retval = kset->uevent_ops->uevent(&dev->kobj, env); + device_unlock(dev); if (retval) goto out; --- a/drivers/base/module.c +++ b/drivers/base/module.c @@ -7,7 +7,6 @@ #include #include #include -#include #include "base.h" static char *make_driver_name(const struct device_driver *drv) @@ -102,9 +101,6 @@ void module_remove_driver(const struct d if (!drv) return; - /* Synchronize with dev_uevent() */ - synchronize_rcu(); - sysfs_remove_link(&drv->p->kobj, "module"); if (drv->owner)