libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fix] remove the possible critical zone risk

This commit is contained in:
liuxianliang 2021-03-31 14:59:12 +08:00
parent 154d73a4e7
commit 4431c4796f
6 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/net/lwip-1.4.1/src/include/netif/ethernetif.h
View File

@ -27,7 +27,7 @@ struct eth_device
rt_uint16_t flags;
rt_uint8_t link_changed;
rt_uint8_t link_status;
rt_uint8_t rx_notice; /* avoid send the same mail to mailbox */
rt_uint8_t rx_notice;
/* eth device interface */
struct pbuf* (*eth_rx)(rt_device_t dev);

12
components/net/lwip-1.4.1/src/netif/ethernetif.c
View File

@ -469,6 +469,8 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_
dev->flags = flags;
/* link changed status of device */
dev->link_changed = 0x00;
/* avoid send the same mail to mailbox */
dev->rx_notice = 0x00;
dev->parent.type = RT_Device_Class_NetIf;
/* register to RT-Thread device manager */
rt_device_register(&(dev->parent), name, RT_DEVICE_FLAG_RDWR);
@ -556,10 +558,12 @@ rt_err_t eth_device_ready(struct eth_device* dev)
dev->rx_notice = RT_TRUE;
return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
}
else
return RT_EOK;
/* post message to Ethernet thread */
}
return ERR_OK; /* netif is not initialized yet, just return. */
else
return -RT_ERROR; /* netif is not initialized yet, just return. */
}
rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up)
@ -652,7 +656,11 @@ static void eth_rx_thread_entry(void* parameter)
else
netifapi_netif_set_link_down(device->netif);
}
rt_enter_critical();
/* 'rx_notice' will be modify in the interrupt or here */
device->rx_notice = RT_FALSE;
rt_exit_critical();
/* receive all of buffer */
while(1)

2
components/net/lwip-2.0.2/src/include/netif/ethernetif.h
View File

@ -27,7 +27,7 @@ struct eth_device
rt_uint16_t flags;
rt_uint8_t link_changed;
rt_uint8_t link_status;
rt_uint8_t rx_notice; /* avoid send the same mail to mailbox */
rt_uint8_t rx_notice;
/* eth device interface */
struct pbuf* (*eth_rx)(rt_device_t dev);

12
components/net/lwip-2.0.2/src/netif/ethernetif.c
View File

@ -511,6 +511,8 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_
dev->flags = flags;
/* link changed status of device */
dev->link_changed = 0x00;
/* avoid send the same mail to mailbox */
dev->rx_notice = 0x00;
dev->parent.type = RT_Device_Class_NetIf;
/* register to RT-Thread device manager */
rt_device_register(&(dev->parent), name, RT_DEVICE_FLAG_RDWR);
@ -605,10 +607,12 @@ rt_err_t eth_device_ready(struct eth_device* dev)
dev->rx_notice = RT_TRUE;
return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
}
else
return RT_EOK;
/* post message to Ethernet thread */
}
return ERR_OK; /* netif is not initialized yet, just return. */
else
return -RT_ERROR; /* netif is not initialized yet, just return. */
}
rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up)
@ -701,7 +705,11 @@ static void eth_rx_thread_entry(void* parameter)
else
netifapi_netif_set_link_down(device->netif);
}
rt_enter_critical();
/* 'rx_notice' will be modify in the interrupt or here */
device->rx_notice = RT_FALSE;
rt_exit_critical();
/* receive all of buffer */
while(1)

2
components/net/lwip-2.1.2/src/include/netif/ethernetif.h
View File

@ -27,7 +27,7 @@ struct eth_device
rt_uint16_t flags;
rt_uint8_t link_changed;
rt_uint8_t link_status;
rt_uint8_t rx_notice; /* avoid send the same mail to mailbox */
rt_uint8_t rx_notice;
/* eth device interface */
struct pbuf* (*eth_rx)(rt_device_t dev);

12
components/net/lwip-2.1.2/src/netif/ethernetif.c
View File

@ -514,6 +514,8 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_
dev->flags = flags;
/* link changed status of device */
dev->link_changed = 0x00;
/* avoid send the same mail to mailbox */
dev->rx_notice = 0x00;
dev->parent.type = RT_Device_Class_NetIf;
/* register to RT-Thread device manager */
rt_device_register(&(dev->parent), name, RT_DEVICE_FLAG_RDWR);
@ -607,10 +609,12 @@ rt_err_t eth_device_ready(struct eth_device* dev)
dev->rx_notice = RT_TRUE;
return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
}
else
return RT_EOK;
/* post message to Ethernet thread */
}
return ERR_OK; /* netif is not initialized yet, just return. */
else
return -RT_ERROR; /* netif is not initialized yet, just return. */
}
rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up)
@ -703,7 +707,11 @@ static void eth_rx_thread_entry(void* parameter)
else
netifapi_netif_set_link_down(device->netif);
}
rt_enter_critical();
/* 'rx_notice' will be modify in the interrupt or here */
device->rx_notice = RT_FALSE;
rt_exit_critical();
/* receive all of buffer */
while(1)