From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755647AbcHBBZW (ORCPT ); Mon, 1 Aug 2016 21:25:22 -0400 Received: from mail-db5eur01on0091.outbound.protection.outlook.com ([104.47.2.91]:45672 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755512AbcHBBZN (ORCPT ); Mon, 1 Aug 2016 21:25:13 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=aryabinin@virtuozzo.com; From: Andrey Ryabinin To: Andrew Morton CC: Alexander Potapenko , Dave Jones , Vegard Nossum , "Sasha Levin" , Dmitry Vyukov , , , , Andrey Ryabinin Subject: [PATCH 4/6] mm/kasan: get rid of ->alloc_size in struct kasan_alloc_meta Date: Mon, 1 Aug 2016 17:45:13 +0300 Message-ID: <1470062715-14077-4-git-send-email-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1470062715-14077-1-git-send-email-aryabinin@virtuozzo.com> References: <1470062715-14077-1-git-send-email-aryabinin@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: AM3PR08CA0029.eurprd08.prod.outlook.com (10.160.207.167) To VI1PR0801MB1982.eurprd08.prod.outlook.com (10.173.74.15) X-MS-Office365-Filtering-Correlation-Id: 6d339b09-cd32-40ba-b8b1-08d3ba1a4cd7 X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1982;2:vyOfuvM4psxDmwSXav39r76afS+/U7SSjbDyCHajWzEXm7rrVqLhSv+uO/fcUegSuyw0B8oCMRPNzPOZzziNmb6mJwCkSsd1HTZM+QBjWLexcIdRExHVBarbWRCa7FinPt6Uw/l9D7Sd/3XsMJte7Ne8aPD2bMohqalMzsU+AFKe2QDi/3DN6cIwg+UlJFae;3:/cuMl257qyazZx9uebTqTyQj5SOh/5F+JhOw+y9UXaIs9zC/MurVrDom0rUjYOpHvH1GSYdUBpNjBjZ77AkTt829YP5HHGe7iPYWiLBRYeLOGX+FflO706OXXwzRvxEt X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0801MB1982; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1982;25:eVdftYQO7g3SOF78cRohX+US1mvx174gz6rRZzcEUIK8bgpjgVLrjIdljsxthRjnEyL+a0mlJbAiT0k5kTrZ8YcoXYum0e/pVcLuM2wanPCTJ8up0rs5dlOtkOyqkZdc9sMA+WDvQ7GD7R+HkThjVaqhj2nz3cAQsHmrWo27DrDcubWlc+HN28q31JxoF3z4H8+OSFNh88GN8fehS23lVJ+qEnhomViISFTOjyD9eu4Q2GC4xvUbppK87rVpGBYOdFHaQ4ZgRQPd3YdzTxYMj1ZHZD9q4zdlrzDTiVDGC6xSQ4NM6GPz1TpjCoFCz2xsJV2L0uzOzY5ZDxOG67/VdxGFYTNCBCzXW7t7rq1fpJUihemTilDBzqbzY/T5yHXjkcsqLhvnK/Ax0SUtYPPaxRHozveij+HHQQgIUotJ73DfWKM5OExeQeGc0P5J/wPA3lBRP2tVK8ueFity4m642wIx3uhYhp1joMOVcpEDO7vkaual3JfubhJ7SYqzOddyq75tf6/xhVfSQPIRlqiC8uhL7IfaJRs6P4fw+Tgv27//tSWHMLUpoFY9r3YZFzhtAdkvu+6qKTGhmSou/QfJnjP30zLXBij47kEYJF7LYAYaKQ10cISEr6lK80ICgpkHALzuDC60Yq/LbPYcxMVekHkaziS4ptZlZ+zhVJNplny4zL/tKgzxMbtDJQz0+FaiA5DUmzY9b374jHAPxwB+gNPdpbMqs8F8lb6M3l+tlXo= X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1982;31:2XRz2a99x05baiVJLfdst5ymLfDSZYRWMZ2BSqj2uWEnkqHpDrqjzUX33V9fHyPVduQRaXlskxMI/Sv4dCvdc8X2BeRrCkem3ppFKQdxKdTR4i8DIQCoSSyY1GVma+b+ZmCvjCe01d6kYfQu8F0w5A8GsrDKZ8mCt6IWr/+Wj3OO6P8w1/lBHX/Uh8dHlfTRQ2GCuuhpdIldGuNpsKwhr5p/AhRqxE9F9YRtiK+bIiU=;4:mVAq7ROS/YR3f/7cUYkro5D6/duuml3GuTB/0j+EZnba0LVfUkU+jSKjldQ4AtkIAmmGkLNCs5csYT+I7Vg13wom8BBwKiVBU9ClMouCopxo5vHFKJQHTD2/rvKxAFRKgaj2S5AyT29/V7lQz+x16c/Sgop49UXB3j2U6t3hJzP81ret2uedQzkUKclXUC9YOlNTPyWfqBrUWwaWv6KlTB4zRLuabCi84SNGYYmDoq5SE6HX9+tgGxlmFlHpLb4Y8vHqGG3o1zTRgyFNcdZL+3ceL/bes45N14BszvZwVL/e1Zrb3g0loTzcKh+KsaSE+Ob6ORv+0K2xSUZjJj2Dn98A5EEQV+ebnSxxRPAHkVR+b4lQH8ZjaBi8X7pFpZ0tdkr3Yv06cp/w+SJfrKMaeIJCAxJCRy8XjkKS3pTjmgk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041072)(6043046);SRVR:VI1PR0801MB1982;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0801MB1982; X-Forefront-PRVS: 0021920B5A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(7916002)(199003)(189002)(97736004)(92566002)(76176999)(36756003)(47776003)(8676002)(101416001)(81166006)(42186005)(81156014)(189998001)(3846002)(6116002)(5003940100001)(107886002)(4326007)(50466002)(110136002)(305945005)(48376002)(66066001)(586003)(69596002)(4001430100002)(2906002)(77096005)(50226002)(86362001)(33646002)(106356001)(2950100001)(229853001)(68736007)(50986999)(19580405001)(19580395003)(53416004)(7846002)(7736002)(105586002)(76506005)(26583001);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR0801MB1982;H:localhost.sw.ru;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;VI1PR0801MB1982;23:3AsiM25FT8wIy5Sz7OWTvtwr9hRfWuaa9Xd5pMc?= =?us-ascii?Q?E0I4X6P47VPuqPrdop7Iq5HuiuQwoaii2/LPbM9whI1uBaRb8KRVmyWe9vzE?= =?us-ascii?Q?rVG08IAyDdwKxadOAs1muAUYD6IEVrf9GaGWdo0lkUSwciDyi4gws+uclcEz?= =?us-ascii?Q?+4Gs/XspcmqVFRzGWedVEVckwhLWv2bz4mYcimZn5L9FLaHV2LHW/1FJaPQr?= =?us-ascii?Q?sbiB62cSIc9ChCccfE/5ctO+6A+twXuMi+7/UpLykNYyCoPqahEEhy5ZyepD?= =?us-ascii?Q?31KxS8rjSzH4ZDe5HXvxlQI8QkDnsc9Us0WG0M59W0duU7t9ccKqf+mtiGvN?= =?us-ascii?Q?6dZ3fiKHHzp2j4+k9Fp2u5vAcN22LS8ErazxjYlOHEWVRJ3Ec0VNGvwfZg9l?= =?us-ascii?Q?qlRgEAlPj5bXvfmM0lNcUaCmluiOSpf7nslCXL8kx04mTcBNfPACw2l9ut65?= =?us-ascii?Q?w00zuClwnorRxfaMXTx+pBS7XDeQ0lsEvlxk/DA5Eg/+E8XP6tq6h9zhcAp5?= =?us-ascii?Q?IEehkfKFtVdEESAQ0cCO3v1tVFVHIX0TzmR4/S50PhvU9cycOkSf4lXZ4hw2?= =?us-ascii?Q?CR0lERGIQ0Evk8ypi6DF6vtZN/903OPS5nhGuZIg/pZPr8fZok9NVHBtUXXH?= =?us-ascii?Q?pK38DcGbreMidOhi0/gIUJHKkRCa5wQqvKFQqZhzXtTfHw6jI5iSicxvjsj2?= =?us-ascii?Q?uolr/zf+drFclhp9QtqxgWKU4znVIYFtuHlSNnru3hTmt9D7AqFK/UgcSh0g?= =?us-ascii?Q?LHHUJf6spTg6Kl49hrMVIApK8oAlWj1Est042drMz74HpWS1Xupiieq8QYZg?= =?us-ascii?Q?GtKVuclF6VvXQ5lXbr1Z6tTc2D5HZpzvcwJTj0GGAWV2uhY0hu4WdHAySg5j?= =?us-ascii?Q?7Qqe97xpuSCphxKf8+K9fwJJoJD84nbiFZkvIqsveXKFBPEHhV0HgNt7oKaG?= =?us-ascii?Q?VG916OsTcXAlqDN64jQXgbjOUv0gl76e3Aj0ZMrmYV9kVdRuquyUJ5oc0HUG?= =?us-ascii?Q?Xs6+LXEbls5MplIkqcJA4h6SmYyuK9CEDV5IMATvbc1WIW8f1RW9f7mmZpgq?= =?us-ascii?Q?ZCTVSKxX92f9l5m/Yt/5h0DIB3ThLYkq45cMSzBgNTUrdqMwUPJhluYFtjut?= =?us-ascii?Q?BjJvnzzl6dQ3epZ69u4kqDrIyGoLUdhF4YrJDrmAvAelBslAMF7P9mNHT1F/?= =?us-ascii?Q?2pineISPOl1PcOydSHRFPTW5/G4uE/newaFvG?= X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1982;6:DEJFQuGon/ZjwPdXfVt24BhI0rTF70Yr6HF5S9WxkB+wODvh4tcu3VoD9jxw58FF51UcKxNZuw5viDLVX1ZHV1jn59tCHfdj5wrH3KiVgDNZ1eWR15XDPX/XRXYxuXr253OEjIPshAymbguG2hyl+07yiQ8WxipaoJ+/Ndn+UwtpqyKi7eUD3Hfw8K/zwCRf5TGQAqcFutUOyyAClDhqLD6esKpxXbMJugZ3XOP0VcYhDrR+XZu0KZSZLt+8psJCZ4GMKbgIoQWow30mx+kk0BKkSoKFbfTq9N3kkwbFS6s3mmoCm/YktZ0l5oLIBw/d;5:C1zu4sb58y8s16RpOqzLt562VKXCKfWv67g2fc52CMq3u5d2BrX2uqt4QKdfMdgW7HV55AYQdl4Fnop//N92uOkSuj5riPSNP/g0vnOxWa5ITVDeRGLwhJHIJ8CQIK5DrpTWxzvS3ENwGhqDxUSsCg==;24:31yCq2lkLLkI+dncyZao7f2wjvz0uVQrR3b+aehNulM2IU5uxXbTYfeDrvL3Oe3QMf2LA9G3f+jpguJc0XP9Z7i9b5zLyrQ1IyxKqc58Flw=;7:3KBRGD0DTVVXu6tD8YdPxHYE/4BW+eTJxR2VY65Rhk75UG2qy46RKbflYIdI0FEMLk054Guqn1Cx8hxI0fH8tVXcA0IQR4HhAPxIB5bPx5NXFZ3G4oxqhBRO2IUrgRsNXQ5IFxhPzleaJaMc8brWFQGZLU6kONd7+vb8FJZUVztlF8QsUpTEMBMoI/HUFN92HXTVrrBuQ9EkOwUWTW8bcXFHHiz2dMGhfx8siWf7JO34o/lSYBBtP07OWlBaZyXJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1982;20:jQpEsXdUZFlW1c7zZo2Jm5EmGq/J9OEuKWfUT9NsNSRHnszZG4wgIpSem66SXFXKM3KaYY8rLbKkITKAZiqqo68JF/sRNH8C1SvoDJOeHxeGv8lEtw4RgE+BTTplggB/6SCdZFXKDqNr1r+Tok1D6/PyFbtT+pr4XU1QJYA8riE= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2016 14:44:10.1826 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1982 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Size of slab object already stored in cache->object_size. Note, that kmalloc() internally rounds up size of allocation, so object_size may be not equal to alloc_size, but, usually we don't need to know the exact size of allocated object. In case if we need that information, we still can figure it out from the report. The dump of shadow memory allows to identify the end of allocated memory, and thereby the exact allocation size. Signed-off-by: Andrey Ryabinin --- mm/kasan/kasan.c | 1 - mm/kasan/kasan.h | 3 +-- mm/kasan/report.c | 8 +++----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c index c99ef40..388e812 100644 --- a/mm/kasan/kasan.c +++ b/mm/kasan/kasan.c @@ -584,7 +584,6 @@ void kasan_kmalloc(struct kmem_cache *cache, const void *object, size_t size, get_alloc_info(cache, object); alloc_info->state = KASAN_STATE_ALLOC; - alloc_info->alloc_size = size; set_track(&alloc_info->track, flags); } } diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 31972cd..aa17546 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -75,8 +75,7 @@ struct kasan_track { struct kasan_alloc_meta { struct kasan_track track; - u32 state : 2; /* enum kasan_state */ - u32 alloc_size : 30; + u32 state; }; struct qlist_node { diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 861b977..d67a7e0 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -136,7 +136,9 @@ static void kasan_object_err(struct kmem_cache *cache, struct page *page, struct kasan_free_meta *free_info; dump_stack(); - pr_err("Object at %p, in cache %s\n", object, cache->name); + pr_err("Object at %p, in cache %s size: %d\n", object, cache->name, + cache->object_size); + if (!(cache->flags & SLAB_KASAN)) return; switch (alloc_info->state) { @@ -144,15 +146,11 @@ static void kasan_object_err(struct kmem_cache *cache, struct page *page, pr_err("Object not allocated yet\n"); break; case KASAN_STATE_ALLOC: - pr_err("Object allocated with size %u bytes.\n", - alloc_info->alloc_size); pr_err("Allocation:\n"); print_track(&alloc_info->track); break; case KASAN_STATE_FREE: case KASAN_STATE_QUARANTINE: - pr_err("Object freed, allocated with size %u bytes\n", - alloc_info->alloc_size); free_info = get_free_info(cache, object); pr_err("Allocation:\n"); print_track(&alloc_info->track); -- 2.7.3