Handle ERELOOKUP from VOP_FSYNC()

[kib]

Summary

We need to repeat the operation if the vnode was relocked.

Reported by: markj

[markj]

Thanks, this fixes the panic I saw.

sys/vm/vm_object.c

1238

Why isn't it necessary to relock the vnode here like we do in md? And if we can simply call VOP_FSYNC() in a loop like this, why not handle the retry entirely in the VOP?

[kib]

sys/vm/vm_object.c

1238

Generally it is useful to unlock the vnode since it allows SU thread and bufdaemon to clean more dependencies that perhaps caused the relock during ffs_fsyncvnode().

I added the relock there.

[kib]

Relock for vm_object_sync()

[markj]

sys/vm/vm_object.c

1244

[kib]

Avoid duplicating VOP_FSYNC() call.
Move comment to the more logical place. Make it stylish.

[markj]

sys/vm/vm_object.c

1249

sys/dev/md/md.c

if (ixv_allocate_pci_resources(ctx)) {
                 device_printf(dev, "ixv_allocate_pci_resources() failed!\n");
                 error = ENXIO;
                 goto err_out;
         }
 
         /* SYSCTL APIs */
         SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
             SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "debug",
-            CTLTYPE_INT | CTLFLAG_RW, adapter, 0, ixv_sysctl_debug, "I",
-            "Debug Info");
+            CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
+            adapter, 0, ixv_sysctl_debug, "I", "Debug Info");
 
         /* Determine hardware revision */
         ixv_identify_hardware(ctx);
         ixv_init_device_features(adapter);
 
         /* Initialize the shared code */
         error = ixgbe_init_ops_vf(hw);
         if (error) {
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "watchdog_events",
             CTLFLAG_RD, &adapter->watchdog_events, "Watchdog timeouts");
         SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "link_irq",
             CTLFLAG_RD, &adapter->link_irq, "Link MSI-X IRQ Handled");
 
         for (int i = 0; i < adapter->num_tx_queues; i++, tx_que++) {
                 struct tx_ring *txr = &tx_que->txr;
                 snprintf(namebuf, QUEUE_NAME_LEN, "queue%d", i);
                 queue_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, namebuf,
-                    CTLFLAG_RD, NULL, "Queue Name");
+                    CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Queue Name");
                 queue_list = SYSCTL_CHILDREN(queue_node);
 
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tso_tx",
                     CTLFLAG_RD, &(txr->tso_tx), "TSO Packets");
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_packets",
                     CTLFLAG_RD, &(txr->total_packets), "TX Packets");
         }
 
         for (int i = 0; i < adapter->num_rx_queues; i++, rx_que++) {
                 struct rx_ring *rxr = &rx_que->rxr;
                 snprintf(namebuf, QUEUE_NAME_LEN, "queue%d", i);
                 queue_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, namebuf,
-                    CTLFLAG_RD, NULL, "Queue Name");
+                    CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Queue Name");
                 queue_list = SYSCTL_CHILDREN(queue_node);
 
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "irqs",
                     CTLFLAG_RD, &(rx_que->irqs), "IRQs on queue");
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_packets",
                     CTLFLAG_RD, &(rxr->rx_packets), "RX packets");
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_bytes",
                     CTLFLAG_RD, &(rxr->rx_bytes), "RX bytes");
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_discarded",
                     CTLFLAG_RD, &(rxr->rx_discarded), "Discarded RX packets");
         }
 
         stat_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "mac",
-            CTLFLAG_RD, NULL, "VF Statistics (read from HW registers)");
+            CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
+            "VF Statistics (read from HW registers)");
         stat_list = SYSCTL_CHILDREN(stat_node);
 
         SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_pkts_rcvd",
             CTLFLAG_RD, &stats->vfgprc, "Good Packets Received");
         SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_rcvd",
             CTLFLAG_RD, &stats->vfgorc, "Good Octets Received");
         SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mcast_pkts_rcvd",
             CTLFLAG_RD, &stats->vfmprc, "Multicast Packets Received");

sys/vm/vm_object.c

if (ixv_allocate_pci_resources(ctx)) {
                 device_printf(dev, "ixv_allocate_pci_resources() failed!\n");
                 error = ENXIO;
                 goto err_out;
         }
 
         /* SYSCTL APIs */
         SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
             SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "debug",
-            CTLTYPE_INT | CTLFLAG_RW, adapter, 0, ixv_sysctl_debug, "I",
-            "Debug Info");
+            CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
+            adapter, 0, ixv_sysctl_debug, "I", "Debug Info");
 
         /* Determine hardware revision */
         ixv_identify_hardware(ctx);
         ixv_init_device_features(adapter);
 
         /* Initialize the shared code */
         error = ixgbe_init_ops_vf(hw);
         if (error) {
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "watchdog_events",
             CTLFLAG_RD, &adapter->watchdog_events, "Watchdog timeouts");
         SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "link_irq",
             CTLFLAG_RD, &adapter->link_irq, "Link MSI-X IRQ Handled");
 
         for (int i = 0; i < adapter->num_tx_queues; i++, tx_que++) {
                 struct tx_ring *txr = &tx_que->txr;
                 snprintf(namebuf, QUEUE_NAME_LEN, "queue%d", i);
                 queue_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, namebuf,
-                    CTLFLAG_RD, NULL, "Queue Name");
+                    CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Queue Name");
                 queue_list = SYSCTL_CHILDREN(queue_node);
 
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tso_tx",
                     CTLFLAG_RD, &(txr->tso_tx), "TSO Packets");
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_packets",
                     CTLFLAG_RD, &(txr->total_packets), "TX Packets");
         }
 
         for (int i = 0; i < adapter->num_rx_queues; i++, rx_que++) {
                 struct rx_ring *rxr = &rx_que->rxr;
                 snprintf(namebuf, QUEUE_NAME_LEN, "queue%d", i);
                 queue_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, namebuf,
-                    CTLFLAG_RD, NULL, "Queue Name");
+                    CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Queue Name");
                 queue_list = SYSCTL_CHILDREN(queue_node);
 
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "irqs",
                     CTLFLAG_RD, &(rx_que->irqs), "IRQs on queue");
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_packets",
                     CTLFLAG_RD, &(rxr->rx_packets), "RX packets");
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_bytes",
                     CTLFLAG_RD, &(rxr->rx_bytes), "RX bytes");
                 SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_discarded",
                     CTLFLAG_RD, &(rxr->rx_discarded), "Discarded RX packets");
         }
 
         stat_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "mac",
-            CTLFLAG_RD, NULL, "VF Statistics (read from HW registers)");
+            CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
+            "VF Statistics (read from HW registers)");
         stat_list = SYSCTL_CHILDREN(stat_node);
 
         SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_pkts_rcvd",
             CTLFLAG_RD, &stats->vfgprc, "Good Packets Received");
         SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_rcvd",
             CTLFLAG_RD, &stats->vfgorc, "Good Octets Received");
         SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mcast_pkts_rcvd",
             CTLFLAG_RD, &stats->vfmprc, "Multicast Packets Received");