Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2416eb02 authored by Govindarajulu Varadarajan's avatar Govindarajulu Varadarajan Committed by Greg Kroah-Hartman
Browse files

enic: initialize enic->rfs_h.lock in enic_probe 



[ Upstream commit 3256d29fc7aecdf99feb1cb9475ed2252769a8a7 ]

lockdep spotted that we are using rfs_h.lock in enic_get_rxnfc() without
initializing. rfs_h.lock is initialized in enic_open(). But ethtool_ops
can be called when interface is down.

Move enic_rfs_flw_tbl_init to enic_probe.

INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
CPU: 18 PID: 1189 Comm: ethtool Not tainted 4.17.0-rc7-devel+ #27
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-20171110_100015-anatol 04/01/2014
Call Trace:
dump_stack+0x85/0xc0
register_lock_class+0x550/0x560
? __handle_mm_fault+0xa8b/0x1100
__lock_acquire+0x81/0x670
lock_acquire+0xb9/0x1e0
?  enic_get_rxnfc+0x139/0x2b0 [enic]
_raw_spin_lock_bh+0x38/0x80
? enic_get_rxnfc+0x139/0x2b0 [enic]
enic_get_rxnfc+0x139/0x2b0 [enic]
ethtool_get_rxnfc+0x8d/0x1c0
dev_ethtool+0x16c8/0x2400
? __mutex_lock+0x64d/0xa00
? dev_load+0x6a/0x150
dev_ioctl+0x253/0x4b0
sock_do_ioctl+0x9a/0x130
sock_ioctl+0x1af/0x350
do_vfs_ioctl+0x8e/0x670
? syscall_trace_enter+0x1e2/0x380
ksys_ioctl+0x60/0x90
__x64_sys_ioctl+0x16/0x20
do_syscall_64+0x5a/0x170
entry_SYSCALL_64_after_hwframe+0x49/0xbe

Signed-off-by: default avatarGovindarajulu Varadarajan <gvaradar@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f26b61f7

drivers/net/ethernet/cisco/enic/enic_clsf.c

+1 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ void enic_rfs_flw_tbl_init(struct enic *enic) 
	enic->rfs_h.max = enic->config.num_arfs;

	enic->rfs_h.free = enic->rfs_h.max;

	enic->rfs_h.toclean = 0;

	enic_rfs_timer_start(enic);

}



void enic_rfs_flw_tbl_free(struct enic *enic)
@@ -87,7 +86,6 @@ void enic_rfs_flw_tbl_free(struct enic *enic) 


	enic_rfs_timer_stop(enic);

	spin_lock_bh(&enic->rfs_h.lock);

	enic->rfs_h.free = 0;

	for (i = 0; i < (1 << ENIC_RFS_FLW_BITSHIFT); i++) {

		struct hlist_head *hhead;

		struct hlist_node *tmp;
@@ -98,6 +96,7 @@ void enic_rfs_flw_tbl_free(struct enic *enic) 
			enic_delfltr(enic, n->fltr_id);

			hlist_del(&n->node);

			kfree(n);

			enic->rfs_h.free++;

		}

	}

	spin_unlock_bh(&enic->rfs_h.lock);

drivers/net/ethernet/cisco/enic/enic_main.c

+2 −1
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@ static int enic_open(struct net_device *netdev) 
		vnic_intr_unmask(&enic->intr[i]);



	enic_notify_timer_start(enic);

	enic_rfs_flw_tbl_init(enic);

	enic_rfs_timer_start(enic);



	return 0;
@@ -2508,6 +2508,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	enic->notify_timer.function = enic_notify_timer;

	enic->notify_timer.data = (unsigned long)enic;



	enic_rfs_flw_tbl_init(enic);

	enic_set_rx_coal_setting(enic);

	INIT_WORK(&enic->reset, enic_reset);

	INIT_WORK(&enic->change_mtu_work, enic_change_mtu_work);