From: Jakub Kicinski Date: Thu, 5 Sep 2024 00:37:37 +0000 (-0700) Subject: Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net... X-Git-Tag: v6.11-rc7~26^2~7 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f0417c50fddd628e534c336d87932e7e1e883df3;p=linux-block.git Merge branch '100GbE' of git://git./linux/kernel/git/tnguy/net-queue Tony Nguyen says: ==================== ice: fix synchronization between .ndo_bpf() and reset Larysa Zaremba says: PF reset can be triggered asynchronously, by tx_timeout or by a user. With some unfortunate timings both ice_vsi_rebuild() and .ndo_bpf will try to access and modify XDP rings at the same time, causing system crash. The first patch factors out rtnl-locked code from VSI rebuild code to avoid deadlock. The following changes lock rebuild and .ndo_bpf() critical sections with an internal mutex as well and provide complementary fixes. * '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue: ice: do not bring the VSI up, if it was down before the XDP setup ice: remove ICE_CFG_BUSY locking from AF_XDP code ice: check ICE_VSI_DOWN under rtnl_lock when preparing for reset ice: check for XDP rings instead of bpf program when unconfiguring ice: protect XDP configuration with a mutex ice: move netif_queue_set_napi to rtnl-protected sections ==================== Link: https://patch.msgid.link/20240903183034.3530411-1-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski --- f0417c50fddd628e534c336d87932e7e1e883df3