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 C0AFCE82CD6 for ; Wed, 27 Sep 2023 20:43:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EE266B0202; Wed, 27 Sep 2023 16:43:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4776D6B0203; Wed, 27 Sep 2023 16:43:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F1326B0204; Wed, 27 Sep 2023 16:43:12 -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 1AAEA6B0202 for ; Wed, 27 Sep 2023 16:43:12 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E47041CABDF for ; Wed, 27 Sep 2023 20:43:11 +0000 (UTC) X-FDA: 81283552182.15.3C81D47 Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) by imf03.hostedemail.com (Postfix) with ESMTP id 1907620026 for ; Wed, 27 Sep 2023 20:43:09 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="VnqzLI/K"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of surenb@google.com designates 209.85.128.171 as permitted sender) smtp.mailfrom=surenb@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695847390; 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=yjpcdsZmpsqxOy2d6oqu0Zcfs5V1qi2ngVN6expqaEM=; b=3SvJgR2XS+yaIBUO9tdqOeGKl82fc6HiTq59j2IVUtQEPQgP/g0pMI78yFr5kbYQisC8Gu bjK8J4aDp0+xJakqNrKVQoUPDPq8a0rYHah+TUigNMTD8A3JwApvR7iODSAcbCRMfBy7OX XZ1lUEQ2xEOcKCGdz5hBu9ThF82PHa8= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="VnqzLI/K"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of surenb@google.com designates 209.85.128.171 as permitted sender) smtp.mailfrom=surenb@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695847390; a=rsa-sha256; cv=none; b=xz2gNIwxiU8x+rpOAiU+0hqcEttqo39r34fEdJNecYAE9IvB8Jm3P6BUQlEZQzeAxtn1yy IgQ7KP8inm1txwrxXdKaBHlccZSm7apfd+0uBRZlYDKbS4l7ZDtgYcnHtHQMd9bU2YrZXd ip68IH14+83VKCoXp4rirj/6Dy0r3Ck= Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-59f6e6b7600so94320767b3.3 for ; Wed, 27 Sep 2023 13:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695847389; x=1696452189; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=yjpcdsZmpsqxOy2d6oqu0Zcfs5V1qi2ngVN6expqaEM=; b=VnqzLI/KVuqJ3eHyNR+cWZbZrPGmL477TnlWIxH13G7W475iSAI/v984dnFwOxNGNd HVzUtm32LsZsNNy7PbID/Iof8T6DM3csCAJU9AQ96XuFvfJEJC8aMAUbQbc032ds0zOa /aXG/xFe8X4a4arUEsPLmgbBF4LH9oU3gWljnoFVtNXN/LINzt7VTAJS0TSAb+wUnl9/ miEnDk+yD/WC+9BMsPwP48CYSg+8YNpDnnpOqXzUI9rMS6pW3PZB8cmRc9Zbz2DRsbYt zEG1fVecklF7fFjuYEFQB6s6Ckv45ZXKYiDXtkKp0UM3lX2GGVjo6BDfUR/DDPL35mcD lt6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695847389; x=1696452189; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yjpcdsZmpsqxOy2d6oqu0Zcfs5V1qi2ngVN6expqaEM=; b=a2J/YLfL/ppaDW+UctNNs/i5yArnIbtlEPhOYOTceJPnX/GPYsn1CWG/YUHgns3LV+ M9H5h16yNaw8sK3a1OZyDadrzGD1ehBhXdoVZLkJNmMxoeGM9a8r5CsIFHbsd56IvMG9 XPpnreW648WW2kXM7doDE2iM2LcDSz01r4D29jT/rBQiOj+Ajel5AscEiELf9pEK7x+l 10OymGPPcKxBjShVG1C1TuSUkwfDt1Zew71wwX8uq6hrwZDNxLdebLh36ke8tw6G5tGL kHsVYmV6GrGzF7MktECuR0UIIdQ/tc2EF6AO+uDDRApfNp3b9h6gXuU18mqOPNFzN32z et/g== X-Gm-Message-State: AOJu0YxjIoIWxKVUs6zJMjY4mntR1Vnm2Iu4lbiDp/tvpOSlRyxNQ3/8 tVRjALZ7wqFpGN0yXYdE2NeuJlli8VJjhZSu52PU5g== X-Google-Smtp-Source: AGHT+IHbo4Hykuc6zuEaClz11a4Sav0sQWQMdUu53vQbEXMyiJQn85B+L29xbafKZEJC1C9iyT0q5ZDyxPKte7jrxeU= X-Received: by 2002:a0d:d60f:0:b0:56d:3b91:7e78 with SMTP id y15-20020a0dd60f000000b0056d3b917e78mr3517738ywd.20.1695847388923; Wed, 27 Sep 2023 13:43:08 -0700 (PDT) MIME-Version: 1.0 References: <20230923013148.1390521-1-surenb@google.com> <20230923013148.1390521-3-surenb@google.com> In-Reply-To: From: Suren Baghdasaryan Date: Wed, 27 Sep 2023 13:42:54 -0700 Message-ID: Subject: Re: [PATCH v2 2/3] userfaultfd: UFFDIO_REMAP uABI To: Jann Horn Cc: akpm@linux-foundation.org, viro@zeniv.linux.org.uk, brauner@kernel.org, shuah@kernel.org, aarcange@redhat.com, lokeshgidra@google.com, peterx@redhat.com, david@redhat.com, hughd@google.com, mhocko@suse.com, axelrasmussen@google.com, rppt@kernel.org, willy@infradead.org, Liam.Howlett@oracle.com, zhangpeng362@huawei.com, bgeffon@google.com, kaleshsingh@google.com, ngeoffray@google.com, jdduke@google.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-team@android.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 1907620026 X-Stat-Signature: cgispfedr6bii8phs1cmnkusdnehh7jm X-HE-Tag: 1695847389-371787 X-HE-Meta: U2FsdGVkX1+vykaxdD98SBUUMC/p2+ceLcMK4FgtQoUMHyw3xWvN7veIYJtTTdttj7SbDkVtUnhabIVcpYqsalU57qH/BQGsNE/4974Uw/blEpEuVvflISLXRWA3a3R+xOUZIY/aLEZCkT/A431UKu+o8SHpI+VBBgFYhVHEyDQ3vt1Sa1ntl1WNfJSDEy1y+XFyh7MdkjR0OYzk5b74a0f7SjQw3nNSQ4HwzRoXBd3Uja1yeJJsDPIubAq8qBeFMnvj9ZwFaEF2MVSx6jlzDJoIl5rv10pB8gWMFtEDriP64X0O/e/9Pgi7gAPIpOIGBkuekK7NGCal3FHavNJk7S+rY97/Ihq4hU3GTTwoQKIA/4LdjD0+fWg1mC1jjyu83+X9OSbQ9PeqcrWWlHlyDF9ing2QtTh9cYPcAIzHkFkS6INTH/ovsXUvbzr2ewlSzMbIMkfYvzhTXKmiJuUku+jrpbh5e4LlliMjRA//lSi/HyeUhLv6kDUPhULMAxULMRJ7XBkRwA6bbhwdYgluOKGUvm2OA/nc5XrvgVU/RiBkG+HmVHKe55k/7A8X/LALswQ2uA7VD4b4PGD4GZ0Rl7wc0dnrsla+GAUT1pk1VzNGiKARzIJTTLEMzLn91t0sjuV51hv0OYdpubaZjUPWX9R7peO7nIjNpXKCRNEjFTXXp1LbbQtAgiYiSa/PZE638pYdcopfbG2APuc+sKQnyX434vH8LGkMaVa5RY0Vnfn9GHdMQZmT2vhkfTOknzP+dKu6tZ+m5FBxgWbr1PM5RovaObSci7hFynxFlklbxL4bSCm4lTDaMSfrtule3zlDA8qGEGP8JRLIXMvWk0kvqEMLZlBorD3Pmai/AzPtrtl0wYklUWN6FeN9trXrKITRE7mwPYE7RnQcqhttWBpobQevjj6zIBts50/u03Nf4QgJJ71aeJWVTZcu8NAykmxmDg4jp8k8JqNpL/2ZAuF ugcpOWbP 5SIXpQZRm5F0G55SJGerhRqEci0yTUNsA1Z/1dvQIIIZWkF4FBU6fkX6HWoHHWD1LId5uo7Y2kgPpGtvqgOMqpq1XcU8s2LPSOkBdvACA7zmJLw47eXEZYIzqX2XJkIiEqXvLXhcuVbLdhZsJwInm+dlphVVCyMg+t+ic/6UJLVMZJi/dv+QDaDISwKRyc3ZqtiLGkDAWxHq60IGaPusHsYekbSy9/hNrbBeqkWgmJQ+3XeCj+lwFlshMfxqS7aglf4rIPmJ0aHpQrPNOpznb9+cxsjs+k+Wns3H+EHbNlw5SKyi801FtnbPaZEiVl/vvs55cQhEU5YNkOpY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Sep 27, 2023 at 1:04=E2=80=AFPM Jann Horn wrote: > > On Wed, Sep 27, 2023 at 8:08=E2=80=AFPM Suren Baghdasaryan wrote: > > On Wed, Sep 27, 2023 at 5:47=E2=80=AFAM Jann Horn wr= ote: > > > On Sat, Sep 23, 2023 at 3:31=E2=80=AFAM Suren Baghdasaryan wrote: > > > > From: Andrea Arcangeli > > > > > > > > This implements the uABI of UFFDIO_REMAP. > > > > > > > > Notably one mode bitflag is also forwarded (and in turn known) by t= he > > > > lowlevel remap_pages method. > > > > > > > > Signed-off-by: Andrea Arcangeli > > > > Signed-off-by: Suren Baghdasaryan > [...] > > > > + /* > > > > + * folio_referenced walks the anon_vma chai= n > > > > + * without the folio lock. Serialize agains= t it with > > > > + * the anon_vma lock, the folio lock is not= enough. > > > > + */ > > > > + src_anon_vma =3D folio_get_anon_vma(src_fol= io); > > > > + if (!src_anon_vma) { > > > > + /* page was unmapped from under us = */ > > > > + err =3D -EAGAIN; > > > > + goto out; > > > > + } > > > > + if (!anon_vma_trylock_write(src_anon_vma)) = { > > > > + pte_unmap(&orig_src_pte); > > > > + pte_unmap(&orig_dst_pte); > > > > + src_pte =3D dst_pte =3D NULL; > > > > + /* now we can block and wait */ > > > > + anon_vma_lock_write(src_anon_vma); > > > > + goto retry; > > > > + } > > > > + } > > > > > > So at this point we have: > > > > > > - the current src_pte > > > - some referenced+locked src_folio that used to be mapped exclusivel= y > > > at src_addr > > > - (the anon_vma associated with the src_folio) > > > > > > > + err =3D remap_anon_pte(dst_mm, src_mm, dst_vma, sr= c_vma, > > > > + dst_addr, src_addr, dst_pte, s= rc_pte, > > > > + orig_dst_pte, orig_src_pte, > > > > + dst_ptl, src_ptl, src_folio); > > > > > > And then this will, without touching folio mapcounts/refcounts, delet= e > > > the current PTE at src_addr, and create a PTE at dst_addr pointing to > > > the old src_folio, leading to incorrect refcounts/mapcounts? > > > > I assume this still points to the missing previous_src_pte check > > discussed in the previous comments. Is that correct or is there yet > > another issue? > > This is still referring to the missing previous_src_pte check. > > > > > > > > + } else { > > > [...] > > > > + } > > > > + > > > > +out: > > > > + if (src_anon_vma) { > > > > + anon_vma_unlock_write(src_anon_vma); > > > > + put_anon_vma(src_anon_vma); > > > > + } > > > > + if (src_folio) { > > > > + folio_unlock(src_folio); > > > > + folio_put(src_folio); > > > > + } > > > > + if (dst_pte) > > > > + pte_unmap(dst_pte); > > > > + if (src_pte) > > > > + pte_unmap(src_pte); > > > > + mmu_notifier_invalidate_range_end(&range); > > > > + > > > > + return err; > > > > +} > > > [...] > > > > +ssize_t remap_pages(struct mm_struct *dst_mm, struct mm_struct *sr= c_mm, > > > > + unsigned long dst_start, unsigned long src_star= t, > > > > + unsigned long len, __u64 mode) > > > > +{ > > > > + struct vm_area_struct *src_vma, *dst_vma; > > > > + unsigned long src_addr, dst_addr; > > > > + pmd_t *src_pmd, *dst_pmd; > > > > + long err =3D -EINVAL; > > > > + ssize_t moved =3D 0; > > > > + > > > > + /* > > > > + * Sanitize the command parameters: > > > > + */ > > > > + BUG_ON(src_start & ~PAGE_MASK); > > > > + BUG_ON(dst_start & ~PAGE_MASK); > > > > + BUG_ON(len & ~PAGE_MASK); > > > > + > > > > + /* Does the address range wrap, or is the span zero-sized? = */ > > > > + BUG_ON(src_start + len <=3D src_start); > > > > + BUG_ON(dst_start + len <=3D dst_start); > > > > + > > > > + /* > > > > + * Because these are read sempahores there's no risk of loc= k > > > > + * inversion. > > > > + */ > > > > + mmap_read_lock(dst_mm); > > > > + if (dst_mm !=3D src_mm) > > > > + mmap_read_lock(src_mm); > > > > + > > > > + /* > > > > + * Make sure the vma is not shared, that the src and dst re= map > > > > + * ranges are both valid and fully within a single existing > > > > + * vma. > > > > + */ > > > > + src_vma =3D find_vma(src_mm, src_start); > > > > + if (!src_vma || (src_vma->vm_flags & VM_SHARED)) > > > > + goto out; > > > > + if (src_start < src_vma->vm_start || > > > > + src_start + len > src_vma->vm_end) > > > > + goto out; > > > > + > > > > + dst_vma =3D find_vma(dst_mm, dst_start); > > > > + if (!dst_vma || (dst_vma->vm_flags & VM_SHARED)) > > > > + goto out; > > > > + if (dst_start < dst_vma->vm_start || > > > > + dst_start + len > dst_vma->vm_end) > > > > + goto out; > > > > + > > > > + err =3D validate_remap_areas(src_vma, dst_vma); > > > > + if (err) > > > > + goto out; > > > > + > > > > + for (src_addr =3D src_start, dst_addr =3D dst_start; > > > > + src_addr < src_start + len;) { > > > > + spinlock_t *ptl; > > > > + pmd_t dst_pmdval; > > > > + unsigned long step_size; > > > > + > > > > + BUG_ON(dst_addr >=3D dst_start + len); > > > > + /* > > > > + * Below works because anonymous area would not hav= e a > > > > + * transparent huge PUD. If file-backed support is = added, > > > > + * that case would need to be handled here. > > > > + */ > > > > + src_pmd =3D mm_find_pmd(src_mm, src_addr); > > > > + if (unlikely(!src_pmd)) { > > > > + if (!(mode & UFFDIO_REMAP_MODE_ALLOW_SRC_HO= LES)) { > > > > + err =3D -ENOENT; > > > > + break; > > > > + } > > > > + src_pmd =3D mm_alloc_pmd(src_mm, src_addr); > > > > + if (unlikely(!src_pmd)) { > > > > + err =3D -ENOMEM; > > > > + break; > > > > + } > > > > + } > > > > + dst_pmd =3D mm_alloc_pmd(dst_mm, dst_addr); > > > > + if (unlikely(!dst_pmd)) { > > > > + err =3D -ENOMEM; > > > > + break; > > > > + } > > > > + > > > > + dst_pmdval =3D pmdp_get_lockless(dst_pmd); > > > > + /* > > > > + * If the dst_pmd is mapped as THP don't override i= t and just > > > > + * be strict. If dst_pmd changes into TPH after thi= s check, the > > > > + * remap_pages_huge_pmd() will detect the change an= d retry > > > > + * while remap_pages_pte() will detect the change a= nd fail. > > > > + */ > > > > + if (unlikely(pmd_trans_huge(dst_pmdval))) { > > > > + err =3D -EEXIST; > > > > + break; > > > > + } > > > > + > > > > + ptl =3D pmd_trans_huge_lock(src_pmd, src_vma); > > > > + if (ptl && !pmd_trans_huge(*src_pmd)) { > > > > + spin_unlock(ptl); > > > > + ptl =3D NULL; > > > > + } > > > > > > This still looks wrong - we do still have to split_huge_pmd() > > > somewhere so that remap_pages_pte() works. > > > > Hmm, I guess this extra check is not even needed... > > Hm, and instead we'd bail at the pte_offset_map_nolock() in > remap_pages_pte()? I guess that's unusual but works... Yes, that's what I was thinking but I agree, that seems fragile. Maybe just bail out early if (ptl && !pmd_trans_huge())? > > (It would be a thing to look out for if anyone tried to backport this, > since the checks in pte_offset_map_nolock() were only introduced in > 6.5, but idk if anyone's doing that)