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 18FE0EB64DD for ; Tue, 27 Jun 2023 15:28:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A599B8D0002; Tue, 27 Jun 2023 11:28:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A097E8D0001; Tue, 27 Jun 2023 11:28:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F9028D0002; Tue, 27 Jun 2023 11:28:14 -0400 (EDT) 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 81EEC8D0001 for ; Tue, 27 Jun 2023 11:28:14 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id AD76C409F4 for ; Tue, 27 Jun 2023 15:28:13 +0000 (UTC) X-FDA: 80948908866.20.0130634 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 3F662C0013 for ; Tue, 27 Jun 2023 15:28:10 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GR1sIrmW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687879691; 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:in-reply-to:references:references:dkim-signature; bh=Lbvc7C545XmCqolJUETDY5ipWdKDOQMSFc/9B60zY/Q=; b=fRmRDKqkx9JKYT7dLMnslmhyYkKaNaF4CFM/gxhOz7XplZx8XGziWNhdYdT0zCzXhKPJ3v H+VMSAcnbmDoQ4jkpAUlJtNjNzlWM4o2yIue4bj7uKavWjwMw8n+nk+Hd5Ko3PRXNWkhTk +WfzTdI+F98SiU8vV/EJEDuzaua+JX4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GR1sIrmW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687879691; a=rsa-sha256; cv=none; b=VINz9sWIUTs5Sl8Ek/SajEHvke9ETO1x+XjswdG/gzsFBqJlPhSCk1BzaBgH1K8XuyFZya CUL8kXA641yid6KpVUgV9QOABbC156l9CJQBXqE2tOKSN17of0O/o7qe7jixTNW+L+lxcL 7ssNWsL8/8CqexnBCVEDx0z56qoDwmY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687879690; 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: in-reply-to:in-reply-to:references:references; bh=Lbvc7C545XmCqolJUETDY5ipWdKDOQMSFc/9B60zY/Q=; b=GR1sIrmWrbqHB2Cl+cdHS3A7nCTq0FgdJMY093Xb2jhpNKeOp7s3J5XnNpxo2BjnHjVv7h ppvHYBVQ8CPnCYVelQfHDcmP4JJ5ZlWJgPnA6q4KErt75yQgwE4PgzF8sasAg4EPSIqQCS PWAyYiNu/Q/5EscHlZceWBMLxehL/YI= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-404-dWGRhbNYPpC_XQbm6fqFsQ-1; Tue, 27 Jun 2023 11:27:58 -0400 X-MC-Unique: dWGRhbNYPpC_XQbm6fqFsQ-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6340023ffbbso7657006d6.1 for ; Tue, 27 Jun 2023 08:27:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687879678; x=1690471678; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Lbvc7C545XmCqolJUETDY5ipWdKDOQMSFc/9B60zY/Q=; b=Lxg8WC9dSYHIrU57SAubEsBzcBT+chD17DxE8vP+5C15sNrWbymMMJtLVQEvVLm+Ou 8Qjn2lV7JqOc7b41bClSbxfolZL0jI7sqW9w4zn/aapbWbrBa0d2rekdZt+yYcPd63Tr fo9nStCt5cNv79oFaD+tmPIzCsovPgSerycDOl1ixDO+52qBC5y8e0C50eGAGqKJWVoO XwF6BJi/sTX2ZfwhFpY9hOVqmp2BbWvpIVzrREmPiQoznZIC6uLKjuNrBJXBc4LJ+MhJ WafKhLPYOLtC3BigoXZE3LOcbQAjrgmHKGhATYFY+es1xmjfCDgNMgwzPe/WlV1tx+3t uz9Q== X-Gm-Message-State: AC+VfDy0jB1DEK+3fJ0bnTefGy5nOg73gvLYZZWEQUghWq8nmYbRFGsk c9Ja2UWJJ2NH88vqsmSBOlY0AkUQkb/ID5owVm8+CQnMDmR5rFgbDzVtKFntQrsedjoIDHAzaFw HbZZhm3Ny61Q= X-Received: by 2002:ad4:5c65:0:b0:61b:2111:c2e2 with SMTP id i5-20020ad45c65000000b0061b2111c2e2mr2560714qvh.2.1687879678343; Tue, 27 Jun 2023 08:27:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4gXsNcLZPQdxRYupGQTR9z9a/jaa4u7R2zWqSv3peFzSdnntX6G1UeITILMfbMy2+ESKSMVA== X-Received: by 2002:ad4:5c65:0:b0:61b:2111:c2e2 with SMTP id i5-20020ad45c65000000b0061b2111c2e2mr2560695qvh.2.1687879678099; Tue, 27 Jun 2023 08:27:58 -0700 (PDT) Received: from x1n (cpe5c7695f3aee0-cm5c7695f3aede.cpe.net.cable.rogers.com. [99.254.144.39]) by smtp.gmail.com with ESMTPSA id o4-20020a0cfa84000000b00631fa7aa9f7sm4639955qvn.32.2023.06.27.08.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 08:27:57 -0700 (PDT) Date: Tue, 27 Jun 2023 11:27:55 -0400 From: Peter Xu To: Suren Baghdasaryan Cc: akpm@linux-foundation.org, willy@infradead.org, hannes@cmpxchg.org, mhocko@suse.com, josef@toxicpanda.com, jack@suse.cz, ldufour@linux.ibm.com, laurent.dufour@fr.ibm.com, michel@lespinasse.org, liam.howlett@oracle.com, jglisse@google.com, vbabka@suse.cz, minchan@google.com, dave@stgolabs.net, punit.agrawal@bytedance.com, lstoakes@gmail.com, hdanton@sina.com, apopple@nvidia.com, ying.huang@intel.com, david@redhat.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, pasha.tatashin@soleen.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: Re: [PATCH v3 3/8] mm: drop per-VMA lock in handle_mm_fault if retrying or when finished Message-ID: References: <20230627042321.1763765-1-surenb@google.com> <20230627042321.1763765-4-surenb@google.com> MIME-Version: 1.0 In-Reply-To: <20230627042321.1763765-4-surenb@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Rspamd-Queue-Id: 3F662C0013 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: jbro5p7r9ibx4cb96783oe3rh5664hm4 X-HE-Tag: 1687879690-557034 X-HE-Meta: U2FsdGVkX1/6EPFDn1BOkMYD9GP4ftw3oWRb9KC/+D63NI5u9PcnLLbDP7YotEU9+6FmifJ3siD2oB5rbDVYUz/jxgL8x+dblJdqcD/3LbnYt+0Oj4jSXJeyHKq79keFLXMN22i7HbpLK3KYE67yFVwlflEc9pZ/v+IN02+o3wakxnbV72yra/DuDbyd5OFbrOSQKtKZMKTJCcn/QlEzv+T+r/uh6CiW/lvX/WnStvgu/EfT52i5iAHvFlN6dxg8cjEtQHubbBc/63bBtQ/UywshuuUDBDpvcUxovUhmrRkZeOzqQ1KeekTszkmy+hutv4cLSO4mVNaGdq2CmsKxtOS9ZuXpEGSefU+JjZwzvp1LsmFMJ4Oy7zgHnbsmGZLUEaO6sagoZqFCheFkBMbBCVDNUK/23xThOgka0qE/ubW7oWtEYhk7Q5IYY+Im2XX65YErl0Okd5UsPiMRA9Tmibu+nTF4Nbeiip+SA53eVNflbbQn2Zz16r0BjF5CjHd5vW29+nau/Lf6G7G79EPNfXK9jJp0bEelGsca6NJSXT2LIY7gFgZl9I3AdHgHsusDcyHqwjUH32prdGpZLqLfujGaBG5H4hs4+SSQMevg1aqQgEM2GguohY2zHrv6qhiAx2350Wj79b//2ecoV0P7xYxVDuocFCRhM2XDuGNfJ8/vpmjcEeRqSzuDJ368ZZmZFrBPkMgcU+XjZG60pu86nDOZorJHU7pDrHgvPbHepbh0M0oZACrU5veGY2hHi8qEnlRtco203uqlJRCtn6trwRJ28v6dBCIMdJrUagIb81y5VAXmue0TzEK66QKrdoDcYmqPaJqpvQ3TZL/AScagI9huHmvi7iFvDjs5iU0EGN20cZn/DC3Th7RxWDwkQ/QmGHY3ERkSY93xADb4kR80wmjjF2N7D1p0CmQOPW96dAHmJv1PUr6/hmYljG8b1QWsj06+7xpLPGJEA9OSAIp FTnLqqWH xI5goZI3BUcniGZIMxE9YAk+J4Z1DNnHf29miDnZ4W3O4h5tJ9M8nmuBuYKm9bFQiwWRHwBwJQnnk0cMgrSj5CweqIdqJ5dlBYYEgHr8UvvVTwBILR2FvfJmyC0dtA/Xz0YHvPgu1mO3vndSq3XmYihc+m4W8lOCCHVktnUS7jyF7XDjGQyZTiRYfv8aLupqyq/xddAMcfFrbOUChrCMAajvhcINHFFrXsbDlfLugHvvUSgqhjP2xPNSMPiI4fsDF7Xz7ltOuwwC5YJVJp7VMjMVh8OAavbpNQnPHVb5bNJPSL3Zxc/vlt2CD7hcI6R0Xz3lClDHtXtY4uPrnOl9CJHE861Ya0TrsP28d+PeHCYmoaEvbsH8hgdn8apbNB+2ZlZ46/QpVYkuZoCHnx8ANJDMouqdsxB1cFwOIghgttceGamT07cLglOmDCA== 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 Mon, Jun 26, 2023 at 09:23:16PM -0700, Suren Baghdasaryan wrote: > handle_mm_fault returning VM_FAULT_RETRY or VM_FAULT_COMPLETED means > mmap_lock has been released. However with per-VMA locks behavior is > different and the caller should still release it. To make the > rules consistent for the caller, drop the per-VMA lock before returning > from handle_mm_fault when page fault should be retried or is completed. > > Signed-off-by: Suren Baghdasaryan > --- > arch/arm64/mm/fault.c | 3 ++- > arch/powerpc/mm/fault.c | 3 ++- > arch/s390/mm/fault.c | 3 ++- > arch/x86/mm/fault.c | 3 ++- > mm/memory.c | 12 +++++++++++- > 5 files changed, 19 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c > index 6045a5117ac1..89f84e9ea1ff 100644 > --- a/arch/arm64/mm/fault.c > +++ b/arch/arm64/mm/fault.c > @@ -601,7 +601,8 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, > goto lock_mmap; > } > fault = handle_mm_fault(vma, addr, mm_flags | FAULT_FLAG_VMA_LOCK, regs); > - vma_end_read(vma); > + if (!(fault & (VM_FAULT_RETRY | VM_FAULT_COMPLETED))) > + vma_end_read(vma); > > if (!(fault & VM_FAULT_RETRY)) { > count_vm_vma_lock_event(VMA_LOCK_SUCCESS); > diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > index 531177a4ee08..4697c5dca31c 100644 > --- a/arch/powerpc/mm/fault.c > +++ b/arch/powerpc/mm/fault.c > @@ -494,7 +494,8 @@ static int ___do_page_fault(struct pt_regs *regs, unsigned long address, > } > > fault = handle_mm_fault(vma, address, flags | FAULT_FLAG_VMA_LOCK, regs); > - vma_end_read(vma); > + if (!(fault & (VM_FAULT_RETRY | VM_FAULT_COMPLETED))) > + vma_end_read(vma); > > if (!(fault & VM_FAULT_RETRY)) { > count_vm_vma_lock_event(VMA_LOCK_SUCCESS); > diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c > index b65144c392b0..cccefe41038b 100644 > --- a/arch/s390/mm/fault.c > +++ b/arch/s390/mm/fault.c > @@ -418,7 +418,8 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access) > goto lock_mmap; > } > fault = handle_mm_fault(vma, address, flags | FAULT_FLAG_VMA_LOCK, regs); > - vma_end_read(vma); > + if (!(fault & (VM_FAULT_RETRY | VM_FAULT_COMPLETED))) > + vma_end_read(vma); > if (!(fault & VM_FAULT_RETRY)) { > count_vm_vma_lock_event(VMA_LOCK_SUCCESS); > goto out; > diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c > index e4399983c50c..d69c85c1c04e 100644 > --- a/arch/x86/mm/fault.c > +++ b/arch/x86/mm/fault.c > @@ -1347,7 +1347,8 @@ void do_user_addr_fault(struct pt_regs *regs, > goto lock_mmap; > } > fault = handle_mm_fault(vma, address, flags | FAULT_FLAG_VMA_LOCK, regs); > - vma_end_read(vma); > + if (!(fault & (VM_FAULT_RETRY | VM_FAULT_COMPLETED))) > + vma_end_read(vma); > > if (!(fault & VM_FAULT_RETRY)) { > count_vm_vma_lock_event(VMA_LOCK_SUCCESS); > diff --git a/mm/memory.c b/mm/memory.c > index f69fbc251198..9011ad63c41b 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -5086,7 +5086,17 @@ static vm_fault_t __handle_mm_fault(struct vm_area_struct *vma, > } > } > > - return handle_pte_fault(&vmf); > + ret = handle_pte_fault(&vmf); > + if (ret & (VM_FAULT_RETRY | VM_FAULT_COMPLETED)) { > + /* > + * In case of VM_FAULT_RETRY or VM_FAULT_COMPLETED we might > + * be still holding per-VMA lock to keep the vma stable as long > + * as possible. Drop it before returning. > + */ > + if (vmf.flags & FAULT_FLAG_VMA_LOCK) > + vma_end_read(vma); > + } This smells hackish.. I'd think better we just release the lock at the place where we'll return RETRY, and AFAIU swap is the only place vma lock returns a RETRY with current code base? do_swap_page(): if (vmf->flags & FAULT_FLAG_VMA_LOCK) { + vma_end_read(vma); ret = VM_FAULT_RETRY; goto out; } I.e., I don't think VM_FAULT_COMPLETED can even be returned with vma lock paths yet as it doesn't yet support VM_SHARED. -- Peter Xu