RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Allocate per-CPU data only if necessary

Browse Source 
The _Workspace_Allocate_aligned() would returns a non-NULL pointer for a
zero size allocation request if there is enough memory available.  This
conflicts with the size estimate of zero in
_Workspace_Space_for_per_CPU_data() if the per-CPU data set is empty.

Update #3507.
This commit is contained in:
Sebastian Huber
2018-09-19 11:52:47 +02:00
parent 68f339b6e3
commit 776464aad4
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cpukit/score/src/wkspace.c
View File

@@ -129,22 +129,26 @@ static uintptr_t _Workspace_Space_for_per_CPU_data( uintptr_t page_size )
static void _Workspace_Allocate_per_CPU_data( void )
{
#ifdef RTEMS_SMP
Per_CPU_Control *cpu;
uintptr_t size;
uint32_t cpu_index;
uint32_t cpu_max;
cpu = _Per_CPU_Get_by_index( 0 );
cpu->data = RTEMS_LINKER_SET_BEGIN( _Per_CPU_Data );
uintptr_t size;
size = RTEMS_LINKER_SET_SIZE( _Per_CPU_Data );
cpu_max = rtems_configuration_get_maximum_processors();
for ( cpu_index = 1 ; cpu_index < cpu_max ; ++cpu_index ) {
cpu = _Per_CPU_Get_by_index( cpu_index );
cpu->data = _Workspace_Allocate_aligned( size, CPU_CACHE_LINE_BYTES );
_Assert( cpu->data != NULL );
memcpy( cpu->data, RTEMS_LINKER_SET_BEGIN( _Per_CPU_Data ), size);
if ( size > 0 ) {
Per_CPU_Control *cpu;
uint32_t cpu_index;
uint32_t cpu_max;
cpu = _Per_CPU_Get_by_index( 0 );
cpu->data = RTEMS_LINKER_SET_BEGIN( _Per_CPU_Data );
cpu_max = rtems_configuration_get_maximum_processors();
for ( cpu_index = 1 ; cpu_index < cpu_max ; ++cpu_index ) {
cpu = _Per_CPU_Get_by_index( cpu_index );
cpu->data = _Workspace_Allocate_aligned( size, CPU_CACHE_LINE_BYTES );
_Assert( cpu->data != NULL );
memcpy( cpu->data, RTEMS_LINKER_SET_BEGIN( _Per_CPU_Data ), size);
}
}
#endif
}