From patchwork Thu Oct 20 20:26:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 78562 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp972389qge; Thu, 20 Oct 2016 13:29:16 -0700 (PDT) X-Received: by 10.55.157.215 with SMTP id g206mr2698984qke.12.1476995355963; Thu, 20 Oct 2016 13:29:15 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id h5si28386284qka.330.2016.10.20.13.29.15; Thu, 20 Oct 2016 13:29:15 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 4BF1760AEF; Thu, 20 Oct 2016 20:29:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id B98F161795; Thu, 20 Oct 2016 20:27:30 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 4433E617AE; Thu, 20 Oct 2016 20:27:20 +0000 (UTC) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by lists.linaro.org (Postfix) with ESMTPS id CE37460A3B for ; Thu, 20 Oct 2016 20:26:55 +0000 (UTC) Received: by mail-lf0-f54.google.com with SMTP id l131so97117490lfl.2 for ; Thu, 20 Oct 2016 13:26:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TqpYzwP5YOu1foH6FgkN7olMtiaZQM7MKZyV1xBY0kA=; b=fU5BDmhcJ4bL84l8kYTAbZTeWT87ZQeYvHPPCQQX0ko1WrJCtACQFzUzKbHIIMP2Zu cF/64pP+NfC0GQw4Rj9sN+tgoDdjowDf79F6oidaEcbNGsKVqyvjx9auUR65mQeiT9g2 u+5dpawlbTAg/Wr5J/sN2YRU1P0sEoMyqfuGv8RQQtZar4s9S82+OSpoyqxu1iTwnBun U5tnD4J8P18gRkNxbY5IdSC/J6mZlsMDR0O+3QphfG7oCmCbzUhkBixJHx0BMdawnSuY T8RJlI2peSZtFeW1SqHz1L2Bs+JgOgeAhl6rGuzfF/6LIaIPkihDEMRoHnSetDxV6gkX 3CMg== X-Gm-Message-State: AA6/9RnWLV3MnlsGziWQ30IQl2XiWRwiIDaUhGPF2C346ruMZ7wCTrvQcgdFp9dbMZO/adDCjxA= X-Received: by 10.25.67.29 with SMTP id q29mr1859091lfa.22.1476995214048; Thu, 20 Oct 2016 13:26:54 -0700 (PDT) Received: from localhost.localdomain (ppp91-77-163-48.pppoe.mtu-net.ru. [91.77.163.48]) by smtp.gmail.com with ESMTPSA id 78sm466282ljj.7.2016.10.20.13.26.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Oct 2016 13:26:53 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 20 Oct 2016 23:26:29 +0300 Message-Id: <1476995190-7548-4-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.7.1.250.gff4ea60 In-Reply-To: <1476995190-7548-1-git-send-email-maxim.uvarov@linaro.org> References: <1476995190-7548-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH 3/4] linix-gen: pktio ipc: allow the same pool name X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Allow the same pool name for master and slave processes. Signed-off-by: Maxim Uvarov --- .../linux-generic/include/odp_packet_io_ipc_internal.h | 2 -- platform/linux-generic/pktio/ipc.c | 17 +++++++---------- test/linux-generic/pktio_ipc/ipc_common.h | 3 +++ test/linux-generic/pktio_ipc/pktio_ipc1.c | 2 +- test/linux-generic/pktio_ipc/pktio_ipc2.c | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) -- 2.7.1.250.gff4ea60 diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h index 0ad2b22..1190e1e 100644 --- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ipc_internal.h @@ -28,8 +28,6 @@ struct pktio_info { struct { /* number of buffer in remote pool */ int shm_pool_bufs_num; - /* size of remote pool */ - size_t shm_pkt_pool_size; /* size of packet/segment in remote pool */ uint32_t shm_pkt_size; /* offset from shared memory block start diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index a322f51..490abc5 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -17,7 +17,7 @@ /* MAC address for the "ipc" interface */ static const char pktio_ipc_mac[] = {0x12, 0x12, 0x12, 0x12, 0x12, 0x12}; -static void *_ipc_map_remote_pool(const char *name, size_t size, int pid); +static void *_ipc_map_remote_pool(const char *name, int pid); static const char *_ipc_odp_buffer_pool_shm_name(odp_pool_t pool_hdl) { @@ -44,7 +44,6 @@ static int _ipc_master_start(pktio_entry_t *pktio_entry) return -1; ipc_pool_base = _ipc_map_remote_pool(pinfo->slave.pool_name, - pinfo->master.shm_pkt_pool_size, pinfo->slave.pid); if (ipc_pool_base == NULL) { ODP_DBG("no pool file %s for pid %d\n", @@ -147,7 +146,6 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, } memcpy(pinfo->master.pool_name, pool_name, strlen(pool_name)); - pinfo->master.shm_pkt_pool_size = pool_entry->s.pool_size; pinfo->master.shm_pool_bufs_num = pool_entry->s.buf_num; pinfo->master.shm_pkt_size = pool_entry->s.seg_size; pinfo->master.mdata_offset = pool_entry->s.pool_mdata_addr - @@ -192,23 +190,23 @@ static void _ipc_export_pool(struct pktio_info *pinfo, pool_entry->s.pool_base_addr; } -static void *_ipc_map_remote_pool(const char *name, size_t size, int pid) +static void *_ipc_map_remote_pool(const char *name, int pid) { odp_shm_t shm; void *addr; + char rname[ODP_SHM_NAME_LEN]; - ODP_DBG("Mapping remote pool %s, size %ld\n", name, size); - + snprintf(rname, ODP_SHM_NAME_LEN, "remote-%s", name); shm = odp_shm_reserve_exported(name, pid, - name, 4096, 0); + rname, 4096, 0); if (shm == ODP_SHM_INVALID) { ODP_ERR("unable map %s\n", name); return NULL; } addr = odp_shm_addr(shm); - ODP_DBG("MAP master: %p - %p size %ld, pool %s\n", - addr, (char *)addr + size, size, name); + + ODP_DBG("Mapped remote pool %s to local %s\n", name, rname); return addr; } @@ -302,7 +300,6 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) /* Get info about remote pool */ pinfo = pktio_entry->s.ipc.pinfo; ipc_pool_base = _ipc_map_remote_pool(pinfo->master.pool_name, - pinfo->master.shm_pkt_pool_size, pid); pktio_entry->s.ipc.pool_mdata_base = (char *)ipc_pool_base + pinfo->master.mdata_offset; diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index 5cc1cb4..430d7b6 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -49,6 +49,9 @@ #define TEST_IPC_PKTIO_NAME "ipc:ipktio" #define TEST_IPC_PKTIO_PID_NAME "ipc:%d:ipktio" +/** Can be any name, same or not the same. */ +#define TEST_IPC_POOL_NAME "ipc_packet_pool" + /** magic number and sequence at start of packet payload */ typedef struct ODP_PACKED { odp_u32be_t magic; diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c index e646fcf..654b506 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc1.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc1.c @@ -312,7 +312,7 @@ int main(int argc, char *argv[]) params.pkt.num = SHM_PKT_POOL_SIZE; params.type = ODP_POOL_PACKET; - pool = odp_pool_create("packet_pool1", ¶ms); + pool = odp_pool_create(TEST_IPC_POOL_NAME, ¶ms); if (pool == ODP_POOL_INVALID) { EXAMPLE_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE); diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c index ce2fd04..74cc137 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc2.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc2.c @@ -40,7 +40,7 @@ static int ipc_second_process(int master_pid) params.pkt.num = SHM_PKT_POOL_SIZE; params.type = ODP_POOL_PACKET; - pool = odp_pool_create("packet_pool2", ¶ms); + pool = odp_pool_create(TEST_IPC_POOL_NAME, ¶ms); if (pool == ODP_POOL_INVALID) { EXAMPLE_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE);