Hi Nathan, thanks for this refactoring... looks good even though i would have split it in more patches as this is doing quite many things. But I will not be stubborn, I understand that it's not trivial to have things split. I will give my r-b for now but I will check it again before applying it as it's very easy to get tangled-up in between all those defines: Reviewed-by: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx> For now I'm quite surprised to see how easily our CI gives green lights :-P On Sat, Sep 24, 2022 at 09:39:30PM -0700, Nathan Chancellor wrote: > On Fri, Sep 23, 2022 at 09:57:47PM -0700, Kees Cook wrote: > > On Thu, Sep 22, 2022 at 12:51:27PM -0700, Nathan Chancellor wrote: > > > [...] > > > To make everything work properly, adjust certain functions to match the > > > type of the ->show() and ->store() members in 'struct kobj_attribute'. > > > Add a macro to generate functions for that can be called via both > > > dev_attr_{show,store}() or kobj_attr_{show,store}() so that they can be > > > called through both kobject locations without violating kCFI and adjust > > > the attribute groups to account for this. > > > > This was quite a roller coaster! I think the solution looks good, even > > if I'm suspicious of the original design that has the same stuff > > available twice in different places. (I have a dim memory of rdma > > needing a refactoring like this too?) > > Right, I noticed this comment in intel_gt_sysfs_register() once I fully > saw what was going on: > > /* > * We need to make things right with the > * ABI compatibility. The files were originally > * generated under the parent directory. > * > * We generate the files only for gt 0 > * to avoid duplicates. > */ > > Makes it seem like there will be userspace breakage if these files do > not exist? I figured this was the cleanest solution within those > parameters. i915 went multi-gt (multitile) so that some interfaces, like the power management files, have effect only on one of the tiles. This means that we needed to move some of the files inside the newly created gt0/gt1 directory. But, because some of those files are part of an ABI specification, we can't simply transfer them from the original position so that we needed to make a "hard" copy (actually the original files now take the role of affecting all the GTs instead of only one). The complexity of this file comes from the necessity of minimizing code duplication, otherwise we could have had two perfectly identical files (which looking at the final result it wouldn't have been a completely bad idea after all). Thanks again, will let you know when I will get this into our branch. Andi > > Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> > > Thanks for looking it over! > > Cheers, > Nathan