Added lightweight protection. In coldfire this is implemented by disabling
interrupts. In unixsim this is implemented by using a mutex. Uses #define SYS_LIGHTWEIGHT_PROT to enable. It is enabled in coldfire by default, but disabled in unixsim. Fixes bug 2005 if you enable SYS_LIGHTWEIGHT_PROT. So the bug is closed.
This commit is contained in:
davidhaas
parent
f71da3c8c8
commit
3cbe86d8a7
|
|
@ -18,214 +18,3 @@ used for pbufs are not in a cachable area. Otherwise the fec driver is
|
|||
guarrenteed to malfunction. The 5272 which this was written for does not
|
||||
support data cache so it did not matter and malloc was used.
|
||||
|
||||
|
||||
I have not released a proj directory, since my system is probably very
|
||||
different than anyone trying to use this code. However my lwipopts file might
|
||||
look a little different, and I reproduce that here:
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001-2003 Swedish Institute of Computer Science.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
* are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
||||
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
|
||||
* OF SUCH DAMAGE.
|
||||
*
|
||||
* This file is part of the lwIP TCP/IP stack.
|
||||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
*/
|
||||
#ifndef __LWIPOPTS_H__
|
||||
#define __LWIPOPTS_H__
|
||||
|
||||
#define NO_SYS 0
|
||||
/*#define LWIP_EVENT_API 0*/
|
||||
|
||||
/* ---------- Memory options ---------- */
|
||||
/* MEM_ALIGNMENT: should be set to the alignment of the CPU for which
|
||||
lwIP is compiled. 4 byte alignment -> define MEM_ALIGNMENT to 4, 2
|
||||
byte alignment -> define MEM_ALIGNMENT to 2. */
|
||||
#define MEM_ALIGNMENT 4
|
||||
|
||||
/* MEM_SIZE: the size of the heap memory. If the application will send
|
||||
a lot of data that needs to be copied, this should be set high. */
|
||||
#define MEM_SIZE 65000
|
||||
|
||||
/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
|
||||
sends a lot of data out of ROM (or other static memory), this
|
||||
should be set high. */
|
||||
#define MEMP_NUM_PBUF 16
|
||||
/* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
|
||||
per active UDP "connection". */
|
||||
#define MEMP_NUM_UDP_PCB 4
|
||||
/* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP
|
||||
connections. */
|
||||
#define MEMP_NUM_TCP_PCB 5
|
||||
/* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP
|
||||
connections. */
|
||||
#define MEMP_NUM_TCP_PCB_LISTEN 8
|
||||
/* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP
|
||||
segments. */
|
||||
#define MEMP_NUM_TCP_SEG 16
|
||||
|
||||
/* The following four are used only with the sequential API and can be
|
||||
set to 0 if the application only will use the raw API. */
|
||||
/* MEMP_NUM_NETBUF: the number of struct netbufs. */
|
||||
#define MEMP_NUM_NETBUF 6
|
||||
/* MEMP_NUM_NETCONN: the number of struct netconns. */
|
||||
#define MEMP_NUM_NETCONN 10
|
||||
/* MEMP_NUM_APIMSG: the number of struct api_msg, used for
|
||||
communication between the TCP/IP stack and the sequential
|
||||
programs. */
|
||||
#define MEMP_NUM_API_MSG 16
|
||||
/* MEMP_NUM_TCPIPMSG: the number of struct tcpip_msg, which is used
|
||||
for sequential API communication and incoming packets. Used in
|
||||
src/api/tcpip.c. */
|
||||
#define MEMP_NUM_TCPIP_MSG 16
|
||||
/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active
|
||||
timeouts. */
|
||||
#define MEMP_NUM_SYS_TIMEOUT 3
|
||||
|
||||
/* These two control is reclaimer functions should be compiled
|
||||
in. Should always be turned on (1). */
|
||||
#define MEM_RECLAIM 1
|
||||
#define MEMP_RECLAIM 1
|
||||
|
||||
/* ---------- Pbuf options ---------- */
|
||||
/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
|
||||
#define PBUF_POOL_SIZE 128
|
||||
|
||||
/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
|
||||
#define PBUF_POOL_BUFSIZE 1024
|
||||
|
||||
/* PBUF_LINK_HLEN: the number of bytes that should be allocated for a
|
||||
link level header. */
|
||||
#define PBUF_LINK_HLEN 16
|
||||
|
||||
/* SYS_ISR_PROT: Define this macro if pbuf functions are called from
|
||||
an ISR and you need extra (and faster) critical region protection. */
|
||||
#define SYS_ISR_PROT 1
|
||||
|
||||
/* ---------- TCP options ---------- */
|
||||
#define LWIP_TCP 1
|
||||
#define TCP_TTL 255
|
||||
|
||||
/* Controls if TCP should queue segments that arrive out of
|
||||
order. Define to 0 if your device is low on memory. */
|
||||
#define TCP_QUEUE_OOSEQ 1
|
||||
|
||||
/* TCP Maximum segment size. */
|
||||
#define TCP_MSS 128
|
||||
|
||||
/* TCP sender buffer space (bytes). */
|
||||
#define TCP_SND_BUF 256
|
||||
|
||||
/* TCP sender buffer space (pbufs). This must be at least = 2 *
|
||||
TCP_SND_BUF/TCP_MSS for things to work. */
|
||||
#define TCP_SND_QUEUELEN 4 * TCP_SND_BUF/TCP_MSS
|
||||
|
||||
/* TCP receive window. */
|
||||
#define TCP_WND 1024
|
||||
|
||||
/* Maximum number of retransmissions of data segments. */
|
||||
#define TCP_MAXRTX 12
|
||||
|
||||
/* Maximum number of retransmissions of SYN segments. */
|
||||
#define TCP_SYNMAXRTX 4
|
||||
|
||||
/* TCP writable space (bytes). This must be less than or equal
|
||||
to TCP_SND_BUF. It is the amount of space which must be
|
||||
available in the tcp snd_buf for select to return writable */
|
||||
#define TCP_SNDLOWAT TCP_SND_BUF/2
|
||||
|
||||
/* ---------- ARP options ---------- */
|
||||
#define ARP_TABLE_SIZE 10
|
||||
#define ARP_QUEUEING 1
|
||||
/**
|
||||
* - If enabled, cache entries are generated for every kind of ARP traffic or
|
||||
* broadcast IP traffic. This enhances behaviour for sending to a dynamic set
|
||||
* of hosts, for example if acting as a gateway.
|
||||
* - If disabled, cache entries are generated only for IP destination addresses
|
||||
* in use by lwIP or applications. This enhances performance if sending to a small,
|
||||
* reasonably static number of hosts. Typically for embedded devices.
|
||||
*/
|
||||
#define ETHARP_ALWAYS_INSERT 0
|
||||
|
||||
/* ---------- IP options ---------- */
|
||||
/* Define IP_FORWARD to 1 if you wish to have the ability to forward
|
||||
IP packets across network interfaces. If you are going to run lwIP
|
||||
on a device with only one network interface, define this to 0. */
|
||||
#define IP_FORWARD 0
|
||||
|
||||
/* If defined to 1, IP options are allowed (but not parsed). If
|
||||
defined to 0, all packets with IP options are dropped. */
|
||||
#define IP_OPTIONS 1
|
||||
|
||||
/* IP reassembly and segmentation.These are orthogonal even
|
||||
* if they both deal with IP fragments */
|
||||
#define IP_REASSEMBLY 1
|
||||
#define IP_FRAG 1
|
||||
|
||||
/* ---------- ICMP options ---------- */
|
||||
#define ICMP_TTL 255
|
||||
|
||||
|
||||
/* ---------- DHCP options ---------- */
|
||||
/* Define LWIP_DHCP to 1 if you want DHCP configuration of
|
||||
interfaces. DHCP is not implemented in lwIP 0.5.1, however, so
|
||||
turning this on does currently not work. */
|
||||
#define LWIP_DHCP 0
|
||||
|
||||
/* 1 if you want to do an ARP check on the offered address
|
||||
(recommended). */
|
||||
#define DHCP_DOES_ARP_CHECK 1
|
||||
|
||||
/* ---------- UDP options ---------- */
|
||||
#define LWIP_UDP 1
|
||||
#define UDP_TTL 255
|
||||
|
||||
|
||||
/* ---------- Statistics options ---------- */
|
||||
#define STATS
|
||||
|
||||
#ifdef STATS
|
||||
#define LINK_STATS
|
||||
#define IP_STATS
|
||||
#define ICMP_STATS
|
||||
#define UDP_STATS
|
||||
#define TCP_STATS
|
||||
#define MEM_STATS
|
||||
#define MEMP_STATS
|
||||
#define PBUF_STATS
|
||||
#define SYS_STATS
|
||||
#endif /* STATS */
|
||||
|
||||
|
||||
#define LWIP_COMPAT_SOCKETS
|
||||
#endif /* __LWIPOPTS_H__ */
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -53,10 +53,6 @@ typedef NU_TASK * sys_thread_t;
|
|||
/* Functions specific to Coldfire/Nucleus */
|
||||
void
|
||||
sys_setvect(u32_t vector, void (*isr_function)(void), void (*dis_funct)(void));
|
||||
u32_t
|
||||
sys_disable_interrupts(void);
|
||||
void
|
||||
sys_restore_interrupts(u32_t old_level);
|
||||
void
|
||||
sys_get_eth_addr(struct eth_addr *eth_addr);
|
||||
int *
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ disable_fec(mcf5272if_t *mcf5272)
|
|||
|
||||
/* We need to disable interrupts here, It is important when dealing with shared
|
||||
registers. */
|
||||
old_level = sys_disable_interrupts();
|
||||
old_level = sys_arch_protect();
|
||||
|
||||
/* First disable the FEC interrupts. Do it in the appropriate ICR register. */
|
||||
value = MCF5272_RD_SIM_ICR3(imm);
|
||||
|
|
@ -206,7 +206,7 @@ disable_fec(mcf5272if_t *mcf5272)
|
|||
/* Now we can restore interrupts. This is because we can assume that
|
||||
* we are single threaded here (only 1 thread will be calling disable_fec
|
||||
* for THIS interface). */
|
||||
sys_restore_interrupts(old_level);
|
||||
sys_arch_unprotect(old_level);
|
||||
|
||||
/* Release all buffers attached to the descriptors. Since the driver
|
||||
* ALWAYS zeros the pbuf array locations and descriptors when buffers are
|
||||
|
|
@ -317,13 +317,13 @@ mcf5272fec_tx_cleanup(void)
|
|||
mcf5272->tx_remove = tx_remove_eof;
|
||||
|
||||
/* clear interrupt status for tx interrupt */
|
||||
old_level = sys_disable_interrupts();
|
||||
old_level = sys_arch_protect();
|
||||
MCF5272_WR_FEC_EIR(imm, MCF5272_FEC_EIR_TXF);
|
||||
value = MCF5272_RD_FEC_IMR(imm);
|
||||
/* Set tx interrupt bit again */
|
||||
MCF5272_WR_FEC_IMR(imm, (value | MCF5272_FEC_IMR_TXFEN));
|
||||
/* Now we can re-enable higher priority interrupts again */
|
||||
sys_restore_interrupts(old_level);
|
||||
sys_arch_unprotect(old_level);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -348,7 +348,7 @@ low_level_output(struct netif *netif, struct pbuf *p)
|
|||
|
||||
/* Interrupts are disabled through this whole thing to support multi-threading
|
||||
* transmit calls. Also this function might be called from an ISR. */
|
||||
old_level = sys_disable_interrupts();
|
||||
old_level = sys_arch_protect();
|
||||
|
||||
/* Determine number of descriptors needed */
|
||||
num_desc = pbuf_clen(p);
|
||||
|
|
@ -358,7 +358,7 @@ low_level_output(struct netif *netif, struct pbuf *p)
|
|||
#ifdef LINK_STATS
|
||||
lwip_stats.link.memerr++;
|
||||
#endif
|
||||
sys_restore_interrupts(old_level);
|
||||
sys_arch_unprotect(old_level);
|
||||
return ERR_MEM;
|
||||
|
||||
} else {
|
||||
|
|
@ -398,7 +398,7 @@ low_level_output(struct netif *netif, struct pbuf *p)
|
|||
#endif
|
||||
/* Indicate that there has been a transmit buffer produced */
|
||||
MCF5272_WR_FEC_TDAR(imm,1);
|
||||
sys_restore_interrupts(old_level);
|
||||
sys_arch_unprotect(old_level);
|
||||
}
|
||||
return ERR_OK;
|
||||
}
|
||||
|
|
@ -568,13 +568,13 @@ mcf5272fec_rx(void)
|
|||
mcf5272->rx_remove = rx_remove_sof;
|
||||
|
||||
/* clear interrupt status for rx interrupt */
|
||||
old_level = sys_disable_interrupts();
|
||||
old_level = sys_arch_protect();
|
||||
MCF5272_WR_FEC_EIR(imm, MCF5272_FEC_EIR_RXF);
|
||||
value = MCF5272_RD_FEC_IMR(imm);
|
||||
/* Set rx interrupt bit again */
|
||||
MCF5272_WR_FEC_IMR(imm, (value | MCF5272_FEC_IMR_RXFEN));
|
||||
/* Now we can re-enable higher priority interrupts again */
|
||||
sys_restore_interrupts(old_level);
|
||||
sys_arch_unprotect(old_level);
|
||||
|
||||
/* Fill up empty descriptor rings */
|
||||
fill_rx_ring(mcf5272);
|
||||
|
|
@ -620,11 +620,11 @@ low_level_init(struct netif *netif)
|
|||
|
||||
/* Set up the appropriate interrupt levels */
|
||||
/* Disable interrupts, since this is a read/modify/write operation */
|
||||
old_level = sys_disable_interrupts();
|
||||
old_level = sys_arch_protect();
|
||||
value = MCF5272_RD_SIM_ICR3(imm);
|
||||
MCF5272_WR_SIM_ICR3(imm, value | MCF5272_SIM_ICR_ERX_IL(FEC_LEVEL) |
|
||||
MCF5272_SIM_ICR_ETX_IL(FEC_LEVEL));
|
||||
sys_restore_interrupts(old_level);
|
||||
sys_arch_unprotect(old_level);
|
||||
|
||||
/* Set the source address for the controller */
|
||||
MCF5272_WR_FEC_MALR(imm,0
|
||||
|
|
|
|||
|
|
@ -550,16 +550,16 @@ sys_setvect(u32_t vector, void (*isr_function)(void), void (*dis_funct)(void))
|
|||
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
u32_t
|
||||
sys_disable_interrupts(void)
|
||||
sys_arch_protect(void)
|
||||
{
|
||||
return NU_Control_Interrupts(NU_DISABLE_INTERRUPTS);
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
void
|
||||
sys_restore_interrupts(u32_t old_level)
|
||||
sys_arch_unprotect(u32_t pval)
|
||||
{
|
||||
NU_Control_Interrupts(old_level);
|
||||
NU_Control_Interrupts(pval);
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ unix_socket_client(char *name)
|
|||
memset(&unix_addr, 0, sizeof(unix_addr));
|
||||
unix_addr.sun_family = AF_UNIX;
|
||||
sprintf(unix_addr.sun_path, "%s%05d", "/var/tmp/", getpid());
|
||||
#ifndef linux
|
||||
#if !defined(linux) && !defined(cygwin)
|
||||
len = sizeof(unix_addr.sun_len) + sizeof(unix_addr.sun_family) +
|
||||
strlen(unix_addr.sun_path) + 1;
|
||||
unix_addr.sun_len = len;
|
||||
|
|
@ -115,7 +115,7 @@ unix_socket_client(char *name)
|
|||
memset(&unix_addr, 0, sizeof(unix_addr));
|
||||
unix_addr.sun_family = AF_UNIX;
|
||||
strcpy(unix_addr.sun_path, name);
|
||||
#ifndef linux
|
||||
#if !defined(linux) && !defined(cygwin)
|
||||
len = sizeof(unix_addr.sun_len) + sizeof(unix_addr.sun_family) +
|
||||
strlen(unix_addr.sun_path) + 1;
|
||||
unix_addr.sun_len = len;
|
||||
|
|
@ -149,7 +149,7 @@ unix_socket_server(char *name)
|
|||
memset(&unix_addr, 0, sizeof(unix_addr));
|
||||
unix_addr.sun_family = AF_UNIX;
|
||||
strcpy(unix_addr.sun_path, name);
|
||||
#ifndef linux
|
||||
#if !defined(linux) && !defined(cygwin)
|
||||
len = sizeof(unix_addr.sun_len) + sizeof(unix_addr.sun_family) +
|
||||
strlen(unix_addr.sun_path) + 1;
|
||||
unix_addr.sun_len = len;
|
||||
|
|
|
|||
|
|
@ -92,6 +92,10 @@ a lot of data that needs to be copied, this should be set high. */
|
|||
link level header. */
|
||||
#define PBUF_LINK_HLEN 16
|
||||
|
||||
/* SYS_LIGHTWEIGHT_PROT: Define this macro if pbuf_alloc() function is called from
|
||||
an ISR or multiple tasks and you need extra (and faster) critical region protection. */
|
||||
/*#define SYS_LIGHTWEIGHT_PROT 1*/
|
||||
|
||||
/* ---------- TCP options ---------- */
|
||||
#define LWIP_TCP 1
|
||||
#define TCP_TTL 255
|
||||
|
|
|
|||
|
|
@ -93,6 +93,10 @@ struct sys_thread {
|
|||
|
||||
static struct timeval starttime;
|
||||
|
||||
static pthread_mutex_t lwprot_mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
static pthread_t lwprot_thread = (pthread_t) 0xDEAD;
|
||||
static int lwprot_count = 0;
|
||||
|
||||
static struct sys_sem *sys_sem_new_(u8_t count);
|
||||
static void sys_sem_free_(struct sys_sem *sem);
|
||||
|
||||
|
|
@ -451,3 +455,37 @@ sys_arch_timeouts(void)
|
|||
return &thread->timeouts;
|
||||
}
|
||||
/*-----------------------------------------------------------------------------------*/
|
||||
u32_t
|
||||
sys_arch_protect(void)
|
||||
{
|
||||
/* Note that for the UNIX port, we are using a lightweight mutex, and our
|
||||
* own counter (which is locked by the mutex). The return code is not actually
|
||||
* used. */
|
||||
if (lwprot_thread != pthread_self())
|
||||
{
|
||||
/* We are locking the mutex where it has not been locked before *
|
||||
* or is being locked by another thread */
|
||||
pthread_mutex_lock(&lwprot_mutex);
|
||||
lwprot_thread = pthread_self();
|
||||
lwprot_count = 1;
|
||||
}
|
||||
else
|
||||
/* It is already locked by THIS thread */
|
||||
lwprot_count++;
|
||||
return 0;
|
||||
}
|
||||
/*-----------------------------------------------------------------------------------*/
|
||||
void
|
||||
sys_arch_unprotect(u32_t pval)
|
||||
{
|
||||
if (lwprot_thread == pthread_self())
|
||||
{
|
||||
if (--lwprot_count == 0)
|
||||
{
|
||||
lwprot_thread = (pthread_t) 0xDEAD;
|
||||
pthread_mutex_unlock(&lwprot_mutex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------------------*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue