From nobody Fri Sep 12 11:10:07 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1D07C636CD for ; Fri, 10 Feb 2023 09:58:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231942AbjBJJ6i (ORCPT ); Fri, 10 Feb 2023 04:58:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231222AbjBJJ6d (ORCPT ); Fri, 10 Feb 2023 04:58:33 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0153A6E984 for ; Fri, 10 Feb 2023 01:58:31 -0800 (PST) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PCq1G5zw9zdbBL; Fri, 10 Feb 2023 17:58:10 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 10 Feb 2023 17:58:29 +0800 From: Longlong Xia To: CC: , , , , , Subject: [PATCH -next v2 1/3] driver core: add error handling for devtmpfs_create_node() Date: Fri, 10 Feb 2023 09:54:42 +0000 Message-ID: <20230210095444.4067307-2-xialonglong1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230210095444.4067307-1-xialonglong1@huawei.com> References: <20230210095444.4067307-1-xialonglong1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In some cases, devtmpfs_create_node() can return error value. So, make use of it. Signed-off-by: Longlong Xia --- drivers/base/core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 7dab705f2937..aaa3088e5456 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -3405,7 +3405,9 @@ int device_add(struct device *dev) if (error) goto SysEntryError; =20 - devtmpfs_create_node(dev); + error =3D devtmpfs_create_node(dev); + if (error) + goto DevtmpfsError; } =20 /* Notify clients of device addition. This call must come @@ -3461,6 +3463,8 @@ int device_add(struct device *dev) done: put_device(dev); return error; + DevtmpfsError: + device_remove_sys_dev_entry(dev); SysEntryError: if (MAJOR(dev->devt)) device_remove_file(dev, &dev_attr_dev); --=20 2.25.1 From nobody Fri Sep 12 11:10:07 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16DA1C636CD for ; Fri, 10 Feb 2023 09:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231960AbjBJJ6p (ORCPT ); Fri, 10 Feb 2023 04:58:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231919AbjBJJ6e (ORCPT ); Fri, 10 Feb 2023 04:58:34 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DA2D76D2E for ; Fri, 10 Feb 2023 01:58:32 -0800 (PST) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PCq1H3C2HzdbBV; Fri, 10 Feb 2023 17:58:11 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 10 Feb 2023 17:58:30 +0800 From: Longlong Xia To: CC: , , , , , Subject: [PATCH -next v2 2/3] devtmpfs: add debug info to handle() Date: Fri, 10 Feb 2023 09:54:43 +0000 Message-ID: <20230210095444.4067307-3-xialonglong1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230210095444.4067307-1-xialonglong1@huawei.com> References: <20230210095444.4067307-1-xialonglong1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Because handle() is the core function for processing devtmpfs requests, Let's add some debug info in handle() to help users know why failed. Signed-off-by: Longlong Xia --- drivers/base/devtmpfs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index ae72d4ba8547..7789b7be4ee5 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -389,10 +389,18 @@ static __initdata DECLARE_COMPLETION(setup_done); static int handle(const char *name, umode_t mode, kuid_t uid, kgid_t gid, struct device *dev) { + int ret; + if (mode) - return handle_create(name, mode, uid, gid, dev); + ret =3D handle_create(name, mode, uid, gid, dev); else - return handle_remove(name, dev); + ret =3D handle_remove(name, dev); + + if (ret) + dev_err(dev, "failed to %s %s, ret =3D %d\n", + mode ? "create" : "remove", name, ret); + + return ret; } =20 static void __noreturn devtmpfs_work_loop(void) --=20 2.25.1 From nobody Fri Sep 12 11:10:07 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCA4CC636D3 for ; Fri, 10 Feb 2023 09:58:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231947AbjBJJ6u (ORCPT ); Fri, 10 Feb 2023 04:58:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231925AbjBJJ6e (ORCPT ); Fri, 10 Feb 2023 04:58:34 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E44576D36 for ; Fri, 10 Feb 2023 01:58:33 -0800 (PST) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4PCpwJ3mRszJr2Z; Fri, 10 Feb 2023 17:53:52 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 10 Feb 2023 17:58:30 +0800 From: Longlong Xia To: CC: , , , , , Subject: [PATCH -next v2 3/3] devtmpfs: remove return value of devtmpfs_delete_node() Date: Fri, 10 Feb 2023 09:54:44 +0000 Message-ID: <20230210095444.4067307-4-xialonglong1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230210095444.4067307-1-xialonglong1@huawei.com> References: <20230210095444.4067307-1-xialonglong1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The only caller of device_del() does not check the return value. And there's nothing we can do when cleaning things up on a remove path. Let's make it a void function. Signed-off-by: Longlong Xia --- drivers/base/base.h | 4 ++-- drivers/base/devtmpfs.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/base/base.h b/drivers/base/base.h index 0e806f641079..f7996bf8d28b 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -201,10 +201,10 @@ void device_pm_move_to_tail(struct device *dev); =20 #ifdef CONFIG_DEVTMPFS int devtmpfs_create_node(struct device *dev); -int devtmpfs_delete_node(struct device *dev); +void devtmpfs_delete_node(struct device *dev); #else static inline int devtmpfs_create_node(struct device *dev) { return 0; } -static inline int devtmpfs_delete_node(struct device *dev) { return 0; } +static inline void devtmpfs_delete_node(struct device *dev) { return 0; } #endif =20 void software_node_notify(struct device *dev); diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index 7789b7be4ee5..e5c4d3e98ec9 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -147,22 +147,22 @@ int devtmpfs_create_node(struct device *dev) return devtmpfs_submit_req(&req, tmp); } =20 -int devtmpfs_delete_node(struct device *dev) +void devtmpfs_delete_node(struct device *dev) { const char *tmp =3D NULL; struct req req; =20 if (!thread) - return 0; + return; =20 req.name =3D device_get_devnode(dev, NULL, NULL, NULL, &tmp); if (!req.name) - return -ENOMEM; + return; =20 req.mode =3D 0; req.dev =3D dev; =20 - return devtmpfs_submit_req(&req, tmp); + devtmpfs_submit_req(&req, tmp); } =20 static int dev_mkdir(const char *name, umode_t mode) --=20 2.25.1