mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
2a5dc090b9
Currently, netif_queue_set_napi() is called from ice_vsi_rebuild() that is not rtnl-locked when called from the reset. This creates the need to take the rtnl_lock just for a single function and complicates the synchronization with .ndo_bpf. At the same time, there no actual need to fill napi-to-queue information at this exact point. Fill napi-to-queue information when opening the VSI and clear it when the VSI is being closed. Those routines are already rtnl-locked. Also, rewrite napi-to-queue assignment in a way that prevents inclusion of XDP queues, as this leads to out-of-bounds writes, such as one below. [ +0.000004] BUG: KASAN: slab-out-of-bounds in netif_queue_set_napi+0x1c2/0x1e0 [ +0.000012] Write of size 8 at addr ffff889881727c80 by task bash/7047 [ +0.000006] CPU: 24 PID: 7047 Comm: bash Not tainted 6.10.0-rc2+ #2 [ +0.000004] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.02.01.0014.082620210524 08/26/2021 [ +0.000003] Call Trace: [ +0.000003] <TASK> [ +0.000002] dump_stack_lvl+0x60/0x80 [ +0.000007] print_report+0xce/0x630 [ +0.000007] ? __pfx__raw_spin_lock_irqsave+0x10/0x10 [ +0.000007] ? __virt_addr_valid+0x1c9/0x2c0 [ +0.000005] ? netif_queue_set_napi+0x1c2/0x1e0 [ +0.000003] kasan_report+0xe9/0x120 [ +0.000004] ? netif_queue_set_napi+0x1c2/0x1e0 [ +0.000004] netif_queue_set_napi+0x1c2/0x1e0 [ +0.000005] ice_vsi_close+0x161/0x670 [ice] [ +0.000114] ice_dis_vsi+0x22f/0x270 [ice] [ +0.000095] ice_pf_dis_all_vsi.constprop.0+0xae/0x1c0 [ice] [ +0.000086] ice_prepare_for_reset+0x299/0x750 [ice] [ +0.000087] pci_dev_save_and_disable+0x82/0xd0 [ +0.000006] pci_reset_function+0x12d/0x230 [ +0.000004] reset_store+0xa0/0x100 [ +0.000006] ? __pfx_reset_store+0x10/0x10 [ +0.000002] ? __pfx_mutex_lock+0x10/0x10 [ +0.000004] ? __check_object_size+0x4c1/0x640 [ +0.000007] kernfs_fop_write_iter+0x30b/0x4a0 [ +0.000006] vfs_write+0x5d6/0xdf0 [ +0.000005] ? fd_install+0x180/0x350 [ +0.000005] ? __pfx_vfs_write+0x10/0xA10 [ +0.000004] ? do_fcntl+0x52c/0xcd0 [ +0.000004] ? kasan_save_track+0x13/0x60 [ +0.000003] ? kasan_save_free_info+0x37/0x60 [ +0.000006] ksys_write+0xfa/0x1d0 [ +0.000003] ? __pfx_ksys_write+0x10/0x10 [ +0.000002] ? __x64_sys_fcntl+0x121/0x180 [ +0.000004] ? _raw_spin_lock+0x87/0xe0 [ +0.000005] do_syscall_64+0x80/0x170 [ +0.000007] ? _raw_spin_lock+0x87/0xe0 [ +0.000004] ? __pfx__raw_spin_lock+0x10/0x10 [ +0.000003] ? file_close_fd_locked+0x167/0x230 [ +0.000005] ? syscall_exit_to_user_mode+0x7d/0x220 [ +0.000005] ? do_syscall_64+0x8c/0x170 [ +0.000004] ? do_syscall_64+0x8c/0x170 [ +0.000003] ? do_syscall_64+0x8c/0x170 [ +0.000003] ? fput+0x1a/0x2c0 [ +0.000004] ? filp_close+0x19/0x30 [ +0.000004] ? do_dup2+0x25a/0x4c0 [ +0.000004] ? __x64_sys_dup2+0x6e/0x2e0 [ +0.000002] ? syscall_exit_to_user_mode+0x7d/0x220 [ +0.000004] ? do_syscall_64+0x8c/0x170 [ +0.000003] ? __count_memcg_events+0x113/0x380 [ +0.000005] ? handle_mm_fault+0x136/0x820 [ +0.000005] ? do_user_addr_fault+0x444/0xa80 [ +0.000004] ? clear_bhb_loop+0x25/0x80 [ +0.000004] ? clear_bhb_loop+0x25/0x80 [ +0.000002] entry_SYSCALL_64_after_hwframe+0x76/0x7e [ +0.000005] RIP: 0033:0x7f2033593154 Fixes:080b0c8d6d("ice: Fix ASSERT_RTNL() warning during certain scenarios") Fixes:91fdbce7e8("ice: Add support in the driver for associating queue with napi") Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Reviewed-by: Amritha Nambiar <amritha.nambiar@intel.com> Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Tested-by: George Kuruvinakunnel <george.kuruvinakunnel@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
121 lines
3.8 KiB
C
121 lines
3.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* Copyright (c) 2018, Intel Corporation. */
|
|
|
|
#ifndef _ICE_LIB_H_
|
|
#define _ICE_LIB_H_
|
|
|
|
#include "ice.h"
|
|
#include "ice_vlan.h"
|
|
|
|
/* Flags used for VSI configuration and rebuild */
|
|
#define ICE_VSI_FLAG_INIT BIT(0)
|
|
#define ICE_VSI_FLAG_NO_INIT 0
|
|
|
|
const char *ice_vsi_type_str(enum ice_vsi_type vsi_type);
|
|
|
|
bool ice_pf_state_is_nominal(struct ice_pf *pf);
|
|
|
|
void ice_update_eth_stats(struct ice_vsi *vsi);
|
|
|
|
void ice_vsi_cfg_msix(struct ice_vsi *vsi);
|
|
|
|
int ice_vsi_start_all_rx_rings(struct ice_vsi *vsi);
|
|
|
|
int ice_vsi_stop_all_rx_rings(struct ice_vsi *vsi);
|
|
|
|
int
|
|
ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,
|
|
u16 rel_vmvf_num);
|
|
|
|
int ice_vsi_stop_xdp_tx_rings(struct ice_vsi *vsi);
|
|
|
|
void ice_cfg_sw_lldp(struct ice_vsi *vsi, bool tx, bool create);
|
|
|
|
int ice_set_link(struct ice_vsi *vsi, bool ena);
|
|
|
|
void ice_vsi_delete(struct ice_vsi *vsi);
|
|
|
|
int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc);
|
|
|
|
int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi);
|
|
|
|
void ice_vsi_cfg_netdev_tc(struct ice_vsi *vsi, u8 ena_tc);
|
|
|
|
struct ice_vsi *
|
|
ice_vsi_setup(struct ice_pf *pf, struct ice_vsi_cfg_params *params);
|
|
|
|
void ice_vsi_set_napi_queues(struct ice_vsi *vsi);
|
|
|
|
void ice_vsi_clear_napi_queues(struct ice_vsi *vsi);
|
|
|
|
int ice_vsi_release(struct ice_vsi *vsi);
|
|
|
|
void ice_vsi_close(struct ice_vsi *vsi);
|
|
|
|
int ice_ena_vsi(struct ice_vsi *vsi, bool locked);
|
|
|
|
void ice_vsi_decfg(struct ice_vsi *vsi);
|
|
void ice_dis_vsi(struct ice_vsi *vsi, bool locked);
|
|
|
|
int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags);
|
|
int ice_vsi_cfg(struct ice_vsi *vsi);
|
|
|
|
bool ice_is_reset_in_progress(unsigned long *state);
|
|
int ice_wait_for_reset(struct ice_pf *pf, unsigned long timeout);
|
|
|
|
void
|
|
ice_write_qrxflxp_cntxt(struct ice_hw *hw, u16 pf_q, u32 rxdid, u32 prio,
|
|
bool ena_ts);
|
|
|
|
void ice_vsi_free_irq(struct ice_vsi *vsi);
|
|
|
|
void ice_vsi_free_rx_rings(struct ice_vsi *vsi);
|
|
|
|
void ice_vsi_free_tx_rings(struct ice_vsi *vsi);
|
|
|
|
void ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena);
|
|
|
|
void ice_vsi_cfg_crc_strip(struct ice_vsi *vsi, bool disable);
|
|
|
|
void ice_update_tx_ring_stats(struct ice_tx_ring *ring, u64 pkts, u64 bytes);
|
|
|
|
void ice_update_rx_ring_stats(struct ice_rx_ring *ring, u64 pkts, u64 bytes);
|
|
|
|
void ice_write_intrl(struct ice_q_vector *q_vector, u8 intrl);
|
|
void ice_write_itr(struct ice_ring_container *rc, u16 itr);
|
|
void ice_set_q_vector_intrl(struct ice_q_vector *q_vector);
|
|
|
|
int ice_vsi_cfg_mac_fltr(struct ice_vsi *vsi, const u8 *macaddr, bool set);
|
|
|
|
bool ice_is_safe_mode(struct ice_pf *pf);
|
|
bool ice_is_rdma_ena(struct ice_pf *pf);
|
|
bool ice_is_dflt_vsi_in_use(struct ice_port_info *pi);
|
|
bool ice_is_vsi_dflt_vsi(struct ice_vsi *vsi);
|
|
int ice_set_dflt_vsi(struct ice_vsi *vsi);
|
|
int ice_clear_dflt_vsi(struct ice_vsi *vsi);
|
|
int ice_set_min_bw_limit(struct ice_vsi *vsi, u64 min_tx_rate);
|
|
int ice_set_max_bw_limit(struct ice_vsi *vsi, u64 max_tx_rate);
|
|
int ice_get_link_speed_kbps(struct ice_vsi *vsi);
|
|
int ice_get_link_speed_mbps(struct ice_vsi *vsi);
|
|
int
|
|
ice_vsi_update_security(struct ice_vsi *vsi, void (*fill)(struct ice_vsi_ctx *));
|
|
|
|
void ice_vsi_ctx_set_antispoof(struct ice_vsi_ctx *ctx);
|
|
|
|
void ice_vsi_ctx_clear_antispoof(struct ice_vsi_ctx *ctx);
|
|
|
|
void ice_vsi_ctx_set_allow_override(struct ice_vsi_ctx *ctx);
|
|
|
|
void ice_vsi_ctx_clear_allow_override(struct ice_vsi_ctx *ctx);
|
|
int ice_vsi_update_local_lb(struct ice_vsi *vsi, bool set);
|
|
int ice_vsi_add_vlan_zero(struct ice_vsi *vsi);
|
|
int ice_vsi_del_vlan_zero(struct ice_vsi *vsi);
|
|
bool ice_vsi_has_non_zero_vlans(struct ice_vsi *vsi);
|
|
u16 ice_vsi_num_non_zero_vlans(struct ice_vsi *vsi);
|
|
bool ice_is_feature_supported(struct ice_pf *pf, enum ice_feature f);
|
|
void ice_set_feature_support(struct ice_pf *pf, enum ice_feature f);
|
|
void ice_clear_feature_support(struct ice_pf *pf, enum ice_feature f);
|
|
void ice_init_feature_support(struct ice_pf *pf);
|
|
bool ice_vsi_is_rx_queue_active(struct ice_vsi *vsi);
|
|
#endif /* !_ICE_LIB_H_ */
|