From patchwork Mon Oct 24 09:23:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 78884 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp2448538qge; Mon, 24 Oct 2016 01:25:43 -0700 (PDT) X-Received: by 10.55.65.75 with SMTP id o72mr12988771qka.84.1477297543207; Mon, 24 Oct 2016 01:25:43 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id l64si11581445qte.14.2016.10.24.01.25.42; Mon, 24 Oct 2016 01:25:43 -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 DA5AD615EE; Mon, 24 Oct 2016 08:25:42 +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=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 466556155C; Mon, 24 Oct 2016 08:24:57 +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 25D8560CAA; Mon, 24 Oct 2016 08:24:52 +0000 (UTC) Received: from mail-lf0-f52.google.com (mail-lf0-f52.google.com [209.85.215.52]) by lists.linaro.org (Postfix) with ESMTPS id B2E2660C4B for ; Mon, 24 Oct 2016 08:24:50 +0000 (UTC) Received: by mail-lf0-f52.google.com with SMTP id b81so180480821lfe.1 for ; Mon, 24 Oct 2016 01:24:50 -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=MFJeSrM6rZbfH0S6RI3uncrkQg16S8KdPoOiP9bPn9Q=; b=WkyS6diTzp8FdZchEuNIWiiSYher+nDXInEsHlHW6dUOHaDgfrIzjQKJnXbq0RRwH8 VTlxQSsqciTI/cttqODjNymOxGb5yq3IQLJeQ0YqPyXmM2LCFofTQ9WPeMu3Nc0Q8rqK IrgyLHHua0G9JL6upQWsFar/b/rmtdGJjKXiyjWHohiVUJqHqONXnxdYaXpRkXXDZK9D Elkp4pmIBHYTD4N23N2NUC0cUeY9iooZDhI1Cp5i4hXqdtnbZlzdpCdgDD+ftd0ViVoA JXM++NwKDvBB4Je6WnwBZIZsq1QlV35isfd4lq6GuA7lquds2ocnMa0e0IFKrjh2F9+a SeaQ== X-Gm-Message-State: ABUngvdfi59nsinlgJmnGIqZew1MswbCWKA+8BWYJpWKwMzGlKUI4WgppD7dcisSt3GX3qR78NI= X-Received: by 10.25.43.193 with SMTP id r184mr6334918lfr.140.1477297489322; Mon, 24 Oct 2016 01:24:49 -0700 (PDT) Received: from erachmi-ericsson.ki.sw.ericsson.se (c-83-233-76-66.cust.bredband2.com. [83.233.76.66]) by smtp.gmail.com with ESMTPSA id y131sm2849878lfd.26.2016.10.24.01.24.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Oct 2016 01:24:48 -0700 (PDT) From: Christophe Milard To: mike.holmes@linaro.org, bill.fischofer@linaro.org, lng-odp@lists.linaro.org Date: Mon, 24 Oct 2016 11:23:58 +0200 Message-Id: <1477301053-35938-2-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477301053-35938-1-git-send-email-christophe.milard@linaro.org> References: <1477301053-35938-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv4 01/16] linux-gen: _ishm: create link for external memory sharing 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" A new flag called _ODP_ISHM_LINK is added to _ishm. When this flag is specified at reserve() time, a link ("/tmp/odp--shm-" where is the process ID of the main ODP instatiation process and is the block name given at reserve time) is created, linking to the underlying block file (either in /tmp or in hugetlbfs). This link is meant to be used by processes external to ODP willing to share this memory. Signed-off-by: Christophe Milard --- platform/linux-generic/_ishm.c | 35 +++++++++++++++++++++++-- platform/linux-generic/include/_ishm_internal.h | 1 + 2 files changed, 34 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index f4aa6d3..e6ceb24 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -99,6 +99,14 @@ #define ISHM_FILENAME_NORMAL_PAGE_DIR "/tmp" /* + * when the memory is to be shared with an external entity (such as another + * ODP instance or an OS process not part of this ODP instance) then a + * link is created to the underlying filename: this defines the location + * and the format of this link name + */ +#define ISHM_LINKNAME_FORMAT "/tmp/odp-%d-shm-%s" + +/* * At worse case the virtual space gets so fragmented that there is * a unallocated fragment between each allocated fragment: * In that case, the number of fragments to take care of is twice the @@ -136,6 +144,7 @@ typedef struct ishm_fragment { typedef struct ishm_block { char name[ISHM_NAME_MAXLEN]; /* name for the ishm block (if any) */ char filename[ISHM_FILENAME_MAXLEN]; /* name of the .../odp-* file */ + char linkname[ISHM_FILENAME_MAXLEN]; /* name of the /tmp/odp-* link */ int main_odpthread; /* The thread which did the initial reserve*/ uint32_t user_flags; /* any flags the user want to remember. */ uint32_t flags; /* block creation flags. */ @@ -380,7 +389,7 @@ static void free_fragment(ishm_fragment_t *fragmnt) * or /mnt/huge/odp-- (for huge pages) * Return the new file descriptor, or -1 on error. */ -static int create_file(int block_index, int huge, uint64_t len) +static int create_file(int block_index, int huge, uint64_t len, uint32_t flags) { char *name; int fd; @@ -429,6 +438,21 @@ static int create_file(int block_index, int huge, uint64_t len) strncpy(new_block->filename, filename, ISHM_FILENAME_MAXLEN - 1); + /* if _ODP_ISHM_LINK is set, create a symbolic link for external ref: */ + if (flags & _ODP_ISHM_LINK) { + snprintf(new_block->linkname, ISHM_FILENAME_MAXLEN, + ISHM_LINKNAME_FORMAT, + odp_global_data.main_pid, + (name && name[0]) ? name : seq_string); + if (symlink(filename, new_block->linkname) < 0) { + ODP_ERR("symlink failed: err=%s.\n", + strerror(errno)); + new_block->linkname[0] = 0; + } + } else { + new_block->linkname[0] = 0; + } + return fd; } @@ -456,7 +480,7 @@ static void *do_map(int block_index, uint64_t len, uint32_t align, * unless a fd was already given */ if (*fd < 0) { - *fd = create_file(block_index, huge, len); + *fd = create_file(block_index, huge, len, flags); if (*fd < 0) return NULL; } else { @@ -472,6 +496,8 @@ static void *do_map(int block_index, uint64_t len, uint32_t align, close(*fd); *fd = -1; unlink(new_block->filename); + if (new_block->linkname[0]) + unlink(new_block->linkname); } return NULL; } @@ -487,6 +513,8 @@ static void *do_map(int block_index, uint64_t len, uint32_t align, close(*fd); *fd = -1; unlink(new_block->filename); + if (new_block->linkname[0]) + unlink(new_block->linkname); } return NULL; } @@ -870,6 +898,9 @@ static int block_free(int block_index) /* remove the .../odp-* file, unless fd was external: */ if (block->filename[0] != 0) unlink(block->filename); + /* also remove possible link: */ + if (block->linkname[0] != 0) + unlink(block->linkname); /* deregister the file descriptor from the file descriptor server. */ _odp_fdserver_deregister_fd(FD_SRV_CTX_ISHM, block_index); diff --git a/platform/linux-generic/include/_ishm_internal.h b/platform/linux-generic/include/_ishm_internal.h index 3231b60..4fa6d9c 100644 --- a/platform/linux-generic/include/_ishm_internal.h +++ b/platform/linux-generic/include/_ishm_internal.h @@ -14,6 +14,7 @@ extern "C" { /* flags available at ishm_reserve: */ #define _ODP_ISHM_SINGLE_VA 1 #define _ODP_ISHM_LOCK 2 +#define _ODP_ISHM_LINK 4 /*create soft link in /tmp */ /** * Shared memory block info