From patchwork Wed Jan 17 22:39:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 13522230 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 7E7E9C47258 for ; Wed, 17 Jan 2024 22:39:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 13EB76B0095; Wed, 17 Jan 2024 17:39:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0EE546B0096; Wed, 17 Jan 2024 17:39:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF78D6B0098; Wed, 17 Jan 2024 17:39:35 -0500 (EST) 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 DCA346B0095 for ; Wed, 17 Jan 2024 17:39:35 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A6D79140317 for ; Wed, 17 Jan 2024 22:39:35 +0000 (UTC) X-FDA: 81690271110.13.C88F8FD Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf20.hostedemail.com (Postfix) with ESMTP id 091781C001E for ; Wed, 17 Jan 2024 22:39:33 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TtCXu9pg; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3JVeoZQsKCKgTWSMaPOQLZIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3JVeoZQsKCKgTWSMaPOQLZIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--lokeshgidra.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705531174; 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:in-reply-to: references:dkim-signature; bh=eLaX/VsA0yABQN8R4nb/2mlejC59XdV0vgZ4D9pH8tM=; b=grEoPz+T0puKs38P7zuNlLFMdP/08+qoVgYRjBUG/H3Oy01o8UnE93ENqeBKFLZ/DIAx8R hdB6LMAvEM/hUvcl70/4AOcp1aIoc3YcyEp+13Az6fV3FGHm4vgq6wOX7xr3rAvPVSIRnt oA5iPJ6bH5KdZf8wPdvNCj9jm9509uk= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TtCXu9pg; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3JVeoZQsKCKgTWSMaPOQLZIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--lokeshgidra.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3JVeoZQsKCKgTWSMaPOQLZIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--lokeshgidra.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705531174; a=rsa-sha256; cv=none; b=gB9UwQuqmcbLERJSAS1mOyR/QBnimJ94/ILdlD2NZYqCM0dU1oK/j3tX39FoFI3oFyT3pu xuYlANaad7L4zJz2r6UW9qFjXsRZa6qhDu2tp2Tw0SylBrxFOkitKt5hYp4oqkz/FCOocG impHVoeopy6MqYqXE7y1j0TQOrKt12c= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc24eb17be6so1071197276.1 for ; Wed, 17 Jan 2024 14:39:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1705531173; x=1706135973; darn=kvack.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=eLaX/VsA0yABQN8R4nb/2mlejC59XdV0vgZ4D9pH8tM=; b=TtCXu9pgWuA8Df20kKvYDx4878SEV0AwRRRtGrKrH1osI5+cypabeslrvt8spN6yUf oI7yr7O+KO4Zt4avQPrtKZOeRkNEhFFDJJewpmYk8Rol2e7T1rUxLAlRF7IyBHiqbKFu u7p9K9uZYu9/qx1ZP1Apg0fo+29Yk76JCp5e6huixnMvEqcayOGOfW7zjeERU6xtDMA9 EoenFhgc7CXGPrhF1ywO1+LAVzy/Od8wQdj8wa+C7LCSxE0imn+zZS0DO9ZHKX1e/8xD QIsxkWFbP49vrnNh6a3oTPPhRMex/gE1QYDAspC5+9wqVzh4pgLe+vvjWGJC7/kxCISq ZhZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705531173; x=1706135973; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=eLaX/VsA0yABQN8R4nb/2mlejC59XdV0vgZ4D9pH8tM=; b=qW5dT6+c6riQHNP3awZkq52v8pdIrsZ/oIUhscXpJHgS8tV7WGwgaY9edfizCiVSka QDD3da1Iuuj6s24tuLUaVMVyxqKuS0/cT9HEyOHvdXSPFaMvUJLfO0x7vJuz3x5XoWlD ugRx+9OF5EFsid5dBLmw3Mw00r31nZrt2OPbFjAMYzokLtLOX8+Ni3cCq7WVLz2hlLIm URQte5Uwct7pFbQTjzPSnGmM8k/KRhS/o51xytng2+vFuQ1zWhiscjga92ELzFQmMFOb iIEOESTSePj0IA/5B78OZQfqUUHtGneoMK7LtBVbmAjZq69oZWlQ9R9s37zJSkOXhgkF Vfvg== X-Gm-Message-State: AOJu0YyeFFkN3BZpBxBXbco1tv0S43P0qPHXzmalNqOnYe81TPq+aJR7 hJAGjpnQl7GRXggQsid4w57wIXCvKC5DJV3UqfIqWqDt X-Google-Smtp-Source: AGHT+IHsZ/7oxdx8GaRkhurYhhtKgQfgyIX8pfvjQeNWc76oHlC+X+I8+rm1se2KT8OndYlqqJlgd/y/2fXPbmiP4g== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:9c18:2400:c024:5c4e]) (user=lokeshgidra job=sendgmr) by 2002:a25:5f4c:0:b0:dc2:5237:81c5 with SMTP id h12-20020a255f4c000000b00dc2523781c5mr231325ybm.10.1705531173178; Wed, 17 Jan 2024 14:39:33 -0800 (PST) Date: Wed, 17 Jan 2024 14:39:21 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240117223922.1445327-1-lokeshgidra@google.com> Subject: [PATCH] userfaultfd: fix return error if mmap_changing is non-zero in MOVE ioctl From: Lokesh Gidra To: akpm@linux-foundation.org Cc: lokeshgidra@google.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, selinux@vger.kernel.org, surenb@google.com, kernel-team@android.com, aarcange@redhat.com, peterx@redhat.com, david@redhat.com, axelrasmussen@google.com, bgeffon@google.com, willy@infradead.org, jannh@google.com, kaleshsingh@google.com, ngeoffray@google.com X-Rspamd-Queue-Id: 091781C001E X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: pth5mrfg64j3iegpcqfryb7ype1486au X-HE-Tag: 1705531173-176487 X-HE-Meta: U2FsdGVkX186ijBD1zqjLCd8xin7p1LoJ4lkU3ARxU6vjAVZbaSiWwrnnxAGno/mLrwBWIirynYTxfUZXSc7Op+oaFIn3LwwqpP9iZ9dixdiexN/nqyPqaxoR5VqF03s+QkBqL1piPReH3ZY1hdII5cqwd/UKYAKBUhlIm+ZOZFUqkYAbe79oP1x+4ZDt7KhaPC9qqt2GmJ5RjNSzUpMKFovbjkXk2QvW8wJAa3S/T2uDoTNwzx280bpi8VJvevNnl7yXQCQQ4rcZyu8UNFAcu03ZghTnB+djrFY+H8NOflaLVxY/G81zWGEf8gpQbQNMcCbgmsCwoEqp5kEwcLW+BLgURqP2q16tdy6PoN3C4L4FhIcxDkw1k7tYkkRvcthcvzHPvQoM1B7bss9a59yZATJVQmUBYPALf1+l7juvrfmqKXXbCmKdFcQEmAzkJtsF7mHtsrl3RICsTW5uKFTaP4YVF8Yosm05eQn9qkpL8+umbZm/d2HjtXEN6HNiZtjrr9F0EpGCg+i6RAJFCRcSRqBm0IfeNJqw42BzsbAaw2xrhxah/HvYx1l09uvYhU+3tNzhJQkWbdEwH0bE2lmmRyNGjfQPfDFFzCA8oAAvkdTnJ6Sp45rXpEBMKaJ+TACQAJb0Y/dfYSl2ly9EuB5JgAROvEFPEQBEVg0HWDA8xu9GhJjpGju3tXyJSEgVkEfFEVDc9WOD6XewgTA9degDl1W6atmj6J8gTR9Ju62SrDPZf4K3spLwGJP0dUZFixUbCtSkLjUXLbcXEbe4AKMEkxIDp+l5Jyl4BuyVInQnza0SDGw4i/RGezqP/m2gIbujRC1hz+hATfPlxY6SlU94VeBdQts17qwSPJ827Xfl5ZkT9Gt4nWUT1QLbsYedhx6uroXZQhpsZ9qLec8/7HbbnUkItB9sL6/NEYXya2T/OX9+dMqT9xQb9g3Bb9/GzC96zi9oURDW4qpf5v5qZs goZfPxvD R8ZSoPALxTINt68CdHxoJktikswTbKo+2+QOH4y3f7afvtpXv/m7EHZJ6guJHnsIKi9w/aaoDEWqbHpNfT+4dpDZN+daRe+fUfvCd/768oMMoBUw7RdBuQTgqvIBTYWm8+1WqUkPapRpCm5UG0UMx0dqz3bnxra8Qdip+asyhKE/Qj2fIG/YqCN1UX/Xg/BGcIXlL2pwEiH3+PRluHHNjQ/TEGS0kHWJRLfS1W11v7YJPR9JnO3EeQ3+vs4Na0Vyp42Zmg73GtaTKz4FwicSq/ebLA0SqxJl0VRl61J4rcBYmkF05wTtNTl/GM0gqAFor+8/62Q+kT3EZWFzX7wtVnHpGbrFh/fZdomr4i/rMwngTRYfx2tyj3nHemYPXvUEssi8FZtDLebNXjMrJ2pNeuItgT9bCzpF4FHl9cpLP4OzbXNxtdNBZRwz4RIDPuDrHMVTYaaPB2i9MrslEDmWELyQKfP4+xeYb5R2DFotq1YQRbclMiRSeMV3fYBsclSlspHqlQZggyLK0ggR41pto8M9YUmA5o829R3HgcH5BbT+lHDP8N+1jzjhxiycsi0HvYWUuWJidGsptJTwNYckEOT2dZe4yF26m+9n+8VU8/Qgx//7aNqigVpTORijmcQnTlGl22UCmQGhsCRgAIXY+gheqxAb4Ta3VQ98luuh4LHnp1WEQqzWZa3uU3A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000028, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: To be consistent with other uffd ioctl's returning EAGAIN when mmap_changing is detected, we should change UFFDIO_MOVE to do the same. Signed-off-by: Lokesh Gidra Acked-by: Suren Baghdasaryan Acked-by: Mike Rapoport (IBM) --- fs/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 959551ff9a95..05c8e8a05427 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -2047,7 +2047,7 @@ static int userfaultfd_move(struct userfaultfd_ctx *ctx, ret = move_pages(ctx, mm, uffdio_move.dst, uffdio_move.src, uffdio_move.len, uffdio_move.mode); else - ret = -EINVAL; + ret = -EAGAIN; mmap_read_unlock(mm); mmput(mm);