From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by kanga.kvack.org (Postfix) with ESMTP id 56B636B0036 for ; Wed, 23 Jul 2014 09:52:25 -0400 (EDT) Received: by mail-pa0-f48.google.com with SMTP id et14so1769601pad.7 for ; Wed, 23 Jul 2014 06:52:25 -0700 (PDT) Received: from mga09.intel.com (mga09.intel.com. [134.134.136.24]) by mx.google.com with ESMTP id f4si1305501pdk.408.2014.07.23.06.52.24 for ; Wed, 23 Jul 2014 06:52:24 -0700 (PDT) Date: Wed, 23 Jul 2014 09:52:22 -0400 From: Matthew Wilcox Subject: Re: [PATCH v8 05/22] Add vm_replace_mixed() Message-ID: <20140723135221.GA6754@linux.intel.com> References: <20140723114540.GD10317@node.dhcp.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="/04w6evG8XlLl3ft" Content-Disposition: inline In-Reply-To: <20140723114540.GD10317@node.dhcp.inet.fi> Sender: owner-linux-mm@kvack.org List-ID: To: "Kirill A. Shutemov" Cc: Matthew Wilcox , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org --/04w6evG8XlLl3ft Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Jul 23, 2014 at 02:45:40PM +0300, Kirill A. Shutemov wrote: > On Tue, Jul 22, 2014 at 03:47:53PM -0400, Matthew Wilcox wrote: > > From: Matthew Wilcox > > > > vm_insert_mixed() will fail if there is already a valid PTE at that > > location. The DAX code would rather replace the previous value with > > the new PTE. > > @@ -1492,8 +1492,12 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, > > if (!pte) > > goto out; > > retval = -EBUSY; > > - if (!pte_none(*pte)) > > - goto out_unlock; > > + if (!pte_none(*pte)) { > > + if (!replace) > > + goto out_unlock; > > + VM_BUG_ON(!mutex_is_locked(&vma->vm_file->f_mapping->i_mmap_mutex)); > > + zap_page_range_single(vma, addr, PAGE_SIZE, NULL); > > zap_page_range_single() takes ptl by itself in zap_pte_range(). It's not > going to work. I have a test program that exercises this path ... it seems to work! Following the code, I don't understand why it does. Maybe it's not exercising this path after all? I've attached the program (so that I have an "oh, duh" moment about 5 seconds after sending the email). > And zap_page_range*() is pretty heavy weapon to shoot down one pte, which > we already have pointer to. Why? I'd love to use a lighter-weight weapon! What would you recommend using, zap_pte_range()? --/04w6evG8XlLl3ft Content-Type: text/x-csrc; charset=us-ascii Content-Disposition: attachment; filename="dax-mmap-write-hole.c" #include #include #include #include #include #include #include #include int main(int argc, char *argv[]) { int fd; void *addr; char buf[4096]; if (argc != 2) { fprintf(stderr, "usage: %s filename\n", argv[0]); exit(1); } if ((fd = open(argv[1], O_CREAT|O_RDWR, 0666)) < 0) { perror(argv[1]); exit(1); } if (ftruncate(fd, 4096) < 0) { perror("ftruncate"); exit(1); } if ((addr = mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == MAP_FAILED) { perror("mmap"); exit(1); } close(fd); /* first read */ memcpy(buf, addr, 4096); /* now write a bit */ memcpy(addr, buf, 8); printf("%s: test passed.\n", argv[0]); exit(0); } --/04w6evG8XlLl3ft-- -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org