From patchwork Thu Mar 5 11:57:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 5945131 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D240CBF440 for ; Thu, 5 Mar 2015 11:57:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1202F200E9 for ; Thu, 5 Mar 2015 11:57:45 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 38B4A2010B for ; Thu, 5 Mar 2015 11:57:44 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 2F1208118F; Thu, 5 Mar 2015 03:57:44 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DA8828118F for ; Thu, 5 Mar 2015 03:57:42 -0800 (PST) Received: by wesu56 with SMTP id u56so8982706wes.6 for ; Thu, 05 Mar 2015 03:57:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=jJug4BF9lWqcgmHosRH1iEumqHdgwvmspGApDfIqd58=; b=BvDyb9EITapsOIB5VD4UdQCJtfztCCHciy7D2LSOFAoq1GMduLslTzNMZy5g4teyUg 7CucTqtOWp9dZEv0q++uZfFASgm+f9DcJt8gYLWjSiTy3iOu+CNVDSiRuVsdTBI3L1Ei vAHVCw497zOCtUZO5AibXG9C8YqjYGCdTECNQz3JuqjnIAMeOxCsSyAPBnDAz/cnPLQ9 VDk0J3KNLWkVvA9C2f+JmY77G2b7sXbOAmhrdtj7CLpozLw48XpYd+bvxwETxRG0j4oL Ze18O3V4ZPyrQmKap6XmOxMZlc4NsOu+lx02utEfkK9m6kWCV5O7aHlpfJJ49AKBTtX+ mZtQ== X-Gm-Message-State: ALoCoQlvlDX3aRm9pi/yP3grYZpKiCh1uHK4Pobs1ymhS8pdmhvvdUs1r84jYbz7MPSfD3eumjQQ X-Received: by 10.180.19.193 with SMTP id h1mr21967767wie.2.1425556661604; Thu, 05 Mar 2015 03:57:41 -0800 (PST) Received: from [10.0.0.5] ([207.232.55.62]) by mx.google.com with ESMTPSA id cf12sm10204086wjb.10.2015.03.05.03.57.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Mar 2015 03:57:40 -0800 (PST) Message-ID: <54F844B3.9050303@plexistor.com> Date: Thu, 05 Mar 2015 13:57:39 +0200 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Ingo Molnar , x86@kernel.org, linux-kernel , "Roger C. Pao" , Dan Williams , Thomas Gleixner , linux-nvdimm , "H. Peter Anvin" , Matthew Wilcox , Andy Lutomirski , Christoph Hellwig References: <54F82CE0.4040502@plexistor.com> <54F830D4.7030205@plexistor.com> In-Reply-To: <54F830D4.7030205@plexistor.com> Subject: [Linux-nvdimm] [PATCH 4/8] pmem: Add support for direct_access() X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ross Zwisler Also fixed a top the initial version [boaz] SQUASHME pmem: Micro optimization the hotpath 002 Signed-off-by: Ross Zwisler Signed-off-by: Boaz Harrosh --- drivers/block/pmem.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/block/pmem.c b/drivers/block/pmem.c index 750ffdf..f0f0ba0 100644 --- a/drivers/block/pmem.c +++ b/drivers/block/pmem.c @@ -111,9 +111,25 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector, return 0; } +static long pmem_direct_access(struct block_device *bdev, sector_t sector, + void **kaddr, unsigned long *pfn, long size) +{ + struct pmem_device *pmem = bdev->bd_disk->private_data; + size_t offset = sector << 9; + + if (unlikely(!pmem)) + return -ENODEV; + + *kaddr = pmem->virt_addr + offset; + *pfn = (pmem->phys_addr + offset) >> PAGE_SHIFT; + + return pmem->size - offset; +} + static const struct block_device_operations pmem_fops = { .owner = THIS_MODULE, .rw_page = pmem_rw_page, + .direct_access = pmem_direct_access, }; /* Kernel module stuff */