DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ranjit Menon <ranjit.menon@intel.com>
To: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>, dev@dpdk.org
Cc: Anatoly Burakov <anatoly.burakov@intel.com>,
	Jie Zhou <jizh@microsoft.com>,
	David Marchand <david.marchand@redhat.com>
Subject: Re: [dpdk-dev] [PATCH v2] mem: fix cleanup when multi-process is disabled
Date: Thu, 25 Mar 2021 08:39:49 -0700
Message-ID: <9c5e4d85-47f6-189d-d64e-7222245329c3@intel.com> (raw)
In-Reply-To: <20210324193227.15497-1-dmitry.kozliuk@gmail.com>

On 3/24/2021 12:32 PM, Dmitry Kozlyuk wrote:
> rte_eal_memory_detach() did not account for cases where multi-process
> mode is disabled: --in-memory and --no-shconf. This resulted
> in unmapping memory that had not been mapped, which caused errors:
>
>      EAL: Could not unmap memory: No error   (Windows)
>      EAL: Cannot munmap(0x1d47f40, 0x7000): Invalid argument  (Linux)
>
> Confusing "No error" was caused by using errno instead of rte_errno
> set by rte_mem_unmap().
>
> Skip detaching memory altogether when --in-memory is specified.
> Skip unmapping configuration when it's not shared.
> Fix and add error handling to produce proper log messages.
>
> Fixes: dfbc61a2f9a6 ("mem: detach memsegs on cleanup")
> Cc: Anatoly Burakov <anatoly.burakov@intel.com>
>
> Reported-by: Jie Zhou <jizh@microsoft.com>
> Suggested-by: David Marchand <david.marchand@redhat.com>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> ---
>   lib/librte_eal/common/eal_common_memory.c | 12 ++++++++++--
>   1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
> index 0e99986d3d..9495170c86 100644
> --- a/lib/librte_eal/common/eal_common_memory.c
> +++ b/lib/librte_eal/common/eal_common_memory.c
> @@ -1006,10 +1006,15 @@ rte_extmem_detach(void *va_addr, size_t len)
>   int
>   rte_eal_memory_detach(void)
>   {
> +	const struct internal_config *internal_conf =
> +		eal_get_internal_configuration();
>   	struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
>   	size_t page_sz = rte_mem_page_size();
>   	unsigned int i;
>   
> +	if (internal_conf->in_memory == 1)
> +		return 0;
> +
>   	rte_rwlock_write_lock(&mcfg->memory_hotplug_lock);
>   
>   	/* detach internal memory subsystem data first */
> @@ -1032,7 +1037,7 @@ rte_eal_memory_detach(void)
>   		if (!msl->external)
>   			if (rte_mem_unmap(msl->base_va, msl->len) != 0)
>   				RTE_LOG(ERR, EAL, "Could not unmap memory: %s\n",
> -						strerror(errno));
> +						rte_strerror(rte_errno));
>   
>   		/*
>   		 * we are detaching the fbarray rather than destroying because
> @@ -1050,7 +1055,10 @@ rte_eal_memory_detach(void)
>   	 * config - we can't zero it out because it might still be referenced
>   	 * by other processes.
>   	 */
> -	rte_mem_unmap(mcfg, RTE_ALIGN(sizeof(*mcfg), page_sz));
> +	if (internal_conf->no_shconf == 0)
> +		if (rte_mem_unmap(mcfg, RTE_ALIGN(sizeof(*mcfg), page_sz)) != 0)
> +			RTE_LOG(ERR, EAL, "Could not unmap shared memory config: %s\n",
> +					rte_strerror(rte_errno));
>   	rte_eal_get_configuration()->mem_config = NULL;
>   
>   	return 0;
Acked-by: Ranjit Menon <ranjit.menon@intel.com>

  reply	other threads:[~2021-03-25 15:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-24 18:01 [dpdk-dev] [PATCH] mem: fix cleanup on Windows Dmitry Kozlyuk
2021-03-24 18:35 ` David Marchand
2021-03-24 19:32 ` [dpdk-dev] [PATCH v2] mem: fix cleanup when multi-process is disabled Dmitry Kozlyuk
2021-03-25 15:39   ` Ranjit Menon [this message]
2021-03-26 12:34   ` Burakov, Anatoly
2021-03-26 16:15   ` David Marchand
2021-04-09 12:00   ` David Marchand

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=9c5e4d85-47f6-189d-d64e-7222245329c3@intel.com \
    --to=ranjit.menon@intel.com \
    --cc=anatoly.burakov@intel.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=dmitry.kozliuk@gmail.com \
    --cc=jizh@microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git