[PATCH v3 0/2] align to generic ib_event logging helper

[PATCH v3 0/2] align to generic ib_event logging helper

[Max Gurtovoy]

Changes since V2:
  - keep log prints inside the default case for nvmet-rdma

Max Gurtovoy (2):
  nvmet-rdma: align to generic ib_event logging helper
  nvme-rdma: align to generic ib_event logging helper

 drivers/nvme/host/rdma.c   |    4 +++-
 drivers/nvme/target/rdma.c |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

[PATCH v3 1/2] nvmet-rdma: align to generic ib_event logging helper

[Max Gurtovoy]

Signed-off-by: Max Gurtovoy <maxg at mellanox.com>
---
 drivers/nvme/target/rdma.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index 005ef5d..ddbae24 100644
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -1129,7 +1129,8 @@ static void nvmet_rdma_qp_event(struct ib_event *event, void *priv)
 		rdma_notify(queue->cm_id, event->event);
 		break;
 	default:
-		pr_err("received unrecognized IB QP event %d\n", event->event);
+		pr_err("received IB QP event: %s (%d)\n",
+		       ib_event_msg(event->event), event->event);
 		break;
 	}
 }
-- 
1.7.1

[PATCH v3 2/2] nvme-rdma: align to generic ib_event logging helper

[Max Gurtovoy]

Signed-off-by: Max Gurtovoy <maxg at mellanox.com>
---
 drivers/nvme/host/rdma.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 3d25add..9c34da5 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -241,7 +241,9 @@ static void nvme_rdma_free_ring(struct ib_device *ibdev,
 
 static void nvme_rdma_qp_event(struct ib_event *event, void *context)
 {
-	pr_debug("QP event %d\n", event->event);
+	pr_debug("QP event %s (%d)\n",
+		 ib_event_msg(event->event), event->event);
+
 }
 
 static int nvme_rdma_wait_for_cm(struct nvme_rdma_queue *queue)
-- 
1.7.1

[PATCH v3 2/2] nvme-rdma: align to generic ib_event logging helper

[J Freyensee]

On Wed, 2016-11-23@11:38 +0200, Max Gurtovoy wrote:
> Signed-off-by: Max Gurtovoy <maxg at mellanox.com>
>?

Reviewed-by: Jay Freyensee <james_p_freyensee at linux.intel.com>

[PATCH v3 1/2] nvmet-rdma: align to generic ib_event logging helper

[J Freyensee]

On Wed, 2016-11-23@11:38 +0200, Max Gurtovoy wrote:
> Signed-off-by: Max Gurtovoy <maxg at mellanox.com>
> ---
> ?drivers/nvme/target/rdma.c |????3 ++-
> ?1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
> index 005ef5d..ddbae24 100644
> --- a/drivers/nvme/target/rdma.c
> +++ b/drivers/nvme/target/rdma.c
> @@ -1129,7 +1129,8 @@ static void nvmet_rdma_qp_event(struct ib_event
> *event, void *priv)
> ?		rdma_notify(queue->cm_id, event->event);
> ?		break;
> ?	default:
> -		pr_err("received unrecognized IB QP event %d\n",
> event->event);
> +		pr_err("received IB QP event: %s (%d)\n",
> +		???????ib_event_msg(event->event), event->event);

I liked the original print statement mentioning something that it hit
the default case ("received unrecognized IB QP event"). ?But if no one
else has a problem with it, then I'm ok with it.

[PATCH v3 1/2] nvmet-rdma: align to generic ib_event logging helper

[Max Gurtovoy]

On 11/23/2016 8:25 PM, J Freyensee wrote:
> On Wed, 2016-11-23@11:38 +0200, Max Gurtovoy wrote:
>> Signed-off-by: Max Gurtovoy <maxg at mellanox.com>
>> ---
>>  drivers/nvme/target/rdma.c |    3 ++-
>>  1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
>> index 005ef5d..ddbae24 100644
>> --- a/drivers/nvme/target/rdma.c
>> +++ b/drivers/nvme/target/rdma.c
>> @@ -1129,7 +1129,8 @@ static void nvmet_rdma_qp_event(struct ib_event
>> *event, void *priv)
>>  		rdma_notify(queue->cm_id, event->event);
>>  		break;
>>  	default:
>> -		pr_err("received unrecognized IB QP event %d\n",
>> event->event);
>> +		pr_err("received IB QP event: %s (%d)\n",
>> +		       ib_event_msg(event->event), event->event);
>
> I liked the original print statement mentioning something that it hit
> the default case ("received unrecognized IB QP event").  But if no one
> else has a problem with it, then I'm ok with it.

in that case you'll get something like:

"nvmet_rdma: received unrecognized IB QP event: last WQE reached (16)"

instead of

"nvmet_rdma: received IB QP event: last WQE reached (16)"

Sagi/Christoph, what do you think ?

[PATCH v3 1/2] nvmet-rdma: align to generic ib_event logging helper

[Christoph Hellwig]

On Thu, Nov 24, 2016@01:19:11PM +0200, Max Gurtovoy wrote:
> in that case you'll get something like:
> 
> "nvmet_rdma: received unrecognized IB QP event: last WQE reached (16)"
> 
> instead of
> 
> "nvmet_rdma: received IB QP event: last WQE reached (16)"
> 
> Sagi/Christoph, what do you think ?

I don't care, it's only a debug printk anyway.

[PATCH v3 1/2] nvmet-rdma: align to generic ib_event logging helper

[Max Gurtovoy]

On 11/25/2016 9:48 AM, Christoph Hellwig wrote:
> On Thu, Nov 24, 2016@01:19:11PM +0200, Max Gurtovoy wrote:
>> in that case you'll get something like:
>>
>> "nvmet_rdma: received unrecognized IB QP event: last WQE reached (16)"
>>
>> instead of
>>
>> "nvmet_rdma: received IB QP event: last WQE reached (16)"
>>
>> Sagi/Christoph, what do you think ?
>
> I don't care, it's only a debug printk anyway.
>

me too :) I just want to put this 2 patches behind us.

[PATCH v3 0/2] align to generic ib_event logging helper

[Christoph Hellwig]

Thanks Max,

I've applied the series to the nvmf-4.10 branch.