From patchwork Sun Sep 3 15:13:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13373277 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 BB698C83F2D for ; Sun, 3 Sep 2023 15:19:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 469E3280018; Sun, 3 Sep 2023 11:19:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F2C1280017; Sun, 3 Sep 2023 11:19:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26C5A280018; Sun, 3 Sep 2023 11:19:53 -0400 (EDT) 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 13C72280017 for ; Sun, 3 Sep 2023 11:19:53 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CA62E403C9 for ; Sun, 3 Sep 2023 15:19:52 +0000 (UTC) X-FDA: 81195646224.12.43B2358 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by imf28.hostedemail.com (Postfix) with ESMTP id 02DC0C0011 for ; Sun, 3 Sep 2023 15:19:50 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=DXTDoK5v; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.219.44 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693754391; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Oa7N2sPH/lilO/UwWqLMR+jDCHXNj+j722SD4+8DAS8=; b=oJs7xDZcj6Dx2TSxK3pgNOqDqW/4EUu1ppCZx9vyDJlzFILdkMPl3qF5M9Ie5O2nckdeSx KcrPGSh79nyjFdFVHHg4UnUR7/vZcJRkFAtXqMnEa8WuQ4+VoGoELPVEkLmOq9wELvaYsE GggJWGPO4hCwqWFr6bfT2WLQtNNLFLk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=DXTDoK5v; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.219.44 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693754391; a=rsa-sha256; cv=none; b=6Z+nwpAq4cS9ZelYuDbm/U0Jr4+pyc0h9bRSpFfQpOIUdtq2YkS3+WkTOxSJrHg3NM3w1j rOv6JgVD9qDvtxfIGsZFWo+jqfr/hN9eHcXgHOL/skh4wzsscoEtohsQbBCYlPRDknUN7n 0l2oB2SR9nGhpkzORMWphh/ar4W62ig= Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-64f3ad95ec0so4644206d6.1 for ; Sun, 03 Sep 2023 08:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754390; x=1694359190; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Oa7N2sPH/lilO/UwWqLMR+jDCHXNj+j722SD4+8DAS8=; b=DXTDoK5vTLfeVTZ1FXWPrq1qSc3T/7BI86TXuDl92scS39yR3o6rPonl4mZMSboFYw 0RkjWRrWXq03J6a7qKgLvC47bZ0VTyRc/pez7ZgPTy8T3aeMecuiXx0eRZrYQRdgU7vv vpwQNW5UgWAJUNvrgaHs0duFQ5AeR8dMv8ZfE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754390; x=1694359190; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oa7N2sPH/lilO/UwWqLMR+jDCHXNj+j722SD4+8DAS8=; b=X01/19zUaLNG2rDJZIzfAdcg8c6/iEtpaGPEqNa9qntU16NC8QDWUJSwoqxNG84J9D l8+1q2Uo9oUt9yKyVZanPr6dITy6qyUVbGh3gJ6N2yAd+9ZfhNs9d6eZXvNCOIu3J0E3 QDcsS3Zc3Aae6q3OSPsJqQ/H3SUUyGrmm2byqU1K9FUfvu7sOU5VeUAmor3aKJAkUXOq L3hhk0A6QQiw8aeEI2c50Bx3SnsRl3MyVJHSwC6BKV6YBukmowodDVN+h+z8GcfNU/rp GrI+HpDLog1bQuU9jty636Q3xBglAJXuC6zg2C/QybrKOsdzFPBZ0PaPgPJSidmsixWB f7nw== X-Gm-Message-State: AOJu0Yz5CGDf5k8skclujIqTF/JV1/vchTVJ6U3OwMnuJKmWKfD3UtTF QA0cV8p+sAJbnGE7tfVRZv4Q2yAf7rETYrP0MP8= X-Google-Smtp-Source: AGHT+IGTBN7+8BUOuxu3HzD4jDZmr/y5lg4NupMcQKdCe0g07b+paLWsn6FtLb2h4fhMmD0ruozikg== X-Received: by 2002:a05:6602:210b:b0:787:169a:927 with SMTP id x11-20020a056602210b00b00787169a0927mr8408605iox.20.1693754018437; Sun, 03 Sep 2023 08:13:38 -0700 (PDT) Received: from joelboxx5.corp.google.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id f5-20020a6b5105000000b007835a305f61sm2605897iob.36.2023.09.03.08.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:37 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 2/7] mm/mremap: Allow moves within the same VMA for stack moves Date: Sun, 3 Sep 2023 15:13:23 +0000 Message-ID: <20230903151328.2981432-3-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230903151328.2981432-1-joel@joelfernandes.org> References: <20230903151328.2981432-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 02DC0C0011 X-Rspam-User: X-Stat-Signature: fhuymdhmwqay3q5d8jhgaq18at7st5xm X-Rspamd-Server: rspam01 X-HE-Tag: 1693754390-681904 X-HE-Meta: U2FsdGVkX18OLdIL/aynI05PWYvAKJFaBfJbut6oQ0o7+SN9tDS3jIKgUE8bWx+/4VzgRqmcAPm3L3CuTIxAbs2WQvOXcPqnTx9OW0GbjSJRNcnCOnkh5z4ygw2oilWAYzCp1gT3Iqb+eyHM2xKa52l2qeSes2tIWcCleOVG4TLl9z4s7MnI9wq6puJmA7Yc4bC2QxZH9dK8bqoVlHnIHVYCfeMA6aObTyoyvQedZ4kOP033amMqxR+a5YAJcIhb1drag9sk/UJWK4y7H0OAwYGAON4L+88SxiRMPS3OHMpDlPQ5eNxIZ1rkki3QXPk6S/ZXrnf4Tka09qwTX3+QiedGLVt13wszTFsnNzJfw5zPweXPoPVT/iNJAgyZ5JOYv2M8iecO05ydWdzJ8K2nGIU1E54yk1UtAgghFI2JkpcyOamqqHeft6LEzVNXEroJHh40rBGYDaGFhCqqfoqGmgsneJeGaW40NNb/WlGRynZW/tz1wUPZMfBc8xig93GVQyHMQbGXx4MqqKjXI3AR22+SLxFYn6i+wbb1yHD8E8lOhdBkAq0llcde+02hagZ4IRd64ywQHLEmIkAfnTDQUv/K5XCLkB8RFyZjdEl1bv+/VdLte+e1BPGTqx09iqi56XIym5uOcMKuJ/ei4pv17/b2pIilq/jztIlBmrx7ifleVaJttMMyXhCd9fEXmm/JhzPOFxA6OFzBUSV02jgSGinUDSVSQnvOiMRDzXoqJFdKLzUzTHyBc8NcMksr9El9Blgqhu8wfE0t0GycpIbEbwItCMEVRpcXIwQ0DT3fsPMOdm22tgp7QEZpmOmS9dDYdUFKU44clo16c1oQcJdZliBy1TqMVfwAmH8au5DoFqJGiKuHpFEMf7l0iElWxhiDi8XVrU/KdULD2p/FLctgb6CwRZrbgYNvBNvQ7bAo5xwxMr+bXSD5wvVIwqtaKA58f2P2luQMHa4C1MOb5gu n/HFX7fF sc46guc59PY8wxCzGX/U0avO98w4NbhcZbqmqeg4R4wCs9mMXD/ClmkHPNfllN6S3a1Ry1C2rqpFDqxXQoiT4Pk149JrZeh17jldG82I9WS8BH9EGrXh85hby7JSzE3cmX2MMbHMzOhPgq4RahKU7pPfXeeKKX4S+n4RMxtDBB/0AJql6ML+vep5z/R65eMIPLPjS5ReqnUbcVhB/cUiBGOBjDmrMU32sTXWPbdtb8vx2fAxaoEjUyCWBU8j8YHvKmxDE60v1/ItaPrZvXoi66owddkhiNHIjHH/9u6dpHxDkqiIp1rVoMVUlU90AzYM+gDUUJQzfqV/td7AJDLGNUL6B7gsDhln8vSkCR0l3FulUOa/ZJBV2zdsiwRl97PIY5l4IeXD/1rEjGeq9+eOdWp/NUg== 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: For the stack move happening in shift_arg_pages(), the move is happening within the same VMA which spans the old and new ranges. In case the aligned address happens to fall within that VMA, allow such moves and don't abort the mremap alignment optimization. In the regular non-stack mremap case, we cannot allow any such moves as will end up destroying some part of the mapping (either the source of the move, or part of the existing mapping). So just avoid it for stack moves. Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes Acked-by: Michal Hocko --- fs/exec.c | 2 +- include/linux/mm.h | 2 +- mm/mremap.c | 33 +++++++++++++++++++-------------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 1a827d55ba94..244925307958 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -712,7 +712,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) * process cleanup to remove whatever mess we made. */ if (length != move_page_tables(vma, old_start, - vma, new_start, length, false)) + vma, new_start, length, false, true)) return -ENOMEM; lru_add_drain(); diff --git a/include/linux/mm.h b/include/linux/mm.h index 406ab9ea818f..e635d1fc73b6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2458,7 +2458,7 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen); extern unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, - bool need_rmap_locks); + bool need_rmap_locks, bool for_stack); /* * Flags used by change_protection(). For now we make it a bitmap so diff --git a/mm/mremap.c b/mm/mremap.c index 1011326b7b80..2b51f8b7cad8 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -490,12 +490,13 @@ static bool move_pgt_entry(enum pgt_entry entry, struct vm_area_struct *vma, } /* - * A helper to check if a previous mapping exists. Required for - * move_page_tables() and realign_addr() to determine if a previous mapping - * exists before we can do realignment optimizations. + * A helper to check if aligning down is OK. The aligned address should fall + * on *no mapping*. For the stack moving down, that's a special move within + * the VMA that is created to span the source and destination of the move, + * so we make an exception for it. */ static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_align, - unsigned long mask) + unsigned long mask, bool for_stack) { unsigned long addr_masked = addr_to_align & mask; @@ -504,9 +505,13 @@ static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_ali * of the corresponding VMA, we can't align down or we will destroy part * of the current mapping. */ - if (vma->vm_start != addr_to_align) + if (!for_stack && vma->vm_start != addr_to_align) return false; + /* In the stack case we explicitly permit in-VMA alignment. */ + if (for_stack && addr_masked >= vma->vm_start) + return true; + /* * Make sure the realignment doesn't cause the address to fall on an * existing mapping. @@ -517,7 +522,7 @@ static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_ali /* Opportunistically realign to specified boundary for faster copy. */ static void try_realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma, unsigned long *new_addr, struct vm_area_struct *new_vma, - unsigned long mask) + unsigned long mask, bool for_stack) { /* Skip if the addresses are already aligned. */ if ((*old_addr & ~mask) == 0) @@ -528,8 +533,8 @@ static void try_realign_addr(unsigned long *old_addr, struct vm_area_struct *old return; /* Ensure realignment doesn't cause overlap with existing mappings. */ - if (!can_align_down(old_vma, *old_addr, mask) || - !can_align_down(new_vma, *new_addr, mask)) + if (!can_align_down(old_vma, *old_addr, mask, for_stack) || + !can_align_down(new_vma, *new_addr, mask, for_stack)) return; *old_addr = *old_addr & mask; @@ -539,7 +544,7 @@ static void try_realign_addr(unsigned long *old_addr, struct vm_area_struct *old unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, - bool need_rmap_locks) + bool need_rmap_locks, bool for_stack) { unsigned long extent, old_end; struct mmu_notifier_range range; @@ -559,9 +564,9 @@ unsigned long move_page_tables(struct vm_area_struct *vma, * If possible, realign addresses to PMD boundary for faster copy. * Only realign if the mremap copying hits a PMD boundary. */ - if ((vma != new_vma) - && (len >= PMD_SIZE - (old_addr & ~PMD_MASK))) - try_realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK); + if (len >= PMD_SIZE - (old_addr & ~PMD_MASK)) + try_realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK, + for_stack); flush_cache_range(vma, old_addr, old_end); mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma->vm_mm, @@ -708,7 +713,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, } moved_len = move_page_tables(vma, old_addr, new_vma, new_addr, old_len, - need_rmap_locks); + need_rmap_locks, false); if (moved_len < old_len) { err = -ENOMEM; } else if (vma->vm_ops && vma->vm_ops->mremap) { @@ -722,7 +727,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, * and then proceed to unmap new area instead of old. */ move_page_tables(new_vma, new_addr, vma, old_addr, moved_len, - true); + true, false); vma = new_vma; old_len = new_len; old_addr = new_addr;