Re: [PATCH v2 1/2] IB/core, cma: Nice log-friendly string helpers

[Sagi Grimberg <sagig-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>]

On 5/11/2015 5:38 PM, Yann Droneaud wrote:
> Hi,
>
> Le lundi 11 mai 2015 à 17:10 +0300, Sagi Grimberg a écrit :
>> Some of us keep revisiting the code to decode enumerations that
>> appear in out logs. Let's borrow the nice logging helpers that
>> exists in xprtrdma and rds for CMA events, IB events and WC statuses.
>>
>> Signed-off-by: Sagi Grimberg <sagig-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
>> ---
>>   drivers/infiniband/core/cma.c   |   26 ++++++++++++++++
>>   drivers/infiniband/core/verbs.c |   61 +++++++++++++++++++++++++++++++++++++++
>>   include/rdma/ib_verbs.h         |    4 ++
>>   include/rdma/rdma_cm.h          |    2 +
>>   4 files changed, 93 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
>> index d570030..fb5a815 100644
>> --- a/drivers/infiniband/core/cma.c
>> +++ b/drivers/infiniband/core/cma.c
>> @@ -65,6 +65,32 @@ MODULE_LICENSE("Dual BSD/GPL");
>>   #define CMA_CM_MRA_SETTING (IB_CM_MRA_FLAG_DELAY | 24)
>>   #define CMA_IBOE_PACKET_LIFETIME 18
>>
>> +static const char *cma_events[] = {
>
> Go for .rodata:
>
> static const char * const cma_events[] = {
>
>> +	[RDMA_CM_EVENT_ADDR_RESOLVED]	= "ADDR_RESOLVED",
>> +	[RDMA_CM_EVENT_ADDR_ERROR]	= "ADDR_ERROR",
>> +	[RDMA_CM_EVENT_ROUTE_RESOLVED]	= "ROUTE_RESOLVED",
>> +	[RDMA_CM_EVENT_ROUTE_ERROR]	= "ROUTE_ERROR",
>> +	[RDMA_CM_EVENT_CONNECT_REQUEST]	= "CONNECT_REQUEST",
>> +	[RDMA_CM_EVENT_CONNECT_RESPONSE]= "CONNECT_RESPONSE",
>> +	[RDMA_CM_EVENT_CONNECT_ERROR]	= "CONNECT_ERROR",
>> +	[RDMA_CM_EVENT_UNREACHABLE]	= "UNREACHABLE",
>> +	[RDMA_CM_EVENT_REJECTED]	= "REJECTED",
>> +	[RDMA_CM_EVENT_ESTABLISHED]	= "ESTABLISHED",
>> +	[RDMA_CM_EVENT_DISCONNECTED]	= "DISCONNECTED",
>> +	[RDMA_CM_EVENT_DEVICE_REMOVAL]	= "DEVICE_REMOVAL",
>> +	[RDMA_CM_EVENT_MULTICAST_JOIN]	= "MULTICAST_JOIN",
>> +	[RDMA_CM_EVENT_MULTICAST_ERROR]	= "MULTICAST_ERROR",
>> +	[RDMA_CM_EVENT_ADDR_CHANGE]	= "ADDR_CHANGE",
>> +	[RDMA_CM_EVENT_TIMEWAIT_EXIT]	= "TIMEWAIT_EXIT",
>> +};
>> +
>> +__attribute_const__ const char *rdma_event_msg(enum rdma_cm_event_type event)
>
> __attribute_const__ is useless here.

Yeh.. either that or const, I'll remove it...

>
>> +{
>> +	return (unsigned)event < ARRAY_SIZE(cma_events) ?
>> +			cma_events[(unsigned)event] : "UNRECOGNIZED_EVENT";
>
> You could be a bit more paranoid here:
>
>            size_t index = event;
>
>            return (index < ARRAY_SIZE(cmd_events) && cma_events[index]) ?
> 			cma_events[index] : "UNRECOGNIZED_EVENT";
>

I'm fine with that too...
--
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