On Wed, Jul 10, 2024 at 04:01:35PM +0200, Alexander Lobakin wrote: > From: Breno Leitao <[email protected]> > Date: Wed, 10 Jul 2024 04:30:28 -0700 > > > From: Alexander Lobakin <[email protected]> > > > > In fact, this structure contains a flexible array at the end, but > > historically its size, alignment etc., is calculated manually. > > There are several instances of the structure embedded into other > > structures, but also there's ongoing effort to remove them and we > > could in the meantime declare &net_device properly. > > Declare the array explicitly, use struct_size() and store the array > > size inside the structure, so that __counted_by() can be applied. > > Don't use PTR_ALIGN(), as SLUB itself tries its best to ensure the > > allocated buffer is aligned to what the user expects. > > Also, change its alignment from %NETDEV_ALIGN to the cacheline size > > as per several suggestions on the netdev ML. > > > > bloat-o-meter for vmlinux: > > > > free_netdev 445 440 -5 > > netdev_freemem 24 - -24 > > alloc_netdev_mqs 1481 1450 -31 > > > > On x86_64 with several NICs of different vendors, I was never able to > > get a &net_device pointer not aligned to the cacheline size after the > > change. > > > > Signed-off-by: Alexander Lobakin <[email protected]> > > Signed-off-by: Breno Leitao <[email protected]> > > Reviewed-by: Przemek Kitszel <[email protected]> > > Reviewed-by: Eric Dumazet <[email protected]> > > Reviewed-by: Kees Cook <[email protected]> > > You did a great job converting embedded &net_devices, thanks a lot! > > I hope SLUB won't return you a non-cacheline-aligned pointer after that > you removed SMP_CACHE_ALIGN(sizeof_priv), right?
Currently the slab will do power-of-2 alignment (i.e. aligned to the bucket size), so this should be fine. In the future I'm trying to make the slab more aware of the required alignments so that it can still provide needed alignment without having to do maximal (power-of-2) alignments. -- Kees Cook
