Add fallback in rpcmem_alloc

By default rpcmem_alloc will use system heap for memory allocation.
Add a fallback to support allocation using fastrpc ioctl request
in case system heap is not enabled.

Signed-off-by: Ekansh Gupta <ekansh.gupta@oss.qualcomm.com>

Author: ekanshibu

inc/fastrpc_common.h

@@ -212,4 +212,25 @@ int fastrpc_get_property_string(fastrpc_properties UserPropertyKey, char * value
  */
 bool is_process_exiting(int domain);
 
+/* Opens device node based on the domain
+ * This function takes care of the backward compatibility to open
+ * approriate device for following configurations of the device nodes
+ * 1. 4 different device nodes
+ * 2. 1 device node (adsprpc-smd)
+ * 3. 2 device nodes (adsprpc-smd, adsprpc-smd-secure)
+ * Algorithm
+ * For ADSP, SDSP, MDSP domains:
+ *   Open secure device node fist
+ *     if no secure device, open actual device node
+ *     if still no device, open default node
+ *     if failed to open the secure node due to permission,
+ *     open default node
+ * For CDSP domain:
+ *   Open secure device node fist
+ *    If the node does not exist or if no permission, open actual device node
+ *    If still no device, open default node
+ *    If no permission to access the default node, access thorugh HAL.
+ */
+int open_device_node(int domain_id);
+
 #endif //FASTRPC_COMMON_H

src/fastrpc_apps_user.c

@@ -333,7 +333,6 @@ static void *dsp_client_instance[NUM_SESSIONS];
 
 static int domain_init(int domain, int *dev);
 static void domain_deinit(int domain);
-static int open_device_node(int domain_id);
 static int close_device_node(int domain_id, int dev);
 extern int apps_mem_table_init(void);
 extern void apps_mem_table_deinit(void);
@@ -3265,26 +3264,7 @@ static const char *get_domain_name(int domain_id) {
   return name;
 }
 
-/* Opens device node based on the domain
- This function takes care of the backward compatibility to open
- approriate device for following configurations of the device nodes
- 1. 4 different device nodes
- 2. 1 device node (adsprpc-smd)
- 3. 2 device nodes (adsprpc-smd, adsprpc-smd-secure)
- Algorithm
- For ADSP, SDSP, MDSP domains:
-   Open secure device node fist
-     if no secure device, open actual device node
-     if still no device, open default node
-     if failed to open the secure node due to permission,
-     open default node
- For CDSP domain:
-   Open secure device node fist
-    If the node does not exist or if no permission, open actual device node
-    If still no device, open default node
-    If no permission to access the default node, access thorugh HAL.
-*/
-static int open_device_node(int domain_id) {
+int open_device_node(int domain_id) {
   int dev = -1, nErr = 0;
   int domain = GET_DOMAIN_FROM_EFFEC_DOMAIN_ID(domain_id);
   int sess_id = GET_SESSION_ID_FROM_DOMAIN_ID(domain_id);

src/rpcmem_linux.c

@@ -47,6 +47,7 @@
 #include "HAP_farf.h"
 #include "apps_std.h"
 #include "fastrpc_common.h"
+#include "fastrpc_ioctl.h"
 #include "rpcmem.h"
 #include "verify.h"
 
@@ -68,6 +69,7 @@ struct dma_heap_allocation_data {
   _IOWR(DMA_HEAP_IOC_MAGIC, 0x0, struct dma_heap_allocation_data)
 #define DMA_HEAP_NAME "/dev/dma_heap/system"
 static int dmafd = -1;
+static int rpcfd = -1;
 static QList rpclst;
 static pthread_mutex_t rpcmt;
 struct rpc_info {
@@ -92,7 +94,15 @@ void rpcmem_init() {
 
   dmafd = open(DMA_HEAP_NAME, O_RDONLY | O_CLOEXEC);
   if (dmafd < 0) {
-    FARF(ERROR, "Error %d: Unable to open %s\n", errno, DMA_HEAP_NAME);
+    FARF(ALWAYS, "Warning %d: Unable to open %s, falling back to fastrpc ioctl\n", errno, DMA_HEAP_NAME);
+    /*
+     * Application should link proper library as DEFAULT_DOMAIN_ID
+     * is used to open rpc device node and not the uri passed by
+     * user.
+     */
+    rpcfd = open_device_node(DEFAULT_DOMAIN_ID);
+    if (rpcfd < 0)
+      FARF(ALWAYS, "Warning %d: Unable to open fastrpc dev node for domain: %d\n", errno, DEFAULT_DOMAIN_ID);
   }
   pthread_mutex_unlock(&rpcmt);
 }
@@ -101,6 +111,8 @@ void rpcmem_deinit() {
   pthread_mutex_lock(&rpcmt);
   if (dmafd != -1)
     close(dmafd);
+  if (rpcfd != -1)
+    close(rpcfd);
   pthread_mutex_unlock(&rpcmt);
   pthread_mutex_destroy(&rpcmt);
 }
@@ -135,28 +147,52 @@ int rpcmem_to_fd(void *po) { return rpcmem_to_fd_internal(po); }
 
 void *rpcmem_alloc_internal(int heapid, uint32 flags, size_t size) {
   struct rpc_info *rinfo;
-  int nErr = 0;
+  int nErr = 0, fd = -1;
   struct dma_heap_allocation_data dmabuf = {
       .len = size,
       .fd_flags = O_RDWR | O_CLOEXEC,
   };
 
-  if (dmafd == -1 || size <= 0)
+  if ((dmafd == -1 && rpcfd == -1) || size <= 0) {
+    FARF(ERROR,
+           "Error: Unable to allocate memory dmaheap fd %d, rpcfd %d, size "
+           "%zu, flags %u",
+           dmafd, rpcfd, size, flags);
     return NULL;
+  }
 
   VERIFY(0 != (rinfo = calloc(1, sizeof(*rinfo))));
 
-  nErr = ioctl(dmafd, DMA_HEAP_IOCTL_ALLOC, &dmabuf);
-  if (nErr) {
-    FARF(ERROR,
-         "Error %d: Unable to allocate memory dmaheap fd %d, heapid %d, size "
-         "%zu, flags %u",
-         errno, dmafd, heapid, size, flags);
-    goto bail;
+  if (dmafd != -1) {
+    nErr = ioctl(dmafd, DMA_HEAP_IOCTL_ALLOC, &dmabuf);
+    if (nErr) {
+      FARF(ERROR,
+           "Error %d: Unable to allocate memory dmaheap fd %d, heapid %d, size "
+           "%zu, flags %u",
+           errno, dmafd, heapid, size, flags);
+      goto bail;
+    }
+    fd = dmabuf.fd;
+  } else {
+    struct fastrpc_ioctl_alloc_dma_buf buf;
+
+    buf.size = size + PAGE_SIZE;
+    buf.fd = -1;
+    buf.flags = 0;
+
+    nErr = ioctl(rpcfd, FASTRPC_IOCTL_ALLOC_DMA_BUFF, (unsigned long)&buf);
+    if (nErr) {
+      FARF(ERROR,
+           "Error %d: Unable to allocate memory fastrpc fd %d, heapid %d, size "
+           "%zu, flags %u",
+           errno, rpcfd, heapid, size, flags);
+      goto bail;
+    }
+    fd = buf.fd;
   }
   VERIFY(0 != (rinfo->buf = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-                                 dmabuf.fd, 0)));
-  rinfo->fd = dmabuf.fd;
+                                 fd, 0)));
+  rinfo->fd = fd;
   rinfo->aligned_buf =
       (void *)(((uintptr_t)rinfo->buf /*+ PAGE_SIZE*/) & PAGE_MASK);
   rinfo->aligned_buf = rinfo->buf;