linux-merge January 2024

linux-merge@lists.open-mesh.org

3 participants
33 discussions

Build check errors found: 2024-01-23
by postmaster＠open-mesh.org 23 Jan '24

23 Jan '24

Name of failed tests ==================== stable ------ * difference between net and batadv stable main ---- * difference between net and batadv main * headers Output of different failed tests ================================ main: difference between net and batadv main -------------------------------------------- netnext/net/batman-adv/multicast.c | 3 --- 1 file changed, 3 deletions(-) stable: difference between net and batadv stable ------------------------------------------------ net/net/batman-adv/Makefile | 1 net/net/batman-adv/bridge_loop_avoidance.c | 2 net/net/batman-adv/fragmentation.c | 8 net/net/batman-adv/gateway_client.c | 2 net/net/batman-adv/main.c | 5 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 129 ++ net/net/batman-adv/multicast.h | 30 net/net/batman-adv/multicast_forw.c | 1178 ++++++++++++++++++++ net/net/batman-adv/netlink.c | 2 net/net/batman-adv/originator.c | 28 net/net/batman-adv/originator.h | 3 net/net/batman-adv/routing.c | 70 + net/net/batman-adv/routing.h | 11 net/net/batman-adv/soft-interface.c | 18 net/net/batman-adv/types.h | 70 + 16 files changed, 1533 insertions(+), 26 deletions(-) main: headers ------------- diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index ae79ab26..fdfdf2cb 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -15,7 +15,6 @@ #include <linux/cache.h> #include <linux/err.h> #include <linux/errno.h> -#include <linux/export.h> #include <linux/genetlink.h> #include <linux/gfp.h> #include <linux/if_ether.h> Statistics ========== stable ------ Failed tests: 1 Started build tests: 239 Tested Linux versions: 38 Tested configs: 108 main ---- Failed tests: 2 Started build tests: 218 Tested Linux versions: 38 Tested configs: 106

1 0

Coverity Scan: Analysis completed for batman-adv
by scan-admin＠coverity.com 22 Jan '24

22 Jan '24

Your request for analysis of batman-adv has been completed successfully. The results are available at https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P… Build ID: 586190 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20240122
by batman＠open-mesh.org 22 Jan '24

22 Jan '24

The following commit has been merged in the master branch: commit ba7dd8570dc8ad4daa3d1c49a137a7b8479eae07 Merge: b0d326da462e20285236e11e4cbc32085de9f363 981cf568a8644161c2f15c02278ebc2834b51ba6 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Jan 18 13:23:53 2024 -0800 Merge tag 'x86_sgx_for_6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 SGX updates from Dave Hansen: "This time, these are entirely confined to SGX selftests fixes. The mini SGX enclave built by the selftests has garnered some attention because it stands alone and does not need the sizable infrastructure of the official SGX SDK. I think that's why folks are suddently interested in cleaning it up. - Clean up selftest compilation issues, mostly from non-gcc compilers - Avoid building selftests when not on x86" * tag 'x86_sgx_for_6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: selftests/sgx: Skip non X86_64 platform selftests/sgx: Remove incomplete ABI sanitization code in test enclave selftests/sgx: Discard unsupported ELF sections selftests/sgx: Ensure expected location of test enclave buffer selftests/sgx: Ensure test enclave buffer is entirely preserved selftests/sgx: Fix linker script asserts selftests/sgx: Handle relocations in test enclave selftests/sgx: Produce static-pie executable for test enclave selftests/sgx: Remove redundant enclave base address save/restore selftests/sgx: Specify freestanding environment for enclave compilation selftests/sgx: Separate linker options selftests/sgx: Include memory clobber for inline asm in test enclave selftests/sgx: Fix uninitialized pointer dereferences in encl_get_entry selftests/sgx: Fix uninitialized pointer dereference in error path -- LinuxNextTracking

1 0

Build check errors found: 2024-01-22
by postmaster＠open-mesh.org 22 Jan '24

22 Jan '24

Name of failed tests ==================== stable ------ * difference between net and batadv stable main ---- * difference between net and batadv main Output of different failed tests ================================ main: difference between net and batadv main -------------------------------------------- netnext/net/batman-adv/multicast.c | 3 --- 1 file changed, 3 deletions(-) stable: difference between net and batadv stable ------------------------------------------------ net/net/batman-adv/Makefile | 1 net/net/batman-adv/bridge_loop_avoidance.c | 2 net/net/batman-adv/fragmentation.c | 8 net/net/batman-adv/gateway_client.c | 2 net/net/batman-adv/main.c | 5 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 129 ++ net/net/batman-adv/multicast.h | 30 net/net/batman-adv/multicast_forw.c | 1178 ++++++++++++++++++++ net/net/batman-adv/netlink.c | 2 net/net/batman-adv/originator.c | 28 net/net/batman-adv/originator.h | 3 net/net/batman-adv/routing.c | 70 + net/net/batman-adv/routing.h | 11 net/net/batman-adv/soft-interface.c | 18 net/net/batman-adv/types.h | 70 + 16 files changed, 1533 insertions(+), 26 deletions(-) Statistics ========== stable ------ Failed tests: 1 Started build tests: 204 Tested Linux versions: 36 Tested configs: 106 main ---- Failed tests: 1 Started build tests: 233 Tested Linux versions: 36 Tested configs: 110

1 0

Build check errors found: 2024-01-21
by postmaster＠open-mesh.org 21 Jan '24

21 Jan '24

Name of failed tests ==================== main ---- * difference between net and batadv main stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: difference between net and batadv main -------------------------------------------- netnext/net/batman-adv/multicast.c | 3 --- 1 file changed, 3 deletions(-) stable: difference between net and batadv stable ------------------------------------------------ net/net/batman-adv/Makefile | 1 net/net/batman-adv/bridge_loop_avoidance.c | 2 net/net/batman-adv/fragmentation.c | 8 net/net/batman-adv/gateway_client.c | 2 net/net/batman-adv/main.c | 5 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 129 ++ net/net/batman-adv/multicast.h | 30 net/net/batman-adv/multicast_forw.c | 1178 ++++++++++++++++++++ net/net/batman-adv/netlink.c | 2 net/net/batman-adv/originator.c | 28 net/net/batman-adv/originator.h | 3 net/net/batman-adv/routing.c | 70 + net/net/batman-adv/routing.h | 11 net/net/batman-adv/soft-interface.c | 18 net/net/batman-adv/types.h | 70 + 16 files changed, 1533 insertions(+), 26 deletions(-) Statistics ========== main ---- Failed tests: 1 Started build tests: 212 Tested Linux versions: 36 Tested configs: 104 stable ------ Failed tests: 1 Started build tests: 243 Tested Linux versions: 36 Tested configs: 111

1 0

Build check errors found: 2024-01-20
by postmaster＠open-mesh.org 20 Jan '24

20 Jan '24

Name of failed tests ==================== main ---- * difference between net and batadv main stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: difference between net and batadv main -------------------------------------------- netnext/net/batman-adv/multicast.c | 3 --- 1 file changed, 3 deletions(-) stable: difference between net and batadv stable ------------------------------------------------ net/net/batman-adv/Makefile | 1 net/net/batman-adv/bridge_loop_avoidance.c | 2 net/net/batman-adv/fragmentation.c | 8 net/net/batman-adv/gateway_client.c | 2 net/net/batman-adv/main.c | 5 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 129 ++ net/net/batman-adv/multicast.h | 30 net/net/batman-adv/multicast_forw.c | 1178 ++++++++++++++++++++ net/net/batman-adv/netlink.c | 2 net/net/batman-adv/originator.c | 28 net/net/batman-adv/originator.h | 3 net/net/batman-adv/routing.c | 70 + net/net/batman-adv/routing.h | 11 net/net/batman-adv/soft-interface.c | 18 net/net/batman-adv/types.h | 70 + 16 files changed, 1533 insertions(+), 26 deletions(-) Statistics ========== main ---- Failed tests: 1 Started build tests: 201 Tested Linux versions: 36 Tested configs: 105 stable ------ Failed tests: 1 Started build tests: 250 Tested Linux versions: 36 Tested configs: 108

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20240119
by batman＠open-mesh.org 19 Jan '24

19 Jan '24

The following commit has been merged in the master branch: commit 7b5bcf9b842087ba38cb6292637910f384368cff Merge: 82fd5ee9d8a516d47a17e8c99c2712a3fd937014 9223614ea760a77873c7061875cb91963e6f79b7 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Wed Jan 17 14:07:14 2024 -0800 Merge tag 'pm-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm Pull more power management updates from Rafael Wysocki: "These restore the asynchronous device resume optimization removed by the previous PM merge, make the intel_pstate driver work better on Meteor Lake systems, optimize the PM QoS core code slightly and fix up typos in admin-guide. Specifics: - Restore the system-wide asynchronous device resume optimization removed by a recent concurrency fix (Rafael J. Wysocki) - Make the intel_pstate cpufreq driver allow Meteor Lake systems to run at somewhat higher frequencies (Srinivas Pandruvada) - Make the PM QoS core code use kcalloc() for array allocation (Erick Archer) - Fix two PM-related typos in admin-guide (Erwan Velu)" * tag 'pm-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM: sleep: Restore asynchronous device resume optimization Documentation: admin-guide: PM: Fix two typos cpufreq: intel_pstate: Update hybrid scaling factor for Meteor Lake PM: QoS: Use kcalloc() instead of kzalloc() -- LinuxNextTracking

1 0

Build check errors found: 2024-01-19
by postmaster＠open-mesh.org 19 Jan '24

19 Jan '24

Name of failed tests ==================== main ---- * difference between net and batadv main stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: difference between net and batadv main -------------------------------------------- netnext/net/batman-adv/multicast.c | 3 --- 1 file changed, 3 deletions(-) stable: difference between net and batadv stable ------------------------------------------------ net/net/batman-adv/Makefile | 1 net/net/batman-adv/bridge_loop_avoidance.c | 2 net/net/batman-adv/fragmentation.c | 8 net/net/batman-adv/gateway_client.c | 2 net/net/batman-adv/main.c | 5 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 129 ++ net/net/batman-adv/multicast.h | 30 net/net/batman-adv/multicast_forw.c | 1178 ++++++++++++++++++++ net/net/batman-adv/netlink.c | 2 net/net/batman-adv/originator.c | 28 net/net/batman-adv/originator.h | 3 net/net/batman-adv/routing.c | 70 + net/net/batman-adv/routing.h | 11 net/net/batman-adv/soft-interface.c | 18 net/net/batman-adv/types.h | 70 + 16 files changed, 1533 insertions(+), 26 deletions(-) Statistics ========== main ---- Failed tests: 1 Started build tests: 201 Tested Linux versions: 36 Tested configs: 105 stable ------ Failed tests: 1 Started build tests: 224 Tested Linux versions: 36 Tested configs: 106

1 0

Build check errors found: 2024-01-18
by postmaster＠open-mesh.org 18 Jan '24

18 Jan '24

Name of failed tests ==================== main ---- * difference between net and batadv main stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: difference between net and batadv main -------------------------------------------- netnext/net/batman-adv/multicast.c | 3 --- 1 file changed, 3 deletions(-) stable: difference between net and batadv stable ------------------------------------------------ net/net/batman-adv/Makefile | 1 net/net/batman-adv/bridge_loop_avoidance.c | 2 net/net/batman-adv/fragmentation.c | 8 net/net/batman-adv/gateway_client.c | 2 net/net/batman-adv/main.c | 5 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 129 ++ net/net/batman-adv/multicast.h | 30 net/net/batman-adv/multicast_forw.c | 1178 ++++++++++++++++++++ net/net/batman-adv/netlink.c | 2 net/net/batman-adv/originator.c | 28 net/net/batman-adv/originator.h | 3 net/net/batman-adv/routing.c | 70 + net/net/batman-adv/routing.h | 11 net/net/batman-adv/soft-interface.c | 18 net/net/batman-adv/types.h | 70 + 16 files changed, 1533 insertions(+), 26 deletions(-) Statistics ========== main ---- Failed tests: 1 Started build tests: 211 Tested Linux versions: 36 Tested configs: 106 stable ------ Failed tests: 1 Started build tests: 235 Tested Linux versions: 36 Tested configs: 110

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20240117
by batman＠open-mesh.org 17 Jan '24

17 Jan '24

The following commit has been merged in the master branch: commit 893e2f9eac9ec8d65a5ae2d99656d5e9f7bd76e2 Merge: 457e4f99765cc41d0b90e1385f51b848d6a921d0 b07bc2347672cc8c7293c64499f1488278c5ca3d Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Jan 11 13:46:50 2024 -0800 Merge tag 'dma-mapping-6.8-2024-01-08' of git://git.infradead.org/users/hch/dma-mapping Pull dma-mapping updates from Christoph Hellwig: - reduce area lock contention for non-primary IO TLB pools (Petr Tesarik) - don't store redundant offsets in the dma_ranges stuctures (Robin Murphy) - clear dev->dma_mem when freeing per-device pools (Joakim Zhang) * tag 'dma-mapping-6.8-2024-01-08' of git://git.infradead.org/users/hch/dma-mapping: dma-mapping: clear dev->dma_mem to NULL after freeing it swiotlb: reduce area lock contention for non-primary IO TLB pools dma-mapping: don't store redundant offsets diff --combined drivers/acpi/scan.c index 18af5064d268,ee88a727f200..0ba008773b00 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@@ -1532,7 -1532,6 +1532,6 @@@ int acpi_dma_get_range(struct device *d r->cpu_start = rentry->res->start; r->dma_start = rentry->res->start - rentry->offset; r->size = resource_size(rentry->res); - r->offset = rentry->offset; r++; } } @@@ -1732,7 -1731,6 +1731,7 @@@ static bool acpi_device_enumeration_by_ * Some ACPI devs contain SerialBus resources even though they are not * attached to a serial bus at all. */ + {ACPI_VIDEO_HID, }, {"MSHW0028", }, /* * HIDs of device with an UartSerialBusV2 resource for which userspace @@@ -1982,9 -1980,10 +1981,9 @@@ static void acpi_scan_init_hotplug(stru } } -static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) +static u32 acpi_scan_check_dep(acpi_handle handle) { struct acpi_handle_list dep_devices; - acpi_status status; u32 count; int i; @@@ -1994,10 -1993,12 +1993,10 @@@ * 2. ACPI nodes describing USB ports. * Still, checking for _HID catches more then just these cases ... */ - if (!check_dep || !acpi_has_method(handle, "_DEP") || - !acpi_has_method(handle, "_HID")) + if (!acpi_has_method(handle, "_DEP") || !acpi_has_method(handle, "_HID")) return 0; - status = acpi_evaluate_reference(handle, "_DEP", NULL, &dep_devices); - if (ACPI_FAILURE(status)) { + if (!acpi_evaluate_reference(handle, "_DEP", NULL, &dep_devices)) { acpi_handle_debug(handle, "Failed to evaluate _DEP.\n"); return 0; } @@@ -2006,7 -2007,6 +2005,7 @@@ struct acpi_device_info *info; struct acpi_dep_data *dep; bool skip, honor_dep; + acpi_status status; status = acpi_get_object_info(dep_devices.handles[i], &info); if (ACPI_FAILURE(status)) { @@@ -2040,13 -2040,7 +2039,13 @@@ return count; } -static acpi_status acpi_bus_check_add(acpi_handle handle, bool check_dep, +static acpi_status acpi_scan_check_crs_csi2_cb(acpi_handle handle, u32 a, void *b, void **c) +{ + acpi_mipi_check_crs_csi2(handle); + return AE_OK; +} + +static acpi_status acpi_bus_check_add(acpi_handle handle, bool first_pass, struct acpi_device **adev_p) { struct acpi_device *device = acpi_fetch_acpi_dev(handle); @@@ -2064,25 -2058,9 +2063,25 @@@ if (acpi_device_should_be_hidden(handle)) return AE_OK; - /* Bail out if there are dependencies. */ - if (acpi_scan_check_dep(handle, check_dep) > 0) - return AE_CTRL_DEPTH; + if (first_pass) { + acpi_mipi_check_crs_csi2(handle); + + /* Bail out if there are dependencies. */ + if (acpi_scan_check_dep(handle) > 0) { + /* + * The entire CSI-2 connection graph needs to be + * extracted before any drivers or scan handlers + * are bound to struct device objects, so scan + * _CRS CSI-2 resource descriptors for all + * devices below the current handle. + */ + acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, + ACPI_UINT32_MAX, + acpi_scan_check_crs_csi2_cb, + NULL, NULL, NULL); + return AE_CTRL_DEPTH; + } + } fallthrough; case ACPI_TYPE_ANY: /* for ACPI_ROOT_OBJECT */ @@@ -2105,10 -2083,10 +2104,10 @@@ } /* - * If check_dep is true at this point, the device has no dependencies, + * If first_pass is true at this point, the device has no dependencies, * or the creation of the device object would have been postponed above. */ - acpi_add_single_object(&device, handle, type, !check_dep); + acpi_add_single_object(&device, handle, type, !first_pass); if (!device) return AE_CTRL_DEPTH; @@@ -2452,13 -2430,6 +2451,13 @@@ static void acpi_scan_postponed_branch( acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX, acpi_bus_check_add_2, NULL, NULL, (void **)&adev); + + /* + * Populate the ACPI _CRS CSI-2 software nodes for the ACPI devices that + * have been added above. + */ + acpi_mipi_init_crs_csi2_swnodes(); + acpi_bus_attach(adev, NULL); } @@@ -2527,22 -2498,12 +2526,22 @@@ int acpi_bus_scan(acpi_handle handle if (!device) return -ENODEV; + /* + * Set up ACPI _CRS CSI-2 software nodes using information extracted + * from the _CRS CSI-2 resource descriptors during the ACPI namespace + * walk above and MIPI DisCo for Imaging device properties. + */ + acpi_mipi_scan_crs_csi2(); + acpi_mipi_init_crs_csi2_swnodes(); + acpi_bus_attach(device, (void *)true); /* Pass 2: Enumerate all of the remaining devices. */ acpi_scan_postponed(); + acpi_mipi_crs_csi2_cleanup(); + return 0; } EXPORT_SYMBOL(acpi_bus_scan); diff --combined kernel/dma/swiotlb.c index 176078bf2215,e20b856255ef..97c298b210bc --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@@ -686,8 -686,8 +686,8 @@@ static struct io_tlb_pool *swiotlb_allo size_t pool_size; size_t tlb_size; - if (nslabs > SLABS_PER_PAGE << MAX_ORDER) { - nslabs = SLABS_PER_PAGE << MAX_ORDER; + if (nslabs > SLABS_PER_PAGE << MAX_PAGE_ORDER) { + nslabs = SLABS_PER_PAGE << MAX_PAGE_ORDER; nareas = limit_nareas(nareas, nslabs); } @@@ -957,7 -957,7 +957,7 @@@ static void dec_used(struct io_tlb_mem #endif /* CONFIG_DEBUG_FS */ /** - * swiotlb_area_find_slots() - search for slots in one IO TLB memory area + * swiotlb_search_pool_area() - search one memory area in one pool * @dev: Device which maps the buffer. * @pool: Memory pool to be searched. * @area_index: Index of the IO TLB memory area to be searched. @@@ -972,7 -972,7 +972,7 @@@ * * Return: Index of the first allocated slot, or -1 on error. */ - static int swiotlb_area_find_slots(struct device *dev, struct io_tlb_pool *pool, + static int swiotlb_search_pool_area(struct device *dev, struct io_tlb_pool *pool, int area_index, phys_addr_t orig_addr, size_t alloc_size, unsigned int alloc_align_mask) { @@@ -1066,41 -1066,50 +1066,50 @@@ found return slot_index; } + #ifdef CONFIG_SWIOTLB_DYNAMIC + /** - * swiotlb_pool_find_slots() - search for slots in one memory pool + * swiotlb_search_area() - search one memory area in all pools * @dev: Device which maps the buffer. - * @pool: Memory pool to be searched. + * @start_cpu: Start CPU number. + * @cpu_offset: Offset from @start_cpu. * @orig_addr: Original (non-bounced) IO buffer address. * @alloc_size: Total requested size of the bounce buffer, * including initial alignment padding. * @alloc_align_mask: Required alignment of the allocated buffer. + * @retpool: Used memory pool, updated on return. * - * Search through one memory pool to find a sequence of slots that match the + * Search one memory area in all pools for a sequence of slots that match the * allocation constraints. * * Return: Index of the first allocated slot, or -1 on error. */ - static int swiotlb_pool_find_slots(struct device *dev, struct io_tlb_pool *pool, - phys_addr_t orig_addr, size_t alloc_size, - unsigned int alloc_align_mask) + static int swiotlb_search_area(struct device *dev, int start_cpu, + int cpu_offset, phys_addr_t orig_addr, size_t alloc_size, + unsigned int alloc_align_mask, struct io_tlb_pool **retpool) { - int start = raw_smp_processor_id() & (pool->nareas - 1); - int i = start, index; - - do { - index = swiotlb_area_find_slots(dev, pool, i, orig_addr, - alloc_size, alloc_align_mask); - if (index >= 0) - return index; - if (++i >= pool->nareas) - i = 0; - } while (i != start); + struct io_tlb_mem *mem = dev->dma_io_tlb_mem; + struct io_tlb_pool *pool; + int area_index; + int index = -1; - return -1; + rcu_read_lock(); + list_for_each_entry_rcu(pool, &mem->pools, node) { + if (cpu_offset >= pool->nareas) + continue; + area_index = (start_cpu + cpu_offset) & (pool->nareas - 1); + index = swiotlb_search_pool_area(dev, pool, area_index, + orig_addr, alloc_size, + alloc_align_mask); + if (index >= 0) { + *retpool = pool; + break; + } + } + rcu_read_unlock(); + return index; } - #ifdef CONFIG_SWIOTLB_DYNAMIC - /** * swiotlb_find_slots() - search for slots in the whole swiotlb * @dev: Device which maps the buffer. @@@ -1124,18 -1133,17 +1133,17 @@@ static int swiotlb_find_slots(struct de unsigned long nslabs; unsigned long flags; u64 phys_limit; + int cpu, i; int index; - rcu_read_lock(); - list_for_each_entry_rcu(pool, &mem->pools, node) { - index = swiotlb_pool_find_slots(dev, pool, orig_addr, - alloc_size, alloc_align_mask); - if (index >= 0) { - rcu_read_unlock(); + cpu = raw_smp_processor_id(); + for (i = 0; i < default_nareas; ++i) { + index = swiotlb_search_area(dev, cpu, i, orig_addr, alloc_size, + alloc_align_mask, &pool); + if (index >= 0) goto found; - } } - rcu_read_unlock(); + if (!mem->can_grow) return -1; @@@ -1148,8 -1156,8 +1156,8 @@@ if (!pool) return -1; - index = swiotlb_pool_find_slots(dev, pool, orig_addr, - alloc_size, alloc_align_mask); + index = swiotlb_search_pool_area(dev, pool, 0, orig_addr, + alloc_size, alloc_align_mask); if (index < 0) { swiotlb_dyn_free(&pool->rcu); return -1; @@@ -1192,9 -1200,21 +1200,21 @@@ static int swiotlb_find_slots(struct de size_t alloc_size, unsigned int alloc_align_mask, struct io_tlb_pool **retpool) { - *retpool = &dev->dma_io_tlb_mem->defpool; - return swiotlb_pool_find_slots(dev, *retpool, - orig_addr, alloc_size, alloc_align_mask); + struct io_tlb_pool *pool; + int start, i; + int index; + + *retpool = pool = &dev->dma_io_tlb_mem->defpool; + i = start = raw_smp_processor_id() & (pool->nareas - 1); + do { + index = swiotlb_search_pool_area(dev, pool, i, orig_addr, + alloc_size, alloc_align_mask); + if (index >= 0) + return index; + if (++i >= pool->nareas) + i = 0; + } while (i != start); + return -1; } #endif /* CONFIG_SWIOTLB_DYNAMIC */ -- LinuxNextTracking

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge January 2024