From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7739EECAAA1 for ; Thu, 27 Oct 2022 19:27:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 08B706B0073; Thu, 27 Oct 2022 15:27:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 03B328E0002; Thu, 27 Oct 2022 15:27:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6CFF8E0001; Thu, 27 Oct 2022 15:27:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D85E26B0073 for ; Thu, 27 Oct 2022 15:27:19 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B07091A0B5D for ; Thu, 27 Oct 2022 19:27:19 +0000 (UTC) X-FDA: 80067712998.02.353DA96 Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by imf05.hostedemail.com (Postfix) with ESMTP id 4E86F10003E for ; Thu, 27 Oct 2022 19:27:19 +0000 (UTC) Received: by mail-oi1-f176.google.com with SMTP id r187so3500738oia.8 for ; Thu, 27 Oct 2022 12:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=o482CCSS2t5cpOMDg/QGNflnp9GjmK74VY4pwqBErkk=; b=QcfHLCvLcdDcNSS9JcyWsrQWJbT7Jc+6SF6HcUvkKjgVVCcFVUFqO3HlWPWjne7V1C gfT0VPSund4Lr96tMV2GhVNUM2EpbX3YbJ5oiuvdPTXqTogbHDCxJ9dMNP2wTKUvk3J2 uvFr94PoHHx/dwlKsNTzbl5h7lPXaU0KqF/Yz7GZrwakBovHByDYxp3xEMzsGlvJM+Qe tZ6yn8P/Q+mferkMK7XA6MCteWeO+Uoh2lgErz52R6Lat2RdgRT3zwMDXG819D7VF5M2 Mf6WLUjdNy06VyNf2e80/6nEgMGasSxg+BwmRPnSjoFWxYOfwt6+vepFfjb1riDcmxyg kB6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o482CCSS2t5cpOMDg/QGNflnp9GjmK74VY4pwqBErkk=; b=UCR8GfMkSFx+WlRR33x2kiPtKnNuK7jNdxoeuZOyvyNcrEGk9UUzCPCVp+tOlQdMNT Gfb5Zhr44uQ2jes24x/s+IvA+vMXiHqJJ3PiFRW8+/ezUutXHctGAfYRMdUxJQSvn/I/ vhTni5aiaisXXrFlnCgBoGNd9VPu+UZ7gY3sxscARNkuVv4BHmbmB4Nx7bQbXKC/mMva /Iq+1QgVAzEuobt89DXAFCAN3giRD3b1MUz08LHq9NWiSMRANc05ZQAGd7ojgUuM28FY hjItEpNPHoLwfvcBNGC8Jylh+Df8At4r3fs1pujttjjDMKGEevXVTQwn3JcW+94/SNRx Uv+A== X-Gm-Message-State: ACrzQf2qJrzMKaGyMFOXLeyXzeuKaZLta8DRHkWzevEuR+Q9OvmXDvhA P/Uf3JgV1BZ/bD4L4LI20mNX1+3rg26nLG3GzWM= X-Google-Smtp-Source: AMsMyM4b1HQd3inUE2h4UCjePESVxawpcJmPy1KHG+3ZdeaLK6CDEkcNyyBshtmKKT4N0IYLmhagnRYn5aIUr/lE+3U= X-Received: by 2002:a05:6808:1404:b0:355:4cd4:b10b with SMTP id w4-20020a056808140400b003554cd4b10bmr5744997oiv.207.1666898838501; Thu, 27 Oct 2022 12:27:18 -0700 (PDT) MIME-Version: 1.0 References: <20221021032405.1825078-1-feng.tang@intel.com> <20221021032405.1825078-2-feng.tang@intel.com> In-Reply-To: <20221021032405.1825078-2-feng.tang@intel.com> From: Andrey Konovalov Date: Thu, 27 Oct 2022 21:27:07 +0200 Message-ID: Subject: Re: [PATCH v7 1/3] mm/slub: only zero requested size of buffer for kzalloc when debug enabled To: Feng Tang Cc: Andrew Morton , Vlastimil Babka , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Dmitry Vyukov , Kees Cook , Dave Hansen , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666898839; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=o482CCSS2t5cpOMDg/QGNflnp9GjmK74VY4pwqBErkk=; b=anHCzf/hkYSfyUzPl8smk+AlHPO1rK4MljocYVWdpCUyya+glWII5oArHJ3415jasBiqKW 9BOxW7pObrn1/MG4YuPrzmgsZFPqLWPD70FR45Ibm6kyzwiLcG0WBc3GXSNB4IY8QAIPdm eyQzK1NFhSHubwDWH9V7TU6D2kHUcKk= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=QcfHLCvL; spf=pass (imf05.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.167.176 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666898839; a=rsa-sha256; cv=none; b=l/Y07iyhmZZkggcdiFYU9wCfiuIkLOIW0yXVRQNE3yj5x6qpMLL3FZZZ6KVATRFZXD9Rec lRe2FquC+z0qUc5OmEG2Hd+X2+dHyOBhSQpNaWBhuXzPb623CPxt4ZyMXvNHZzJkmfMR9g IBsE4QM2uEKCLYlvo3OJhN2e6C9RTkc= X-Stat-Signature: m6x4uz5hauq5fsbr36kb8afpjj7jzhsx X-Rspamd-Queue-Id: 4E86F10003E Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=QcfHLCvL; spf=pass (imf05.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.167.176 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1666898839-845205 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Oct 21, 2022 at 5:24 AM Feng Tang wrote: > > kzalloc/kmalloc will round up the request size to a fixed size > (mostly power of 2), so the allocated memory could be more than > requested. Currently kzalloc family APIs will zero all the > allocated memory. > > To detect out-of-bound usage of the extra allocated memory, only > zero the requested part, so that redzone sanity check could be > added to the extra space later. > > For kzalloc users who will call ksize() later and utilize this > extra space, please be aware that the space is not zeroed any > more when debug is enabled. (Thanks to Kees Cook's effort to > sanitize all ksize() user cases [1], this won't be a big issue). > > [1]. https://lore.kernel.org/all/20220922031013.2150682-1-keescook@chromium.org/#r > Signed-off-by: Feng Tang > --- > mm/slab.c | 7 ++++--- > mm/slab.h | 18 ++++++++++++++++-- > mm/slub.c | 10 +++++++--- > 3 files changed, 27 insertions(+), 8 deletions(-) > > diff --git a/mm/slab.c b/mm/slab.c > index a5486ff8362a..4594de0e3d6b 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -3253,7 +3253,8 @@ slab_alloc_node(struct kmem_cache *cachep, struct list_lru *lru, gfp_t flags, > init = slab_want_init_on_alloc(flags, cachep); > > out: > - slab_post_alloc_hook(cachep, objcg, flags, 1, &objp, init); > + slab_post_alloc_hook(cachep, objcg, flags, 1, &objp, init, > + cachep->object_size); > return objp; > } > > @@ -3506,13 +3507,13 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, > * Done outside of the IRQ disabled section. > */ > slab_post_alloc_hook(s, objcg, flags, size, p, > - slab_want_init_on_alloc(flags, s)); > + slab_want_init_on_alloc(flags, s), s->object_size); > /* FIXME: Trace call missing. Christoph would like a bulk variant */ > return size; > error: > local_irq_enable(); > cache_alloc_debugcheck_after_bulk(s, flags, i, p, _RET_IP_); > - slab_post_alloc_hook(s, objcg, flags, i, p, false); > + slab_post_alloc_hook(s, objcg, flags, i, p, false, s->object_size); > kmem_cache_free_bulk(s, i, p); > return 0; > } > diff --git a/mm/slab.h b/mm/slab.h > index 0202a8c2f0d2..8b4ee02fc14a 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -720,12 +720,26 @@ static inline struct kmem_cache *slab_pre_alloc_hook(struct kmem_cache *s, > > static inline void slab_post_alloc_hook(struct kmem_cache *s, > struct obj_cgroup *objcg, gfp_t flags, > - size_t size, void **p, bool init) > + size_t size, void **p, bool init, > + unsigned int orig_size) > { > + unsigned int zero_size = s->object_size; > size_t i; > > flags &= gfp_allowed_mask; > > + /* > + * For kmalloc object, the allocated memory size(object_size) is likely > + * larger than the requested size(orig_size). If redzone check is > + * enabled for the extra space, don't zero it, as it will be redzoned > + * soon. The redzone operation for this extra space could be seen as a > + * replacement of current poisoning under certain debug option, and > + * won't break other sanity checks. > + */ > + if (kmem_cache_debug_flags(s, SLAB_STORE_USER) && > + (s->flags & SLAB_KMALLOC)) > + zero_size = orig_size; > + > /* > * As memory initialization might be integrated into KASAN, > * kasan_slab_alloc and initialization memset must be > @@ -736,7 +750,7 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, > for (i = 0; i < size; i++) { > p[i] = kasan_slab_alloc(s, p[i], flags, init); > if (p[i] && init && !kasan_has_integrated_init()) > - memset(p[i], 0, s->object_size); > + memset(p[i], 0, zero_size); > kmemleak_alloc_recursive(p[i], s->object_size, 1, > s->flags, flags); > kmsan_slab_alloc(s, p[i], flags); > diff --git a/mm/slub.c b/mm/slub.c > index 12354fb8d6e4..17292c2d3eee 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -3395,7 +3395,11 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s, struct list_l > init = slab_want_init_on_alloc(gfpflags, s); > > out: > - slab_post_alloc_hook(s, objcg, gfpflags, 1, &object, init); > + /* > + * When init equals 'true', like for kzalloc() family, only > + * @orig_size bytes will be zeroed instead of s->object_size > + */ > + slab_post_alloc_hook(s, objcg, gfpflags, 1, &object, init, orig_size); > > return object; > } > @@ -3852,11 +3856,11 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, > * Done outside of the IRQ disabled fastpath loop. > */ > slab_post_alloc_hook(s, objcg, flags, size, p, > - slab_want_init_on_alloc(flags, s)); > + slab_want_init_on_alloc(flags, s), s->object_size); > return i; > error: > slub_put_cpu_ptr(s->cpu_slab); > - slab_post_alloc_hook(s, objcg, flags, i, p, false); > + slab_post_alloc_hook(s, objcg, flags, i, p, false, s->object_size); > kmem_cache_free_bulk(s, i, p); > return 0; > } > -- > 2.34.1 > For the KASAN part: Reviewed-by: Andrey Konovalov Thanks!