* [PATCH 0/2] Fix OPA_VNIC issues with debug kernel
@ 2017-06-14 19:33 Vishwanathapura, Niranjana
0 siblings, 0 replies; 6+ messages in thread
From: Vishwanathapura, Niranjana @ 2017-06-14 19:33 UTC (permalink / raw)
To: dledford-H+wXaHxf7aLQT0dZR+AlfA; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA
Hi Doug,
Here are couple OPA_VNIC bug fixes.
As OPA_VNIC is alredy included for 4.12, it would be great
to get them into the RC release.
Thanks,
Niranjana
Vishwanathapura, Niranjana (2):
IB/opa_vnic: Use GFP_ATOMIC while sending trap
IB/opa_vnic: Use spinlock instead of mutex for stats_lock
drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 4 ++--
drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h | 2 +-
drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 8 +++-----
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +-
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 8 ++++----
5 files changed, 11 insertions(+), 13 deletions(-)
--
1.8.3.1
--
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] 6+ messages in thread
* [PATCH 0/2] Fix OPA_VNIC issues with debug kernel
@ 2017-06-14 19:34 Vishwanathapura, Niranjana
0 siblings, 0 replies; 6+ messages in thread
From: Vishwanathapura, Niranjana @ 2017-06-14 19:34 UTC (permalink / raw)
To: dledford-H+wXaHxf7aLQT0dZR+AlfA
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
dennis.dalessandro-ral2JQCrhuEAvxtiuMwx3w,
mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w
Hi Doug,
Here are couple OPA_VNIC bug fixes.
As OPA_VNIC is alredy included for 4.12, it would be great
to get them into the RC release.
Thanks,
Niranjana
Vishwanathapura, Niranjana (2):
IB/opa_vnic: Use GFP_ATOMIC while sending trap
IB/opa_vnic: Use spinlock instead of mutex for stats_lock
drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 4 ++--
drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h | 2 +-
drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 8 +++-----
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +-
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 8 ++++----
5 files changed, 11 insertions(+), 13 deletions(-)
--
1.8.3.1
--
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] 6+ messages in thread
* [PATCH 0/2] Fix OPA_VNIC issues with debug kernel
@ 2017-06-14 19:34 Vishwanathapura, Niranjana
[not found] ` <1497468882-19161-1-git-send-email-niranjana.vishwanathapura-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Vishwanathapura, Niranjana @ 2017-06-14 19:34 UTC (permalink / raw)
To: dledford-H+wXaHxf7aLQT0dZR+AlfA
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA,
dennis.dalessandro-ral2JQCrhuEAvxtiuMwx3w,
mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w
Hi Doug,
Here are couple OPA_VNIC bug fixes.
As OPA_VNIC is alredy included for 4.12, it would be great
to get them into the RC release.
Thanks,
Niranjana
Vishwanathapura, Niranjana (2):
IB/opa_vnic: Use GFP_ATOMIC while sending trap
IB/opa_vnic: Use spinlock instead of mutex for stats_lock
drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 4 ++--
drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h | 2 +-
drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 8 +++-----
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +-
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 8 ++++----
5 files changed, 11 insertions(+), 13 deletions(-)
--
1.8.3.1
--
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] 6+ messages in thread
* [PATCH 1/2] IB/opa_vnic: Use GFP_ATOMIC while sending trap
[not found] ` <1497468882-19161-1-git-send-email-niranjana.vishwanathapura-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
@ 2017-06-14 19:34 ` Vishwanathapura, Niranjana
2017-06-14 19:34 ` [PATCH 2/2] IB/opa_vnic: Use spinlock instead of mutex for stats_lock Vishwanathapura, Niranjana
2017-06-29 18:02 ` [PATCH 0/2] Fix OPA_VNIC issues with debug kernel Doug Ledford
2 siblings, 0 replies; 6+ messages in thread
From: Vishwanathapura, Niranjana @ 2017-06-14 19:34 UTC (permalink / raw)
To: dledford-H+wXaHxf7aLQT0dZR+AlfA
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA,
dennis.dalessandro-ral2JQCrhuEAvxtiuMwx3w,
mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w,
Niranjana Vishwanathapura
Pass GFP_ATOMIC flag to ib_create_send_mad() while sending trap as it
can be triggered from the atomic context.
Fix the following trace with debug kernel.
BUG: sleeping function called from invalid context at mm/slab.h:432
in_atomic(): 1, irqs_disabled(): 0, pid: 1771, name: NetworkManager
Call Trace:
dump_stack+0x63/0x90
___might_sleep+0xda/0x130
__might_sleep+0x4a/0x90
__kmalloc+0x19e/0x220
? ib_create_send_mad+0xea/0x390 [ib_core]
ib_create_send_mad+0xea/0x390 [ib_core]
opa_vnic_vema_send_trap+0x17b/0x460 [opa_vnic]
opa_vnic_vema_report_event+0x57/0x80 [opa_vnic]
opa_vnic_mac_send_event+0xaa/0xf0 [opa_vnic]
opa_vnic_set_rx_mode+0x17/0x30 [opa_vnic]
__dev_set_rx_mode+0x52/0x90
dev_set_rx_mode+0x26/0x40
__dev_open+0xe8/0x140
Reviewed-by: Mike Marciniszyn <mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
index 875694f..cf768dd 100644
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
@@ -794,7 +794,7 @@ void opa_vnic_vema_send_trap(struct opa_vnic_adapter *adapter,
send_buf = ib_create_send_mad(port->mad_agent, 1, pkey_idx, 0,
IB_MGMT_VENDOR_HDR, IB_MGMT_MAD_DATA,
- GFP_KERNEL, OPA_MGMT_BASE_VERSION);
+ GFP_ATOMIC, OPA_MGMT_BASE_VERSION);
if (IS_ERR(send_buf)) {
c_err("%s:Couldn't allocate send buf\n", __func__);
goto err_sndbuf;
--
1.8.3.1
--
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] 6+ messages in thread
* [PATCH 2/2] IB/opa_vnic: Use spinlock instead of mutex for stats_lock
[not found] ` <1497468882-19161-1-git-send-email-niranjana.vishwanathapura-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-06-14 19:34 ` [PATCH 1/2] IB/opa_vnic: Use GFP_ATOMIC while sending trap Vishwanathapura, Niranjana
@ 2017-06-14 19:34 ` Vishwanathapura, Niranjana
2017-06-29 18:02 ` [PATCH 0/2] Fix OPA_VNIC issues with debug kernel Doug Ledford
2 siblings, 0 replies; 6+ messages in thread
From: Vishwanathapura, Niranjana @ 2017-06-14 19:34 UTC (permalink / raw)
To: dledford-H+wXaHxf7aLQT0dZR+AlfA
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA,
dennis.dalessandro-ral2JQCrhuEAvxtiuMwx3w,
mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w,
Niranjana Vishwanathapura
Stats can be read from atomic context, hence make stats_lock as
a spinlock.
Fix the following trace with debug kernel.
BUG: sleeping function called from invalid context at
kernel/locking/mutex.c:238
in_atomic(): 1, irqs_disabled(): 0, pid: 6487, name: sadc
Call Trace:
dump_stack+0x63/0x90
___might_sleep+0xda/0x130
__might_sleep+0x4a/0x90
mutex_lock+0x20/0x50
opa_vnic_get_stats64+0x56/0x140 [opa_vnic]
dev_get_stats+0x74/0x130
dev_seq_printf_stats+0x37/0x120
dev_seq_show+0x14/0x30
seq_read+0x26d/0x3d0
Reviewed-by: Mike Marciniszyn <mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 4 ++--
drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h | 2 +-
drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 8 +++-----
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 8 ++++----
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
index d66540e..62390e9 100644
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
@@ -146,15 +146,15 @@ static void vnic_get_ethtool_stats(struct net_device *netdev,
int i;
memset(&vstats, 0, sizeof(vstats));
- mutex_lock(&adapter->stats_lock);
+ spin_lock(&adapter->stats_lock);
adapter->rn_ops->ndo_get_stats64(netdev, &vstats.netstats);
+ spin_unlock(&adapter->stats_lock);
for (i = 0; i < VNIC_STATS_LEN; i++) {
char *p = (char *)&vstats + vnic_gstrings_stats[i].stat_offset;
data[i] = (vnic_gstrings_stats[i].sizeof_stat ==
sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
}
- mutex_unlock(&adapter->stats_lock);
}
/* vnic_get_strings - get strings */
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h b/drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h
index 6bba886..ca29e6d 100644
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h
@@ -214,7 +214,7 @@ struct opa_vnic_adapter {
struct mutex mactbl_lock;
/* Lock used to protect access to vnic counters */
- struct mutex stats_lock;
+ spinlock_t stats_lock;
u8 flow_tbl[OPA_VNIC_FLOW_TBL_SIZE];
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
index 905f39d..78d9007 100644
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
@@ -69,9 +69,9 @@ static void opa_vnic_get_stats64(struct net_device *netdev,
struct opa_vnic_stats vstats;
memset(&vstats, 0, sizeof(vstats));
- mutex_lock(&adapter->stats_lock);
+ spin_lock(&adapter->stats_lock);
adapter->rn_ops->ndo_get_stats64(netdev, &vstats.netstats);
- mutex_unlock(&adapter->stats_lock);
+ spin_unlock(&adapter->stats_lock);
memcpy(stats, &vstats.netstats, sizeof(*stats));
}
@@ -344,7 +344,7 @@ struct opa_vnic_adapter *opa_vnic_add_netdev(struct ib_device *ibdev,
netdev->hard_header_len += OPA_VNIC_SKB_HEADROOM;
mutex_init(&adapter->lock);
mutex_init(&adapter->mactbl_lock);
- mutex_init(&adapter->stats_lock);
+ spin_lock_init(&adapter->stats_lock);
SET_NETDEV_DEV(netdev, ibdev->dev.parent);
@@ -364,7 +364,6 @@ struct opa_vnic_adapter *opa_vnic_add_netdev(struct ib_device *ibdev,
netdev_err:
mutex_destroy(&adapter->lock);
mutex_destroy(&adapter->mactbl_lock);
- mutex_destroy(&adapter->stats_lock);
kfree(adapter);
adapter_err:
ibdev->free_rdma_netdev(netdev);
@@ -383,7 +382,6 @@ void opa_vnic_rem_netdev(struct opa_vnic_adapter *adapter)
opa_vnic_release_mac_tbl(adapter);
mutex_destroy(&adapter->lock);
mutex_destroy(&adapter->mactbl_lock);
- mutex_destroy(&adapter->stats_lock);
kfree(adapter);
ibdev->free_rdma_netdev(netdev);
}
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c
index a51bf97..c273396 100644
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c
@@ -89,9 +89,9 @@ void opa_vnic_get_summary_counters(struct opa_vnic_adapter *adapter,
u64 *src;
memset(&vstats, 0, sizeof(vstats));
- mutex_lock(&adapter->stats_lock);
+ spin_lock(&adapter->stats_lock);
adapter->rn_ops->ndo_get_stats64(adapter->netdev, &vstats.netstats);
- mutex_unlock(&adapter->stats_lock);
+ spin_unlock(&adapter->stats_lock);
cntrs->vp_instance = cpu_to_be16(adapter->vport_num);
cntrs->vesw_id = cpu_to_be16(adapter->info.vesw.vesw_id);
@@ -128,9 +128,9 @@ void opa_vnic_get_error_counters(struct opa_vnic_adapter *adapter,
struct opa_vnic_stats vstats;
memset(&vstats, 0, sizeof(vstats));
- mutex_lock(&adapter->stats_lock);
+ spin_lock(&adapter->stats_lock);
adapter->rn_ops->ndo_get_stats64(adapter->netdev, &vstats.netstats);
- mutex_unlock(&adapter->stats_lock);
+ spin_unlock(&adapter->stats_lock);
cntrs->vp_instance = cpu_to_be16(adapter->vport_num);
cntrs->vesw_id = cpu_to_be16(adapter->info.vesw.vesw_id);
--
1.8.3.1
--
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] 6+ messages in thread
* Re: [PATCH 0/2] Fix OPA_VNIC issues with debug kernel
[not found] ` <1497468882-19161-1-git-send-email-niranjana.vishwanathapura-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-06-14 19:34 ` [PATCH 1/2] IB/opa_vnic: Use GFP_ATOMIC while sending trap Vishwanathapura, Niranjana
2017-06-14 19:34 ` [PATCH 2/2] IB/opa_vnic: Use spinlock instead of mutex for stats_lock Vishwanathapura, Niranjana
@ 2017-06-29 18:02 ` Doug Ledford
2 siblings, 0 replies; 6+ messages in thread
From: Doug Ledford @ 2017-06-29 18:02 UTC (permalink / raw)
To: Vishwanathapura, Niranjana
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA,
dennis.dalessandro-ral2JQCrhuEAvxtiuMwx3w,
mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w
On Wed, 2017-06-14 at 12:34 -0700, Vishwanathapura, Niranjana wrote:
> Hi Doug,
> Here are couple OPA_VNIC bug fixes.
> As OPA_VNIC is alredy included for 4.12, it would be great
> to get them into the RC release.
>
> Thanks,
> Niranjana
>
> Vishwanathapura, Niranjana (2):
> IB/opa_vnic: Use GFP_ATOMIC while sending trap
> IB/opa_vnic: Use spinlock instead of mutex for stats_lock
>
> drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 4 ++--
> drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h | 2 +-
> drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 8 +++-----
> drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +-
> drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 8 ++++----
> 5 files changed, 11 insertions(+), 13 deletions(-)
I've pulled these in for what I expect to be my final -rc submission.
Thanks.
--
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
--
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] 6+ messages in thread
end of thread, other threads:[~2017-06-29 18:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-14 19:34 [PATCH 0/2] Fix OPA_VNIC issues with debug kernel Vishwanathapura, Niranjana
[not found] ` <1497468882-19161-1-git-send-email-niranjana.vishwanathapura-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-06-14 19:34 ` [PATCH 1/2] IB/opa_vnic: Use GFP_ATOMIC while sending trap Vishwanathapura, Niranjana
2017-06-14 19:34 ` [PATCH 2/2] IB/opa_vnic: Use spinlock instead of mutex for stats_lock Vishwanathapura, Niranjana
2017-06-29 18:02 ` [PATCH 0/2] Fix OPA_VNIC issues with debug kernel Doug Ledford
-- strict thread matches above, loose matches on Subject: below --
2017-06-14 19:34 Vishwanathapura, Niranjana
2017-06-14 19:33 Vishwanathapura, Niranjana
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.