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 4F62ACFC500 for ; Mon, 14 Oct 2024 08:53:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BBABE6B0082; Mon, 14 Oct 2024 04:53:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B44BD6B0083; Mon, 14 Oct 2024 04:53:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 948906B0085; Mon, 14 Oct 2024 04:53:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 728C16B0082 for ; Mon, 14 Oct 2024 04:53:38 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 75E43140B85 for ; Mon, 14 Oct 2024 08:53:30 +0000 (UTC) X-FDA: 82671594348.10.E0CED5F Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf05.hostedemail.com (Postfix) with ESMTP id 7E194100005 for ; Mon, 14 Oct 2024 08:53:24 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=txCMgrn6; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=srrGAWyH; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=H+2eXESj; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=U8fFOABY; spf=pass (imf05.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728895943; a=rsa-sha256; cv=none; b=FZOAYD3JAXgbooweTVQneXCjZwNM6FaOyt4rPhqHsncSx9v/JcnNk/2Wvrc3VK1qpIKRz/ vXB5LcyNfDw6KPMU9LA64INahRbjHqEhmOCbVG2NE2iVPHsbqS31FRDtCexdZuyHRonw79 c+9uAvoMMAbOQPtST6iyzyqrjAC7Btk= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=txCMgrn6; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=srrGAWyH; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=H+2eXESj; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=U8fFOABY; spf=pass (imf05.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728895943; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=VkZ73gkatyjPy2/ge37jSry6pjGozQUYmtnYd9iTMRI=; b=GPCu/9pq5DJ8jsVvErOMa+ZAhp8KDwNzqqSdDhvJf+jmwprCFbAkp3cN0PMxRZLeJjZvb9 jjmpIxV+MogbgX1f37SEiLUiVzsHq7vizSaI3fEznjOy/ypEw17ShL1uVPV6eo9Q/pOIQX 1ZHxNC16z2UhKAvZGe+2P76Wbx5AGgI= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 01B2021BD1; Mon, 14 Oct 2024 08:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1728896014; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=VkZ73gkatyjPy2/ge37jSry6pjGozQUYmtnYd9iTMRI=; b=txCMgrn6GHxWgCZdJIRYPz1FHIJwnWzMQXnW1WeoQBuMB0zjaBDwWLgNgozo9Lhft3uqIP mRWcR0t/0KLOnWSKdBRX7gVnDOMkfqBVeKrHK5oNT/Qq3nGUoeNPT/fZTVCou40IQch9wq QOv9fS9aEaKP/WLo0f+Y/sNs5NZslK8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1728896014; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=VkZ73gkatyjPy2/ge37jSry6pjGozQUYmtnYd9iTMRI=; b=srrGAWyHbOHoEiML1ydg8mwv+taW+lF8MxnalLTp4pJxQ7Oci/BRhCK1iro5mFp2OqGgWt DSeLae6gxI/m7mBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1728896013; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=VkZ73gkatyjPy2/ge37jSry6pjGozQUYmtnYd9iTMRI=; b=H+2eXESj+pDqIwXHXYqWGFOEGivJ3yKXFc8NTxSciC1+wYrZY0C/RrSp0hOf7Sq4w6o+g7 1+WGgVpe5cK2cpC09mSDQK1Uexx+vPBKNZXf5rmCwhm+tPOx9iZCcAiBP2NeiF2tapMPh7 orZVNs8Kb3yHW9xmT3MHs5/3uZ5Ogd0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1728896013; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=VkZ73gkatyjPy2/ge37jSry6pjGozQUYmtnYd9iTMRI=; b=U8fFOABYMJDcg5OHRFg0V60EZDEmKYKqOU1m9oEYrNJ5QENifPdOsEst7U6G1vGq15v5TM OBeJfrWyJpwsCYCQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CAAD113A42; Mon, 14 Oct 2024 08:53:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id Ju0iMQzcDGc4ewAAD6G6ig (envelope-from ); Mon, 14 Oct 2024 08:53:32 +0000 Message-ID: Date: Mon, 14 Oct 2024 10:53:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 0/5] mm/slub: Improve data handling of krealloc() when orig_size is enabled To: Feng Tang Cc: Marco Elver , Andrew Morton , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrey Konovalov , Shuah Khan , David Gow , Danilo Krummrich , Alexander Potapenko , Andrey Ryabinin , Dmitry Vyukov , Vincenzo Frascino , "linux-mm@kvack.org" , "kasan-dev@googlegroups.com" , "linux-kernel@vger.kernel.org" , Eric Dumazet References: <20240911064535.557650-1-feng.tang@intel.com> <49ef066d-d001-411e-8db7-f064bdc2104c@suse.cz> <2382d6e1-7719-4bf9-8a4a-1e2c32ee7c9f@suse.cz> Content-Language: en-US From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= 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 EP+ylKVEKb0Q2A== In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: 8hx4powerpre8zbufyc6iatbmgm8yc8i X-Rspamd-Queue-Id: 7E194100005 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1728896004-584922 X-HE-Meta: U2FsdGVkX19Tn8CxffrtJpwQCXOgBKumIaA4nKXnFodrGQ/Xm8khoDsOnjTF44JMEvDlrhxXUS1EDKS9IY6iDUgD7Amve+rBVDWad9zH8Kif/LJG7wsOkP+mIfwgl9mGNn5hWOedKZuzIIEJZJnP85LVXokhN0TI7+EDKGict3A7y6rd9sU/JCTYnp+5Yc0U5Xmcz7afPFZJhVjA416POZDxe/mHhcZLrfKyffTBhoPLksWlph1tRf684MsxjWx63ESWspzdrTEAOjxal/4xMId3z4jBx+EsKAlJhu7xF3ovsvjF0cxawhy02DbRNpxNzb+PWJzOKpwOHepk2I/PgClw0YvXJ79Tms/6HwZCorXlpi7kzSLyzS5SWdiyl0U18Nnkg8cQnfZckPVbRe8ImsptDGbA9emmq/bw2YxEmlS3MGBen6sfu6+cRBuCjYTq9KtJDvFjTTUfL1usvaaM1yXD1cXXD5gOfivzXp0MEN9JVEYb2+Ufq8bq78UFIB/wCgbfe1HaUOW910+ddxByhxQRwjDsAKbJZLTayPKLQ6Hmcoi5WXNT+yYUbiJY8hXW5LcL+HcSoUQ9OeEKEf5Ooh6jIfly2iPOGHcCGvtXzkCEcn/y9XXm4+shJiCcJxHYtGlqSixwOfx0hWKR7rVimUqV28uxzsOmTNc4oyuuBGDfeg6g6R27iIp/iV5m45wCz76v5calD7sONUSYuHJ2IsAbUMzwgZk2A/ZI2C3kbWDkr6eX/b7ihRwKQQLRHoco2UWTOEoXbSe1j9YiVfewO9xZt2tegJadp7opygH0qgAQy6pCM3/PxCQCVJsqqn2utudCGrXdQqsRK4o+JsAQ+Ub9QsIKUAUwDp447jIOKpOD8re7lZwjkJNMoYCMbNgYHU1FsDUDgOVlymYy+UdLcfXpUanse6mHhseqst5q8NO36kgGihu9l37f7FZl6/gWoa8TGAwT0irO24/HZjd GJGBh/fh 3RRb9y4IFFNAKN8utWk+ErBqMQ30RylbQbeF09Qr9R9FeIqWfi/84djokeDyGQbFE8aqz9jV7YchgowopjRoe8yqU+vqX1Qu7aFlTMx2vUtlyJM2xtGtkVGhhpeSvYg9FhgWTVM7JIJbLq6n4UFZceg/zFEw0vlSv11FfZNUNezVIyO2xhb0xsvfFyDIrvLygQdVOU9aqS1IJ6TU9+6GfTr0JG4b3cfYfzlngoQlcdzvDJHRj4ATECNiOkugvWTVBl2xKYD2dziypxrg4To6Ld2jVbPPufTB/5CgcUKg8TYo0bFHa5Hwlzv1uk/7ULpS1Krc5nPq/+kanzgH6UnNA5c0DxLaARoHlKVf0KaHJY9SZCiCK3PZG4QKvaYGaQmbP3ybWJjmAusY3XJYGE0edxOXvD/U++Qu1k7cKlDDjd4OPaFS1ADYGFIH/zS+81kTLukrN 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: List-Subscribe: List-Unsubscribe: On 10/14/24 09:52, Feng Tang wrote: > On Fri, Oct 04, 2024 at 05:52:10PM +0800, Vlastimil Babka wrote: > Thanks for the suggestion! > > As there were error report about the NULL slab for big kmalloc object, how > about the following code for > > __do_krealloc(const void *p, size_t new_size, gfp_t flags) > { > void *ret; > size_t ks = 0; > int orig_size = 0; > struct kmem_cache *s = NULL; > > /* Check for double-free. */ > if (likely(!ZERO_OR_NULL_PTR(p))) { > if (!kasan_check_byte(p)) > return NULL; > > ks = ksize(p); I think this will result in __ksize() doing skip_orig_size_check(folio_slab(folio)->slab_cache, object); and we don't want that? Also the checks below repeat some of the checks of ksize(). So I think in __do_krealloc() we should do things manually to determine ks and not call ksize(). Just not break any of the cases ksize() handles (kfence, large kmalloc). > > /* Some objects have no orig_size, like big kmalloc case */ > if (is_kfence_address(p)) { > orig_size = kfence_ksize(p); > } else if (virt_to_slab(p)) { > s = virt_to_cache(p); > orig_size = get_orig_size(s, (void *)p); > } > } else { > goto alloc_new; > } > > /* If the object doesn't fit, allocate a bigger one */ > if (new_size > ks) > goto alloc_new; > > /* Zero out spare memory. */ > if (want_init_on_alloc(flags)) { > kasan_disable_current(); > if (orig_size && orig_size < new_size) > memset((void *)p + orig_size, 0, new_size - orig_size); > else > memset((void *)p + new_size, 0, ks - new_size); > kasan_enable_current(); > } > > /* Setup kmalloc redzone when needed */ > if (s && slub_debug_orig_size(s) && !is_kfence_address(p)) { > set_orig_size(s, (void *)p, new_size); > if (s->flags & SLAB_RED_ZONE && new_size < ks) > memset_no_sanitize_memory((void *)p + new_size, > SLUB_RED_ACTIVE, ks - new_size); > } > > p = kasan_krealloc((void *)p, new_size, flags); > return (void *)p; > > alloc_new: > ret = kmalloc_node_track_caller_noprof(new_size, flags, NUMA_NO_NODE, _RET_IP_); > if (ret && p) { > /* Disable KASAN checks as the object's redzone is accessed. */ > kasan_disable_current(); > memcpy(ret, kasan_reset_tag(p), orig_size ?: ks); > kasan_enable_current(); > } > > return ret; > } > > I've run it with the reproducer of syzbot, so far the issue hasn't been > reproduced on my local machine. > > Thanks, > Feng > >> >> But either way means rewriting 2 commits. I think it's indeed better to drop >> the series now from -next and submit a v3. >> >> Vlastimil >> >> >> Thanks, >> >> -- Marco >> > >>