On 05/09/2024 13:50, Alasdair McWilliam wrote: >> We've been working recently on somewhat related issues and it looks like >> not every commit from [0] has been backported. >> >> $ git log --oneline v6.1.103..v6.1.104 drivers/net/ethernet/intel/ice/ >> 5a80b682e3e1 ice: add missing WRITE_ONCE when clearing ice_rx_ring::xdp_prog >> 8782f0fcb19d ice: replace synchronize_rcu with synchronize_net >> 15115033f056 ice: don't busy wait for Rx queue disable in ice_qp_dis() >> 3dbc58774e58 ice: respect netif readiness in AF_XDP ZC related ndo's >> >> can you apply the rest of it on top of 6.1.107 and see the result? > > The first one I've attempted doesn't apply cleanly to 6.1.107. > > Eg: d59227179949 ("ice: modify error handling when setting XSK pool in > ndo_bpf"). The above looks to have been based on code from around 6.8 or > 6.9 where the makeup of routines like ice_qp_ena() has changed. Looks > like this happened around a292ba981324 ("ice: make ice_vsi_cfg_txq() > static"). > > Should I try and apply a292ba981324 as well? > Good evening, I just wondered if there was perhaps any further feedback on the above. Thanks in advance! Alasdair.