Hi Am Fr., 20. März 2026 um 02:08 Uhr schrieb Rosen Penev <[email protected]>: > > A local helper was developed previously for struct_size. > > kzalloc_flex can be used now. > > Signed-off-by: Rosen Penev <[email protected]> > --- > drivers/gpu/drm/etnaviv/etnaviv_drv.h | 12 ------------ > drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 3 +-- > 2 files changed, 1 insertion(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h > b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > index 20dad16fd554..55a9e745604d 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > @@ -93,18 +93,6 @@ void etnaviv_gem_describe_objects(struct > etnaviv_drm_private *priv, > #define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__) > #define VERB(fmt, ...) if (0) DRM_DEBUG(fmt"\n", ##__VA_ARGS__) > > -/* > - * Return the storage size of a structure with a variable length array. > - * The array is nelem elements of elem_size, where the base structure > - * is defined by base. If the size overflows size_t, return zero. > - */ > -static inline size_t size_vstruct(size_t nelem, size_t elem_size, size_t > base) > -{ > - if (elem_size && nelem > (SIZE_MAX - base) / elem_size) > - return 0; > - return base + nelem * elem_size; > -} > - > /* > * Etnaviv timeouts are specified wrt CLOCK_MONOTONIC, not jiffies. > * We need to calculate the timeout in terms of number of jiffies > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c > b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c > index fbf693addd74..1a77a09b3377 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c > @@ -32,9 +32,8 @@ static struct etnaviv_gem_submit *submit_create(struct > drm_device *dev, > struct etnaviv_gpu *gpu, size_t nr_bos, size_t nr_pmrs) > { > struct etnaviv_gem_submit *submit; > - size_t sz = size_vstruct(nr_bos, sizeof(submit->bos[0]), > sizeof(*submit)); > > - submit = kzalloc(sz, GFP_KERNEL); > + submit = kzalloc_flex(*submit, bos, nr_bos); > if (!submit) > return NULL; > > -- > 2.53.0 >
Thanks for the patch - applied to drm-misc-next. -- greets -- Christian Gmeiner, MSc https://christian-gmeiner.info/privacypolicy
