Fix VNIC module unloading
ClosedPublic
Actions

Authored by wma on May 13 2016, 9:17 AM.

Details

Reviewers

zbb
emaste

Commits

rS300295: Fix VNIC module unloading

Summary

Fix panics which were present when BGX and PF module were unloaded.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

wma updated this revision to Diff 16280.May 13 2016, 9:17 AM

wma retitled this revision from to Fix VNIC module unloading.

wma updated this object.

wma edited the test plan for this revision. (Show Details)

wma added a reviewer: zbb.

wma set the repository for this revision to rS FreeBSD src repository - subversion.

Herald added a subscriber: imp. · View Herald TranscriptMay 13 2016, 9:17 AM

zbb added inline comments.May 16 2016, 8:37 AM

sys/dev/vnic/nic_main.c

247

Please add following code to the patch:

 static int
 nicpf_detach(device_t dev)
 {
 	struct nicpf *nic;
+	int err;
 
+	err = 0;
 	nic = device_get_softc(dev);
 
 	callout_drain(&nic->check_link);
 	mtx_destroy(&nic->check_link_mtx);
 
 	nic_unregister_interrupts(nic);
 	nicpf_free_res(nic);
 	pci_disable_busmaster(dev);
 
-	return (0);
+#ifdef PCI_IOV
+	err = pci_iov_detach(dev);
+	if (err != 0)
+		device_printf(dev, "SR-IOV in use. Detach first.\n");
+#endif
+	return (err);
 }

wma updated this revision to Diff 16440.May 17 2016, 5:08 AM

wma added a reviewer: emaste.

zbb accepted this revision.May 20 2016, 8:25 AM

zbb edited edge metadata.

This revision is now accepted and ready to land.May 20 2016, 8:25 AM

Closed by commit rS300295: Fix VNIC module unloading (authored by wma). · Explain WhyMay 20 2016, 11:02 AM

This revision was automatically updated to reflect the committed changes.