From patchwork Mon Nov 13 18:19:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 10056503 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A23D2602A7 for ; Mon, 13 Nov 2017 18:19:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99FB429225 for ; Mon, 13 Nov 2017 18:19:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CF512922A; Mon, 13 Nov 2017 18:19:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2EB1529225 for ; Mon, 13 Nov 2017 18:19:42 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 0E9DE220757E2; Mon, 13 Nov 2017 10:15:36 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=dave.jiang@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2C5DE2203D618 for ; Mon, 13 Nov 2017 10:15:34 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2017 10:19:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.44,389,1505804400"; d="scan'208"; a="1243564469" Received: from djiang5-desk3.ch.intel.com ([143.182.137.38]) by fmsmga002.fm.intel.com with ESMTP; 13 Nov 2017 10:19:39 -0800 Subject: [PATCH v2 1/2] ndctl: daxctl: fix mmap size From: Dave Jiang To: dan.j.williams@intel.com Date: Mon, 13 Nov 2017 11:19:39 -0700 Message-ID: <151059717963.29832.3262165776997767425.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvdimm@lists.01.org Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP The size for mmap needs to be aligned to the region alignment. Fix the mapping size so that it satisfy the alignment requirement. Signed-off-by: Dave Jiang --- daxctl/io.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/daxctl/io.c b/daxctl/io.c index 2f8cb4a..e739d0e 100644 --- a/daxctl/io.c +++ b/daxctl/io.c @@ -55,6 +55,7 @@ struct io_dev { struct ndctl_region *region; struct ndctl_dax *dax; uint64_t size; + uint64_t mmap_size; }; static struct { @@ -83,6 +84,7 @@ static bool is_stdinout(struct io_dev *io_dev) static int setup_device(struct io_dev *io_dev, size_t size) { int flags, rc; + unsigned long align; if (is_stdinout(io_dev)) return 0; @@ -104,8 +106,14 @@ static int setup_device(struct io_dev *io_dev, size_t size) if (!io_dev->is_dax) return 0; + align = ndctl_dax_get_align(io_dev->dax); + if (align == ULLONG_MAX) + return -ERANGE; + + io_dev->mmap_size = ALIGN(size, align); flags = (io_dev->direction == IO_READ) ? PROT_READ : PROT_WRITE; - io_dev->mmap = mmap(NULL, size, flags, MAP_SHARED, io_dev->fd, 0); + io_dev->mmap = mmap(NULL, io_dev->mmap_size, flags, + MAP_SHARED, io_dev->fd, 0); if (io_dev->mmap == MAP_FAILED) { rc = -errno; perror("mmap"); @@ -501,6 +509,8 @@ static void cleanup(void) for (i = 0; i < 2; i++) { if (is_stdinout(&io.dev[i])) continue; + if (io.dev[i].mmap_size) + munmap(io.dev[i].mmap, io.dev[i].mmap_size); close(io.dev[i].fd); } }