Received: by 10.223.185.111 with SMTP id b44csp1642994wrg; Sat, 10 Mar 2018 10:25:45 -0800 (PST) X-Google-Smtp-Source: AG47ELvSCi5nxhMNTiTLFlyJbQx5WZw/HSjGI9JJFLp3ihuwtygQvtL6X0k9GvnyMlUSNXj90cj7 X-Received: by 10.101.64.67 with SMTP id h3mr2177678pgp.200.1520706345684; Sat, 10 Mar 2018 10:25:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520706345; cv=none; d=google.com; s=arc-20160816; b=JoA8MugoudxyccT769kyB7SCb9ST8Vugn5ptMmnUQKr7R/t4nTHzhezhuib7xb2w9t d220f3JKHNw6c9zowiVBFz9AI9kww5xXbdB4RUgqlIhAY7qTXqIbhztZRP1H/vIyRIFS 1412yr83Qu3vIwYrcv0JjBCKXT3sa1RFxBCYOVDHPVe5UUB0tsoJbrNICnDjI6kq8CfF ivyJJbbqzfr0AZ68YdxA1Je+XQqgSKddLX1pCKGnqE8yz5OnAQYvUwXmzO1hjjtGgScB RWHYQUvRwYp2ac1n2id/94edCg97pP/3+nkfZ2EAYQwBdMBR8ovMqyUBX7RkJUlorpCy oI/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=HfvZqUeOPlkUUvhdndEHM3LiLj04yJY2/JR640YH4Tw=; b=GO5jXC39NKRzuNxERKXo4iIwB/Y/cyswSnCFjROcHw9VG1HAY0V1+wi+pp4xuyXFox LjAtar1saPbqKZMa1jnfdDweTyDRHwcIZ/YgUQCPxlsIqFM4FJ4sCChgSFQMvmVLNNGO wDa0xhmM/pOq8YxZobeapqLE1ZvcEcBb5o4TRO6JBQJ09Z8MQ5lOpi5XCJ6bhon9gBwJ 4oS1Kyea4nVWDalUn7Fpx9uWnoY/3rKpctpViWskxbvyaJfk7SnheEXj1HMPbsYfzo5N 1G46fZOIidlcHzIBD7mr9tO09C42WC+IjqEL2e3InmwsyHp2CDXydD2g2J2W1/eFPcjL EbqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@eng.ucsd.edu header.s=google header.b=bI0RKDi/; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u8-v6si3108910plh.219.2018.03.10.10.25.31; Sat, 10 Mar 2018 10:25:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@eng.ucsd.edu header.s=google header.b=bI0RKDi/; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932932AbeCJSVs (ORCPT + 99 others); Sat, 10 Mar 2018 13:21:48 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:40668 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932071AbeCJSVq (ORCPT ); Sat, 10 Mar 2018 13:21:46 -0500 Received: by mail-pg0-f67.google.com with SMTP id g8so4833056pgv.7 for ; Sat, 10 Mar 2018 10:21:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eng.ucsd.edu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HfvZqUeOPlkUUvhdndEHM3LiLj04yJY2/JR640YH4Tw=; b=bI0RKDi/z7MR88UF9VlkSF/Fz7PjGk6/dRaIgnVSLc10BmiSMlxrwgj2f6G4Vmv69P oGny5BDc3hIrNKG+CS5QWeW6u8WDNhzShgVy6Elm7m46oZkR4D6jqi3vam+01FZY+Vbv yWJ77TuYJ3Dh+3oeLN672MhzLHUSaWCloLtOA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HfvZqUeOPlkUUvhdndEHM3LiLj04yJY2/JR640YH4Tw=; b=tqXlmmegtORu1TYW89ZAlGSC4twnsNA3Is1tBrVlS42FIAevcv0WMswY9dL0/YDTQQ M/mgqHpnqbd4OcpPfXkJ9peQnEEPv7Y1Y3Lsx1x9TIRJrYvFAv2ZPESF93Do4Y7uZzYq 4N0xQeo9UsTYu6cXOJcOI0EucqSmCrPTFL4cTN7v2JZzVwYYqOmGF+2Ry99FOzVdCrnB hwjFrfjgPR4twoipjlZi0jP5YnhWheCa4vbK3NZD67xLsESnPtJ0Zy9uTVe1G2jHX9PX cGSVzE0OuncyscciogXHShPevOS0oc0ueoHP6j/OKGG8RqLQ/wJ9iq5Jom0gBkpo/qrF MRGw== X-Gm-Message-State: AElRT7HNry0bnVMQgthZlWUX8JHNgoRROz8Uq++qanKJLibgkQDL/rC0 TKwAnY9EhWrf94D4GTpobNVP2w== X-Received: by 10.99.119.130 with SMTP id s124mr2246875pgc.64.1520706105893; Sat, 10 Mar 2018 10:21:45 -0800 (PST) Received: from brienza-desktop.8.8.4.4 (andxu.ucsd.edu. [132.239.17.134]) by smtp.gmail.com with ESMTPSA id h80sm9210167pfj.181.2018.03.10.10.21.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Mar 2018 10:21:45 -0800 (PST) From: Andiry Xu To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org Cc: dan.j.williams@intel.com, andy.rudoff@intel.com, coughlan@redhat.com, swanson@cs.ucsd.edu, david@fromorbit.com, jack@suse.com, swhiteho@redhat.com, miklos@szeredi.hu, andiry.xu@gmail.com, Andiry Xu Subject: [RFC v2 74/83] File operation: Mmap. Date: Sat, 10 Mar 2018 10:18:55 -0800 Message-Id: <1520705944-6723-75-git-send-email-jix024@eng.ucsd.edu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520705944-6723-1-git-send-email-jix024@eng.ucsd.edu> References: <1520705944-6723-1-git-send-email-jix024@eng.ucsd.edu> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andiry Xu NOVA uses the iomap framework to support mmap operation. Currently it does not support huge page mmap. Signed-off-by: Andiry Xu --- fs/nova/dax.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/nova/file.c | 25 +++++++++++++++++++++++++ fs/nova/nova.h | 1 + 3 files changed, 79 insertions(+) diff --git a/fs/nova/dax.c b/fs/nova/dax.c index e639b23..fa424b1 100644 --- a/fs/nova/dax.c +++ b/fs/nova/dax.c @@ -915,3 +915,56 @@ const struct iomap_ops nova_iomap_ops = { .iomap_begin = nova_iomap_begin, .iomap_end = nova_iomap_end, }; + + +/* TODO: Hugemap mmap */ +static int nova_dax_huge_fault(struct vm_fault *vmf, + enum page_entry_size pe_size) +{ + int ret = 0; + timing_t fault_time; + struct address_space *mapping = vmf->vma->vm_file->f_mapping; + struct inode *inode = mapping->host; + + NOVA_START_TIMING(pmd_fault_t, fault_time); + + nova_dbgv("%s: inode %lu, pgoff %lu\n", + __func__, inode->i_ino, vmf->pgoff); + + if (vmf->flags & FAULT_FLAG_WRITE) + file_update_time(vmf->vma->vm_file); + + ret = dax_iomap_fault(vmf, pe_size, NULL, NULL, &nova_iomap_ops); + + NOVA_END_TIMING(pmd_fault_t, fault_time); + return ret; +} + +static int nova_dax_fault(struct vm_fault *vmf) +{ + struct address_space *mapping = vmf->vma->vm_file->f_mapping; + struct inode *inode = mapping->host; + + nova_dbgv("%s: inode %lu, pgoff %lu, flags 0x%x\n", + __func__, inode->i_ino, vmf->pgoff, vmf->flags); + + return nova_dax_huge_fault(vmf, PE_SIZE_PTE); +} + +static int nova_dax_pfn_mkwrite(struct vm_fault *vmf) +{ + struct address_space *mapping = vmf->vma->vm_file->f_mapping; + struct inode *inode = mapping->host; + + nova_dbgv("%s: inode %lu, pgoff %lu, flags 0x%x\n", + __func__, inode->i_ino, vmf->pgoff, vmf->flags); + + return nova_dax_huge_fault(vmf, PE_SIZE_PTE); +} + +const struct vm_operations_struct nova_dax_vm_ops = { + .fault = nova_dax_fault, + .huge_fault = nova_dax_huge_fault, + .page_mkwrite = nova_dax_fault, + .pfn_mkwrite = nova_dax_pfn_mkwrite, +}; diff --git a/fs/nova/file.c b/fs/nova/file.c index a6b5bd3..0ae0333 100644 --- a/fs/nova/file.c +++ b/fs/nova/file.c @@ -617,10 +617,35 @@ static ssize_t nova_dax_file_write(struct file *filp, const char __user *buf, } +static int nova_dax_file_mmap(struct file *file, struct vm_area_struct *vma) +{ + struct inode *inode = file->f_mapping->host; + + file_accessed(file); + + vma->vm_flags |= VM_MIXEDMAP; + + vma->vm_ops = &nova_dax_vm_ops; + + nova_dbg_mmap4k("[%s:%d] inode %lu, MMAP 4KPAGE vm_start(0x%lx), " + "vm_end(0x%lx), vm pgoff %lu, %lu blocks, " + "vm_flags(0x%lx), vm_page_prot(0x%lx)\n", + __func__, __LINE__, + inode->i_ino, vma->vm_start, vma->vm_end, + vma->vm_pgoff, + (vma->vm_end - vma->vm_start) >> PAGE_SHIFT, + vma->vm_flags, + pgprot_val(vma->vm_page_prot)); + + return 0; +} + + const struct file_operations nova_dax_file_operations = { .llseek = nova_llseek, .read = nova_dax_file_read, .write = nova_dax_file_write, + .mmap = nova_dax_file_mmap, .open = nova_open, .fsync = nova_fsync, .flush = nova_flush, diff --git a/fs/nova/nova.h b/fs/nova/nova.h index 0d62c47..d209cfc 100644 --- a/fs/nova/nova.h +++ b/fs/nova/nova.h @@ -488,6 +488,7 @@ ssize_t do_nova_inplace_file_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos); extern const struct iomap_ops nova_iomap_ops; +extern const struct vm_operations_struct nova_dax_vm_ops; /* dir.c */ -- 2.7.4