Attachment 6241 Details for Bug 6242 – private DMA buffers / mach64-ddx - try 3

[patch] private DMA buffers / mach64-ddx - try 3

mach64-ddx-private-dma-3.patch (text/plain), 9.37 KB, created by George - on 2006-07-16 09:38:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2006-07-16 09:38:16 UTC

Size: 9.37 KB

patch

obsolete

>From 019f22d8ead293075396d90ee7f013b22addf567 Mon Sep 17 00:00:00 2001
>From: George Sapountzis <gsap7@yahoo.gr>
>Date: Sun, 16 Jul 2006 19:23:56 +0300
>Subject: [PATCH] Bug 6242: [mach64] Use private DMA buffers.
>
>Map the DMA buffers read-only. This eliminates a security problem where a
>client can alter the contents of the DMA buffer after submission to the DRM.
>---
> src/atidri.c        |  157 +++++++++++++++++++++++++++++++++------------------
> src/mach64_common.h |    2 -
> 2 files changed, 102 insertions(+), 57 deletions(-)
>
>diff --git a/src/atidri.c b/src/atidri.c
>index 2f7e95b..2fe9575 100644
>--- a/src/atidri.c
>+++ b/src/atidri.c
>@@ -668,6 +668,36 @@ static int Mach64MinBits(int val)
>     return bits;
> }
> 
>+static Bool ATIDRISetBufSize( ScreenPtr pScreen, unsigned int maxSize )
>+{
>+   ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
>+   ATIPtr pATI = ATIPTR(pScreenInfo);
>+   ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
>+
>+   if (pATI->OptionBufferSize) {
>+      if (pATI->OptionBufferSize < 1 || pATI->OptionBufferSize > maxSize  ) {
>+	 xf86DrvMsg( pScreen->myNum, X_ERROR, "[drm] Illegal DMA buffers size: %d MB\n",
>+		     pATI->OptionBufferSize );
>+	 return FALSE;
>+      }
>+      if (pATI->OptionBufferSize > 2) {
>+	 xf86DrvMsg( pScreen->myNum, X_WARNING, "[drm] Illegal DMA buffers size: %d MB\n",
>+		     pATI->OptionBufferSize );
>+	 xf86DrvMsg( pScreen->myNum, X_WARNING, "[drm] Clamping DMA buffers size to 2 MB\n");
>+	 pATIDRIServer->bufferSize = 2;
>+      } else {
>+	 pATIDRIServer->bufferSize = pATI->OptionBufferSize;
>+	 xf86DrvMsg( pScreen->myNum, X_CONFIG, "[drm] Using %d MB for DMA buffers\n",
>+		     pATIDRIServer->bufferSize );
>+      }
>+   } else {
>+      xf86DrvMsg( pScreen->myNum, X_DEFAULT, "[drm] Using %d MB for DMA buffers\n",
>+		  pATIDRIServer->bufferSize );
>+   }
>+
>+   return TRUE;
>+}
>+
> static Bool ATIDRISetAgpMode( ScreenPtr pScreen )
> {
>    ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
>@@ -789,26 +819,8 @@ static Bool ATIDRIAgpInit( ScreenPtr pSc
>    xf86DrvMsg(pScreen->myNum, X_INFO,
> 	      "[agp] Using %d kB for DMA descriptor ring\n", pATIDRIServer->ringSize);
> 
>-   if (pATI->OptionBufferSize) {
>-      if (pATI->OptionBufferSize < 1 || pATI->OptionBufferSize > pATIDRIServer->agpSize  ) {
>-	 xf86DrvMsg( pScreen->myNum, X_ERROR, "[agp] Illegal DMA buffers size: %d MB\n",
>-		     pATI->OptionBufferSize );
>-	 return FALSE;
>-      }
>-      if (pATI->OptionBufferSize > 2) {
>-	 xf86DrvMsg( pScreen->myNum, X_WARNING, "[agp] Illegal DMA buffers size: %d MB\n",
>-		     pATI->OptionBufferSize );
>-	 xf86DrvMsg( pScreen->myNum, X_WARNING, "[agp] Clamping DMA buffers size to 2 MB\n");
>-	 pATIDRIServer->bufferSize = 2;
>-      } else {
>-	 pATIDRIServer->bufferSize = pATI->OptionBufferSize;
>-	 xf86DrvMsg( pScreen->myNum, X_CONFIG, "[agp] Using %d MB for DMA buffers\n",
>-		     pATIDRIServer->bufferSize );
>-      }
>-   } else {
>-      xf86DrvMsg( pScreen->myNum, X_DEFAULT, "[agp] Using %d MB for DMA buffers\n",
>-		  pATIDRIServer->bufferSize );
>-   }
>+   if ( !ATIDRISetBufSize( pScreen, pATIDRIServer->agpSize ) )
>+      return FALSE;
> 
>    pATIDRIServer->agpTexSize    = pATIDRIServer->agpSize - pATIDRIServer->bufferSize;
> 
>@@ -853,7 +865,7 @@ static Bool ATIDRIAgpInit( ScreenPtr pSc
> 
>    /* Map vertex buffers */
>    if ( drmAddMap( pATI->drmFD, pATIDRIServer->bufferStart, pATIDRIServer->bufferMapSize,
>-		   DRM_AGP, 0, &pATIDRIServer->bufferHandle ) < 0 ) {
>+		   DRM_AGP, DRM_READ_ONLY, &pATIDRIServer->bufferHandle ) < 0 ) {
>       xf86DrvMsg( pScreen->myNum, X_ERROR,
> 		  "[agp] Could not add vertex buffers mapping\n" );
>       return FALSE;
>@@ -929,6 +941,55 @@ static Bool ATIDRIAgpInit( ScreenPtr pSc
>    return TRUE;
> }
> 
>+static Bool ATIDRIPciInit( ScreenPtr pScreen )
>+{
>+   ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
>+   ATIPtr pATI = ATIPTR(pScreenInfo);
>+   ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
>+
>+   pATIDRIServer->bufferSize = ATI_DEFAULT_BUFFER_SIZE;
>+   pATIDRIServer->ringSize = 16; /* 16 kB ring */
>+
>+   if ( !ATIDRISetBufSize( pScreen, (unsigned)(-1) ) )
>+      return FALSE;
>+
>+   /* Set size of the DMA descriptor ring */
>+   pATIDRIServer->ringStart   = 0;
>+   pATIDRIServer->ringMapSize = pATIDRIServer->ringSize*1024; /* ringSize is in kB */
>+
>+   /* Set size of the vertex buffer */
>+   pATIDRIServer->bufferStart   = 0;
>+   pATIDRIServer->bufferMapSize = pATIDRIServer->bufferSize*1024*1024;
>+
>+   /* Map DMA descriptor ring */
>+   if ( drmAddMap( pATI->drmFD, 0, pATIDRIServer->ringMapSize,
>+		   DRM_CONSISTENT, DRM_RESTRICTED, &pATIDRIServer->ringHandle ) < 0 ) {
>+      xf86DrvMsg( pScreen->myNum, X_ERROR,
>+		  "[pci] Could not add ring mapping\n" );
>+      return FALSE;
>+   }
>+   xf86DrvMsg( pScreen->myNum, X_INFO, "[pci] ring handle = 0x%08x\n",
>+	       pATIDRIServer->ringHandle );
>+
>+   if ( drmMap( pATI->drmFD, pATIDRIServer->ringHandle,
>+		pATIDRIServer->ringMapSize, &pATIDRIServer->ringMap ) < 0 ) {
>+      xf86DrvMsg( pScreen->myNum, X_ERROR,
>+		  "[pci] Could not map ring\n" );
>+      return FALSE;
>+   }
>+   xf86DrvMsg( pScreen->myNum, X_INFO,
>+	       "[pci] Ring mapped at 0x%08lx\n",
>+	       (unsigned long)pATIDRIServer->ringMap );
>+
>+   /* Disable AGP for ForcePCIMode */
>+   if ( pATI->BusType != ATI_BUS_PCI ) {
>+       outm( AGP_BASE, 0 );
>+       outm( AGP_CNTL, 0 );
>+   }
>+
>+   return TRUE;
>+}
>+
> /* Add a map for the MMIO registers that will be accessed by any
>  * DRI-based clients.
>  */
>@@ -1004,9 +1065,9 @@ static Bool ATIDRIAddBuffers( ScreenPtr 
>    /* Initialize vertex buffers */
>    if ( pATIDRIServer->IsPCI ) {
>       pATIDRIServer->numBuffers = drmAddBufs( pATI->drmFD,
>-					      (pATIDRIServer->bufferSize*1024*1024)/MACH64_BUFFER_SIZE,
>+					      pATIDRIServer->bufferMapSize/MACH64_BUFFER_SIZE,
> 					      MACH64_BUFFER_SIZE,
>-					      0,
>+					      DRM_PCI_BUFFER_RO,
> 					      0 );
>    } else {
>       pATIDRIServer->numBuffers = drmAddBufs( pATI->drmFD,
>@@ -1286,7 +1347,7 @@ #endif
>    /* Check the mach64 DRM version */
>    version = drmGetVersion( pATI->drmFD );
>    if ( version ) {
>-      if ( version->version_major != 1 ||
>+      if ( version->version_major != 2 ||
> 	   version->version_minor < 0 ) {
> 	 /* Incompatible DRM version */
> 	 xf86DrvMsg( pScreen->myNum, X_ERROR,
>@@ -1320,48 +1381,22 @@ #endif
>    pATIDRIServer->IsPCI = (pATI->BusType == ATI_BUS_PCI || pATI->OptionIsPCI) ? TRUE : FALSE;
> 
>    if ( pATI->BusType != ATI_BUS_PCI && pATI->OptionIsPCI ) {
>-       outm( AGP_BASE, 0 );
>-       outm( AGP_CNTL, 0 );
>        xf86DrvMsg(pScreen->myNum, X_CONFIG, "[dri] Forcing PCI mode\n");
>    }
> 
>-   /* Check buffer size option for PCI, since it won't be done in ATIDRIAgpInit */
>-   if ( pATIDRIServer->IsPCI) {
>-      pATIDRIServer->bufferSize = ATI_DEFAULT_BUFFER_SIZE;
>-      if (pATI->OptionBufferSize) {
>-      	 if (pATI->OptionBufferSize < 1) {
>-	    xf86DrvMsg( pScreen->myNum, X_ERROR, "[pci] Illegal DMA buffers size: %d MB\n",
>-			pATI->OptionBufferSize );
>-	    ATIDRICloseScreen( pScreen );
>-	    return FALSE;
>-	 }
>-	 if (pATI->OptionBufferSize > 2) {
>-	    xf86DrvMsg( pScreen->myNum, X_WARNING, "[pci] Illegal DMA buffers size: %d MB\n",
>-			pATI->OptionBufferSize );
>-	    xf86DrvMsg( pScreen->myNum, X_WARNING, "[pci] Clamping DMA buffers size to 2 MB\n");
>-	    pATIDRIServer->bufferSize = 2;
>-	 } else {
>-	    pATIDRIServer->bufferSize = pATI->OptionBufferSize;
>-	    xf86DrvMsg( pScreen->myNum, X_CONFIG, "[pci] Using %d MB DMA buffer size\n",
>-			pATIDRIServer->bufferSize );
>-	 }
>-      } else {
>-	 xf86DrvMsg( pScreen->myNum, X_DEFAULT, "[pci] Using %d MB DMA buffer size\n",
>-		     pATIDRIServer->bufferSize );
>-      }
>-   }
>-
>    /* Initialize AGP */
>    if ( !pATIDRIServer->IsPCI && !ATIDRIAgpInit( pScreen ) ) {
>       pATIDRIServer->IsPCI = TRUE;
>-      if ( pATI->BusType != ATI_BUS_PCI ) {
>-	 outm( AGP_BASE, 0 );
>-	 outm( AGP_CNTL, 0 );
>-      }
>       xf86DrvMsg( pScreen->myNum, X_WARNING, "[agp] AGP failed to initialize -- falling back to PCI mode.\n" );
>       xf86DrvMsg( pScreen->myNum, X_WARNING, "[agp] Make sure you have the agpgart kernel module loaded.\n" );
>    }
> 
>+   /* Initialize PCI */
>+   if ( pATIDRIServer->IsPCI && !ATIDRIPciInit( pScreen ) ) {
>+      ATIDRICloseScreen( pScreen );
>+      return FALSE;
>+   }
>+
>    if ( !ATIDRIMapInit( pScreen ) ) {
>       ATIDRICloseScreen( pScreen );
>       return FALSE;
>@@ -1537,6 +1572,10 @@ void ATIDRICloseScreen( ScreenPtr pScree
>       drmUnmap( pATIDRIServer->bufferMap, pATIDRIServer->bufferMapSize );
>       pATIDRIServer->bufferMap = NULL;
>    }
>+   if ( pATIDRIServer->ringMap ) {
>+      drmUnmap( pATIDRIServer->ringMap, pATIDRIServer->ringMapSize );
>+      pATIDRIServer->ringMap = NULL;
>+   }
>    if ( pATIDRIServer->agpHandle ) {
>       drmAgpUnbind( pATI->drmFD, pATIDRIServer->agpHandle );
>       drmAgpFree( pATI->drmFD, pATIDRIServer->agpHandle );
>@@ -1544,6 +1583,12 @@ void ATIDRICloseScreen( ScreenPtr pScree
>       drmAgpRelease( pATI->drmFD );
>    }
> 
>+   /* De-allocate all PCI resources */
>+   if ( pATIDRIServer->IsPCI && pATIDRIServer->ringHandle ) {
>+      drmRmMap( pATI->drmFD, pATIDRIServer->ringHandle );
>+      pATIDRIServer->ringHandle = 0;
>+   }
>+
>    /* De-allocate all DRI resources */
>    DRICloseScreen( pScreen );
> 
>diff --git a/src/mach64_common.h b/src/mach64_common.h
>index 00609e3..dc480e7 100644
>--- a/src/mach64_common.h
>+++ b/src/mach64_common.h
>@@ -112,7 +112,7 @@ typedef struct {
> } drmMach64Vertex;
> 
> typedef struct {
>-   int idx;
>+   void *buf;
>    int pitch;
>    int offset;
>    int format;
>-- 
>1.4.0-dirty
>

Actions: View | Splinter Review

Attachments on bug 6242: 4911 | 4912 | 4913 | 4925 | 5123 | 5269 | 5270 | 5271 | 5283 | 5284 | 6234 | 6235 | 6236 | 6241 | 6270 | 6271 | 7232

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.