From dd1560fa748dbede38a5132c258f52ec4481496d Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 28 Sep 2012 14:14:56 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 34 ---------------------------------- patches/xrc_sample | 13 +++++++++---- 3 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 0d085e6..5395e58 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: adeb5c3384ba910eb785d6ab1689ab1316dd1f45 -Head: 5b4293d358b582c1156b8bae0d5ea8b6cdb60fed +Previous: daa0d529c368660d341efdeff9abfccacfc877f5 +Head: e6485431d372ecddd51edfb71d4ec03dee0a5a4b Applied: verbs-ext: e3d312ae562579568c8941c4a9851a8b210eb70f xrcd2: 46318924283ba96f16863a0c77ad677e8d43e907 @@ -8,7 +8,6 @@ Applied: xrc_qp: 14ea92a7e8682895d304ee36713d2dc5d29ef3e8 open_qp: cd573b748ea037b19b9f1aa93bcd8062e26cda12 open_qp_man: 1bb5f5fdd591d818af12c9b114b8eaf913d6ebf8 - xrc_sample: 676e4578ec8289ab83e9674ec8e32133fa782780 - refresh-temp: 5b4293d358b582c1156b8bae0d5ea8b6cdb60fed + xrc_sample: e6485431d372ecddd51edfb71d4ec03dee0a5a4b Unapplied: Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 2d7ca86..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,34 +0,0 @@ -Bottom: 18f031255c7e7aee4c0d2677896a3b4e2ca8dc80 -Top: 7c41eb6085492b6e434c8293b22e95a315f9d53b -Author: Sean Hefty -Date: 2012-09-28 14:14:56 -0700 - -Refresh of xrc_sample - ---- - -diff --git a/examples/xsrq_pingpong.c b/examples/xsrq_pingpong.c -index 30a7f3d..55b7e6a 100644 ---- a/examples/xsrq_pingpong.c -+++ b/examples/xsrq_pingpong.c -@@ -196,6 +196,7 @@ static int create_qps(void) - static int pp_init_ctx(char *ib_devname) - { - struct ibv_srq_init_attr_ex attr; -+ struct ibv_xrcd_init_attr xrcd_attr; - - ctx.recv_qp = calloc(ctx.num_clients, sizeof *ctx.recv_qp); - ctx.send_qp = calloc(ctx.num_clients, sizeof *ctx.send_qp); -@@ -250,7 +251,11 @@ static int pp_init_ctx(char *ib_devname) - ctx.fd = -1; - } - -- ctx.xrcd = ibv_open_xrcd(ctx.context, ctx.fd, O_CREAT); -+ memset(&xrcd_attr, 0, sizeof xrcd_attr); -+ xrcd_attr.comp_mask = IBV_XRCD_INIT_ATTR_FD | IBV_XRCD_INIT_ATTR_OFLAGS; -+ xrcd_attr.fd = ctx.fd; -+ xrcd_attr.oflags = O_CREAT; -+ ctx.xrcd = ibv_open_xrcd(ctx.context, &xrcd_attr); - if (!ctx.xrcd) { - fprintf(stderr, "Couldn't Open the XRC Domain %d\n", errno); - return 1; diff --git a/patches/xrc_sample b/patches/xrc_sample index cc39e72..4b2dbad 100644 --- a/patches/xrc_sample +++ b/patches/xrc_sample @@ -1,5 +1,5 @@ Bottom: 3d9487bf73cccfe0944251cdd72d254362a7f977 -Top: 18f031255c7e7aee4c0d2677896a3b4e2ca8dc80 +Top: 7c41eb6085492b6e434c8293b22e95a315f9d53b Author: Jay Sternberg Date: 2012-09-19 14:46:28 -0700 @@ -35,10 +35,10 @@ index cd00a65..4821ec6 100644 diff --git a/examples/xsrq_pingpong.c b/examples/xsrq_pingpong.c new file mode 100644 -index 0000000..30a7f3d +index 0000000..55b7e6a --- /dev/null +++ b/examples/xsrq_pingpong.c -@@ -0,0 +1,880 @@ +@@ -0,0 +1,885 @@ +/* + * Copyright (c) 2005 Topspin Communications. All rights reserved. + * Copyright (c) 2011 Intel Corporation, Inc. All rights reserved. @@ -237,6 +237,7 @@ index 0000000..30a7f3d +static int pp_init_ctx(char *ib_devname) +{ + struct ibv_srq_init_attr_ex attr; ++ struct ibv_xrcd_init_attr xrcd_attr; + + ctx.recv_qp = calloc(ctx.num_clients, sizeof *ctx.recv_qp); + ctx.send_qp = calloc(ctx.num_clients, sizeof *ctx.send_qp); @@ -291,7 +292,11 @@ index 0000000..30a7f3d + ctx.fd = -1; + } + -+ ctx.xrcd = ibv_open_xrcd(ctx.context, ctx.fd, O_CREAT); ++ memset(&xrcd_attr, 0, sizeof xrcd_attr); ++ xrcd_attr.comp_mask = IBV_XRCD_INIT_ATTR_FD | IBV_XRCD_INIT_ATTR_OFLAGS; ++ xrcd_attr.fd = ctx.fd; ++ xrcd_attr.oflags = O_CREAT; ++ ctx.xrcd = ibv_open_xrcd(ctx.context, &xrcd_attr); + if (!ctx.xrcd) { + fprintf(stderr, "Couldn't Open the XRC Domain %d\n", errno); + return 1; -- 2.46.0