* [PATCHv2 2/3] libibmad/gs.c: In pma_query_via/performance_reset_via, set errno
@ 2011-04-27 11:14 Hal Rosenstock
[not found] ` <4DB7FA9C.8000503-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Hal Rosenstock @ 2011-04-27 11:14 UTC (permalink / raw)
To: Ira Weiny; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
according to rpc error field
Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
diff --git a/src/gs.c b/src/gs.c
index 3cb2b25..5541b6b 100644
--- a/src/gs.c
+++ b/src/gs.c
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2004-2009 Voltaire Inc. All rights reserved.
+ * Copyright (c) 2011 Mellanox Technologies LTD. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -38,6 +39,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
#include <infiniband/umad.h>
#include <infiniband/mad.h>
@@ -49,8 +51,10 @@ uint8_t *pma_query_via(void *rcvbuf, ib_portid_t * dest, int port,
unsigned timeout, unsigned id,
const struct ibmad_port * srcport)
{
- ib_rpc_t rpc = { 0 };
+ ib_rpc_v1_t rpc = { 0 };
+ ib_rpc_t *rpcold = (ib_rpc_t *)(void *)&rpc;
int lid = dest->lid;
+ void *p_ret;
DEBUG("lid %u port %d", lid, port);
@@ -59,7 +63,7 @@ uint8_t *pma_query_via(void *rcvbuf, ib_portid_t * dest, int port,
return NULL;
}
- rpc.mgtclass = IB_PERFORMANCE_CLASS;
+ rpc.mgtclass = IB_PERFORMANCE_CLASS | IB_MAD_RPC_VERSION1;
rpc.method = IB_MAD_METHOD_GET;
rpc.attr.id = id;
@@ -75,15 +79,20 @@ uint8_t *pma_query_via(void *rcvbuf, ib_portid_t * dest, int port,
if (!dest->qkey)
dest->qkey = IB_DEFAULT_QP1_QKEY;
- return mad_rpc(srcport, &rpc, dest, rcvbuf, rcvbuf);
+ p_ret = mad_rpc(srcport, rpcold, dest, rcvbuf, rcvbuf);
+ errno = rpc.error;
+ return p_ret;
}
uint8_t *performance_reset_via(void *rcvbuf, ib_portid_t * dest,
int port, unsigned mask, unsigned timeout,
unsigned id, const struct ibmad_port * srcport)
{
- ib_rpc_t rpc = { 0 };
+ ib_rpc_v1_t rpc = { 0 };
+ ib_rpc_t *rpcold = (ib_rpc_t *)(void *)&rpc;
+
int lid = dest->lid;
+ void *p_ret;
DEBUG("lid %u port %d mask 0x%x", lid, port, mask);
@@ -95,7 +104,7 @@ uint8_t *performance_reset_via(void *rcvbuf, ib_portid_t * dest,
if (!mask)
mask = ~0;
- rpc.mgtclass = IB_PERFORMANCE_CLASS;
+ rpc.mgtclass = IB_PERFORMANCE_CLASS | IB_MAD_RPC_VERSION1;
rpc.method = IB_MAD_METHOD_SET;
rpc.attr.id = id;
@@ -115,5 +124,7 @@ uint8_t *performance_reset_via(void *rcvbuf, ib_portid_t * dest,
if (!dest->qkey)
dest->qkey = IB_DEFAULT_QP1_QKEY;
- return mad_rpc(srcport, &rpc, dest, rcvbuf, rcvbuf);
+ p_ret = mad_rpc(srcport, rpcold, dest, rcvbuf, rcvbuf);
+ errno = rpc.error;
+ return p_ret;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCHv2 2/3] libibmad/gs.c: In pma_query_via/performance_reset_via, set errno
[not found] ` <4DB7FA9C.8000503-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
@ 2011-04-28 21:19 ` Ira Weiny
0 siblings, 0 replies; 2+ messages in thread
From: Ira Weiny @ 2011-04-28 21:19 UTC (permalink / raw)
To: Hal Rosenstock; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
On Wed, 27 Apr 2011 04:14:36 -0700
Hal Rosenstock <hal-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> wrote:
>
> according to rpc error field
>
> Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Thanks applied,
Ira
> ---
> diff --git a/src/gs.c b/src/gs.c
> index 3cb2b25..5541b6b 100644
> --- a/src/gs.c
> +++ b/src/gs.c
> @@ -1,5 +1,6 @@
> /*
> * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved.
> + * Copyright (c) 2011 Mellanox Technologies LTD. All rights reserved.
> *
> * This software is available to you under a choice of one of two
> * licenses. You may choose to be licensed under the terms of the GNU
> @@ -38,6 +39,7 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <errno.h>
>
> #include <infiniband/umad.h>
> #include <infiniband/mad.h>
> @@ -49,8 +51,10 @@ uint8_t *pma_query_via(void *rcvbuf, ib_portid_t * dest, int port,
> unsigned timeout, unsigned id,
> const struct ibmad_port * srcport)
> {
> - ib_rpc_t rpc = { 0 };
> + ib_rpc_v1_t rpc = { 0 };
> + ib_rpc_t *rpcold = (ib_rpc_t *)(void *)&rpc;
> int lid = dest->lid;
> + void *p_ret;
>
> DEBUG("lid %u port %d", lid, port);
>
> @@ -59,7 +63,7 @@ uint8_t *pma_query_via(void *rcvbuf, ib_portid_t * dest, int port,
> return NULL;
> }
>
> - rpc.mgtclass = IB_PERFORMANCE_CLASS;
> + rpc.mgtclass = IB_PERFORMANCE_CLASS | IB_MAD_RPC_VERSION1;
> rpc.method = IB_MAD_METHOD_GET;
> rpc.attr.id = id;
>
> @@ -75,15 +79,20 @@ uint8_t *pma_query_via(void *rcvbuf, ib_portid_t * dest, int port,
> if (!dest->qkey)
> dest->qkey = IB_DEFAULT_QP1_QKEY;
>
> - return mad_rpc(srcport, &rpc, dest, rcvbuf, rcvbuf);
> + p_ret = mad_rpc(srcport, rpcold, dest, rcvbuf, rcvbuf);
> + errno = rpc.error;
> + return p_ret;
> }
>
> uint8_t *performance_reset_via(void *rcvbuf, ib_portid_t * dest,
> int port, unsigned mask, unsigned timeout,
> unsigned id, const struct ibmad_port * srcport)
> {
> - ib_rpc_t rpc = { 0 };
> + ib_rpc_v1_t rpc = { 0 };
> + ib_rpc_t *rpcold = (ib_rpc_t *)(void *)&rpc;
> +
> int lid = dest->lid;
> + void *p_ret;
>
> DEBUG("lid %u port %d mask 0x%x", lid, port, mask);
>
> @@ -95,7 +104,7 @@ uint8_t *performance_reset_via(void *rcvbuf, ib_portid_t * dest,
> if (!mask)
> mask = ~0;
>
> - rpc.mgtclass = IB_PERFORMANCE_CLASS;
> + rpc.mgtclass = IB_PERFORMANCE_CLASS | IB_MAD_RPC_VERSION1;
> rpc.method = IB_MAD_METHOD_SET;
> rpc.attr.id = id;
>
> @@ -115,5 +124,7 @@ uint8_t *performance_reset_via(void *rcvbuf, ib_portid_t * dest,
> if (!dest->qkey)
> dest->qkey = IB_DEFAULT_QP1_QKEY;
>
> - return mad_rpc(srcport, &rpc, dest, rcvbuf, rcvbuf);
> + p_ret = mad_rpc(srcport, rpcold, dest, rcvbuf, rcvbuf);
> + errno = rpc.error;
> + return p_ret;
> }
--
Ira Weiny
Math Programmer/Computer Scientist
Lawrence Livermore National Lab
925-423-8008
weiny2-i2BcT+NCU+M@public.gmane.org
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-28 21:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-27 11:14 [PATCHv2 2/3] libibmad/gs.c: In pma_query_via/performance_reset_via, set errno Hal Rosenstock
[not found] ` <4DB7FA9C.8000503-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2011-04-28 21:19 ` Ira Weiny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox