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 3F563C3DA4A for ; Sat, 10 Aug 2024 20:23:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 66CB06B008A; Sat, 10 Aug 2024 16:23:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 61BD96B0092; Sat, 10 Aug 2024 16:23:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 494E66B0095; Sat, 10 Aug 2024 16:23:35 -0400 (EDT) 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 2A5AA6B008A for ; Sat, 10 Aug 2024 16:23:35 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9756E80B74 for ; Sat, 10 Aug 2024 20:23:34 +0000 (UTC) X-FDA: 82437461148.01.2229F27 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf20.hostedemail.com (Postfix) with ESMTP id 3A29F1C0009 for ; Sat, 10 Aug 2024 20:23:31 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=TGmFIMzF; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=TqPtBLoE; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=TGmFIMzF; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=TqPtBLoE; spf=pass (imf20.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723321378; a=rsa-sha256; cv=none; b=CNtwTfjVB/RzFnI5i2P3wP0e2+t5ENZ/sbbzqysg85XCu3vOkDRK9+lplIf3HEmaFdoOhA Tcs0xpKYJNz3qIUGyqvtZJdKW3hDTrSi0lX78w405eQAy2nBg/vnjT19QlnfnlsrNK8efo eEuyb5lVQr8jTYcfS6GO+NOS91N0Jq0= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=TGmFIMzF; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=TqPtBLoE; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=TGmFIMzF; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=TqPtBLoE; spf=pass (imf20.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 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=1723321378; 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=dU5FpYeZ5zWDwOs2yWnFMVpSiFRDeYnnwFffftni6eo=; b=25idAOJu/RZzzA7hFsQOcz+dQXyH6JiIYaLHesm9vPvWfhrccstYaVWtoTg17ZKn+4Zcgn 7F5sXQt38hT8Xd1fNs0+NOeeJMgi6aXfv63xna8TAUbD5aCb8cbaR7camYhI6n5HCD4/bK h+niIveHnfvVAKTYeNMB/QssYzWRwxE= 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-out2.suse.de (Postfix) with ESMTPS id 516EA1F86C; Sat, 10 Aug 2024 20:23:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1723321410; 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; bh=dU5FpYeZ5zWDwOs2yWnFMVpSiFRDeYnnwFffftni6eo=; b=TGmFIMzFIMV3cKlNeopKwIJe+8PdLEKWBx2CUqapgYU5OfcVY5aDlw66da1JUPgXKOYoQb ybuqOhnrOf8DgjYtX7cdwV9JUfJWFVh+9ZvTJ08rhJRlk1i6vS33/lbpBh8L8qGWYwXZTi pprIAlvC8xqXBjCFI+6J95zhmEENdCU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1723321410; 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; bh=dU5FpYeZ5zWDwOs2yWnFMVpSiFRDeYnnwFffftni6eo=; b=TqPtBLoEucA4YZTADDSDyeLt0AqTOeL+L/PXOBJ1VLvU72CgQWmBTObd8gxDdAC7BnPbxe Stz2Hp3iGmaxE1BA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1723321410; 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; bh=dU5FpYeZ5zWDwOs2yWnFMVpSiFRDeYnnwFffftni6eo=; b=TGmFIMzFIMV3cKlNeopKwIJe+8PdLEKWBx2CUqapgYU5OfcVY5aDlw66da1JUPgXKOYoQb ybuqOhnrOf8DgjYtX7cdwV9JUfJWFVh+9ZvTJ08rhJRlk1i6vS33/lbpBh8L8qGWYwXZTi pprIAlvC8xqXBjCFI+6J95zhmEENdCU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1723321410; 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; bh=dU5FpYeZ5zWDwOs2yWnFMVpSiFRDeYnnwFffftni6eo=; b=TqPtBLoEucA4YZTADDSDyeLt0AqTOeL+L/PXOBJ1VLvU72CgQWmBTObd8gxDdAC7BnPbxe Stz2Hp3iGmaxE1BA== 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 3997E13704; Sat, 10 Aug 2024 20:23:29 +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 O9/cC0HMt2bmQAAAD6G6ig (envelope-from ); Sat, 10 Aug 2024 20:23:29 +0000 Message-ID: <167495c0-187b-4fb8-8de5-63db0aef193e@suse.cz> Date: Sat, 10 Aug 2024 22:25:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [-next conflict imminent] Re: [PATCH v2 0/7] mm, slub: handle pending kfree_rcu() in kmem_cache_destroy() To: Andrew Morton , Stephen Rothwell Cc: Jann Horn , "Paul E. McKenney" , Joel Fernandes , Josh Triplett , Boqun Feng , Christoph Lameter , David Rientjes , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Julia Lawall , Jakub Kicinski , "Jason A. Donenfeld" , "Uladzislau Rezki (Sony)" , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, rcu@vger.kernel.org, Alexander Potapenko , Marco Elver , Dmitry Vyukov , kasan-dev@googlegroups.com, Mateusz Guzik References: <20240807-b4-slab-kfree_rcu-destroy-v2-0-ea79102f428c@suse.cz> <54d62d5a-16e3-4ea9-83c6-8801ee99855e@suse.cz> <20240809171115.9e5faf65d43143efb57a7c96@linux-foundation.org> From: Vlastimil Babka Content-Language: en-US In-Reply-To: <20240809171115.9e5faf65d43143efb57a7c96@linux-foundation.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Stat-Signature: kmym5iiny761ykj964ddtid8dep4qemo X-Rspamd-Queue-Id: 3A29F1C0009 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1723321411-622736 X-HE-Meta: U2FsdGVkX19+2UpFkqJdlfgN9qC+1PvwWJyO0bkXUylofHXj2DauXpnjxy6I95Mk+pk11fcns4DKlqFdq+Q4xSu8iVCRGNKpvdaU0TSmpcKZF8EhXbPhdT2jZ+0tzbtB4P0MLtLjpozpzDyLDfCAfNKrXBtkYRWDL4Lg59O3Fd36Hvk2Nav6isDOl12Ks3y2SGAYagnJayNjq3l8DnGzZk7mw3IRNZQ12HFtSKScE/Mz3avYon4Z4xsnmbCu5PeBBx0T82yE+D1CPo9Wbn6a/vIGblCZV6NCn8HHDFXdBL4uJ0vGIdS1ztDdQtetpDBk/Uzrz3e2HQsGXxmdGtleyb/E1g27M2Dc0XOXtv8XCW0JpwyDVsFvHsliWyKpKj9TsOyA/5sFrQtM2L0jw4Bpjp85p9WfFVkFJckXa/fisM/GVmVmA9HcOl/8x0DoraOSCQHdl0GJQg64iFQ7Au2pxuZoP9M2qmhLESKDBJhWw+HKGGDXzjT2fjDeTTpi/+2bC8WkGD/yMPrfH0BAvooV2uP1jKfX//bNc5HJdIjgsQz5Wxe96JZlDqAlpI1x7gHSqBCzlmjaSRoMDf2RHdEfRZMidJZDy1nrG6E9MSMeFYgCr6siogsoiRkbGEX57MzMqLOkvUpv2LwQsVSsEg8o7Vhd9WzwiNKX9t1MWRjqvSbYQUvyXCYbUJE4N/HzxvlOnd5umA8pgEfM4Uw+ozurPXcTEN87ef2cSHNOVlZnugW4NPLLUL31FWOEWAphp8AqDVguk9iADAbptSQRxZidVTJfMYZoKe3KVMiDaDKXMRMyn9NKZN8JPXJ7U4xegW3ahuGCPDaq+nAqR1Z8U1pNN7EiA6EAY1TQvn0riljn3RBn40UM3zjmbWavweweJ8dXBPCQm3tCb4yMBL4fWAkYGBB5yk+c+VrRbq2940oO1cP/CLYriX51WVXPoto6DItegHlEbFn6Pb2IPXEg/J8 Z2y1L2WT POfsvD8cRyf3bH98VDPPAUz7/4ZiM/SZMJ9j+m1SJxuY25bwlP2uWKSAzUAzCmIaMQ3c3fx8kIQvXEvxDKoBW2CU3pyyQBpBooR8QTkeGGuxwVWbSZdGS6Q8B7MqguByiEt6JhZ5G5Nih/4mNHDxaIHsG6wIpGMeMP4As7Je9NBdU7RE2IGFZqsMDDpTCoxx+CjhpFowwh0YCzCpzAMc5r3o49FCv9HTydbCMYQXrykuN8W+47EmV3f+U3HrKesA7uijNg7VhdVSbBisHrslGPK4WGC9fgeFj1miEjvcnOJJHlXWCpvRcJbn8/RNyztEy4xWoprbJYyY4+XZfwZLEcN4HlBnnGZRuauUpZ0G3PcqqPx2nolkKj3VBcmFxAaSCwPwlCJhdmCzB6iAOrkmtMWfOKAkqqAayutCsqvyoT2KiljqEQHISOeHRYfDcQ9qsWi2gznvxQraspbYlD5sTfUk8Qw== 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 8/10/24 2:11 AM, Andrew Morton wrote: > On Fri, 9 Aug 2024 17:14:40 +0200 Vlastimil Babka wrote: > >> On 8/9/24 17:12, Jann Horn wrote: >>> On Fri, Aug 9, 2024 at 5:02 PM Vlastimil Babka wrote: >>>> On 8/7/24 12:31, Vlastimil Babka wrote: >>>>> Also in git: >>>>> https://git.kernel.org/vbabka/l/slab-kfree_rcu-destroy-v2r2 >>>> >>>> I've added this to slab/for-next, there will be some conflicts and here's my >>>> resulting git show or the merge commit I tried over today's next. >>>> >>>> It might look a bit different with tomorrow's next as mm will have v7 of the >>>> conflicting series from Jann: >>>> >>>> https://lore.kernel.org/all/1ca6275f-a2fc-4bad-81dc-6257d4f8d750@suse.cz/ >>>> >>>> (also I did resolve it in the way I suggested to move Jann's block before >>>> taking slab_mutex() but unless that happens in mm-unstable it would probably be more >>>> correct to keep where he did) >>> >>> Regarding my conflicting patch: Do you want me to send a v8 of that >>> one now to move things around in my patch as you suggested? Or should >>> we do that in the slab tree after the conflict has been resolved in >>> Linus' tree, or something like that? >>> I'm not sure which way of doing this would minimize work for maintainers... >> >> I guess it would be easiest to send a -fix to Andrew as it's rather minor >> change. Thanks! > > That's quite a large conflict. How about we carry Jann's patchset in > the slab tree? OK I've done that and pushed to slab/for-next. Had no issues applying the kasan parts and merge with mm-unstable (locally rebased with Jann's commits dropped) had no conflicts either so it should work fine. Thanks!