Re: [PATCH dovetail 6.1-cip] igb: add missing header for oob extensions

[Philippe Gerum <rpm@xenomai.org>]

Jan Kiszka <jan.kiszka@siemens.com> writes:

> On 12.06.25 17:11, Philippe Gerum wrote:
>> Jan Kiszka <jan.kiszka@siemens.com> writes:
>> 
>>> On 11.06.25 18:20, Jan Kiszka wrote:
>>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>>
>>>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>>>> ---
>>>>
>>>> Not yet tested, but this should make our pipeline green again:
>>>> https://source.denx.de/Xenomai/xenomai-images/-/jobs/1166309
>>>>
>>>>  drivers/net/ethernet/intel/igb/igb_main.c | 1 +
>>>>  1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
>>>> index c0932a3cb220f..26be743f2a6cf 100644
>>>> --- a/drivers/net/ethernet/intel/igb/igb_main.c
>>>> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
>>>> @@ -12,6 +12,7 @@
>>>>  #include <linux/pagemap.h>
>>>>  #include <linux/netdevice.h>
>>>>  #include <linux/ipv6.h>
>>>> +#include <linux/skbuff.h>
>>>>  #include <linux/slab.h>
>>>>  #include <net/checksum.h>
>>>>  #include <net/ip6_checksum.h>
>>>
>>> Sorry, this was wrong, at least insufficient:
>>>
>>> https://source.denx.de/Xenomai/xenomai-images/-/jobs/1167536
>>>
>>> Seems there is no way around reproducing locally. Will keep you informed.
>>>
>>> Jan
>> 
>> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
>> index 26be743f2a6cf..67920a8a66733 100644
>> --- a/drivers/net/ethernet/intel/igb/igb_main.c
>> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
>> @@ -8910,8 +8910,10 @@ static struct sk_buff *igb_build_skb(struct igb_ring *rx_ring,
>>  	if (unlikely(!skb))
>>  		return NULL;
>>  
>> +#ifdef CONFIG_IGB_OOB
>>  	if (igb_is_oob_page(rx_ring, rx_buffer->page))
>>  		skb_mark_for_recycle(skb);
>> +#endif
>>  
>>  	/* update pointers within the skb to store the data */
>>  	skb_reserve(skb, xdp->data - xdp->data_hard_start);
>
> Yeah, that looks better - we are not enabling OOB networking in Xenomai 3.
>
> Jan

This is related to the page pool support, not used by the upstream IGB
driver which manages packet memory somewhat manually. That support has
gained an oob extension NET_OOB wants, so that we can keep most of the
original memory management unchanged in drivers which already depend on
it. IOW, IGB_OOB -> NET_OOB -> PAGE_POOL_OOB -> PAGE_POOL.

-- 
Philippe.