RDMA/srpt: Avoid print error when modify_port is not supported
Subsystems (2)
PATCH 1/1 RDMA/srpt: Avoid print error when modify_port is not supported
Avoid printing the following error when modify_port isn't supported.
[47541.541145] ib_srpt disabling MAD processing failed.
--- drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/srpt/ib_srpt.c +3 -1
@@ -628,12 +628,14 @@ static void srpt_unregister_mad_agent(struct srpt_device *sdev) .clr_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP, };struct srpt_port *sport; +int ret;int i;for (i =1 ; i <= sdev->device->phys_port_cnt; i++) { sport = &sdev->port[i -1 ];WARN_ON (sport->port != i); -if (ib_modify_port (sdev->device, i,0 , &port_modify) <0 ) + ret =ib_modify_port (sdev->device, i,0 , &port_modify); +if (ret <0 && ret != -EOPNOTSUPP )pr_err ("disabling MAD processing failed.\n" );if (sport->mad_agent) {ib_unregister_mad_agent (sport->mad_agent);
Signature · 1 line
2.21.1
Quoted 18 lines · Kamal Heib
Avoid printing the following error when
modify_portisn't supported.[47541.541145] ib_srpt disabling MAD processing failed.Fixes a42d985bd5b2 ("ib_srpt: Initial SRP Target merge for v3.3-rc1")Signed-off-by Kamal Heib <[email protected]>--- drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/infiniband/ulp/srpt/ib_srpt.c +0
-0@@ -628,12 +628,14 @@ static void srpt_unregister_mad_agent(struct srpt_device *sdev) .clr_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP, };struct srpt_port *sport;
drivers/infiniband/ulp/srpt/ib_srpt.c static void srpt_unregister_mad_agent(struct srpt_device *sdev) · line 639
Quoted 10 lines
drivers/infiniband/ulp/srpt/ib_srpt.c +3
-1+int ret;int i;for (i =1 ; i <= sdev->device->phys_port_cnt; i++) { sport = &sdev->port[i -1 ];WARN_ON (sport->port != i); -if (ib_modify_port (sdev->device, i,0 , &port_modify) <0 ) + ret =ib_modify_port (sdev->device, i,0 , &port_modify); +if (ret <0 && ret != -EOPNOTSUPP )pr_err ("disabling MAD processing failed.\n" );
This print doesn't make any sense, we are unregistering MAD agent anyway.
Quoted 5 lines
drivers/infiniband/ulp/srpt/ib_srpt.c +0
-1if (sport->mad_agent) {ib_unregister_mad_agent (sport->mad_agent); --2.21.1
Quoted 18 lines · Kamal Heib
Avoid printing the following error when
modify_portisn't supported.[47541.541145] ib_srpt disabling MAD processing failed.Fixes a42d985bd5b2 ("ib_srpt: Initial SRP Target merge for v3.3-rc1")Signed-off-by Kamal Heib <[email protected]>drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/infiniband/ulp/srpt/ib_srpt.c +2
-0+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c@@ -628,12 +628,14 @@ static void srpt_unregister_mad_agent(struct srpt_device *sdev) .clr_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP, };struct srpt_port *sport; +int ret;int i;
drivers/infiniband/ulp/srpt/ib_srpt.c static void srpt_unregister_mad_agent(struct srpt_device *sdev) · line 641
Quoted 10 lines
drivers/infiniband/ulp/srpt/ib_srpt.c +2
-1for (i =1 ; i <= sdev->device->phys_port_cnt; i++) { sport = &sdev->port[i -1 ];WARN_ON (sport->port != i); -if (ib_modify_port (sdev->device, i,0 , &port_modify) <0 ) + ret =ib_modify_port (sdev->device, i,0 , &port_modify); +if (ret <0 && ret != -EOPNOTSUPP )pr_err ("disabling MAD processing failed.\n" );if (sport->mad_agent) {ib_unregister_mad_agent (sport->mad_agent);
This logic is goofy if the original ib_modify_port fails then sport->mad_agent should be NULL so it should just skip it anyhow.
If it is fixed up then we won't get the EOPNOTSUPP anymore.
I'm also unclear what this IB_PORT_DEVICE_MGMT_SUP is all about, it is weird that a ULP is touching a device global flag like this
Jason