From patchwork Wed Apr 23 09:53:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 28861 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4A56F20534 for ; Wed, 23 Apr 2014 09:54:49 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id to1sf4274853ieb.1 for ; Wed, 23 Apr 2014 02:54:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=XWfrN5nBuRHP8sqLstb//bCNI/a3JBfuuOrdn/u98m8=; b=GUxGILvhcYWjwavbJCs5Zc+QEUnr6EsXfdpdHkehnK15P2UxSIqJO3I+uqfcmDJh9g 5MYizte17MbLZHLwCmr15Mm9JBsJgOZrwSupSRRKSkVqCwQ5FLWTIvqKlRVG7Q+0fnDI LuVshHjwjqQLXYkQjP7kLs4LfEzZXZg1OpgoORUcMd9N9qC/TRT00UuRvCVT+dJClrvP VuDVi6aE4dHR/GLFiAELctve7hwkC5L6WfNqswqul80dcOaWKCCoH/u5G4AaMcplRTp5 +mgY5FwEKmms/JkGeX82bFgYESqsG7dpYKfpKyi3aDQmlGNTCpFx+67gBIWf2/LqpLuW NBsA== X-Gm-Message-State: ALoCoQlUxdfLTOX4n41vcoRFwQMwKwMZTCU3VbQBCKYqhH28PZYJ/kOaXHt7IGejaALWRijtzuP5 X-Received: by 10.50.108.47 with SMTP id hh15mr681319igb.3.1398246888679; Wed, 23 Apr 2014 02:54:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.163 with SMTP id a32ls507418qgf.73.gmail; Wed, 23 Apr 2014 02:54:48 -0700 (PDT) X-Received: by 10.58.74.38 with SMTP id q6mr43703184vev.7.1398246888575; Wed, 23 Apr 2014 02:54:48 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id cb3si77702vdc.59.2014.04.23.02.54.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 02:54:48 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so875170veb.9 for ; Wed, 23 Apr 2014 02:54:48 -0700 (PDT) X-Received: by 10.58.123.71 with SMTP id ly7mr44936620veb.11.1398246888446; Wed, 23 Apr 2014 02:54:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp90714vcb; Wed, 23 Apr 2014 02:54:48 -0700 (PDT) X-Received: by 10.224.72.66 with SMTP id l2mr10712612qaj.102.1398246887960; Wed, 23 Apr 2014 02:54:47 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id m17si189621qgd.119.2014.04.23.02.54.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 23 Apr 2014 02:54:47 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Wctso-0005AG-9X; Wed, 23 Apr 2014 09:54:26 +0000 Received: from mail-ee0-f46.google.com ([74.125.83.46]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1WctsR-000580-5E for lng-odp@lists.linaro.org; Wed, 23 Apr 2014 09:54:03 +0000 Received: by mail-ee0-f46.google.com with SMTP id t10so564824eei.19 for ; Wed, 23 Apr 2014 02:54:18 -0700 (PDT) X-Received: by 10.14.214.68 with SMTP id b44mr62463700eep.0.1398246857998; Wed, 23 Apr 2014 02:54:17 -0700 (PDT) Received: from uglx0153363.synapse.com ([195.238.92.128]) by mx.google.com with ESMTPSA id o4sm4757906eef.20.2014.04.23.02.54.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 02:54:16 -0700 (PDT) From: Taras Kondratiuk To: lng-odp@lists.linaro.org Date: Wed, 23 Apr 2014 12:53:55 +0300 Message-Id: <1398246839-15554-6-git-send-email-taras.kondratiuk@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398246839-15554-1-git-send-email-taras.kondratiuk@linaro.org> References: <1398246839-15554-1-git-send-email-taras.kondratiuk@linaro.org> Subject: [lng-odp] [PATCH v3 5/9] Keystone2: Add CMA shared memory allocation X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: taras.kondratiuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 To be able to send buffers to PtkDMA they should be allocated from contiguous DMA-accessible memory. In a current application model buffer pools are created from memory allocated via odp_shm_reserve(). So implement this call to allocate memory from CMA allocator. Signed-off-by: Taras Kondratiuk --- .../include/odp_shared_memory_internal.h | 29 ++ .../linux-keystone2/source/odp_shared_memory.c | 284 ++++++++++++++++++++ 2 files changed, 313 insertions(+) create mode 100644 platform/linux-keystone2/include/odp_shared_memory_internal.h create mode 100644 platform/linux-keystone2/source/odp_shared_memory.c diff --git a/platform/linux-keystone2/include/odp_shared_memory_internal.h b/platform/linux-keystone2/include/odp_shared_memory_internal.h new file mode 100644 index 0000000..833091e --- /dev/null +++ b/platform/linux-keystone2/include/odp_shared_memory_internal.h @@ -0,0 +1,29 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP shared memory internal + */ + +#ifndef ODP_SHARED_MEMORY_INTERNAL_H_ +#define ODP_SHARED_MEMORY_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +void *_odp_shm_reserve(const char *name, uint64_t size, uint64_t align, + int type); +uintptr_t _odp_shm_get_paddr(void *vaddr); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-keystone2/source/odp_shared_memory.c b/platform/linux-keystone2/source/odp_shared_memory.c new file mode 100644 index 0000000..e595111 --- /dev/null +++ b/platform/linux-keystone2/source/odp_shared_memory.c @@ -0,0 +1,284 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#ifdef __powerpc__ +#include +#endif +#include + +#include +#include + +#include + +#define ODP_SHM_NUM_BLOCKS 32 + + +typedef struct { + char name[ODP_SHM_NAME_LEN]; + uint64_t size; + uint64_t align; + void *addr; + int huge; + ti_em_rh_mem_config_t mem_config; +} odp_shm_block_t; + + +typedef struct { + odp_shm_block_t block[ODP_SHM_NUM_BLOCKS]; + odp_spinlock_t lock; + +} odp_shm_table_t; + + +#define SHM_FLAGS (MAP_SHARED | MAP_ANONYMOUS) + + +/* Global shared memory table */ +static odp_shm_table_t *odp_shm_tbl; + + +int odp_shm_init_global(void) +{ + void *addr; + +#ifndef MAP_HUGETLB + ODP_DBG("NOTE: mmap does not support huge pages\n"); +#endif + + addr = mmap(NULL, sizeof(odp_shm_table_t), + PROT_READ | PROT_WRITE, SHM_FLAGS, -1, 0); + + if (addr == MAP_FAILED) + return -1; + + odp_shm_tbl = addr; + + memset(odp_shm_tbl, 0, sizeof(odp_shm_table_t)); + odp_spinlock_init(&odp_shm_tbl->lock); + + return 0; +} + + +int odp_shm_init_local(void) +{ + return 0; +} + + +static int find_block(const char *name) +{ + int i; + + for (i = 0; i < ODP_SHM_NUM_BLOCKS; i++) { + if (strcmp(name, odp_shm_tbl->block[i].name) == 0) { + /* found it */ + return i; + } + } + + return -1; +} + +enum { + ODP_SHM_MMAP, + ODP_SHM_CMA +}; + +void *_odp_shm_reserve(const char *name, uint64_t size, uint64_t align, + int type) +{ + int i; + odp_shm_block_t *block; +#ifdef MAP_HUGETLB + uint64_t huge_sz, page_sz; + ti_em_rh_mem_config_t mem_config = {0}; + + huge_sz = odp_sys_huge_page_size(); + page_sz = odp_sys_page_size(); +#endif + + odp_spinlock_lock(&odp_shm_tbl->lock); + + if (find_block(name) >= 0) { + /* Found a block with the same name */ + odp_spinlock_unlock(&odp_shm_tbl->lock); + return NULL; + } + + for (i = 0; i < ODP_SHM_NUM_BLOCKS; i++) { + if (odp_shm_tbl->block[i].addr == NULL) { + /* Found free block */ + break; + } + } + + if (i > ODP_SHM_NUM_BLOCKS - 1) { + /* Table full */ + odp_spinlock_unlock(&odp_shm_tbl->lock); + return NULL; + } + + block = &odp_shm_tbl->block[i]; + + /* Allocate memory */ + mem_config.size = size + align; + mem_config.flags = TI_EM_OSAL_MEM_CACHED; + /* + * alloc free mapping id. + * FIXME: mapping_id is uint32_t. + */ + mem_config.mapping_id = -1; + + if (type == ODP_SHM_CMA) { + ti_em_rh_alloc_map_cma(&mem_config); + + if (!mem_config.vaddr) { + /* Alloc failed */ + odp_spinlock_unlock(&odp_shm_tbl->lock); + ODP_ERR("%s: failed to allocate block: %-24s %4"PRIu64" %4"PRIu64"\n", + __func__, + name, + size, + align); + return NULL; + } + + } else if (type == ODP_SHM_MMAP) { + void *addr = MAP_FAILED; + block->huge = 0; + +#ifdef MAP_HUGETLB + /* Try first huge pages */ + if (huge_sz && (size + align) > page_sz) { + addr = mmap(NULL, size + align, PROT_READ | PROT_WRITE, + SHM_FLAGS | MAP_HUGETLB, -1, 0); + } +#endif + + /* Use normal pages for small or failed huge page allocations */ + if (addr == MAP_FAILED) { + addr = mmap(NULL, size + align, PROT_READ | PROT_WRITE, + SHM_FLAGS, -1, 0); + } else { + block->huge = 1; + } + + if (addr == MAP_FAILED) { + /* Alloc failed */ + odp_spinlock_unlock(&odp_shm_tbl->lock); + return NULL; + } + mem_config.vaddr = (uintptr_t)addr; + } else { + ODP_ERR("Unknown shared memory type: %d\n", type); + } + + block->mem_config = mem_config; + + /* move to correct alignment */ + block->addr = ODP_ALIGN_ROUNDUP_PTR(mem_config.vaddr, align); + + strncpy(block->name, name, ODP_SHM_NAME_LEN - 1); + block->name[ODP_SHM_NAME_LEN - 1] = 0; + block->size = size; + block->align = align; + + odp_spinlock_unlock(&odp_shm_tbl->lock); + ODP_DBG("%s: reserved block: %-24s %4"PRIu64" %4"PRIu64" %p\n", + __func__, + block->name, + block->size, + block->align, + block->addr); + + return block->addr; +} + +void *odp_shm_reserve(const char *name, uint64_t size, uint64_t align) +{ + return _odp_shm_reserve(name, size, align, ODP_SHM_CMA); +} + +uintptr_t _odp_shm_get_paddr(void *vaddr) +{ + int i; + uintptr_t addr = (uintptr_t)vaddr; + for (i = 0; i < ODP_SHM_NUM_BLOCKS; i++) { + ti_em_rh_mem_config_t *mem = &odp_shm_tbl->block[i].mem_config; + if (mem->vaddr == 0) + continue; + if ((mem->vaddr <= addr) && (addr < mem->vaddr + mem->size)) { + addr = (uintptr_t)odp_shm_tbl->block[i].addr; + return (addr - mem->vaddr) + mem->paddr; + } + } + return 0; +} + +void *odp_shm_lookup(const char *name) +{ + int i; + void *addr; + + odp_spinlock_lock(&odp_shm_tbl->lock); + + i = find_block(name); + + if (i < 0) { + odp_spinlock_unlock(&odp_shm_tbl->lock); + return NULL; + } + + addr = odp_shm_tbl->block[i].addr; + odp_spinlock_unlock(&odp_shm_tbl->lock); + + return addr; +} + + +void odp_shm_print_all(void) +{ + int i; + + printf("\nShared memory\n"); + printf("--------------\n"); + printf(" page size: %"PRIu64" kB\n", odp_sys_page_size() / 1024); + printf(" huge page size: %"PRIu64" kB\n", + odp_sys_huge_page_size() / 1024); + printf("\n"); + + printf(" id name kB align huge addr paddr\n"); + + for (i = 0; i < ODP_SHM_NUM_BLOCKS; i++) { + odp_shm_block_t *block; + + block = &odp_shm_tbl->block[i]; + + if (block->addr) { + printf(" %2i %-24s %4"PRIu64" %4"PRIu64" %2c %p 0x%08x\n", + i, + block->name, + block->size/1024, + block->align, + (block->huge ? '*' : ' '), + block->addr, + block->mem_config.paddr); + } + } + + printf("\n"); +}