Module Name: src
Committed By: yamaguchi
Date: Wed Sep 9 00:56:17 UTC 2020
Modified Files:
src/sys/dev/pci: if_iavf.c
Log Message:
Added the explain about locking order in iavf(4)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/if_iavf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iavf.c
diff -u src/sys/dev/pci/if_iavf.c:1.3 src/sys/dev/pci/if_iavf.c:1.4
--- src/sys/dev/pci/if_iavf.c:1.3 Wed Sep 9 00:35:36 2020
+++ src/sys/dev/pci/if_iavf.c Wed Sep 9 00:56:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iavf.c,v 1.3 2020/09/09 00:35:36 jakllsch Exp $ */
+/* $NetBSD: if_iavf.c,v 1.4 2020/09/09 00:56:17 yamaguchi Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.3 2020/09/09 00:35:36 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iavf.c,v 1.4 2020/09/09 00:56:17 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -319,6 +319,12 @@ struct iavf_stat_counters {
* + Other fields in iavf_softc is protected by sc_cfg_lock
* (an adaptive mutex).
* - The lock must be held before acquiring another lock.
+ *
+ * Locking order:
+ * - IFNET_LOCK => sc_cfg_lock => sc_adminq_lock
+ * - sc_cfg_lock => ETHER_LOCK => sc_adminq_lock
+ * - sc_cfg_lock => txr_lock
+ * - sc_cfg_lock => rxr_lock
*/
struct iavf_softc {
