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 54F39C77B61 for ; Fri, 28 Apr 2023 07:13:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C36326B0071; Fri, 28 Apr 2023 03:13:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B97F66B0072; Fri, 28 Apr 2023 03:13:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A11566B0074; Fri, 28 Apr 2023 03:13:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8D7C46B0071 for ; Fri, 28 Apr 2023 03:13:15 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 44364C02D5 for ; Fri, 28 Apr 2023 07:13:15 +0000 (UTC) X-FDA: 80729933550.27.2EECB44 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf24.hostedemail.com (Postfix) with ESMTP id 1A608180010 for ; Fri, 28 Apr 2023 07:13:12 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=W9kYRwWG; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="hI0/yIUG"; spf=pass (imf24.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 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=1682665993; 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=LJ+TMkCiDgfegvvsz0b3841mXTh3rnZkeHoyCdZ3g2o=; b=PC7D9VTLAFbM4/upw+6nMKC8JhewUZydbPKnCZLGCyJTPXRGTRc3nKorZb1TEY7yVaZiZv i6giXGPockWbtiL34zIFPbg+68n28hDHCMKuQCLcOru6lKKIVCMlTq7JrO/pCcFPYx/5qU K6Er0OF2oaIaqkNDaTMVuu3Y1ggLGt4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=W9kYRwWG; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="hI0/yIUG"; spf=pass (imf24.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682665993; a=rsa-sha256; cv=none; b=ZX5qmy8bIMClsmR08E8mrGQ6SGC+qmiWxGwbyW7k0SVQKTjzZlwFLCtW7Aqzwn1I7DCRAd /4KgyYhBzwdQNoWxja7cL4z27zPwayanSOkfpXuXUMxM2vfj5Y8+/LO0P5Uu0NnR9YJx0a XvPN2C/igzIdG551tztmite7nkA0pn4= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 428511FFFA; Fri, 28 Apr 2023 07:13:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1682665991; 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=LJ+TMkCiDgfegvvsz0b3841mXTh3rnZkeHoyCdZ3g2o=; b=W9kYRwWGdploRnynCxhQA6nn/OPsw3CdOInic8+pvp7oDcet2eShcDStKef/Ma72D5kMp5 UZKPdwh88ZSsAnYG5r/die/XpbmsAO+GjZ6/fTaD4HG3bAyUtYN5zzdnI7kaTWpJCLHYXH I9BsMVyxKILhHqhDrWtTZ08UPT5OcmQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1682665991; 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=LJ+TMkCiDgfegvvsz0b3841mXTh3rnZkeHoyCdZ3g2o=; b=hI0/yIUG0x80oyE863aFGoetKlHqs9fMKCgzSEVLD5N7r6P4oduv/mBvD++Lt7TDCNEvNn irMGXGwb/GBARwBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0F36D138FA; Fri, 28 Apr 2023 07:13:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 60bxAgdyS2SzTQAAMHmgww (envelope-from ); Fri, 28 Apr 2023 07:13:11 +0000 Message-ID: Date: Fri, 28 Apr 2023 09:13:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH for v6.3 regression] mm/mremap: fix vm_pgoff in vma_merge() case 3 To: Linus Torvalds Cc: Greg KH , Andrew Morton , "Liam R. Howlett" , lstoakes@gmail.com, regressions@lists.linux.dev, linux-mm@kvack.org, patches@lists.linux.dev, linux-kernel@vger.kernel.org, Jiri Slaby , Fabian Vogt , stable@vger.kernel.org References: <20230427140959.27655-1-vbabka@suse.cz> <2023042719-stratus-pavestone-505e@gregkh> <3cc6e10c-f054-a30a-bf87-966098ccb7bf@suse.cz> Content-Language: en-US From: Vlastimil Babka In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 1A608180010 X-Stat-Signature: unef6fpzejbhsqomx69pqj1a9jedec3b X-HE-Tag: 1682665992-992257 X-HE-Meta: U2FsdGVkX18e2VHq41URTYqKS/h/yRqO92ZWSSJNH/EP5yOc7zB133ISjLyOzLsPjGIk0iO7BgM1vDNN4lB1+yB/9WdVNV2mbduGIMZVgyUDZKfbqOx+RJvfH6ALzQS/EVqAfvWObRc/KiMSyglZ1V3zeK0Nf1zf7ZKf+TLYvuiiCrEWxWGLJGpiH/511cea2yRcgaObHR8d496XkSgUGZbMOBrvoEoMmV+03k4m3Aj661xZhmHd4ygQT5iYtjtETNC+0ez2uSvyEXnlEKDyZs5T7wKvHmoGhCg9Y9B2r7DferNynBRXrvyHlPIlZeRdgaNmH6Uy0yt+AVgUS0Mw66UyUb2m2YIB2J59DdABa7Dx2250MEev9v2DIG+q9J/7WvedZhYowZMcjGAKnyn4OHC4MgNh+KvSSgLFp+uahn4he42ca2Z0BWaVmnm6Lx1VosmD66Cc41eZPpEFRiCGBwgsJmF83lgqP9ktyv/OaSy/nq0BZcQGEHF0ThCI30lK2QeGDrtGG8QJ60IDkksQ4ku7rkYe24wagRmfhNB0xDlfWOKkbBKNn/RmF5BbOElvqULawcoMKusQqhY1SlmMuyl3YJR/Moy87yeYk5mhnFnrVjMDGiACYGVtJuQvkPxli6ZVp7gCKpdC3iEjt/23blaDbhdCEoVUQ6Q9zd6NeXxT1Ej0GWycppoLwbqKB4yGpUpqje9cR3vTvkYrIbSOvTAZ87LB2MBWtjMlRhRZgAs/LMFOq0QlpRSMlFn8GN4XX1HePOZm8JY5g+JWj7mpWJ00rGr3tKp9sD2Zn+t+kfA4IMJJY7iYjwVD6l+UEJjTK0jzJLSZFMTlDH+gtRp6Y/3eJTFc8uhwOAlh5f9ly7YntesKefBtGlbyAtUrc2NDGtsy/cfbb1rCDB0APdf24aQL1aQxIVy09nuRPH339H1F+7diBp+0q/3fGqk2dzENh1fmfoIkgeQqSAgpQaL AZQUJeLw 77d77NE8sJaXnPfvQRcMB9ws4aNZwyX8FS+K9Pb6PrenvlanMOfPBSTHmVe/NTEOSYWaG1ZkeukEeEd/RbD9a1JVN+SKnRTbnwZoq77iGziWoXP3iNiCyFlzpQ8nRs4MjIiNrfUpydBLkAhJGtnzSrRcbvTGj1BjHMX2lEDg0zMUIb+wYKNXnBDLGNXyx+cw5IZsaxP+NhPfRO2dOa6QsghlHMnj7nJP8BTukusn6v4NRnpPEObuyLd9zWlkCqJzCvfoQ+LLRlLAxUlc09CAA/ofWCOS2UFGRK/ZTVGt5jfW1m5A= 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 4/28/23 04:53, Linus Torvalds wrote: > Hi Vlastimil, Hi Linus, > On Thu, Apr 27, 2023 at 8:12 AM Linus Torvalds > wrote: >> >> Ack. It's in my tree as commit 7e7757876f25 right now (not pushed out >> yet, will do the usual build tests and look around for other things >> pending). > > Gaah. I just merged Andrew's MM tree, and while it had a lot of small > conflicts (and the ext4 ones were annoying semantic ones), the only > one that was in *confusing* code was the one introduced by this > one-liner fix. > > I'm pretty sure I did the right thing, particularly given your other > patch for the mm tree, but please humor me and take a look at it? Sure, took a look and looks correct to me, thanks! > That 'vma_merge()' function is the function from hell. Yeah, unfortunately. But despite the bugs, I believe Liam's changes in 6.3 improved it a lot, as with __vma_adjust() it was much worse (it did e.g. things like "swap(vma, expand)" in some cases). And hopefully the cleanups from me and Lorenzo in the mm 6.4 pull request improved readability too, even though it made the merge tricky. > I haven't pushed out yet because it's still going through my build > tests, but it should be out soon. > > Linus