Commit 90dfc392 authored Apr 25, 2018 by Dariusz Stojaczyk Committed by Daniel Verkamp May 03, 2018

event/reactor: take into account ring metadata size in event mempools



See previous patch for some background.

rte_mempool uses the following formula for its ring allocation size:
```
count = rte_align32pow2(mp->size + 1);
sz = sizeof(struct rte_ring) + count * sizeof(void *);
sz = RTE_ALIGN(sz, RTE_CACHE_LINE_SIZE);
```

With count==262144, rte_mempool was trying to allocate
(2MB + sizeof(struct rte_ring) physically contiguous memory.

Change-Id: I69e8cdcbcaaaa8a053540588afa6eb2fd36c525b
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/408926


Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>

parent f23c48d5

lib/event/reactor.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		#include "spdk/log.h"
		#include "spdk/io_channel.h"
		#include "spdk/env.h"
		#include "spdk/util.h"

		#define SPDK_MAX_SOCKET 64

		@@ -366,7 +367,19 @@ _spdk_reactor_context_switch_monitor_stop(void arg1, void arg2)
		static size_t
		_spdk_reactor_get_max_event_cnt(uint8_t socket_count)
		{
		return 262144 / socket_count - 1;
		size_t cnt;

		/* Try to make event ring fill at most 2MB of memory,
		* as some ring implementations may require physical address
		* contingency. We don't want to introduce a requirement of
		* at least 2 physically contiguous 2MB hugepages.
		*/
		cnt = spdk_min(262144 / socket_count, 262144 / 2);
		/* Take into account one extra element required by
		* some ring implementations.
		*/
		cnt -= 1;
		return cnt;
		}

		void