From patchwork Tue May 25 17:24:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 12279691 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22CDCC47085 for ; Tue, 25 May 2021 17:24:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 047ED61423 for ; Tue, 25 May 2021 17:24:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233843AbhEYR0X (ORCPT ); Tue, 25 May 2021 13:26:23 -0400 Received: from mga03.intel.com ([134.134.136.65]:9404 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233835AbhEYR0S (ORCPT ); Tue, 25 May 2021 13:26:18 -0400 IronPort-SDR: uuYBvVQR2urQ05fFrZLRIpgG59Yauka25wjwJbn8mwY0GCn2IDfj8zT/IYrySjcg+SVpIXV7zJ uBumMgRFxihA== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202288210" X-IronPort-AV: E=Sophos;i="5.82,328,1613462400"; d="scan'208";a="202288210" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 10:24:32 -0700 IronPort-SDR: OdHNGHsGvoFfmo9nVy8uBbmyAzlVttYVc6mn4zkD6OrNs9eFbsEEKMYl7leWvV3KbxrkFVTowF 1W+pU5hd1R3A== X-IronPort-AV: E=Sophos;i="5.82,328,1613462400"; d="scan'208";a="633105446" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 10:24:31 -0700 From: ira.weiny@intel.com To: Dan Williams Cc: Ira Weiny , Vishal Verma , linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 1/3] fs/fuse: Remove unneeded kaddr parameter Date: Tue, 25 May 2021 10:24:26 -0700 Message-Id: <20210525172428.3634316-2-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 In-Reply-To: <20210525172428.3634316-1-ira.weiny@intel.com> References: <20210525172428.3634316-1-ira.weiny@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Ira Weiny fuse_dax_mem_range_init() does not need the address or the pfn of the memory requested in dax_direct_access(). It is only calling direct access to get the number of pages. Remove the unused variables and stop requesting the kaddr and pfn from dax_direct_access(). Reviewed-by: Dan Williams Signed-off-by: Ira Weiny Reviewed-by: Vivek Goyal --- fs/fuse/dax.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index ff99ab2a3c43..34f8a5635c7f 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -1234,8 +1234,6 @@ void fuse_dax_conn_free(struct fuse_conn *fc) static int fuse_dax_mem_range_init(struct fuse_conn_dax *fcd) { long nr_pages, nr_ranges; - void *kaddr; - pfn_t pfn; struct fuse_dax_mapping *range; int ret, id; size_t dax_size = -1; @@ -1247,8 +1245,8 @@ static int fuse_dax_mem_range_init(struct fuse_conn_dax *fcd) INIT_DELAYED_WORK(&fcd->free_work, fuse_dax_free_mem_worker); id = dax_read_lock(); - nr_pages = dax_direct_access(fcd->dev, 0, PHYS_PFN(dax_size), &kaddr, - &pfn); + nr_pages = dax_direct_access(fcd->dev, 0, PHYS_PFN(dax_size), NULL, + NULL); dax_read_unlock(id); if (nr_pages < 0) { pr_debug("dax_direct_access() returned %ld\n", nr_pages); From patchwork Tue May 25 17:24:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 12279689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A74E5C47084 for ; Tue, 25 May 2021 17:24:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8CEA861417 for ; Tue, 25 May 2021 17:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233824AbhEYR0R (ORCPT ); Tue, 25 May 2021 13:26:17 -0400 Received: from mga03.intel.com ([134.134.136.65]:9404 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233852AbhEYR0Q (ORCPT ); Tue, 25 May 2021 13:26:16 -0400 IronPort-SDR: T4J9M3K8ez9XlBmhz8UYK0JfdQw1kV8H4R5TI5DiSWm4YLZ130kxwzgpobp6DjHsVxX7JB39Ye Kug+r8syaVRw== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202288198" X-IronPort-AV: E=Sophos;i="5.82,328,1613462400"; d="scan'208";a="202288198" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 10:24:32 -0700 IronPort-SDR: iTg7kWfPtWs9sWulBMt5sNbz3FIReiZmGS+ArfHxfJGzKJ5yq+zmb6tNwOwraCEALNJrKnbBck x13LZednWADA== X-IronPort-AV: E=Sophos;i="5.82,328,1613462400"; d="scan'208";a="633105443" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 10:24:32 -0700 From: ira.weiny@intel.com To: Dan Williams Cc: Ira Weiny , Vishal Verma , linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 2/3] fs/dax: Clarify nr_pages to dax_direct_access() Date: Tue, 25 May 2021 10:24:27 -0700 Message-Id: <20210525172428.3634316-3-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 In-Reply-To: <20210525172428.3634316-1-ira.weiny@intel.com> References: <20210525172428.3634316-1-ira.weiny@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Ira Weiny dax_direct_access() takes a number of pages. PHYS_PFN(PAGE_SIZE) is a very round about way to specify '1'. Change the nr_pages parameter to the explicit value of '1'. Reviewed-by: Dan Williams Signed-off-by: Ira Weiny --- fs/dax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dax.c b/fs/dax.c index b3d27fdc6775..07621322aeee 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -710,7 +710,7 @@ static int copy_cow_page_dax(struct block_device *bdev, struct dax_device *dax_d return rc; id = dax_read_lock(); - rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(PAGE_SIZE), &kaddr, NULL); + rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL); if (rc < 0) { dax_read_unlock(id); return rc; From patchwork Tue May 25 17:24:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 12279687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29E13C2B9F8 for ; Tue, 25 May 2021 17:24:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E91861417 for ; Tue, 25 May 2021 17:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233856AbhEYR0Q (ORCPT ); Tue, 25 May 2021 13:26:16 -0400 Received: from mga03.intel.com ([134.134.136.65]:9404 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233843AbhEYR0Q (ORCPT ); Tue, 25 May 2021 13:26:16 -0400 IronPort-SDR: ORtokHP8GR+g4SaXWfdeAE+JDGJVwxfY5z5f0gcX0cugm8brw5jFZ1wabDmgBEBbJBiz4wiEVN fVzYdac7PPXw== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202288219" X-IronPort-AV: E=Sophos;i="5.82,328,1613462400"; d="scan'208";a="202288219" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 10:24:33 -0700 IronPort-SDR: iSJB6XtPrtPA88Et5nfaFUasQXO07mqz6NAlMsTbI4655hsWgUQEF6JYKXVXNX+nNviIytsXNY l00jeGp5eGPQ== X-IronPort-AV: E=Sophos;i="5.82,328,1613462400"; d="scan'208";a="633105450" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2021 10:24:32 -0700 From: ira.weiny@intel.com To: Dan Williams Cc: Ira Weiny , Vishal Verma , linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 3/3] dax: Ensure errno is returned from dax_direct_access Date: Tue, 25 May 2021 10:24:28 -0700 Message-Id: <20210525172428.3634316-4-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 In-Reply-To: <20210525172428.3634316-1-ira.weiny@intel.com> References: <20210525172428.3634316-1-ira.weiny@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Ira Weiny If the caller specifies a negative nr_pages that is an invalid parameter. Return -EINVAL to ensure callers get an errno if they want to check it. Reviewed-by: Dan Williams Signed-off-by: Ira Weiny --- drivers/dax/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 5fa6ae9dbc8b..44736cbd446e 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -313,7 +313,7 @@ long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, return -ENXIO; if (nr_pages < 0) - return nr_pages; + return -EINVAL; avail = dax_dev->ops->direct_access(dax_dev, pgoff, nr_pages, kaddr, pfn);