diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-04-22 09:56:00 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-04-22 09:56:00 +0200 |
| commit | f70925bf99406150d8133e775e49c9c459f78733 (patch) | |
| tree | 392dd3854bf229c0c94b481819e4a67551ba6895 /mm/slab_common.c | |
| parent | 9c8774e629a1950c24b44e3c8fb93d76fb644b49 (diff) | |
| parent | 59f0c2447e2553b0918b4a9fd38763a5c0587d02 (diff) | |
| download | linux-stable-f70925bf99406150d8133e775e49c9c459f78733.tar.gz linux-stable-f70925bf99406150d8133e775e49c9c459f78733.tar.bz2 linux-stable-f70925bf99406150d8133e775e49c9c459f78733.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/microchip/lan966x/lan966x_main.c
d08ed852560e ("net: lan966x: Make sure to release ptp interrupt")
c8349639324a ("net: lan966x: Add FDMA functionality")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'mm/slab_common.c')
| -rw-r--r-- | mm/slab_common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index 6ee64d6208b3..2b3206a2c3b5 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -555,6 +555,13 @@ bool kmem_valid_obj(void *object) } EXPORT_SYMBOL_GPL(kmem_valid_obj); +static void kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *slab) +{ + if (__kfence_obj_info(kpp, object, slab)) + return; + __kmem_obj_info(kpp, object, slab); +} + /** * kmem_dump_obj - Print available slab provenance information * @object: slab object for which to find provenance information. @@ -590,6 +597,8 @@ void kmem_dump_obj(void *object) pr_cont(" slab%s %s", cp, kp.kp_slab_cache->name); else pr_cont(" slab%s", cp); + if (is_kfence_address(object)) + pr_cont(" (kfence)"); if (kp.kp_objp) pr_cont(" start %px", kp.kp_objp); if (kp.kp_data_offset) |