The patch titled Slab GFP_ZERO support: Use obj_size instead of buffer_size. has been removed from the -mm tree. Its filename was slab-allocators-support-__gfp_zero-in-all-allocators-fix.patch This patch was dropped because it was folded into slab-allocators-support-__gfp_zero-in-all-allocators.patch ------------------------------------------------------ Subject: Slab GFP_ZERO support: Use obj_size instead of buffer_size. From: Christoph Lameter <clameter@xxxxxxx> Buffer size includes the metadata in the debug case so we were clearing SLAB metadata. The obj_size() function determines the size independent of CONFIG_SLAB_DEBUG. Signed-off-by: Christoph Lameter <clameter@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/slab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/slab.c~slab-allocators-support-__gfp_zero-in-all-allocators-fix mm/slab.c --- a/mm/slab.c~slab-allocators-support-__gfp_zero-in-all-allocators-fix +++ a/mm/slab.c @@ -3395,7 +3395,7 @@ __cache_alloc_node(struct kmem_cache *ca ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller); if (unlikely((flags & __GFP_ZERO) && ptr)) - memset(ptr, 0, cachep->buffer_size); + memset(ptr, 0, obj_size(cachep)); return ptr; } @@ -3449,7 +3449,7 @@ __cache_alloc(struct kmem_cache *cachep, prefetchw(objp); if (unlikely((flags & __GFP_ZERO) && objp)) - memset(objp, 0, cachep->buffer_size); + memset(objp, 0, obj_size(cachep)); return objp; } _ Patches currently in -mm which might be from clameter@xxxxxxx are git-ubi.patch pa-risc-use-page-allocator-instead-of-slab-allocator.patch usb-make-the-usb_device-numa_node-to-get-assigned-from.patch quicklist-support-for-x86_64.patch x86_64-get-mp_bus_to_node-as-early.patch change-zonelist-order-zonelist-order-selection-logic.patch make-proc-slabinfo-use-seq_list_xxx-helpers.patch remove-the-deprecated-kmem_cache_t-typedef-from-slabh.patch slub-support-slub_debug-on-by-default.patch numa-mempolicy-dynamic-interleave-map-for-system-init.patch numa-mempolicy-trivial-debug-fixes.patch slob-initial-numa-support.patch add-__gfp_movable-for-callers-to-flag-allocations-from-high-memory-that-may-be-migrated.patch group-short-lived-and-reclaimable-kernel-allocations.patch fix-calculation-in-move_freepages_block-for-counting-pages.patch breakout-page_order-to-internalh-to-avoid-special-knowledge-of-the-buddy-allocator.patch do-not-depend-on-max_order-when-grouping-pages-by-mobility.patch print-out-statistics-in-relation-to-fragmentation-avoidance-to-proc-pagetypeinfo.patch have-kswapd-keep-a-minimum-order-free-other-than-order-0.patch only-check-absolute-watermarks-for-alloc_high-and-alloc_harder-allocations.patch slub-mm-only-make-slub-the-default-slab-allocator.patch slub-exploit-page-mobility-to-increase-allocation-order.patch slub-reduce-antifrag-max-order.patch slub-change-error-reporting-format-to-follow-lockdep-loosely.patch slub-use-list_for_each_entry-for-loops-over-all-slabs.patch slub-slab-validation-move-tracking-information-alloc-outside-of.patch slub-ensure-that-the-object-per-slabs-stays-low-for-high-orders.patch slub-debug-fix-initial-object-debug-state-of-numa-bootstrap-objects.patch slab-allocators-consolidate-code-for-krealloc-in-mm-utilc.patch slab-allocators-consistent-zero_size_ptr-support-and-null-result-semantics.patch slab-allocators-support-__gfp_zero-in-all-allocators.patch slab-allocators-support-__gfp_zero-in-all-allocators-fix.patch slub-add-some-more-inlines-and-ifdef-config_slub_debug.patch slub-extract-dma_kmalloc_cache-from-get_cache.patch slub-do-proper-locking-during-dma-slab-creation.patch slub-faster-more-efficient-slab-determination-for-__kmalloc.patch slub-faster-more-efficient-slab-determination-for-__kmalloc-fix.patch slub-faster-more-efficient-slab-determination-for-__kmalloc-fix-2.patch slub-simplify-dma-index-size-calculation.patch mm-slubc-make-code-static.patch slub-style-fix-up-the-loop-to-disable-small-slabs.patch slub-do-not-use-length-parameter-in-slab_alloc.patch slab-allocators-cleanup-zeroing-allocations.patch slab-allocators-replace-explicit-zeroing-with-__gfp_zero.patch slub-do-not-allocate-object-bit-array-on-stack.patch slub-move-sysfs-operations-outside-of-slub_lock.patch slub-fix-config_slub_debug-use-for-config_numa.patch add-vm_bug_on-in-case-someone-uses-page_mapping-on-a-slab-page.patch memory-unplug-v7-migration-by-kernel.patch memory-unplug-v7-isolate_lru_page-fix.patch define-config_bounce-to-avoid-useless-inclusion-of-bounce-buffer.patch dma-make-dma-pool-to-use-kmalloc_node.patch revoke-core-code.patch intel-iommu-dmar-detection-and-parsing-logic.patch intel-iommu-pci-generic-helper-function.patch intel-iommu-pci-generic-helper-function-fix.patch intel-iommu-clflush_cache_range-now-takes-size-param.patch intel-iommu-iova-allocation-and-management-routines.patch intel-iommu-iova-allocation-and-management-routines-fix.patch intel-iommu-intel-iommu-driver.patch intel-iommu-intel-iommu-driver-fix.patch intel-iommu-intel-iommu-driver-fix-2.patch intel-iommu-avoid-memory-allocation-failures-in-dma-map-api-calls.patch intel-iommu-intel-iommu-cmdline-option-forcedac.patch intel-iommu-dmar-fault-handling-support.patch intel-iommu-iommu-gfx-workaround.patch intel-iommu-iommu-floppy-workaround.patch intel-iommu-iommu-floppy-workaround-fix.patch define-new-percpu-interface-for-shared-data-version-4.patch use-the-new-percpu-interface-for-shared-data-version-4.patch mm-implement-swap-prefetching.patch rename-gfp_high_movable-to-gfp_highuser_movable-prefetch.patch cpuset-zero-malloc-revert-the-old-cpuset-fix.patch containersv10-share-css_group-arrays-between-tasks-with-same-container-memberships-cpuset-zero-malloc-fix-for-new-containers.patch print-out-page_owner-statistics-in-relation-to-fragmentation-avoidance.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html