Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <debac5fa-3ea1-3796-8eb4-ff411a174697@amd.com>
Date:   Tue, 20 Jun 2023 20:30:24 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.6.1
Subject: Re: linux-next: manual merge of the mm tree with Linus' tree
Content-Language: en-US
To:     Will Deacon <will@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        catalin.marinas@arm.com
References: <20230619092355.133c5cdb@canb.auug.org.au>
 <20230619204309.GA13937@willie-the-truck>
 <20230619143944.fb445cb3f28bb839942ed4ae@linux-foundation.org>
 <20230620094314.GA14607@willie-the-truck>
From:   "Jain, Ayush" <ayush.jain3@amd.com>
In-Reply-To: <20230620094314.GA14607@willie-the-truck>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Tno5dGVqYU5scklGT2J3blpibkFlWFpzZzh2V3A4UEQrWTh1UXUyQ0JoRE5I?=
 =?utf-8?B?SCt5MGVUYlU0cmZ3amNoM3BLUHVGbFdPSkZPUXJUVlRneFBoMlAvU0V3bGc0?=
 =?utf-8?B?NHg5VUNvaldTTDdMa251dGNpREh4eEdyRmJJN1pER0lSalRwdU9jUzd2UGs4?=
 =?utf-8?B?a1AwQzNuajR0TTBiRTdIcG1LTEFMdjFlMW43cnRQcnFqbkRSbm4wQTgvcjl6?=
 =?utf-8?B?ZndPYUN2QmI4WFgxWEZISS9CazVrTDI5V0ZxcGZuNjlDWEpOcDZsbG9pQXZq?=
 =?utf-8?B?SGdwMHIwTDBNRlNJaFZ1c1VIaFdqQnBxWXZXNE5tYkFHYnhZZDl3dW9jOHFp?=
 =?utf-8?B?L2IxYXdlOENsaVg5bnYzSDJmbW1GM1N3bE11UEUydzd1MEQ3MDZqN1FMN3Vr?=
 =?utf-8?B?YTVHUkVzZmsySFdhZytqbGpPeHVFajR5Nlo1ZWFTUkJJZFlyaGpXY25YYzJQ?=
 =?utf-8?B?Tzhvb3QwZm1lQnUzTStXMXFOK1JQYi93RTU4MjBvbGNJa3BSOHpSTnRTNTVu?=
 =?utf-8?B?QjNFcFFydzBudGg1Qng0RFRXdlJBTmY4L0pnK2g4LzZtcDZKTGZYRllPQytx?=
 =?utf-8?B?dXFlcmdwdHAxZ0xuRVRqSzNxenM0SG04RklvdTh6Z2orem1kOWdvUTY4c3NY?=
 =?utf-8?B?N2dzb1AwbHJzTlE1VDhBemdHbG1sUy9YM2NKWnk3VGJqOG83NUZUeFBLNlJJ?=
 =?utf-8?B?blM3RjJzTXo1Y1RPdUppSS9aWHNyNTUzL3VjQ29OeS94T0hMUUkzTSs0OG01?=
 =?utf-8?B?UVh0U1N3TGUrMDV2M2d5KzRjOWhyTCthSlkwa2V6a1YrdHduaXg0aytBT2xn?=
 =?utf-8?B?WkpQaU8zeW1XYzlVelZWUk96azhZakJtaGlOVjZtd2dnaDdrL0xObGFLa3BK?=
 =?utf-8?B?Rm9Sb3dmRVkrN2xSY3l2b2RLMDlzUDFETzBCZXkrWHFrWXk2djFJcTcvMG40?=
 =?utf-8?B?bGlidnpGNHhlNnRqNWhiYWxqR3E2Nll4VXZSUHppQU9keFRpMDlZVE9MZCtC?=
 =?utf-8?B?ZzM0aXArKzBUek1NU3J0SVZGd0JjbTd5bmNsTnpQRTRKRTNvTWZoWmEzejRk?=
 =?utf-8?B?aHVtZHRJckhOYmdSQnZrai93ZGFxSXVFRzc0a1ZsK0gyZ0w0c1dHR2cxNlM5?=
 =?utf-8?B?cmgxd1k1Q3RHL1NFUVNCaXJsdlIxUkF5d1NOck9uZFRJam1yakpSRUJnM0Ez?=
 =?utf-8?B?VVc1RERiN0pWYW5OR0pjaUxnMTg2bGNuMS9XVFZKMFJ2ODIxai9YOTlZOUlP?=
 =?utf-8?B?Y3RaL05ydFBuckgvMDV0ZVBPWlBjTG1kTUw0eFY3andFUjUydnV4QUdMMHBG?=
 =?utf-8?B?OGt3RDFQem5kU0c0bzl0R0NMUlh4Z3dGTVdPV3JOaWtvTDh0UXBlNTFOQVdw?=
 =?utf-8?B?dk5aYlMxalRWVG1wZ3BmdS9qL0dHMm1WN01vNnRKbEMvUVdVbWVPdVFEVjlM?=
 =?utf-8?B?RGtnOGFQcGlPem5SL0RlNGNnZHU3QWp1NXdidS9QRG1uMXJ3L3FmeHVaRDNR?=
 =?utf-8?B?NzYxWlEvZndKWU96YjBnL1dDRXFlNHZrcDhZZkJwd1VFZnJ5Rlp0QWdPU3I0?=
 =?utf-8?B?RUtkQmpWZjBkenlRaWVLUENzN0VaRUhVT2FITExCdTJoZmFiZ3lsNnN0ZDhZ?=
 =?utf-8?B?bnBrZDdtNnJwZ1QyenZtWW1HL0xJRzVtSnh0QzNaMmxyUEtWTURaeEluM2JS?=
 =?utf-8?B?VElLTnlPYnZPWTBEbmpYRlhMeU92dmtnUzFiTnlHZUM3VmlzSzg4S1kyZCtE?=
 =?utf-8?B?RTdldDE1THZ0RWF6YVdXeWdTOERXdjZEd0I4ZHJjNUxMWS9ZT0k0c3JBQ2dK?=
 =?utf-8?B?NHl0WTVjV1ZwYXFjUnRDaTVMNTVVS3ZLRzlKM0FueTRodiswRWFXT1RTOVNU?=
 =?utf-8?B?TlJMeVIxc2FRcG0rRTVnUU9jRmVzU3NScTE5NFJIa3ZnN0huQkh3eHhxbXpR?=
 =?utf-8?B?Ny8ySVRQdUw3V2ZRZ3pIbkZ2UUNWMkNvbVhvWjEyWnZ4d3VXVU1GeWhUeUdD?=
 =?utf-8?B?MS96VnMxUWMwZTJCUitBelJsM1ZjWGNYR0NnSjNsUDdnRU10ZzdRUTJ5cE01?=
 =?utf-8?B?TTA4eWRjMExkcy9YRDcyNERpVmEyaWx3MFlFbHN0ek5IaWNMdXJsUTJVNWlZ?=
 =?utf-8?Q?sJiBLniFj8CA4JK6lFNq1iPWb?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 88900f20-bed7-4d12-e7ae-08db719f1aa2
X-MS-Exchange-CrossTenant-AuthSource: IA1PR12MB6137.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2023 15:00:36.7349
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ylbu9bRGuhNpxcETLNnphNtGp4sxOA9lRJma64PCknwwkkB5dOv4NgJtkXdXrN4AOxs0MIEVgHYIPs/h68EGfg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8321
X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hello Will,
On 6/20/2023 3:13 PM, Will Deacon wrote:
> On Mon, Jun 19, 2023 at 02:39:44PM -0700, Andrew Morton wrote:
>> On Mon, 19 Jun 2023 21:43:11 +0100 Will Deacon <will@kernel.org> wrote:
>>
>>>>    	/*
>>>>    	 * Do not downgrade mmap_lock if we are next to VM_GROWSDOWN or
>>>>    	 * VM_GROWSUP VMA. Such VMAs can change their size under
>>>
>>> This resolution seems to be causing horrible problems on arm64 with 16k
>>> pages. I see things like the crash below, but the two branches being merged
>>> are fine on their own.
>>
>> I've dropped the mm.git side of this conflict so next -next should
>> be better.
> 
> Thanks, Andrew. next-20230620 is still broken, so I came up with the diff
> below in the meantime which seems to resolve the crashes. I don't pretend
> to understand the VMA iterator stuff well enough though, so I may have
> missed something else.
> 
> Will
> 
> --->8
> 
> diff --git a/mm/mmap.c b/mm/mmap.c
> index 9a93b054148a..4c82e9b36fb3 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -2396,6 +2396,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
>                          if (error)
>                                  goto end_split_failed;
>                  }
> +               mas_set(&mas_detach, count);
>                  vma_start_write(next);
>                  if (mas_store_gfp(&mas_detach, next, GFP_KERNEL))
>                          goto munmap_gather_failed;


Thanks, Will. I have been able to reproduce similar kernel panics on AMD x86 platform
on next-20230619 and next-20230620.
By applying your patch kernel looks to being able to boot now.

Tested-by: Ayush Jain <Ayush.jain3@amd.com>