djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rgbmatrix: recover gracefully from allocation errors

Browse Source 
e.g., allocating a 192x32x6bpp matrix would be enough to trigger this
reliably on a Metro M4 Express using the "memory hogging" layout.
Allocating 64x32x6bpp could trigger it, but somewhat unreliably.

There are several things going on here:
 * we make the failing call with interrupts off
 * we were throwing an exception with interrupts off
 * protomatter failed badly in _PM_free when it was partially-initialized

Incorporate the fix from protomatter, switch to a non-throwing malloc
variant, and ensure that interrupts get turned back on.

This decreases the quality of the MemoryError (it cannot report the size
of the failed allocation) but allows CircuitPython to survive, rather
than faulting.
This commit is contained in:
Jeff Epler 2020-08-28 11:17:07 -05:00
parent 9bd2a61d8b
commit 2f120c70ee
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/protomatter

@ -1 +1 @@
Subproject commit 761d6437e8cd6a131d51de96974337121a9c7164 Subproject commit 2a1ba8fa4753b2bcb158c9b17351cf18eade0d2b

17
shared-module/rgbmatrix/RGBMatrix.c
View File

@ -89,6 +89,7 @@ void common_hal_rgbmatrix_rgbmatrix_reconstruct(rgbmatrix_rgbmatrix_obj_t* self,
self->bufinfo.typecode = 'H' | MP_OBJ_ARRAY_TYPECODE_FLAG_RW; self->bufinfo.typecode = 'H' | MP_OBJ_ARRAY_TYPECODE_FLAG_RW;
} }
memset(&self->core, 0, sizeof(self->core));
ProtomatterStatus stat = _PM_init(&self->core, ProtomatterStatus stat = _PM_init(&self->core,
self->width, self->bit_depth, self->width, self->bit_depth,
self->rgb_count/6, self->rgb_pins, self->rgb_count/6, self->rgb_pins,
@ -101,14 +102,17 @@ void common_hal_rgbmatrix_rgbmatrix_reconstruct(rgbmatrix_rgbmatrix_obj_t* self,
common_hal_mcu_disable_interrupts(); common_hal_mcu_disable_interrupts();
common_hal_rgbmatrix_timer_enable(self->timer); common_hal_rgbmatrix_timer_enable(self->timer);
stat = _PM_begin(&self->core); stat = _PM_begin(&self->core);
_PM_convert_565(&self->core, self->bufinfo.buf, self->width);
if (stat == PROTOMATTER_OK) {
_PM_convert_565(&self->core, self->bufinfo.buf, self->width);
}
common_hal_mcu_enable_interrupts(); common_hal_mcu_enable_interrupts();
_PM_swapbuffer_maybe(&self->core); if (stat == PROTOMATTER_OK) {
_PM_swapbuffer_maybe(&self->core);
}
} }
if (stat != PROTOMATTER_OK) { if (stat != PROTOMATTER_OK) {
// XXX this deinit() actually makes crashy-crashy
// can trigger it by sending inappropriate pins
common_hal_rgbmatrix_rgbmatrix_deinit(self); common_hal_rgbmatrix_rgbmatrix_deinit(self);
switch (stat) { switch (stat) {
case PROTOMATTER_ERR_PINS: case PROTOMATTER_ERR_PINS:
@ -117,7 +121,9 @@ void common_hal_rgbmatrix_rgbmatrix_reconstruct(rgbmatrix_rgbmatrix_obj_t* self,
case PROTOMATTER_ERR_ARG: case PROTOMATTER_ERR_ARG:
mp_raise_ValueError(translate("Invalid argument")); mp_raise_ValueError(translate("Invalid argument"));
break; break;
case PROTOMATTER_ERR_MALLOC: /// should have already been signaled as NLR case PROTOMATTER_ERR_MALLOC:
mp_raise_msg(&mp_type_MemoryError, NULL);
break;
default: default:
mp_raise_msg_varg(&mp_type_RuntimeError, mp_raise_msg_varg(&mp_type_RuntimeError,
translate("Internal error #%d"), (int)stat); translate("Internal error #%d"), (int)stat);
@ -126,7 +132,6 @@ void common_hal_rgbmatrix_rgbmatrix_reconstruct(rgbmatrix_rgbmatrix_obj_t* self,
} }
self->paused = 0; self->paused = 0;
} }
STATIC void free_pin(uint8_t *pin) { STATIC void free_pin(uint8_t *pin) {

2
shared-module/rgbmatrix/allocator.h
View File

@ -11,7 +11,7 @@
static inline void *_PM_allocator_impl(size_t sz) { static inline void *_PM_allocator_impl(size_t sz) {
if (gc_alloc_possible()) { if (gc_alloc_possible()) {
return m_malloc(sz + sizeof(void*), true); return m_malloc_maybe(sz + sizeof(void*), true);
} else { } else {
supervisor_allocation *allocation = allocate_memory(align32_size(sz), false); supervisor_allocation *allocation = allocate_memory(align32_size(sz), false);
return allocation ? allocation->ptr : NULL; return allocation ? allocation->ptr : NULL;