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 C4270D10F2F for ; Sun, 17 Nov 2024 21:02:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1595F6B00AF; Sun, 17 Nov 2024 16:02:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 109E86B00CF; Sun, 17 Nov 2024 16:02:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9E206B00D0; Sun, 17 Nov 2024 16:02:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C51A26B00AF for ; Sun, 17 Nov 2024 16:02:02 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4E191C0111 for ; Sun, 17 Nov 2024 21:02:02 +0000 (UTC) X-FDA: 82796807100.08.F4FC374 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf10.hostedemail.com (Postfix) with ESMTP id 7DAE1C0008 for ; Sun, 17 Nov 2024 21:01:38 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=KcHSRb11; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="+4DEh/HW"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=KcHSRb11; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="+4DEh/HW"; dmarc=none; spf=pass (imf10.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731877186; a=rsa-sha256; cv=none; b=zRm6bmWxv3ng02yskg+SmgKftLJUUqpzdE3KnrWTnphHabECucTl4gqTdCKD0uQxf4FXt+ gAEcJcqNLkz0zxm07e/0D8Erv7vPEXXlN4GjzRY1fJn7Q5L7ps9nzfO+/o9GoaIIGVXWC9 JvBabgSG8Vk7v03dsspSdZMkGkDQvUs= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=KcHSRb11; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="+4DEh/HW"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=KcHSRb11; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="+4DEh/HW"; dmarc=none; spf=pass (imf10.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731877186; 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=xLTr/NahoUUzWTaTSWHEo2tnJpwITYiCHiCG5lE+2BQ=; b=WnL+41lJN26Q6kXiawCrx/2ke9k9gJ21efDyfijrFMx7G//hTz6rJXxC6VTW1QSsMJI1lY aotE/S8OjUdgW3acFCNHXO+wXeGqKSe96dorX6zCp2+E1WMIV6mV/OiJ8pWr5bVckt86Nz qno/UZaOxQtjlsn4EAmU87Sbst4ShMo= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 C60AC21288; Sun, 17 Nov 2024 21:01:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1731877317; 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=xLTr/NahoUUzWTaTSWHEo2tnJpwITYiCHiCG5lE+2BQ=; b=KcHSRb11TedM4R6iEOebivmcfzIM7q1A66Fn+0sC8VB3A4O4v1U9WdQkG0/BsA72tlIs7O 8zIioVYhYOHWkervA4eB+htlSJKqyNA2rGez8vq3+CtQjMApLLCyUVsgDvN7C0W3qVVmJc 3cGCeDm1AC7SxEQ2nFLUetTbLHLuw2o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1731877317; 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=xLTr/NahoUUzWTaTSWHEo2tnJpwITYiCHiCG5lE+2BQ=; b=+4DEh/HWB42jr7OAB7JWLlJXNh3NdmkCORClvYpvySMmG0F7yu68vRa0QpS8h1PzGImyZ6 g39leJIfEM0MupDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1731877317; 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=xLTr/NahoUUzWTaTSWHEo2tnJpwITYiCHiCG5lE+2BQ=; b=KcHSRb11TedM4R6iEOebivmcfzIM7q1A66Fn+0sC8VB3A4O4v1U9WdQkG0/BsA72tlIs7O 8zIioVYhYOHWkervA4eB+htlSJKqyNA2rGez8vq3+CtQjMApLLCyUVsgDvN7C0W3qVVmJc 3cGCeDm1AC7SxEQ2nFLUetTbLHLuw2o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1731877317; 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=xLTr/NahoUUzWTaTSWHEo2tnJpwITYiCHiCG5lE+2BQ=; b=+4DEh/HWB42jr7OAB7JWLlJXNh3NdmkCORClvYpvySMmG0F7yu68vRa0QpS8h1PzGImyZ6 g39leJIfEM0MupDg== 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 A778713297; Sun, 17 Nov 2024 21:01:57 +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 y84mKMVZOmcaXAAAD6G6ig (envelope-from ); Sun, 17 Nov 2024 21:01:57 +0000 Message-ID: Date: Sun, 17 Nov 2024 22:01:57 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [GIT PULL] slab updates for 6.13 Content-Language: en-US To: Xiongwei Song , Sasha Levin Cc: brauner@kernel.org, viro@zeniv.linux.org.uk, Linus Torvalds , David Rientjes , Christoph Lameter , Andrew Morton , "linux-mm@kvack.org" , LKML , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com> References: <03ec75a9-aade-4457-ac21-5649116afa98@suse.cz> <52be272d-009b-477b-9929-564f75208168@suse.cz> 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: 8bit X-Rspamd-Action: no action X-Rspamd-Queue-Id: 7DAE1C0008 X-Stat-Signature: md8dpiwzmjt6scx1x6c4stoqn9ywfex5 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1731877298-116916 X-HE-Meta: U2FsdGVkX19skT1IjJgThdIjyLcQX991KgOwoOMOKnt7FW5+z0BONC0HsOoUQcLhCuMCfNzV1kAtz/cmHt1mN/yd8ZsGhleZS7pPxEesokcdkG8GbgT68OmVjaQXTyIUrEcilUqLQjzPYz5/1PX3DMS/CorrpYPTP2YXMaUA0KxZSPKs0Vwb7PeIycEXYuHaEZpqipUUmQ0LfddmBcPjG+DbK4HYldw2Ek7wmVq1VvatGC337Zqeeo/H2XNJDaSehBcrxQDGm4AvAmfMkoYXPHZKODCAz0XgLojVCo5xwM3c6If2VSlztBrQXR5BcJ8SvxLfV9c3ZxnW4aL6iwcuVFlo6AwAbPLGl9EKUi5llCH2uppV9vHF/62y+X8A2AzF0sUOwbKNloanBoQTVmfM0RWIaLoUagKlm/2dYtfIpFpvT4EgJaTtc2gONE1kZalsRw3ng1A2shoxa3l1ArCvks6OIohXKNl2uj+NT7nu29O5+EbbRKeivl6a8UWUZuyDQV03/mm4aDG51vN2uYH6OKPJ6W2pJk+xAa0fNIBU/g3wsXmp4lLXqhdFcT+tG/ypP3ZnBeuig0WifOV9hNR1UiS+t6aqxc8QB9s/ZlHLO9/Ep8Bxjq8lOYcVMM8bYvn1J5dMCJlrNcGsh6BoSzZj/Rds8Q1j3U1KUxef6+CqP5ZQys246/rvRNILUxAV4UoJGDjUQobYomZmzglDKEzoYjr/GCklWRhuSVDictahTgtTUN1Afa+PrPEYPiac6VhxY3WRiqekDVF/9dn4hjUQGx9ceTmwPVxcq9UwKP69RfP1GwkEhvuCDYXIJdctiNyBUpYP9bcFQdJbeEr+dC6hkHfg/91EpFo1LI8eoZSLWgPZEktodXK7Y1CZsGUJPBMY+470txRjROHDs82MgGBAxPV16DrbjkF0umRshBZLz+Mz8v6uRohCM/NB0oMYBnx3o3LlJwiq+U6KovWKu15 wXl5LwjV Iq05ebd+1R1DgM53RqU3Z/xACgMRPbF0T/ANQhw7L2LSMCo3bNV3jaKrHGkjg8fMruToduTICTKG7uRZ6XlIwTxBV+pv/LFZHd2yEqygVzcHp2e3wsXsznHJrAuv8s/OfToX0mcdoK6qczHjE1BZXHjSJxFSxIURU90vKVdmNGURgysPKRNMYhzZc9ml8gk7+zf0AiyR7CwPY3EF2IZfmR831eLkEj/6fPXdsn4KYfFFZRAs7kxfdilIvc9J0dV8dF8e6X/GyHhYoTmbHEXPLdszn3QqUVTTHh2PF5Or1XGXS/YT62RK1cfjtAvXbcoasdz4jhuohqe4K153dSFFDwWcfzLrtdMYJolSZDnT3+lBrj288QIQ4Y9STt7YJlqkbkGQIQMik4j+uHukXzKNf7vQUfGG81hfMsVZiBCGYfMax9/MUleeyj4knfEGhOPIVY7HuK2H6RQqPjaE= 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 11/17/24 13:56, Xiongwei Song wrote: > It seems there is a conflict between fc0eac57d08c ("slab: pull kmem_cache_open() > into do_kmem_cache_create()") and 543c5bde72e9 ("mm/slab: Allow cache creation > to proceed even if sysfs registration fails"). The err is initialized No conflict, commit fc0eac57d08c is from 6.12-rc1, there's no merge here. I've introduced the bug by trying to improve Hyeonggon's patch and he quickly corrected me [1] so the buggy version never even made it to -next. But here I managed to resurrect it before the git pull. [1] https://lore.kernel.org/all/195242b4-5471-419a-a350-08fd246973f0@suse.cz/ > to -EINVAL in > the entry of do_kmem_cache_create(), sysfs_slab_add() call can assign > a value to > err normally, but the assignment to err variable has been removed in > Hyeonggon's > patch, so do_kmem_cache_create() returns -EINVAL normally. We probably can do > the following fix: > > diff --git a/mm/slub.c b/mm/slub.c > index 73eea67a306b..19630a2da8e1 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -6199,9 +6199,11 @@ int do_kmem_cache_create(struct kmem_cache *s, > const char *name, > if (!alloc_kmem_cache_cpus(s)) > goto out; > > + /* The error code is not needed any more. */ > + err = 0; > + > /* Mutex is not taken during early boot */ > if (slab_state <= UP) { > - err = 0; That was indeed the fix. > goto out; > } > > Regards, > Xiongwei > > On Sun, Nov 17, 2024 at 11:42 AM Sasha Levin wrote: >> >> On Sat, Nov 16, 2024 at 09:43:07PM +0100, Vlastimil Babka wrote: >> >On 11/16/24 16:35, Sasha Levin wrote: >> >> [ Obviously I fat-fingered it and didn't add Christian or Al ] >> > >> >I have found the problem and looks like I managed to force push an older >> >broken version of a branch, possibly due to switching between two computers. >> >Serves me well for amending in some last minute R-b tags. Doing git diff >> >@{u} to check for unexpected suprirses before pushing the result didn't help >> >this time, either I forgot or was blind. >> > >> >I have deleted the slab-for-6.13 signed tag and pushed the fixed branch only >> >to -next. Thanks a lot Sasha for catching this early and please drop the >> >merge from the for-linus tree. >> >> I've dropped the merge and tests are passing now, thanks! >> >> -- >> Thanks, >> Sasha >>