drm: switch GPU driver to DDK 25.1

DC driver name is changed to vs_drm to match DDK UM blobs.

Signed-off-by: Icenowy Zheng <uwu@icenowy.me>

Author: Icenowy

drivers/gpu/drm/img-rogue/Makefile

@@ -12,7 +12,3 @@ ccflags-y += \
  -D__linux__
 
 include $(img_basedir)/pvrsrvkm.mk
-
-obj-$(CONFIG_DRM_POWERVR_ROGUE)	+= drm_nulldisp.o
-
-drm_nulldisp-y	+= drm_nulldisp_drv.o drm_nulldisp_netlink.o drm_netlink_gem.o drm_nulldisp_gem.o

drivers/gpu/drm/img-rogue/allocmem.c

@@ -49,9 +49,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "allocmem.h"
 #include "pvr_debug.h"
 #include "process_stats.h"
-#if defined(DEBUG) && defined(SUPPORT_VALIDATION)
-#include "pvrsrv.h"
-#endif
 #include "osfunc.h"
 
 
@@ -65,9 +62,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * enabled, since all allocations are tracked in DebugFS mem_area files.
  */
 #if defined(PVRSRV_ENABLE_PROCESS_STATS) && !defined(PVRSRV_ENABLE_MEMORY_STATS)
-#define ALLOCMEM_MEMSTATS_PADDING sizeof(IMG_UINT32)
+/* kmalloc guarantees a minimal alignment which is ARCH_KMALLOC_MINALIGN. This
+ * alignment is architecture specific and can be quite big, e.g. on Aarch64
+ * it can be 64 bytes. This is too much for keeping a single PID field and could
+ * lead to a lot of wasted memory. This is a reason why we're defaulting to 8
+ * bytes alignment which should be enough for any architecture.
+ */
+#define ALLOCMEM_PID_SIZE_PADDING PVR_ALIGN(sizeof(IMG_UINT32), 8)
 #else
-#define ALLOCMEM_MEMSTATS_PADDING 0UL
+#define ALLOCMEM_PID_SIZE_PADDING 0UL
 #endif
 
 /* How many times kmalloc can fail before the allocation threshold is reduced */
@@ -79,10 +82,6 @@ static IMG_UINT32 g_ui32kmallocThreshold = PVR_LINUX_KMALLOC_ALLOCATION_THRESHOL
 /* Spinlock used so that the global variables above may not be modified by more than 1 thread at a time */
 static DEFINE_SPINLOCK(kmalloc_lock);
 
-#if defined(DEBUG) && defined(SUPPORT_VALIDATION)
-static DEFINE_SPINLOCK(kmalloc_leak_lock);
-static IMG_UINT32 g_ui32kmallocLeakCounter = 0;
-#endif
 
 static inline void OSTryDecreaseKmallocThreshold(void)
 {
@@ -137,7 +136,7 @@ static inline void _pvr_kfree(const void* pvAddr)
 	kfree(pvAddr);
 }
 
-static inline void _pvr_alloc_stats_add(void *pvAddr, IMG_UINT32 ui32Size DEBUG_MEMSTATS_PARAMS)
+static inline void *_pvr_alloc_stats_add(void *pvAddr, IMG_UINT32 ui32Size DEBUG_MEMSTATS_PARAMS)
 {
 #if !defined(PVRSRV_ENABLE_PROCESS_STATS)
 	PVR_UNREFERENCED_PARAMETER(pvAddr);
@@ -152,16 +151,18 @@ static inline void _pvr_alloc_stats_add(void *pvAddr, IMG_UINT32 ui32Size DEBUG_
 									  pvAddr,
 									  sCpuPAddr,
 									  ksize(pvAddr),
-									  NULL,
 									  OSGetCurrentClientProcessIDKM()
 									  DEBUG_MEMSTATS_ARGS);
 #else
-		{
-			/* Store the PID in the final additional 4 bytes allocated */
-			IMG_UINT32 *puiTemp = IMG_OFFSET_ADDR(pvAddr, ksize(pvAddr) - ALLOCMEM_MEMSTATS_PADDING);
-			*puiTemp = OSGetCurrentClientProcessIDKM();
-		}
-		PVRSRVStatsIncrMemAllocStat(PVRSRV_MEM_ALLOC_TYPE_KMALLOC, ksize(pvAddr), OSGetCurrentClientProcessIDKM());
+		/* because clang has some features that allow detection out-of-bounds
+		 * access we need to put the metadata in the beginning of the allocation */
+		*(IMG_UINT32 *) pvAddr = OSGetCurrentClientProcessIDKM();
+		PVRSRVStatsIncrMemAllocStat(PVRSRV_MEM_ALLOC_TYPE_KMALLOC, ksize(pvAddr),
+		                            *(IMG_UINT32 *) pvAddr);
+
+		/* because metadata is kept in the beginning of the allocation we need
+		 * to return address offset by the ALLOCMEM_PID_SIZE_PADDING */
+		pvAddr = (IMG_UINT8 *) pvAddr + ALLOCMEM_PID_SIZE_PADDING;
 #endif /* defined(PVRSRV_ENABLE_MEMORY_STATS) */
 	}
 	else
@@ -173,32 +174,36 @@ static inline void _pvr_alloc_stats_add(void *pvAddr, IMG_UINT32 ui32Size DEBUG_
 		PVRSRVStatsAddMemAllocRecord(PVRSRV_MEM_ALLOC_TYPE_VMALLOC,
 									  pvAddr,
 									  sCpuPAddr,
-									  ((ui32Size + PAGE_SIZE-1) & ~(PAGE_SIZE-1)),
-									  NULL,
+									  PVR_ALIGN(ui32Size, PAGE_SIZE),
 									  OSGetCurrentClientProcessIDKM()
 									  DEBUG_MEMSTATS_ARGS);
 #else
 		PVRSRVStatsIncrMemAllocStatAndTrack(PVRSRV_MEM_ALLOC_TYPE_VMALLOC,
-		                                    ((ui32Size + PAGE_SIZE-1) & ~(PAGE_SIZE-1)),
+		                                    PVR_ALIGN(ui32Size, PAGE_SIZE),
 		                                    (IMG_UINT64)(uintptr_t) pvAddr,
 		                                    OSGetCurrentClientProcessIDKM());
 #endif /* defined(PVRSRV_ENABLE_MEMORY_STATS) */
 	}
 #endif /* !defined(PVRSRV_ENABLE_PROCESS_STATS) */
+
+	return pvAddr;
 }
 
-static inline void _pvr_alloc_stats_remove(void *pvAddr)
+static inline void *_pvr_alloc_stats_remove(void *pvAddr)
 {
 #if !defined(PVRSRV_ENABLE_PROCESS_STATS)
 	PVR_UNREFERENCED_PARAMETER(pvAddr);
 #else
 	if (!is_vmalloc_addr(pvAddr))
 	{
 #if !defined(PVRSRV_ENABLE_MEMORY_STATS)
-		{
-			IMG_UINT32 *puiTemp = IMG_OFFSET_ADDR(pvAddr, ksize(pvAddr) - ALLOCMEM_MEMSTATS_PADDING);
-			PVRSRVStatsDecrMemKAllocStat(ksize(pvAddr), *puiTemp);
-		}
+		/* because metadata is kept in the beginning of the allocation we need
+		 * shift address offset by the ALLOCMEM_PID_SIZE_PADDING to the original
+		 * value */
+		pvAddr = (IMG_UINT8 *) pvAddr - ALLOCMEM_PID_SIZE_PADDING;
+
+		/* first 4 bytes of the allocation are the process' PID */
+		PVRSRVStatsDecrMemKAllocStat(ksize(pvAddr), *(IMG_UINT32 *) pvAddr);
 #else
 		PVRSRVStatsRemoveMemAllocRecord(PVRSRV_MEM_ALLOC_TYPE_KMALLOC,
 		                                (IMG_UINT64)(uintptr_t) pvAddr,
@@ -217,15 +222,17 @@ static inline void _pvr_alloc_stats_remove(void *pvAddr)
 #endif
 	}
 #endif /* !defined(PVRSRV_ENABLE_PROCESS_STATS) */
+
+	return pvAddr;
 }
 
 void *(OSAllocMem)(IMG_UINT32 ui32Size DEBUG_MEMSTATS_PARAMS)
 {
 	void *pvRet = NULL;
 
-	if ((ui32Size + ALLOCMEM_MEMSTATS_PADDING) <= g_ui32kmallocThreshold)
+	if ((ui32Size + ALLOCMEM_PID_SIZE_PADDING) <= g_ui32kmallocThreshold)
 	{
-		pvRet = kmalloc(ui32Size + ALLOCMEM_MEMSTATS_PADDING, GFP_KERNEL);
+		pvRet = kmalloc(ui32Size + ALLOCMEM_PID_SIZE_PADDING, GFP_KERNEL);
 		if (pvRet == NULL)
 		{
 			OSTryDecreaseKmallocThreshold();
@@ -243,7 +250,7 @@ void *(OSAllocMem)(IMG_UINT32 ui32Size DEBUG_MEMSTATS_PARAMS)
 
 	if (pvRet != NULL)
 	{
-		_pvr_alloc_stats_add(pvRet, ui32Size DEBUG_MEMSTATS_ARGS);
+		pvRet = _pvr_alloc_stats_add(pvRet, ui32Size DEBUG_MEMSTATS_ARGS);
 	}
 
 	return pvRet;
@@ -253,9 +260,9 @@ void *(OSAllocZMem)(IMG_UINT32 ui32Size DEBUG_MEMSTATS_PARAMS)
 {
 	void *pvRet = NULL;
 
-	if ((ui32Size + ALLOCMEM_MEMSTATS_PADDING) <= g_ui32kmallocThreshold)
+	if ((ui32Size + ALLOCMEM_PID_SIZE_PADDING) <= g_ui32kmallocThreshold)
 	{
-		pvRet = kzalloc(ui32Size + ALLOCMEM_MEMSTATS_PADDING, GFP_KERNEL);
+		pvRet = kzalloc(ui32Size + ALLOCMEM_PID_SIZE_PADDING, GFP_KERNEL);
 		if (pvRet == NULL)
 		{
 			OSTryDecreaseKmallocThreshold();
@@ -273,7 +280,7 @@ void *(OSAllocZMem)(IMG_UINT32 ui32Size DEBUG_MEMSTATS_PARAMS)
 
 	if (pvRet != NULL)
 	{
-		_pvr_alloc_stats_add(pvRet, ui32Size DEBUG_MEMSTATS_ARGS);
+		pvRet = _pvr_alloc_stats_add(pvRet, ui32Size DEBUG_MEMSTATS_ARGS);
 	}
 
 	return pvRet;
@@ -285,35 +292,9 @@ void *(OSAllocZMem)(IMG_UINT32 ui32Size DEBUG_MEMSTATS_PARAMS)
  */
 void (OSFreeMem)(void *pvMem)
 {
-#if defined(DEBUG) && defined(SUPPORT_VALIDATION)
-	unsigned long flags;
-	PVRSRV_DATA *psPVRSRVData = PVRSRVGetPVRSRVData();
-
-	if (psPVRSRVData)
-	{
-		IMG_UINT32 ui32kmallocLeakMax = psPVRSRVData->sMemLeakIntervals.ui32OSAlloc;
-
-		spin_lock_irqsave(&kmalloc_leak_lock, flags);
-
-		g_ui32kmallocLeakCounter++;
-		if (ui32kmallocLeakMax && (g_ui32kmallocLeakCounter >= ui32kmallocLeakMax))
-		{
-			g_ui32kmallocLeakCounter = 0;
-			spin_unlock_irqrestore(&kmalloc_leak_lock, flags);
-
-			PVR_DPF((PVR_DBG_WARNING,
-			         "%s: Skipped freeing of pointer 0x%p to trigger memory leak.",
-			         __func__,
-			         pvMem));
-			return;
-		}
-
-		spin_unlock_irqrestore(&kmalloc_leak_lock, flags);
-	}
-#endif
 	if (pvMem != NULL)
 	{
-		_pvr_alloc_stats_remove(pvMem);
+		pvMem = _pvr_alloc_stats_remove(pvMem);
 
 		if (!is_vmalloc_addr(pvMem))
 		{
@@ -382,32 +363,6 @@ void *OSAllocZMemNoStats(IMG_UINT32 ui32Size)
  */
 void (OSFreeMemNoStats)(void *pvMem)
 {
-#if defined(DEBUG) && defined(SUPPORT_VALIDATION)
-	unsigned long flags;
-	PVRSRV_DATA *psPVRSRVData = PVRSRVGetPVRSRVData();
-
-	if (psPVRSRVData)
-	{
-		IMG_UINT32 ui32kmallocLeakMax = psPVRSRVData->sMemLeakIntervals.ui32OSAlloc;
-
-		spin_lock_irqsave(&kmalloc_leak_lock, flags);
-
-		g_ui32kmallocLeakCounter++;
-		if (ui32kmallocLeakMax && (g_ui32kmallocLeakCounter >= ui32kmallocLeakMax))
-		{
-			g_ui32kmallocLeakCounter = 0;
-			spin_unlock_irqrestore(&kmalloc_leak_lock, flags);
-
-			PVR_DPF((PVR_DBG_WARNING,
-			         "%s: Skipped freeing of pointer 0x%p to trigger memory leak.",
-			         __func__,
-			         pvMem));
-			return;
-		}
-
-		spin_unlock_irqrestore(&kmalloc_leak_lock, flags);
-	}
-#endif
 	if (pvMem != NULL)
 	{
 		if (!is_vmalloc_addr(pvMem))