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 2E0B1C38142 for ; Tue, 31 Jan 2023 08:35:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C09BB6B0074; Tue, 31 Jan 2023 03:35:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BB97C6B0075; Tue, 31 Jan 2023 03:35:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5B046B0078; Tue, 31 Jan 2023 03:35:34 -0500 (EST) 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 94D396B0074 for ; Tue, 31 Jan 2023 03:35:34 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6A1C71608CD for ; Tue, 31 Jan 2023 08:35:34 +0000 (UTC) X-FDA: 80414435388.05.3564B01 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 496D4100013 for ; Tue, 31 Jan 2023 08:35:31 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IvKyLKXy; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675154131; 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=gEXPkm2deTpGOq986t/LPngut+HkZZrd809/PA2mKmo=; b=UsgEIika1aiUeDmGVw+NHlSMNCNUtLs3McjnIoouYGVP9DUGkHbYkr+4zAXLp9CmLGwznc X/mXC+iF/6uBrMdzswCXQp0KIMiXQLIsNovSYxVI4MdKfuFkcrsVyOhsH54HLrUhq3JquV UU9Xs6d+xvgXGL2ca9wp5mihx06rxeQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IvKyLKXy; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675154131; a=rsa-sha256; cv=none; b=hFrzM4kMFZP4Q4YIZcVr8/iT/Jiw6CBFQsKEt2/1nMWr68RWuQJxW9q4UyDTlQZQxLRmIg /lpWDtY7aarxKvT7EfmnBsxJaIQz3eNSMNdfeI2mnrd5CkHfDlB3LE0vhS3h09mIUpoly7 YHY1a1DvDMVG/8wr8i4MklULJQOQlyw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675154130; h=from:from: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; bh=gEXPkm2deTpGOq986t/LPngut+HkZZrd809/PA2mKmo=; b=IvKyLKXy6hos+O9BrB8JAa2XehHq039oeT9hmBHKby9R4sQSJ5wnAg0805RhacEvIqudBK Nz+gCWlmgZZWfEUQ+lje6/12s84JTe/6ssbbROYcCftWdwQoKHJqCs9HSpIK6sp9KTI3oc 48EzpMIUSLVgwFjG3dXlp474TSC5pJw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-427-mZo-VDcPP0WH229ojUyeog-1; Tue, 31 Jan 2023 03:35:29 -0500 X-MC-Unique: mZo-VDcPP0WH229ojUyeog-1 Received: by mail-wm1-f70.google.com with SMTP id l5-20020a1ced05000000b003db300f2e1cso5531671wmh.0 for ; Tue, 31 Jan 2023 00:35:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gEXPkm2deTpGOq986t/LPngut+HkZZrd809/PA2mKmo=; b=y2M+cToCY6wz6HaH2O4Z7+rpC8k2tBGvFMPFF75DFOGoz+8wK9kvpFvMael9zwz5Vd 6Fq6A+beCNq2ZZXMhqDbTK2L6iPyGgK6RfBG8nixvHyLhaH01MwuNwdSN+UmUidIpWcK Eraw2d+nxJ/fyrdQ9J+nx1B8gcVpvrEkTegdrtk6xPyxqPln8sb4SpwV6Wb2F3BUqM9p yPlWxKfcGLQKigsOz3+3BweCBipHc5Ba243cg2G6vcDWRx4SFTwXWfKwfUxOw5tSc777 NXeyKrlo9w6jwTfMgrmjB5TRCA9AC2hq/AHepH2j75vUm38c+j5VUaIJ0+5V69Rg92nK 5uRg== X-Gm-Message-State: AO0yUKW/C9kaLHSRsfjs5p/UMWxG59XRbkSaVbOyeY5yKsYG/gnd/G4t Pd1T8rbSogiUIzBCF77khmjGxt99hWCDB1YJA+3Q0kw0uJT6zWEc6CNJNAKNmbXGTdNfUYVoshK 9s8j45A1pED4= X-Received: by 2002:a05:600c:5022:b0:3dc:3398:cf7f with SMTP id n34-20020a05600c502200b003dc3398cf7fmr16251598wmr.26.1675154128203; Tue, 31 Jan 2023 00:35:28 -0800 (PST) X-Google-Smtp-Source: AK7set/dIaNpMyEGuks53GD0rMx/xrUMoKEqNRXDdjxBQr9skCTr2hZwU95hHfmGy6R/UmFYPxh3oQ== X-Received: by 2002:a05:600c:5022:b0:3dc:3398:cf7f with SMTP id n34-20020a05600c502200b003dc3398cf7fmr16251575wmr.26.1675154127920; Tue, 31 Jan 2023 00:35:27 -0800 (PST) Received: from ?IPV6:2003:d8:2f0a:ca00:f74f:2017:1617:3ec3? (p200300d82f0aca00f74f201716173ec3.dip0.t-ipconnect.de. [2003:d8:2f0a:ca00:f74f:2017:1617:3ec3]) by smtp.gmail.com with ESMTPSA id y21-20020a05600c341500b003da28dfdedcsm9456694wmp.5.2023.01.31.00.35.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 31 Jan 2023 00:35:27 -0800 (PST) Message-ID: <97ea66a4-54a0-68a3-c42b-f3c36c69768e@redhat.com> Date: Tue, 31 Jan 2023 09:35:26 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH] mm/mmap: Fix vma_merge() offset when expanding the next vma To: "Liam R. Howlett" , maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , linux-next@vger.kernel.org Cc: Sanan Hasanov , Matthew Wilcox , Hugh Dickins References: <20230130195713.2881766-1-Liam.Howlett@oracle.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230130195713.2881766-1-Liam.Howlett@oracle.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 496D4100013 X-Stat-Signature: 153naqryim7nhwisor5by56tpp3o5a18 X-HE-Tag: 1675154131-78787 X-HE-Meta: U2FsdGVkX18/f0OPx818jYvOngNmj7T1Rn/CBCq0N4Yxgffh5YYSpa3nehpowJLuPwnJjJSBLVa0WcAXj1aHV7NMM05RGNXPTMe5JISrZdtNZAK7CIe4MvibDpS1DT64x0VtP1RmJhDAfOle3zL2VRECsQ+CjlmZ7t/TGw6lh9jBwaWogqCuPKNXcWL2cOngOR609GX0/t6oPxQiDfNEcLv0bWyiVrYY+yVMnVZyCklAvwwf1wtrHywKO4IcBYRcmr0QdEVtE7quBnliHbtFLj6McxTtPqAAHzyKTV//7o3BoyJMA4RgDKSCffT9vzeU+QCGS/aXs/xnS4D1f0M8ZfvzCvPC9DcpnbIcMIqggi0EVVl7M5FSbZyl3keCDn986u18i1IvmGMH0WIF/Y5GU/yObqt9H9HMhLryK/HmQQOoxwMPyfXClDCmxPkyO/MkHvBHB2m6qLIwGo8D9vQ1rrfAYG3I9lBc/mY2U245ewb7X/SeGUtBS0VSHerQy6o4aT5zFD+/wt82fnU14h1E+HyZK+bCXdkvm96qu/uNzcrUsJTDafRq1joxaNw69wBetVw7D8yGOdu9h3L2zwgtPBbw9fNsPoghhmwlvK7hJLl1wnH9kvMCcIOD5ZqsEPE6xpNY3pAZdWMmXyjxwQhZ6YaglWxuQcqBom6QsapgTs1Y561TXdRUiH5J/Yi/xMeRVpeYf1kxWsQ4oB6+Enrefq+XdMN64HdmYi5m7n7zkavbzG8WZAnKrKVK1zxi6nWTtgrfuX9lhk8O0BIrlPbftNAt3rcmJOQtTLTftIpcYsDgKXiOvlCpjiUTKcfmvomg32dhwem6KK3eZiEg6BPGnlMx1xqFka+lQszpu+Qg3+W2jJ/w5TKmzSE+MNX63uIQfRsUBs1hSwP5FcQRqrOOnVIzbyos7CRmeZkAem9UoWyVv/M4hYiApIYU8FcdeHaxLZDRGyT48qoObxy9g7U 7y9pqKUd L0Gn1HcZEVcxm2aPwaUJDx5GEXvrrG+7h2W0ExtNbkmff7YselZB0XycM1fttc3xczHYttds++3eNpWZnCmCyAXpsMBl6DNdM76wB4CqZ9ssu92AKqa3VqeKlyGYicMRKGhEEJgtS5EAAAb71X9bTm5c78rTGSFq/IO5gGi4QaH1ZtBNm3zfIhhY98m4uufuchAkRRdydSrJ7MvHUrpkUO8RqllYE6SZ2n73NqsZ3/G3hAAKywfz6zqYuShrtka4OZDSR5AcbzDlLbrK6/ccpixrJGHTCbiHxeEX67SlViJxHBz43LBisTiHI4qL6k0mEtUX/8ugNL4jOryNsZNf9vZcsjm0GTrfCF6sM2hzwMSe1LH5NsvUHdr5eCkH00vYr3LIc3DxR6TjiKoHGGrjQRrpwMzsFzd3CA+QpxBFjgHNVm38H2BJM6FBOXZ3ISjx3LeNksQhGBbODu0PdykLyVW7rfhtVFx1ZxNhOq9EW7lUErSnadKow2JS9P0pUqfksIAgAvsDmJi3ATjef5X3MlMeaoFt1Kz7vma4OTNM3Z6zRiX4gIXUP/wLJ3T8BjjWAlY4KHv3ReS5Wcj/xXH6s5n0lYudizVVs1c0owD9BChNnjrOuQkxnq8t7vZxADH/l/eT+X2WpVoWH9k33bG9PI35zeg== 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 30.01.23 20:57, Liam R. Howlett wrote: > The vm_pgoff was being set incorrectly when expanding the next VMA to a > lower address. Fix the issue by using the mid->vm_pgoff value for this > merge case (aka case 8). Note that this does not change case 3's > vm_pgoff as next and mid are the same VMA. > > Reported-by: Sanan Hasanov > Link: https://lore.kernel.org/linux-mm/IA1PR07MB983017D2FBA174D2FF78CEB6ABCE9@IA1PR07MB9830.namprd07.prod.outlook.com/ > Cc: Matthew Wilcox > Cc: David Hildenbrand > Cc: Hugh Dickins Fixes: ? > Signed-off-by: Liam R. Howlett > --- > mm/mmap.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index 00d90bbc250e..614ea2d93b0a 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -978,7 +978,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, > vma = next; /* case 3 */ > vma_start = addr; > vma_end = next->vm_end; > - vma_pgoff = next->vm_pgoff; > + vma_pgoff = mid->vm_pgoff; > err = 0; > if (mid != next) { /* case 8 */ > remove = mid; Acked-by: David Hildenbrand Thanks! -- Thanks, David / dhildenb