Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 34898,
    "url": "http://patches.dpdk.org/api/patches/34898/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180202164050.13017-4-adrien.mazarguil@6wind.com/",
    "project": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20180202164050.13017-4-adrien.mazarguil@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20180202164050.13017-4-adrien.mazarguil@6wind.com",
    "date": "2018-02-02T16:46:16",
    "name": "[dpdk-dev,v2,3/4] net/mlx: version rdma-core glue libraries",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "3b58d9c4c586397ee6e4ede49522349ece314d14",
    "submitter": {
        "id": 165,
        "url": "http://patches.dpdk.org/api/people/165/?format=api",
        "name": "Adrien Mazarguil",
        "email": "adrien.mazarguil@6wind.com"
    },
    "delegate": {
        "id": 319,
        "url": "http://patches.dpdk.org/api/users/319/?format=api",
        "username": "fyigit",
        "first_name": "Ferruh",
        "last_name": "Yigit",
        "email": "ferruh.yigit@amd.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180202164050.13017-4-adrien.mazarguil@6wind.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/34898/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/34898/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CB77C1B1A7;\n\tFri,  2 Feb 2018 17:46:31 +0100 (CET)",
            "from mail-wm0-f65.google.com (mail-wm0-f65.google.com\n\t[74.125.82.65]) by dpdk.org (Postfix) with ESMTP id A25231B170\n\tfor <dev@dpdk.org>; Fri,  2 Feb 2018 17:46:29 +0100 (CET)",
            "by mail-wm0-f65.google.com with SMTP id f3so13705879wmc.1\n\tfor <dev@dpdk.org>; Fri, 02 Feb 2018 08:46:29 -0800 (PST)",
            "from 6wind.com (host.78.145.23.62.rev.coltfrance.com.\n\t[62.23.145.78]) by smtp.gmail.com with ESMTPSA id\n\tc49sm4644354wrc.48.2018.02.02.08.46.28\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 02 Feb 2018 08:46:28 -0800 (PST)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:in-reply-to;\n\tbh=zxH8bzpxaIK0E2bkyu80a7SWjhk91MWb9Coyg43BByc=;\n\tb=HbTOpHGNxkQyATlCcyjHboVr+k9oHa8Szb/B0WlF/lCPdB62lvuB8iq6Yz7d9TcB/H\n\tRazzNoZZy71agX9c+Y7fiMbj7c5wprEileFKqs3s8Kcc8+A/HjDS2/C04CqP7F4kICmB\n\tV0hRtVflXT2wHXgkll59+bgqmP5SfDjcSBKU0ptO3WhL1LOUUE6HeLXULt5LrD+Iju3/\n\tLp2VrnsJkqSmJzmWqm4JGAv8xhSdG3VQ22eEkagJaFeKOdMsNEeIsuNVi6JNX+tNWety\n\tf82U6NOOIWd+droLcPUMJGIeeiTLcAADNxKt87lbEWnrVjGbQKcOarf/B6TvRvfIAXrR\n\tb9Wg==",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:in-reply-to;\n\tbh=zxH8bzpxaIK0E2bkyu80a7SWjhk91MWb9Coyg43BByc=;\n\tb=gVD62NoHZFAV8phszF0f0F227hDi+6Rn6gv0UOnP9Z8lTP3ufCxP3BoS3shVdmvU6L\n\tC9qVpg39J+aXf4i4/cwUB2OlmFmkYIhVbIiWNKFk869M/YKt5m+FmDL+bVL4S44hVmvR\n\tWCykEf7aw/WXQyRzmqosUPt2Kmn7SKJaQ3mthTK2lia61EUJib+yq+6v5ZCw340gCI19\n\t9ajJCQBAxjh8mD2szfVMicHtdiZREZZeKSh07KJY9LjGtDQce0D7XDFyAp2sks9SPUJF\n\tu87Ly3Ho9UIQbGQdVH15YeYruZzoWc15ZPoyU1ipA8Lze6rxe8xfXFL+5uUbyaFKzbTb\n\tzo1Q==",
        "X-Gm-Message-State": "APf1xPC4pgpal2bUi2wS4asUdt6CXnHfgfiya0AilJIZyxXkqFn8j4Ct\n\tKkLEWUiAGgfAn62iqKudf4YyTw==",
        "X-Google-Smtp-Source": "AH8x2276GYrmtWl9od9yKSaNQmg2/KxYgalTBJCCwlv4YHX1qlU0/V28JnKbKMHfNjCfP3M5S7Wq1w==",
        "X-Received": "by 10.28.225.133 with SMTP id y127mr400339wmg.55.1517589989142; \n\tFri, 02 Feb 2018 08:46:29 -0800 (PST)",
        "Date": "Fri, 2 Feb 2018 17:46:16 +0100",
        "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>",
        "To": "Shahaf Shuler <shahafs@mellanox.com>",
        "Cc": "Nelio Laranjeiro <nelio.laranjeiro@6wind.com>, dev@dpdk.org,\n\tMarcelo Ricardo Leitner <mleitner@redhat.com>",
        "Message-ID": "<20180202164050.13017-4-adrien.mazarguil@6wind.com>",
        "References": "<20180202144736.8239-1-adrien.mazarguil@6wind.com>\n\t<20180202164050.13017-1-adrien.mazarguil@6wind.com>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain; charset=us-ascii",
        "Content-Disposition": "inline",
        "In-Reply-To": "<20180202164050.13017-1-adrien.mazarguil@6wind.com>",
        "X-Mailer": "git-send-email 2.11.0",
        "Subject": "[dpdk-dev] [PATCH v2 3/4] net/mlx: version rdma-core glue libraries",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://dpdk.org/ml/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "When built as separate objects, these libraries do not have unique names.\nSince they do not maintain a stable ABI, loading an incompatible library\nmay result in a crash (e.g. in case multiple versions are installed).\n\nThis patch addresses the above by versioning glue libraries, both on the\nfile system (version suffix) and by comparing a dedicated version field\nmember in glue structures.\n\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\n---\n drivers/net/mlx4/Makefile    | 8 ++++++--\n drivers/net/mlx4/mlx4.c      | 5 +++++\n drivers/net/mlx4/mlx4_glue.c | 1 +\n drivers/net/mlx4/mlx4_glue.h | 6 ++++++\n drivers/net/mlx5/Makefile    | 8 ++++++--\n drivers/net/mlx5/mlx5.c      | 5 +++++\n drivers/net/mlx5/mlx5_glue.c | 1 +\n drivers/net/mlx5/mlx5_glue.h | 6 ++++++\n 8 files changed, 36 insertions(+), 4 deletions(-)",
    "diff": "diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile\nindex c004ac71c..cc9db9977 100644\n--- a/drivers/net/mlx4/Makefile\n+++ b/drivers/net/mlx4/Makefile\n@@ -33,7 +33,9 @@ include $(RTE_SDK)/mk/rte.vars.mk\n \n # Library name.\n LIB = librte_pmd_mlx4.a\n-LIB_GLUE = librte_pmd_mlx4_glue.so\n+LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)\n+LIB_GLUE_BASE = librte_pmd_mlx4_glue.so\n+LIB_GLUE_VERSION = 18.02.1\n \n # Sources.\n SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4.c\n@@ -64,6 +66,7 @@ CFLAGS += -D_XOPEN_SOURCE=600\n CFLAGS += $(WERROR_FLAGS)\n ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS),y)\n CFLAGS += -DMLX4_GLUE='\"$(LIB_GLUE)\"'\n+CFLAGS += -DMLX4_GLUE_VERSION='\"$(LIB_GLUE_VERSION)\"'\n CFLAGS_mlx4_glue.o += -fPIC\n LDLIBS += -ldl\n else\n@@ -131,6 +134,7 @@ $(LIB): $(LIB_GLUE)\n \n $(LIB_GLUE): mlx4_glue.o\n \t$Q $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) \\\n+\t\t-Wl,-h,$(LIB_GLUE) \\\n \t\t-s -shared -o $@ $< -libverbs -lmlx4\n \n mlx4_glue.o: mlx4_autoconf.h\n@@ -139,6 +143,6 @@ endif\n \n clean_mlx4: FORCE\n \t$Q rm -f -- mlx4_autoconf.h mlx4_autoconf.h.new\n-\t$Q rm -f -- mlx4_glue.o $(LIB_GLUE)\n+\t$Q rm -f -- mlx4_glue.o $(LIB_GLUE_BASE)*\n \n clean: clean_mlx4\ndiff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c\nindex 201d39b6e..61a852fb9 100644\n--- a/drivers/net/mlx4/mlx4.c\n+++ b/drivers/net/mlx4/mlx4.c\n@@ -808,6 +808,11 @@ rte_mlx4_pmd_init(void)\n \t\t\tassert(((const void *const *)mlx4_glue)[i]);\n \t}\n #endif\n+\tif (strcmp(mlx4_glue->version, MLX4_GLUE_VERSION)) {\n+\t\tERROR(\"rdma-core glue \\\"%s\\\" mismatch: \\\"%s\\\" is required\",\n+\t\t      mlx4_glue->version, MLX4_GLUE_VERSION);\n+\t\treturn;\n+\t}\n \tmlx4_glue->fork_init();\n \trte_pci_register(&mlx4_driver);\n }\ndiff --git a/drivers/net/mlx4/mlx4_glue.c b/drivers/net/mlx4/mlx4_glue.c\nindex 47ae7ad0f..3b79d320e 100644\n--- a/drivers/net/mlx4/mlx4_glue.c\n+++ b/drivers/net/mlx4/mlx4_glue.c\n@@ -240,6 +240,7 @@ mlx4_glue_dv_set_context_attr(struct ibv_context *context,\n }\n \n const struct mlx4_glue *mlx4_glue = &(const struct mlx4_glue){\n+\t.version = MLX4_GLUE_VERSION,\n \t.fork_init = mlx4_glue_fork_init,\n \t.get_async_event = mlx4_glue_get_async_event,\n \t.ack_async_event = mlx4_glue_ack_async_event,\ndiff --git a/drivers/net/mlx4/mlx4_glue.h b/drivers/net/mlx4/mlx4_glue.h\nindex de251c622..368f906bf 100644\n--- a/drivers/net/mlx4/mlx4_glue.h\n+++ b/drivers/net/mlx4/mlx4_glue.h\n@@ -19,7 +19,13 @@\n #pragma GCC diagnostic error \"-Wpedantic\"\n #endif\n \n+#ifndef MLX4_GLUE_VERSION\n+#define MLX4_GLUE_VERSION \"\"\n+#endif\n+\n+/* LIB_GLUE_VERSION must be updated every time this structure is modified. */\n struct mlx4_glue {\n+\tconst char *version;\n \tint (*fork_init)(void);\n \tint (*get_async_event)(struct ibv_context *context,\n \t\t\t       struct ibv_async_event *event);\ndiff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile\nindex 4b20d718b..4086f2039 100644\n--- a/drivers/net/mlx5/Makefile\n+++ b/drivers/net/mlx5/Makefile\n@@ -33,7 +33,9 @@ include $(RTE_SDK)/mk/rte.vars.mk\n \n # Library name.\n LIB = librte_pmd_mlx5.a\n-LIB_GLUE = librte_pmd_mlx5_glue.so\n+LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)\n+LIB_GLUE_BASE = librte_pmd_mlx5_glue.so\n+LIB_GLUE_VERSION = 18.02.1\n \n # Sources.\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5.c\n@@ -74,6 +76,7 @@ CFLAGS += $(WERROR_FLAGS)\n CFLAGS += -Wno-strict-prototypes\n ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y)\n CFLAGS += -DMLX5_GLUE='\"$(LIB_GLUE)\"'\n+CFLAGS += -DMLX5_GLUE_VERSION='\"$(LIB_GLUE_VERSION)\"'\n CFLAGS_mlx5_glue.o += -fPIC\n LDLIBS += -ldl\n else\n@@ -180,6 +183,7 @@ $(LIB): $(LIB_GLUE)\n \n $(LIB_GLUE): mlx5_glue.o\n \t$Q $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) \\\n+\t\t-Wl,-h,$(LIB_GLUE) \\\n \t\t-s -shared -o $@ $< -libverbs -lmlx5\n \n mlx5_glue.o: mlx5_autoconf.h\n@@ -188,6 +192,6 @@ endif\n \n clean_mlx5: FORCE\n \t$Q rm -f -- mlx5_autoconf.h mlx5_autoconf.h.new\n-\t$Q rm -f -- mlx5_glue.o $(LIB_GLUE)\n+\t$Q rm -f -- mlx5_glue.o $(LIB_GLUE_BASE)*\n \n clean: clean_mlx5\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 050cfac0d..341230d2b 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -1151,6 +1151,11 @@ rte_mlx5_pmd_init(void)\n \t\t\tassert(((const void *const *)mlx5_glue)[i]);\n \t}\n #endif\n+\tif (strcmp(mlx5_glue->version, MLX5_GLUE_VERSION)) {\n+\t\tERROR(\"rdma-core glue \\\"%s\\\" mismatch: \\\"%s\\\" is required\",\n+\t\t      mlx5_glue->version, MLX5_GLUE_VERSION);\n+\t\treturn;\n+\t}\n \tmlx5_glue->fork_init();\n \trte_pci_register(&mlx5_driver);\n }\ndiff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c\nindex 8f500be6e..1c4396ada 100644\n--- a/drivers/net/mlx5/mlx5_glue.c\n+++ b/drivers/net/mlx5/mlx5_glue.c\n@@ -308,6 +308,7 @@ mlx5_glue_dv_init_obj(struct mlx5dv_obj *obj, uint64_t obj_type)\n }\n \n const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){\n+\t.version = MLX5_GLUE_VERSION,\n \t.fork_init = mlx5_glue_fork_init,\n \t.alloc_pd = mlx5_glue_alloc_pd,\n \t.dealloc_pd = mlx5_glue_dealloc_pd,\ndiff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h\nindex 7fed302ba..b5efee3b6 100644\n--- a/drivers/net/mlx5/mlx5_glue.h\n+++ b/drivers/net/mlx5/mlx5_glue.h\n@@ -19,6 +19,10 @@\n #pragma GCC diagnostic error \"-Wpedantic\"\n #endif\n \n+#ifndef MLX5_GLUE_VERSION\n+#define MLX5_GLUE_VERSION \"\"\n+#endif\n+\n #ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT\n struct ibv_counter_set;\n struct ibv_counter_set_data;\n@@ -27,7 +31,9 @@ struct ibv_counter_set_init_attr;\n struct ibv_query_counter_set_attr;\n #endif\n \n+/* LIB_GLUE_VERSION must be updated every time this structure is modified. */\n struct mlx5_glue {\n+\tconst char *version;\n \tint (*fork_init)(void);\n \tstruct ibv_pd *(*alloc_pd)(struct ibv_context *context);\n \tint (*dealloc_pd)(struct ibv_pd *pd);\n",
    "prefixes": [
        "dpdk-dev",
        "v2",
        "3/4"
    ]
}