[v1] eal: update all buses default scan mode
Checks
Commit Message
When parsing EAL allowed or blocked device arguments, only device bus
being parsed got default scan mode updated. If the devargs was vdev, PCI
bus default scan mode not touched, all PCI bus devices will got probed
even none appear in allowed list.
This patch update all buses default scan mode when parsing first
devargs.
Signed-off-by: Xueming Li <xuemingl@nvidia.com>
---
lib/librte_eal/common/eal_common_bus.c | 15 +++++++++++++++
lib/librte_eal/common/eal_common_devargs.c | 13 +++++--------
lib/librte_eal/common/eal_private.h | 8 ++++++++
3 files changed, 28 insertions(+), 8 deletions(-)
Comments
On Sun, 28 Mar 2021 21:12:22 +0800
Xueming Li <xuemingl@nvidia.com> wrote:
> When parsing EAL allowed or blocked device arguments, only device bus
> being parsed got default scan mode updated. If the devargs was vdev, PCI
> bus default scan mode not touched, all PCI bus devices will got probed
> even none appear in allowed list.
>
> This patch update all buses default scan mode when parsing first
> devargs.
>
> Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Looking back at this old patch, and wondering why it never got applied.
Probably because it wasn't clear the exact problem.
It does raise the issue that scan_mode is currently a property
of the bus, not global. This patch would cause setting of allowed list
for PCI to also impact other bus types. That doesn't follow current
practice.
If you want to resubmit, make it per bus.
@@ -277,3 +277,18 @@ rte_bus_sigbus_handler(const void *failure_addr)
return ret;
}
+
+void
+rte_bus_scan_mode_update(enum rte_bus_scan_mode mode)
+{
+ struct rte_bus *bus;
+ static bool mode_set;
+
+ if (mode_set)
+ return;
+ TAILQ_FOREACH(bus, &rte_bus_list, next) {
+ if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED)
+ bus->conf.scan_mode = mode;
+ }
+ mode_set = true;
+}
@@ -301,7 +301,6 @@ int
rte_devargs_add(enum rte_devtype devtype, const char *devargs_str)
{
struct rte_devargs *devargs = NULL;
- struct rte_bus *bus = NULL;
const char *dev = devargs_str;
/* use calloc instead of rte_zmalloc as it's called early at init */
@@ -312,15 +311,13 @@ rte_devargs_add(enum rte_devtype devtype, const char *devargs_str)
if (rte_devargs_parse(devargs, dev))
goto fail;
devargs->type = devtype;
- bus = devargs->bus;
if (devargs->type == RTE_DEVTYPE_BLOCKED)
devargs->policy = RTE_DEV_BLOCKED;
- if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
- if (devargs->policy == RTE_DEV_ALLOWED)
- bus->conf.scan_mode = RTE_BUS_SCAN_ALLOWLIST;
- else if (devargs->policy == RTE_DEV_BLOCKED)
- bus->conf.scan_mode = RTE_BUS_SCAN_BLOCKLIST;
- }
+
+ if (devargs->policy == RTE_DEV_ALLOWED)
+ rte_bus_scan_mode_update(RTE_BUS_SCAN_ALLOWLIST);
+ else if (devargs->policy == RTE_DEV_BLOCKED)
+ rte_bus_scan_mode_update(RTE_BUS_SCAN_BLOCKLIST);
TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
return 0;
@@ -452,6 +452,14 @@ int rte_eal_memory_detach(void);
*/
struct rte_bus *rte_bus_find_by_device_name(const char *str);
+/**
+ * Update all buses scan mode if not set, used by EAL parameter parsing.
+ *
+ * @param mode
+ * Bus scan mode to be set.
+ */
+void rte_bus_scan_mode_update(enum rte_bus_scan_mode mode);
+
/**
* Create the unix channel for primary/secondary communication.
*