mem: fix cleanup after incomplete initialization
Checks
Commit Message
In case of EAL initialization failure rte_eal_memory_detach() may be
called before mapping memory configuration, which in this case points
to the static structure. Attempt to unmap it yields error:
EAL: Could not unmap shared memory config: Invalid argument
Skip unmapping memory configuration if it's not yet shared.
Fixes: dfbc61a2f9a6 ("mem: detach memsegs on cleanup")
Cc: Anatoly Burakov <anatoly.burakov@intel.com>
Reported-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
lib/librte_eal/common/eal_common_memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 09-Apr-21 6:16 PM, Dmitry Kozlyuk wrote:
> In case of EAL initialization failure rte_eal_memory_detach() may be
> called before mapping memory configuration, which in this case points
> to the static structure. Attempt to unmap it yields error:
>
> EAL: Could not unmap shared memory config: Invalid argument
>
> Skip unmapping memory configuration if it's not yet shared.
>
> Fixes: dfbc61a2f9a6 ("mem: detach memsegs on cleanup")
> Cc: Anatoly Burakov <anatoly.burakov@intel.com>
>
> Reported-by: David Marchand <david.marchand@redhat.com>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> ---
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
20/04/2021 18:49, Burakov, Anatoly:
> On 09-Apr-21 6:16 PM, Dmitry Kozlyuk wrote:
> > In case of EAL initialization failure rte_eal_memory_detach() may be
> > called before mapping memory configuration, which in this case points
> > to the static structure. Attempt to unmap it yields error:
> >
> > EAL: Could not unmap shared memory config: Invalid argument
> >
> > Skip unmapping memory configuration if it's not yet shared.
> >
> > Fixes: dfbc61a2f9a6 ("mem: detach memsegs on cleanup")
> > Cc: Anatoly Burakov <anatoly.burakov@intel.com>
> >
> > Reported-by: David Marchand <david.marchand@redhat.com>
> > Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
>
> Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
Applied, thanks
@@ -1055,7 +1055,7 @@ rte_eal_memory_detach(void)
* config - we can't zero it out because it might still be referenced
* by other processes.
*/
- if (internal_conf->no_shconf == 0) {
+ if (internal_conf->no_shconf == 0 && mcfg->mem_cfg_addr != 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));