From mboxrd@z Thu Jan 1 00:00:00 1970 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 16068C04A68 for ; Sat, 30 Jul 2022 03:35:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239784AbiG3DfF (ORCPT ); Fri, 29 Jul 2022 23:35:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239972AbiG3DfA (ORCPT ); Fri, 29 Jul 2022 23:35:00 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46C496E899 for ; Fri, 29 Jul 2022 20:34:47 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id h21-20020a17090aa89500b001f31a61b91dso7205232pjq.4 for ; Fri, 29 Jul 2022 20:34:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=F39FaWBJWE0fi5jqGRfU1GqfOtK0kP4inIpNw2SjR3Y=; b=SJcJYf92oEJsAL0bPB7SolR+ToKa9Qz8iiVmJ0XentFL6hPJsm8tcisd6HuGNOfFtX eVQvfLqdDNV+Rza2fGLvKjZxyBsa/bxTfDXLgTnCNJywbQePjDUoc7JdwtCLWdeueuIa ccX3cpgXhdtVo67yJplhJ4E/Q0fqlni4FZ1dHeczDZ00CFT/yd5772IfZ/uTTdhpgyHJ iBgXGEPukC8RF+Yz9G5/IsvMjsH+C0QgOftbxKzywWSzgpKbKFlB0cC2M9oHE7vUv1J6 LXzZUd4vGwUOI9LnMSFNQA7C1Oa5Qkhwe7VAAc48PH5p9G3WJgHP31PRyISloGDIFMbA bCZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=F39FaWBJWE0fi5jqGRfU1GqfOtK0kP4inIpNw2SjR3Y=; b=PUcM5jKtXn/VrvnsUIUI/NtEoENxN3WSQEliL1ld0zO7zZ7JZHdVe9xPrVtLF4uzNT uD90xGQ0CU9akMjveryXu9KSLb4+bn8uKVO2ejUY4WPnSVwj921iOu060Ql3GzUBUsG9 +zi4vhgyASjAAQ404rJlWAXJrJxaeXc3N3PxQBSYZ0jycPBDUZmkYObMRsiLHJs2VvCx eHTRGlCD0uVGchRAtEPSpvTyC61TgjVcT+sA2c/tOOTDR+aYRyvoiwyqAJUT8Mae++pi awBAO+GgB6TwePc+VYn1/6PEkkS5NaX/JMZH1C5XXFn4UhbStV3A4V5zUDeIqXCrnQlE ZXXA== X-Gm-Message-State: ACgBeo0cNsYI+iMW0zdGhdpirlcuHmMviafkJrP3h+duuTdQOQ+7zHNw bVQKDdAaggxREbwxXI4B3Rogq5Cvc6nnDA== X-Google-Smtp-Source: AA6agR4J97GI3V0+ADn9hII5cBWGzM9rJnnF8lWT62AbB8FwvGMFjIsy9hsI2NMtp90D1YsralL7kw== X-Received: by 2002:a17:902:ab0f:b0:16d:b340:bf8f with SMTP id ik15-20020a170902ab0f00b0016db340bf8fmr6781184plb.140.1659152086708; Fri, 29 Jul 2022 20:34:46 -0700 (PDT) Received: from tong-desktop.local ([2600:1700:3ec7:421f:f0d:9a23:40c8:9423]) by smtp.googlemail.com with ESMTPSA id h3-20020a170902f54300b0016a3248376esm4441555plf.181.2022.07.29.20.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 20:34:46 -0700 (PDT) From: Tong Zhang To: Greg Kroah-Hartman , Dan Carpenter , Tong Zhang , Jakub Kicinski , Saurav Girepunje , Colin Ian King , Nathan Chancellor , Johan Hovold , linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Cc: Zheyu Ma Subject: [PATCH v4 4/4] staging: rtl8192u: fix rmmod warn when device is renamed Date: Fri, 29 Jul 2022 20:33:24 -0700 Message-Id: <20220730033335.74153-5-ztong0001@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This driver creates 4 debug files under [devname] folder. The devname could be wlan0 initially, however it could be renamed later to e.g. enx00e04c00000. This will cause problem during debug file teardown since it uses netdev->name, which is no longer wlan0. To solve this problem, add a notifier to handle device renaming. Also note that we cannot simply do debugfs_lookup to find out old dentry since by the time the notifier is called, netdev->name is already changed to new name. Reported-by: Zheyu Ma Tested-by: Zheyu Ma Reviewed-by: Dan Carpenter Signed-off-by: Tong Zhang --- drivers/staging/rtl8192u/r8192U.h | 1 + drivers/staging/rtl8192u/r8192U_core.c | 32 +++++++++++++++++++++++ drivers/staging/rtl8192u/r8192U_debugfs.c | 8 ++++++ 3 files changed, 41 insertions(+) diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h index 920a6a154860..420ab696fc3e 100644 --- a/drivers/staging/rtl8192u/r8192U.h +++ b/drivers/staging/rtl8192u/r8192U.h @@ -1122,6 +1122,7 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, void rtl8192_debugfs_init_one(struct net_device *dev); void rtl8192_debugfs_exit_one(struct net_device *dev); +void rtl8192_debugfs_rename_one(struct net_device *dev); void rtl8192_debugfs_init(void); void rtl8192_debugfs_exit(void); diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 865bc0dc7c71..0a60ef20107c 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -4606,6 +4606,30 @@ static void rtl8192_usb_disconnect(struct usb_interface *intf) RT_TRACE(COMP_DOWN, "wlan driver removed\n"); } +static int rtl8192_usb_netdev_event(struct notifier_block *nb, unsigned long event, + void *data) +{ + struct net_device *netdev = netdev_notifier_info_to_dev(data); + + if (netdev->netdev_ops != &rtl8192_netdev_ops) + goto out; + + switch (event) { + case NETDEV_CHANGENAME: + rtl8192_debugfs_rename_one(netdev); + break; + default: + break; + } + +out: + return NOTIFY_DONE; +} + +static struct notifier_block rtl8192_usb_netdev_notifier = { + .notifier_call = rtl8192_usb_netdev_event, +}; + static int __init rtl8192_usb_module_init(void) { int ret; @@ -4615,6 +4639,12 @@ static int __init rtl8192_usb_module_init(void) RT_TRACE(COMP_INIT, "Initializing module"); RT_TRACE(COMP_INIT, "Wireless extensions version %d", WIRELESS_EXT); + ret = register_netdevice_notifier(&rtl8192_usb_netdev_notifier); + if (ret) { + pr_err("register_netdevice_notifier failed %d\n", ret); + return ret; + } + rtl8192_debugfs_init(); ret = ieee80211_debug_init(); if (ret) { @@ -4663,6 +4693,7 @@ static int __init rtl8192_usb_module_init(void) ieee80211_debug_exit(); debugfs_exit: rtl8192_debugfs_exit(); + unregister_netdevice_notifier(&rtl8192_usb_netdev_notifier); return ret; } @@ -4675,6 +4706,7 @@ static void __exit rtl8192_usb_module_exit(void) ieee80211_crypto_deinit(); ieee80211_debug_exit(); rtl8192_debugfs_exit(); + unregister_netdevice_notifier(&rtl8192_usb_netdev_notifier); RT_TRACE(COMP_DOWN, "Exiting"); } diff --git a/drivers/staging/rtl8192u/r8192U_debugfs.c b/drivers/staging/rtl8192u/r8192U_debugfs.c index c64504346657..fe8ef72506ee 100644 --- a/drivers/staging/rtl8192u/r8192U_debugfs.c +++ b/drivers/staging/rtl8192u/r8192U_debugfs.c @@ -169,6 +169,14 @@ void rtl8192_debugfs_exit_one(struct net_device *dev) debugfs_remove_recursive(priv->debugfs_dir); } +void rtl8192_debugfs_rename_one(struct net_device *dev) +{ + struct r8192_priv *priv = ieee80211_priv(dev); + struct dentry *parent_dir = debugfs_lookup(KBUILD_MODNAME, NULL); + + debugfs_rename(parent_dir, priv->debugfs_dir, parent_dir, dev->name); +} + void rtl8192_debugfs_init(void) { debugfs_create_dir(KBUILD_MODNAME, NULL); -- 2.25.1