d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Make the _hw_iommu sysctl node non-static;

Browse Source 
o Move the dmar sysctl knobs to _hw_iommu_dmar.

Reviewed by:	kib
Sponsored by:	DARPA/AFRL
Differential Revision:	https://reviews.freebsd.org/D25807
This commit is contained in:
Ruslan Bukin 2020-07-25 21:37:07 +00:00
parent 9c843a409b
commit 357149f037
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=363534
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/iommu/iommu.h
View File

@ -35,6 +35,7 @@
#define _SYS_IOMMU_H_ #define _SYS_IOMMU_H_
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/sysctl.h>
#include <sys/taskqueue.h> #include <sys/taskqueue.h>
#include <sys/tree.h> #include <sys/tree.h>
#include <sys/types.h> #include <sys/types.h>
@ -210,4 +211,6 @@ int iommu_gas_map_region(struct iommu_domain *domain,
int iommu_gas_reserve_region(struct iommu_domain *domain, iommu_gaddr_t start, int iommu_gas_reserve_region(struct iommu_domain *domain, iommu_gaddr_t start,
iommu_gaddr_t end); iommu_gaddr_t end);
SYSCTL_DECL(_hw_iommu);
#endif /* !_SYS_IOMMU_H_ */ #endif /* !_SYS_IOMMU_H_ */

4
sys/dev/iommu/iommu_gas.c
View File

@ -732,9 +732,9 @@ iommu_map_region(struct iommu_domain *domain, struct iommu_map_entry *entry,
return (error); return (error);
} }
SYSCTL_NODE(_hw, OID_AUTO, iommu, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, "");
#ifdef INVARIANTS #ifdef INVARIANTS
static SYSCTL_NODE(_hw, OID_AUTO, iommu, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
"");
SYSCTL_INT(_hw_iommu, OID_AUTO, check_free, CTLFLAG_RWTUN, SYSCTL_INT(_hw_iommu, OID_AUTO, check_free, CTLFLAG_RWTUN,
&iommu_check_free, 0, &iommu_check_free, 0,
"Check the GPA RBtree for free_down and free_after validity"); "Check the GPA RBtree for free_down and free_after validity");

10
sys/x86/iommu/intel_utils.c
View File

@ -655,15 +655,15 @@ dmar_timeout_sysctl(SYSCTL_HANDLER_ARGS)
return (error); return (error);
} }
static SYSCTL_NODE(_hw, OID_AUTO, dmar, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, static SYSCTL_NODE(_hw_iommu, OID_AUTO, dmar, CTLFLAG_RD | CTLFLAG_MPSAFE,
""); NULL, "");
SYSCTL_INT(_hw_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD, SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD,
&dmar_tbl_pagecnt, 0, &dmar_tbl_pagecnt, 0,
"Count of pages used for DMAR pagetables"); "Count of pages used for DMAR pagetables");
SYSCTL_INT(_hw_dmar, OID_AUTO, batch_coalesce, CTLFLAG_RWTUN, SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, batch_coalesce, CTLFLAG_RWTUN,
&dmar_batch_coalesce, 0, &dmar_batch_coalesce, 0,
"Number of qi batches between interrupt"); "Number of qi batches between interrupt");
SYSCTL_PROC(_hw_dmar, OID_AUTO, timeout, SYSCTL_PROC(_hw_iommu_dmar, OID_AUTO, timeout,
CTLTYPE_U64 | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0, CTLTYPE_U64 | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0,
dmar_timeout_sysctl, "QU", dmar_timeout_sysctl, "QU",
"Timeout for command wait, in nanoseconds"); "Timeout for command wait, in nanoseconds");