| Message ID | 20201026132737.1338171-1-leon@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [rdma-next] IB/srpt: Fix memory leak in srpt_add_one | expand |
On 10/26/20 6:27 AM, Leon Romanovsky wrote: > From: Maor Gottlieb <maorg@nvidia.com> > > In case srpt_refresh_port failed for the second port, then > we don't unregister the MAD agnet. ^^^^^ agent? The commit message is incomplete. Why does this patch have a Fixes tag? The commit message should explain this but doesn't explain this. What does this patch actually change? ib_unregister_mad_agent() is only called by the current code if sport->mad_agent != NULL. > -static void srpt_unregister_mad_agent(struct srpt_device *sdev) > +static void __srpt_unregister_mad_agent(struct srpt_device *sdev, int port_cnt) > { > struct ib_port_modify port_modify = { > .clr_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP, > @@ -633,7 +627,10 @@ static void srpt_unregister_mad_agent(struct srpt_device *sdev) > struct srpt_port *sport; > int i; > > - for (i = 1; i <= sdev->device->phys_port_cnt; i++) { > + if (!port_cnt) > + return; > + > + for (i = 1; i <= port_cnt; i++) { > sport = &sdev->port[i - 1]; > WARN_ON(sport->port != i); > if (sport->mad_agent) { If this patch is retained, please leave the if-test out if you agree that it is not necessary. I'm concerned that it will confuse readers. Thanks, Bart.
On Mon, Oct 26, 2020 at 07:22:07PM -0700, Bart Van Assche wrote: > On 10/26/20 6:27 AM, Leon Romanovsky wrote: > > From: Maor Gottlieb <maorg@nvidia.com> > > > > In case srpt_refresh_port failed for the second port, then > > we don't unregister the MAD agnet. > ^^^^^ > agent? > > The commit message is incomplete. Why does this patch have a Fixes tag? > The commit message should explain this but doesn't explain this. > > What does this patch actually change? ib_unregister_mad_agent() is only > called by the current code if sport->mad_agent != NULL. Failure in srpt_refresh_port() for the second port will leave MAD registered for the first one, however the srpt_add_one() will be marked as "failed" and SRPT will leak resources for that registered but not used and released first port. This is what is written in the commit message. > > > -static void srpt_unregister_mad_agent(struct srpt_device *sdev) > > +static void __srpt_unregister_mad_agent(struct srpt_device *sdev, int port_cnt) > > { > > struct ib_port_modify port_modify = { > > .clr_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP, > > @@ -633,7 +627,10 @@ static void srpt_unregister_mad_agent(struct srpt_device *sdev) > > struct srpt_port *sport; > > int i; > > > > - for (i = 1; i <= sdev->device->phys_port_cnt; i++) { > > + if (!port_cnt) > > + return; > > + > > + for (i = 1; i <= port_cnt; i++) { > > sport = &sdev->port[i - 1]; > > WARN_ON(sport->port != i); > > if (sport->mad_agent) { > > If this patch is retained, please leave the if-test out if you agree > that it is not necessary. I'm concerned that it will confuse readers. No problem. > > Thanks, > > Bart.
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index 0065eb17ae36..cfe38996ea91 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -619,13 +619,7 @@ static int srpt_refresh_port(struct srpt_port *sport) return 0; } -/** - * srpt_unregister_mad_agent - unregister MAD callback functions - * @sdev: SRPT HCA pointer. - * - * Note: It is safe to call this function more than once for the same device. - */ -static void srpt_unregister_mad_agent(struct srpt_device *sdev) +static void __srpt_unregister_mad_agent(struct srpt_device *sdev, int port_cnt) { struct ib_port_modify port_modify = { .clr_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP, @@ -633,7 +627,10 @@ static void srpt_unregister_mad_agent(struct srpt_device *sdev) struct srpt_port *sport; int i; - for (i = 1; i <= sdev->device->phys_port_cnt; i++) { + if (!port_cnt) + return; + + for (i = 1; i <= port_cnt; i++) { sport = &sdev->port[i - 1]; WARN_ON(sport->port != i); if (sport->mad_agent) { @@ -644,6 +641,17 @@ static void srpt_unregister_mad_agent(struct srpt_device *sdev) } } +/** + * srpt_unregister_mad_agent - unregister MAD callback functions + * @sdev: SRPT HCA pointer. + * + * Note: It is safe to call this function more than once for the same device. + */ +static void srpt_unregister_mad_agent(struct srpt_device *sdev) +{ + __srpt_unregister_mad_agent(sdev, sdev->device->phys_port_cnt); +} + /** * srpt_alloc_ioctx - allocate a SRPT I/O context structure * @sdev: SRPT HCA pointer. @@ -3185,7 +3193,8 @@ static int srpt_add_one(struct ib_device *device) if (ret) { pr_err("MAD registration failed for %s-%d.\n", dev_name(&sdev->device->dev), i); - goto err_event; + i--; + goto err_port; } } @@ -3197,7 +3206,8 @@ static int srpt_add_one(struct ib_device *device) pr_debug("added %s.\n", dev_name(&device->dev)); return 0; -err_event: +err_port: + __srpt_unregister_mad_agent(sdev, i); ib_unregister_event_handler(&sdev->event_handler); err_cm: if (sdev->cm_id)