Changeset 57108 in vbox

Timestamp:

Jul 28, 2015 11:49:23 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101836

Message:

supdrv: Added SUPKERNELFEATURES_SMAP to SUPR0GetKernelFeatures and document the API in the header.

Location:

trunk

Files:

trunk/include/VBox/sup.h

-              r57090
+              r57108
 /** GDT is read-only. */
 #define SUPKERNELFEATURES_GDT_READ_ONLY     RT_BIT(0)
+/** SMAP is possibly enabled. */
+#define SUPKERNELFEATURES_SMAP              RT_BIT(1)
 /** @} */
 …
 SUPR0DECL(int) SUPR0Printf(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 SUPR0DECL(SUPPAGINGMODE) SUPR0GetPagingMode(void);
-SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void);
 SUPR0DECL(RTCCUINTREG) SUPR0ChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask);
 SUPR0DECL(int) SUPR0EnableVTx(bool fEnable);
 …
 SUPR0DECL(int) SUPR0TscDeltaMeasureBySetIndex(PSUPDRVSESSION pSession, uint32_t iCpuSet, uint32_t fFlags,
                                               RTMSINTERVAL cMsWaitRetry, RTMSINTERVAL cMsWaitThread, uint32_t cTries);
+/**
+ * Returns configuration flags of the host kernel.
+ *
+ * @returns Combination of SUPKERNELFEATURES_XXX flags.
+ */
+SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void);
 /** @name Absolute symbols

r56702	r57108
1400	1400	}
1401	1401
	1402
1402	1403	/**
1403	1404	* Check if the CPU has SMAP support.
…	…
1417	1418	}
1418	1419
	1420
1419	1421	RTDECL(int) SUPR0Printf(const char *pszFormat, ...)
1420	1422	{
…	…
1432	1434
1433	1435
1434		/**
1435		* Returns configuration flags of the host kernel.
1436		*/
1437	1436	SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void)
1438	1437	{
1439		return 0;
	1438	uint32_t fFlags = 0;
	1439	if (ASMGetCR4() & X86_CR4_SMAP)
	1440	fFlags \|= SUPKERNELFEATURES_SMAP;
	1441	return fFlags;
1440	1442	}
1441	1443

-              r54581
+              r57108
-/**
- * Returns configuration flags of the host kernel.
- */
 SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void)
+{

-              r56293
+              r57108
-/**
- * Returns configuration flags of the host kernel.
- */
 SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void)
+{
 …
 #ifdef CONFIG_PAX_KERNEXEC
     fFlags |= SUPKERNELFEATURES_GDT_READ_ONLY;
+#endif
+#ifdef CONFIG_X86_SMAP
+    if (ASMGetCR4() & X86_CR4_SMAP)
+        fFlags |= SUPKERNELFEATURES_SMAP;
 #endif
     return fFlags;

-              r56293
+              r57108
-/**
- * Returns configuration flags of the host kernel.
- */
 SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void)
+{

-              r56293
+              r57108
-/**
- * Returns configuration flags of the host kernel.
- */
 SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void)
+{

-              r56293
+              r57108
-/**
- * Returns configuration flags of the host kernel.
- */
 SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void)
+{

Note: See TracChangeset for help on using the changeset viewer.