Add one notifier for udev changes net device name.
Signed-off-by: Jiping Ma <[email protected]>
---
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 38 ++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index b14f46a57154..c1c877bb4421 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4038,6 +4038,40 @@ static int stmmac_dma_cap_show(struct seq_file *seq, void *v)
}
DEFINE_SHOW_ATTRIBUTE(stmmac_dma_cap);
+/**
+ * Use network device events to create/remove/rename
+ * debugfs file entries
+ */
+static int stmmac_device_event(struct notifier_block *unused,
+ unsigned long event, void *ptr)
+{
+ struct net_device *dev = netdev_notifier_info_to_dev(ptr);
+ struct stmmac_priv *priv = netdev_priv(dev);
+
+ switch (event) {
+ case NETDEV_CHANGENAME:
+ if (priv->dbgfs_dir)
+ priv->dbgfs_dir = debugfs_rename(stmmac_fs_dir,
+ priv->dbgfs_dir,
+ stmmac_fs_dir,
+ dev->name);
+ break;
+
+ case NETDEV_GOING_DOWN:
+ break;
+
+ case NETDEV_UP:
+ break;
+ }
+
+done:
+ return NOTIFY_DONE;
+}
+
+static struct notifier_block stmmac_notifier = {
+ .notifier_call = stmmac_device_event,
+};
+
static int stmmac_init_fs(struct net_device *dev)
{
struct stmmac_priv *priv = netdev_priv(dev);
@@ -4050,7 +4084,6 @@ static int stmmac_init_fs(struct net_device *dev)
return -ENOMEM;
}
-
/* Entry to report DMA RX/TX rings */
priv->dbgfs_rings_status =
debugfs_create_file("descriptors_status", 0444,
@@ -4076,6 +4109,8 @@ static int stmmac_init_fs(struct net_device *dev)
return -ENOMEM;
}
+ register_netdevice_notifier(&stmmac_notifier);
+
return 0;
}
@@ -4083,6 +4118,7 @@ static void stmmac_exit_fs(struct net_device *dev)
{
struct stmmac_priv *priv = netdev_priv(dev);
+ unregister_netdevice_notifier(&stmmac_notifier);
debugfs_remove_recursive(priv->dbgfs_dir);
}
#endif /* CONFIG_DEBUG_FS */
--
2.23.0
Hi,
On 12/30/19 6:03 PM, Jiping Ma wrote:
> Add one notifier for udev changes net device name.
>
> Signed-off-by: Jiping Ma <[email protected]>
> ---
> .../net/ethernet/stmicro/stmmac/stmmac_main.c | 38 ++++++++++++++++++-
> 1 file changed, 37 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index b14f46a57154..c1c877bb4421 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -4038,6 +4038,40 @@ static int stmmac_dma_cap_show(struct seq_file *seq, void *v)
> }
> DEFINE_SHOW_ATTRIBUTE(stmmac_dma_cap);
>
> +/**
Just use /* here since this is not a kernel-doc comment.
/** is reserved for kernel-doc comments/notation.
> + * Use network device events to create/remove/rename
> + * debugfs file entries
> + */
> +static int stmmac_device_event(struct notifier_block *unused,
> + unsigned long event, void *ptr)
> +{
> @@ -4050,7 +4084,6 @@ static int stmmac_init_fs(struct net_device *dev)
>
> return -ENOMEM;
> }
> -
> /* Entry to report DMA RX/TX rings */
> priv->dbgfs_rings_status =
> debugfs_create_file("descriptors_status", 0444,
I don't see a problem with the blank line. Why remove it?
thanks.
--
~Randy
On 12/31/2019 10:11 AM, Randy Dunlap wrote:
> Hi,
>
> On 12/30/19 6:03 PM, Jiping Ma wrote:
>> Add one notifier for udev changes net device name.
>>
>> Signed-off-by: Jiping Ma <[email protected]>
>> ---
>> .../net/ethernet/stmicro/stmmac/stmmac_main.c | 38 ++++++++++++++++++-
>> 1 file changed, 37 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> index b14f46a57154..c1c877bb4421 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> @@ -4038,6 +4038,40 @@ static int stmmac_dma_cap_show(struct seq_file *seq, void *v)
>> }
>> DEFINE_SHOW_ATTRIBUTE(stmmac_dma_cap);
>>
>> +/**
> Just use /* here since this is not a kernel-doc comment.
> /** is reserved for kernel-doc comments/notation.
I use checkpatch.pl to check my patch, it show one warning, then I
change * to **. I will change it back to *.
WARNING: networking block comments don't use an empty /* line, use /*
Comment...
#23: FILE: drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:4042:
+/*
+ * Use network device events to create/remove/rename
>
>> + * Use network device events to create/remove/rename
>> + * debugfs file entries
>> + */
>> +static int stmmac_device_event(struct notifier_block *unused,
>> + unsigned long event, void *ptr)
>> +{
>
>> @@ -4050,7 +4084,6 @@ static int stmmac_init_fs(struct net_device *dev)
>>
>> return -ENOMEM;
>> }
>> -
>> /* Entry to report DMA RX/TX rings */
>> priv->dbgfs_rings_status =
>> debugfs_create_file("descriptors_status", 0444,
> I don't see a problem with the blank line. Why remove it?
I will change it back.
>
>
> thanks.
On 12/30/19 6:16 PM, Jiping Ma wrote:
>
>
> On 12/31/2019 10:11 AM, Randy Dunlap wrote:
>> Hi,
>>
>> On 12/30/19 6:03 PM, Jiping Ma wrote:
>>> Add one notifier for udev changes net device name.
>>>
>>> Signed-off-by: Jiping Ma <[email protected]>
>>> ---
>>> .../net/ethernet/stmicro/stmmac/stmmac_main.c | 38 ++++++++++++++++++-
>>> 1 file changed, 37 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>>> index b14f46a57154..c1c877bb4421 100644
>>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>>> @@ -4038,6 +4038,40 @@ static int stmmac_dma_cap_show(struct seq_file *seq, void *v)
>>> }
>>> DEFINE_SHOW_ATTRIBUTE(stmmac_dma_cap);
>>> +/**
>> Just use /* here since this is not a kernel-doc comment.
>> /** is reserved for kernel-doc comments/notation.
> I use checkpatch.pl to check my patch, it show one warning, then I change * to **. I will change it back to *.
It should be more like:
/* Use network device events to create/remove/rename
* debugfs file entries.
*/
> WARNING: networking block comments don't use an empty /* line, use /* Comment...
> #23: FILE: drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:4042:
> +/*
> + * Use network device events to create/remove/rename
>>
>>> + * Use network device events to create/remove/rename
>>> + * debugfs file entries
>>> + */
>>> +static int stmmac_device_event(struct notifier_block *unused,
>>> + unsigned long event, void *ptr)
>>> +{
>>
--
~Randy
Reported-by: Randy Dunlap <[email protected]>
On 12/31/2019 10:22 AM, Randy Dunlap wrote:
> On 12/30/19 6:16 PM, Jiping Ma wrote:
>>
>> On 12/31/2019 10:11 AM, Randy Dunlap wrote:
>>> Hi,
>>>
>>> On 12/30/19 6:03 PM, Jiping Ma wrote:
>>>> Add one notifier for udev changes net device name.
>>>>
>>>> Signed-off-by: Jiping Ma <[email protected]>
>>>> ---
>>>> .../net/ethernet/stmicro/stmmac/stmmac_main.c | 38 ++++++++++++++++++-
>>>> 1 file changed, 37 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>>>> index b14f46a57154..c1c877bb4421 100644
>>>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>>>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>>>> @@ -4038,6 +4038,40 @@ static int stmmac_dma_cap_show(struct seq_file *seq, void *v)
>>>> }
>>>> DEFINE_SHOW_ATTRIBUTE(stmmac_dma_cap);
>>>> +/**
>>> Just use /* here since this is not a kernel-doc comment.
>>> /** is reserved for kernel-doc comments/notation.
>> I use checkpatch.pl to check my patch, it show one warning, then I change * to **. I will change it back to *.
> It should be more like:
>
> /* Use network device events to create/remove/rename
> * debugfs file entries.
> */
>
Got it. Thanks.
>> WARNING: networking block comments don't use an empty /* line, use /* Comment...
>> #23: FILE: drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:4042:
>> +/*
>> + * Use network device events to create/remove/rename
>>>> + * Use network device events to create/remove/rename
>>>> + * debugfs file entries
>>>> + */
>>>> +static int stmmac_device_event(struct notifier_block *unused,
>>>> + unsigned long event, void *ptr)
>>>> +{
>
Hello!
On 31.12.2019 5:03, Jiping Ma wrote:
> Add one notifier for udev changes net device name.
>
> Signed-off-by: Jiping Ma <[email protected]>
> ---
> .../net/ethernet/stmicro/stmmac/stmmac_main.c | 38 ++++++++++++++++++-
> 1 file changed, 37 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index b14f46a57154..c1c877bb4421 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -4038,6 +4038,40 @@ static int stmmac_dma_cap_show(struct seq_file *seq, void *v)
> }
> DEFINE_SHOW_ATTRIBUTE(stmmac_dma_cap);
>
> +/**
> + * Use network device events to create/remove/rename
> + * debugfs file entries
> + */
> +static int stmmac_device_event(struct notifier_block *unused,
> + unsigned long event, void *ptr)
> +{
> + struct net_device *dev = netdev_notifier_info_to_dev(ptr);
> + struct stmmac_priv *priv = netdev_priv(dev);
> +
> + switch (event) {
> + case NETDEV_CHANGENAME:
> + if (priv->dbgfs_dir)
> + priv->dbgfs_dir = debugfs_rename(stmmac_fs_dir,
> + priv->dbgfs_dir,
> + stmmac_fs_dir,
> + dev->name);
> + break;
> +
> + case NETDEV_GOING_DOWN:
> + break;
> +
> + case NETDEV_UP:
> + break;
Why not merge the above 2 cases? Or just remove them('event' is not *enum*)?
> + }
> +
> +done:
> + return NOTIFY_DONE;
> +}
[...]
MBR, Sergei
On 12/31/2019 06:12 PM, Sergei Shtylyov wrote:
> Hello!
>
> On 31.12.2019 5:03, Jiping Ma wrote:
>
>> Add one notifier for udev changes net device name.
>>
>> Signed-off-by: Jiping Ma <[email protected]>
>> ---
>> .../net/ethernet/stmicro/stmmac/stmmac_main.c | 38 ++++++++++++++++++-
>> 1 file changed, 37 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> index b14f46a57154..c1c877bb4421 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> @@ -4038,6 +4038,40 @@ static int stmmac_dma_cap_show(struct seq_file
>> *seq, void *v)
>> }
>> DEFINE_SHOW_ATTRIBUTE(stmmac_dma_cap);
>> +/**
>> + * Use network device events to create/remove/rename
>> + * debugfs file entries
>> + */
>> +static int stmmac_device_event(struct notifier_block *unused,
>> + unsigned long event, void *ptr)
>> +{
>> + struct net_device *dev = netdev_notifier_info_to_dev(ptr);
>> + struct stmmac_priv *priv = netdev_priv(dev);
>> +
>> + switch (event) {
>> + case NETDEV_CHANGENAME:
>> + if (priv->dbgfs_dir)
>> + priv->dbgfs_dir = debugfs_rename(stmmac_fs_dir,
>> + priv->dbgfs_dir,
>> + stmmac_fs_dir,
>> + dev->name);
>> + break;
>> +
>> + case NETDEV_GOING_DOWN:
>> + break;
>> +
>> + case NETDEV_UP:
>> + break;
>
> Why not merge the above 2 cases? Or just remove them('event' is not
> *enum*)?
I will remove them.
Thanks,
>
>> + }
>> +
>> +done:
>> + return NOTIFY_DONE;
>> +}
> [...]
>
> MBR, Sergei
>