From: Sergei Shtylyov <sergei.shtylyov@cogentembedded•com>
To: Douglas Miller <dougmill@linux•vnet.ibm.com>, netdev@vger•kernel.org
Cc: sathya.perla@broadcom•com, ajit.khaparde@broadcom•com,
padmanabh.ratnakar@broadcom•com,
sriharsha.basavapatna@broadcom•com, somnath.kotur@broadcom•com
Subject: Re: [PATCH 1/1] be2net: Don't leak iomapped memory on removal.
Date: Fri, 4 Mar 2016 16:18:18 +0300 [thread overview]
Message-ID: <56D98B1A.1070804@cogentembedded.com> (raw)
In-Reply-To: <1457044549-10563-2-git-send-email-dougmill@linux.vnet.ibm.com>
Hello.
On 3/4/2016 1:35 AM, Douglas Miller wrote:
> The adapter->pcicfg resource is either mapped via pci_iomap() or
> derived from adapter->db. During be_remove() this resource was ignored
> and so could remain mapped after remove.
>
> Add a flag to track whether adapter->pcicfg was mapped or not, then
> use that flag in be_unmap_pci_bars() to unmap if required.
>
> Signed-off-by: Douglas Miller <dougmill@linux•vnet.ibm.com>
> ---
> drivers/net/ethernet/emulex/benet/be.h | 1 +
> drivers/net/ethernet/emulex/benet/be_main.c | 4 ++++
> 2 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
> index cf83783..f975129 100644
> --- a/drivers/net/ethernet/emulex/benet/be.h
> +++ b/drivers/net/ethernet/emulex/benet/be.h
> @@ -531,6 +531,7 @@ struct be_adapter {
>
> struct delayed_work be_err_detection_work;
> u8 err_flags;
> + bool pcicfg_mapped; /* pcicfg obtained via pci_iomap() */
> u32 flags;
> u32 cmd_privileges;
> /* Ethtool knobs and info */
> diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
> index f99de36..a79b8a5 100644
> --- a/drivers/net/ethernet/emulex/benet/be_main.c
> +++ b/drivers/net/ethernet/emulex/benet/be_main.c
[...]
> @@ -5019,8 +5021,10 @@ static int be_map_pci_bars(struct be_adapter *adapter)
> if (!addr)
> goto pci_map_err;
> adapter->pcicfg = addr;
> + adapter->pcicfg_mapped = 1;
s/1/true/.
> } else {
> adapter->pcicfg = adapter->db + SRIOV_VF_PCICFG_OFFSET;
> + adapter->pcicfg_mapped = 0;
s/0/false/.
[...]
MBR, Sergei
prev parent reply other threads:[~2016-03-04 13:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-03 22:35 [PATCH 0/1] be2net: Don't leak iomapped memory on removal Douglas Miller
2016-03-03 22:35 ` [PATCH 1/1] " Douglas Miller
2016-03-04 5:00 ` Sathya Perla
2016-03-04 13:18 ` Sergei Shtylyov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56D98B1A.1070804@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded$(echo .)com \
--cc=ajit.khaparde@broadcom$(echo .)com \
--cc=dougmill@linux$(echo .)vnet.ibm.com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=padmanabh.ratnakar@broadcom$(echo .)com \
--cc=sathya.perla@broadcom$(echo .)com \
--cc=somnath.kotur@broadcom$(echo .)com \
--cc=sriharsha.basavapatna@broadcom$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox