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 F2C99EB64D7 for ; Tue, 20 Jun 2023 15:22:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 633118D0003; Tue, 20 Jun 2023 11:22:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E2FD8D0001; Tue, 20 Jun 2023 11:22:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AA5E8D0003; Tue, 20 Jun 2023 11:22:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3BD628D0001 for ; Tue, 20 Jun 2023 11:22:33 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DDAD21C948E for ; Tue, 20 Jun 2023 15:22:32 +0000 (UTC) X-FDA: 80923492944.05.BA9CF07 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id E54CAA0026 for ; Tue, 20 Jun 2023 15:22:29 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="i+MZ6/oX"; spf=pass (imf25.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687274550; 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=vUHsmWFXJbqKAxJCOSo9wPf2HsRiiOjgMGetTznsPf8=; b=pdH4CepaqDgD5QG0DBOJq1kYk+xFLS9zP68xWffQTBdJzqn0ycX6ZxfQi3xBmvhH+qHsDP nRiz5bCdA2dT3QaPas2Olr8Q455do5qZfhhgz5LWsR4a/QhMX+9Qig04wbUKJoAhopR/wp Q+CN6bstl4UH6KzI3PNPxFksR3RplI4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687274550; a=rsa-sha256; cv=none; b=oUrcXRshQKiB/41zeQ15DuNOJuasXpEMs7uF5Z4hyf9FsHlV371NTrj7+CQTvyGUBDJACd CQ2CTBFWoqboKN/3QDVxSE1Y+7pGrJl9uRKHT6CX0dzX+ZskfcvCV9xWpkBgnGSJSGbmEE aTtd+FdqEQMo1oVr0J1bTcGrebkkh7U= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="i+MZ6/oX"; spf=pass (imf25.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687274549; 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=vUHsmWFXJbqKAxJCOSo9wPf2HsRiiOjgMGetTznsPf8=; b=i+MZ6/oXWSrV73uxDMKuueUN8rmMH58W1xzuMUrkG19rVdiJbWFeaV+j4oTlWNWzEYArAC 8y6cxS1MBi4g9vJbUgKR9ZkbcCNplq/pJXOcpcHs7khH2vFfNGDSDmI3DDcELLGIKJ6jo3 11zwJnaWtSoM6pGMbRHroH2VkizS9ZE= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609-RRDeNm8pNZS_t7L_dU9JVA-1; Tue, 20 Jun 2023 11:22:25 -0400 X-MC-Unique: RRDeNm8pNZS_t7L_dU9JVA-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-3f5df65fa35so22297855e9.3 for ; Tue, 20 Jun 2023 08:22:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687274524; x=1689866524; h=content-transfer-encoding:in-reply-to:subject:organization:from :references:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vUHsmWFXJbqKAxJCOSo9wPf2HsRiiOjgMGetTznsPf8=; b=OFTQFwQKX+b+nZhECxSil+ZWuEgdzuIhtm5j5VYzN14DpUh4Tq4A/Rlngts7f1/ANc auLw1iowl+oFT9zpjp4bbDdAdY9Naccaf99u85Z/31OVHuWPrus86m5DC/o+1YMC+R8h iujS/ZPFrdvbMrPvx3d8hG94GUUgfhwCdQq9DDP6BU+u2q6d/uhE1Pt9C6lZWCD0GbRS WeOz1qVcBN8Bn6KGqWgLmEhoB3N9p0VrZ3LYXwYVq6MNOM2UHn7Q930O6MvKzRDDJvzW xWPI7o+dCwIM0jLMasVDI8G3uydOZQMxgqgwdMD3OkjY4owfAQy9J8Nu7OI9EkXgYLly /D8w== X-Gm-Message-State: AC+VfDyAZLJbEXvJwpY2T8V3ALxvKTlcX8gUK5bWNibOVF69Yhov9sbW ELDexi8ioN6sp05wY7RBGnj5jwhGi3rfA33CnhhC17WdANymOpmHZo0AbT5YvnKV0amlUUSQdOg El7oLq9YvNa0= X-Received: by 2002:a5d:6a91:0:b0:2fe:e137:dbad with SMTP id s17-20020a5d6a91000000b002fee137dbadmr8376988wru.51.1687274524630; Tue, 20 Jun 2023 08:22:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Gn4OPb3ze0G2DgnO1dg9J7p3I2mezr5RXhvZxL6SVcrkjCJEZW18z1MqUMg/O9j9exoZ+WQ== X-Received: by 2002:a5d:6a91:0:b0:2fe:e137:dbad with SMTP id s17-20020a5d6a91000000b002fee137dbadmr8376969wru.51.1687274524265; Tue, 20 Jun 2023 08:22:04 -0700 (PDT) Received: from ?IPV6:2003:cb:c739:d200:8745:c520:8bf6:b587? (p200300cbc739d2008745c5208bf6b587.dip0.t-ipconnect.de. [2003:cb:c739:d200:8745:c520:8bf6:b587]) by smtp.gmail.com with ESMTPSA id h5-20020adff4c5000000b00304adbeeabbsm2211610wrp.99.2023.06.20.08.22.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Jun 2023 08:22:03 -0700 (PDT) Message-ID: Date: Tue, 20 Jun 2023 17:22:02 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 To: Peter Xu , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrea Arcangeli , Mike Rapoport , Matthew Wilcox , Vlastimil Babka , John Hubbard , "Kirill A . Shutemov" , James Houghton , Andrew Morton , Lorenzo Stoakes , Hugh Dickins , Mike Kravetz , Jason Gunthorpe References: <20230619231044.112894-1-peterx@redhat.com> <20230619231044.112894-3-peterx@redhat.com> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH v2 2/8] mm/hugetlb: Prepare hugetlb_follow_page_mask() for FOLL_PIN In-Reply-To: <20230619231044.112894-3-peterx@redhat.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-Rspamd-Queue-Id: E54CAA0026 X-Rspam-User: X-Stat-Signature: ee5cxecfini5d8wmwcds3fbugj9bxx5i X-Rspamd-Server: rspam03 X-HE-Tag: 1687274549-94341 X-HE-Meta: U2FsdGVkX1+mnO1F2MlfC8siLZX0+7c09iFkyia7j+7gvuWpXkjUtRjUkOqkRS06firxLRLllhn6IwgOcU0woOEEwMXG1o8ffWxUywwnPolCUack9C94L5+lpUNkHe4SxWN/LCcT6nejWjZjIfGOqO4olQLILAVovbUDnA9jPr8t4/u/upj5gxOz82TlF7GvPv5/35pnbVk/QABaeP7u2INuY/eXmQXi0yndq+k9J37Oac7aDpO7t0FOhTP6rroe80GOGeNoXAEo9qSM2kV3C3rf1pvYBKCmVM6MD/M7De3vTSwNV/NTskH5yOcsnxoKnK6lOldiZOEUMxXsSeXyKankVxGkr0dx0d65za3e6La/aXWMTVsg9Ua6tFGyglrj8qF6k67M9WGYs8TEwD6FVeEyGc9klL3xkdBzERyDQyXLwBHe2dXxwD3SZqu/mvmLNOTRHviM205jBYLw9hHIqMik3mF2QYmFoTKGhNdx0sm+35RqZegpU0uFMMxQ1T23XT/wHvD/N2lJjXpCEA2ZDd16ICJlo0YYiIN+3psLu2EtTmmpbFTxTruBUK45x+b5lRKGvc2neO2TOO4M5tcuMBhUouvEPKDqxWSSIo97utzy5zenv89Sy8uSlN27bXomEqWL6nret3wZg09N1k4iYv3KSB2VhhVoUmhZdN+NPITZiCl9H3rUA1JRyg3MXWfdjKEGt0M8lxSnQjaQHxC2BXM07lD31/1CqgJEf4nL6kr+29QKdbL+Xnr6tIFmLNMSZtiRrDl9HeNUKwyXYgGxZWQUbTBVLBh3vgnYET5A4PqIc4EjXwHRzvW+GzGkV1Sjdu2lHSmnc1W/WutEptgWTYGMzHbnxAtPwAoe892RSZ5zHfNFRxJ2cWCnaKRCtUO55REKlpgkuVM4TfLnp/SQcwplHWQwTJqNQ7JxOfQvklT8ck0akXwQI7cLx4DCvRSI/6J07QLFJyu8Wrn5Zsz 59fF1yoF bEclzjVV1Pmf7HkvB7qF2zeInSm9A5GVnFiBSXeoEKl/VVE0fe3vv7uFz1M4a2lBrrp4+yp1VqDmh+ZK8ZoUMQ2UYFEafIjO89WxHpLT4f6Ueu7KZmBSOkUdhTX/C7itXJqDXEi1V5GHOaHvgnXGJUXBDkxJhZj9tNUDtbxKdOpHdihZp/u5zO1vpQyI7Sf7s+uGqYXAl6RaUfDzY+JCW+mi033GvxBvLC1OT0ehAGbzAKt3odpd+pYIeYxb6Qi3iuZpV5DhAzLwryyoN1r9nUMZ7VsIGyJydS9XMm87T+d+UEPUFqOxTcEvB1usSO3V1RjZMJP3XtyM6EFNGDGWX0Ueo8h7XeB6HbPMAEHokeGiX+/WmfKwgQ0nctz5Iv5c9OER4OSBf0EU5kLejx3XH/eP3O/MOrVYL0aOeRzAqMX7J8vCRLig6O3YsGMwwaXucphZ7pVaTgvfTH+OyLVmM7og6rQDUHsoGLSN2 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 20.06.23 01:10, Peter Xu wrote: > follow_page() doesn't use FOLL_PIN, meanwhile hugetlb seems to not be the > target of FOLL_WRITE either. However add the checks. > > Namely, either the need to CoW due to missing write bit, or proper CoR on s/CoR/unsharing/ > !AnonExclusive pages over R/O pins to reject the follow page. That brings > this function closer to follow_hugetlb_page(). > > So we don't care before, and also for now. But we'll care if we switch > over slow-gup to use hugetlb_follow_page_mask(). We'll also care when to > return -EMLINK properly, as that's the gup internal api to mean "we should > do CoR". Not really needed for follow page path, though. "we should unshare". > > When at it, switching the try_grab_page() to use WARN_ON_ONCE(), to be > clear that it just should never fail. > > Reviewed-by: Mike Kravetz > Signed-off-by: Peter Xu > --- > mm/hugetlb.c | 24 +++++++++++++++--------- > 1 file changed, 15 insertions(+), 9 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index f75f5e78ff0b..9a6918c4250a 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -6463,13 +6463,6 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, > spinlock_t *ptl; > pte_t *pte, entry; > > - /* > - * FOLL_PIN is not supported for follow_page(). Ordinary GUP goes via > - * follow_hugetlb_page(). > - */ > - if (WARN_ON_ONCE(flags & FOLL_PIN)) > - return NULL; > - > hugetlb_vma_lock_read(vma); > pte = hugetlb_walk(vma, haddr, huge_page_size(h)); > if (!pte) > @@ -6478,8 +6471,21 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, > ptl = huge_pte_lock(h, mm, pte); > entry = huge_ptep_get(pte); > if (pte_present(entry)) { > - page = pte_page(entry) + > - ((address & ~huge_page_mask(h)) >> PAGE_SHIFT); > + page = pte_page(entry); > + > + if (gup_must_unshare(vma, flags, page)) { All other callers (like follow_page_pte(), including __follow_hugetlb_must_fault()) (a) check for write permissions first. (b) check for gup_must_unshare() only if !pte_write(entry) I'd vote to keep these checks as similar as possible to the other GUP code. > + /* Tell the caller to do Copy-On-Read */ "Tell the caller to unshare". > + page = ERR_PTR(-EMLINK); > + goto out; > + } > + > + if ((flags & FOLL_WRITE) && !pte_write(entry)) { > + page = NULL; > + goto out; > + } I'm confused about pte_write() vs. huge_pte_write(), and I don't know what's right or wrong here. -- Cheers, David / dhildenb