From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi0-x244.google.com (mail-oi0-x244.google.com [IPv6:2607:f8b0:4003:c06::244]) (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 AF96D2263DD99 for ; Mon, 16 Apr 2018 09:14:49 -0700 (PDT) Received: by mail-oi0-x244.google.com with SMTP id 188-v6so15055128oih.8 for ; Mon, 16 Apr 2018 09:14:49 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20180414155059.GA18015@jordon-HP-15-Notebook-PC> References: <20180414155059.GA18015@jordon-HP-15-Notebook-PC> From: Dan Williams Date: Mon, 16 Apr 2018 09:14:48 -0700 Message-ID: Subject: Re: [PATCH] dax: Change return type to vm_fault_t List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Souptick Joarder Cc: Linux MM , Andrew Morton , Michal Hocko , Matthew Wilcox , linux-nvdimm List-ID: On Sat, Apr 14, 2018 at 8:50 AM, Souptick Joarder wrote: > Use new return type vm_fault_t for fault and > huge_fault handler. > > Signed-off-by: Souptick Joarder > Reviewed-by: Matthew Wilcox > --- > drivers/dax/device.c | 26 +++++++++++--------------- > 1 file changed, 11 insertions(+), 15 deletions(-) > > diff --git a/drivers/dax/device.c b/drivers/dax/device.c > index 2137dbc..a122701 100644 > --- a/drivers/dax/device.c > +++ b/drivers/dax/device.c > @@ -243,11 +243,11 @@ __weak phys_addr_t dax_pgoff_to_phys(struct dev_dax *dev_dax, pgoff_t pgoff, > return -1; > } > > -static int __dev_dax_pte_fault(struct dev_dax *dev_dax, struct vm_fault *vmf) > +static vm_fault_t __dev_dax_pte_fault(struct dev_dax *dev_dax, > + struct vm_fault *vmf) > { > struct device *dev = &dev_dax->dev; > struct dax_region *dax_region; > - int rc = VM_FAULT_SIGBUS; > phys_addr_t phys; > pfn_t pfn; > unsigned int fault_size = PAGE_SIZE; > @@ -274,17 +274,11 @@ static int __dev_dax_pte_fault(struct dev_dax *dev_dax, struct vm_fault *vmf) > > pfn = phys_to_pfn_t(phys, dax_region->pfn_flags); > > - rc = vm_insert_mixed(vmf->vma, vmf->address, pfn); > - > - if (rc == -ENOMEM) > - return VM_FAULT_OOM; > - if (rc < 0 && rc != -EBUSY) > - return VM_FAULT_SIGBUS; > - > - return VM_FAULT_NOPAGE; > + return vmf_insert_mixed(vmf->vma, vmf->address, pfn); Ugh, so this change to vmf_insert_mixed() went upstream without fixing the users? This changelog is now misleading as it does not mention that is now an urgent standalone fix. On first read I assumed this was part of a wider effort for 4.18. Grumble, we'll get this applied with a 'Fixes: 1c8f422059ae ("mm: change return type to vm_fault_t")' tag. _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by kanga.kvack.org (Postfix) with ESMTP id 2E9CB6B026F for ; Mon, 16 Apr 2018 12:14:51 -0400 (EDT) Received: by mail-oi0-f69.google.com with SMTP id 6-v6so2141893oij.6 for ; Mon, 16 Apr 2018 09:14:51 -0700 (PDT) Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h134-v6sor5505276oib.260.2018.04.16.09.14.48 for (Google Transport Security); Mon, 16 Apr 2018 09:14:49 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20180414155059.GA18015@jordon-HP-15-Notebook-PC> References: <20180414155059.GA18015@jordon-HP-15-Notebook-PC> From: Dan Williams Date: Mon, 16 Apr 2018 09:14:48 -0700 Message-ID: Subject: Re: [PATCH] dax: Change return type to vm_fault_t Content-Type: text/plain; charset="UTF-8" Sender: owner-linux-mm@kvack.org List-ID: To: Souptick Joarder Cc: linux-nvdimm , Matthew Wilcox , Linux MM , Andrew Morton , Michal Hocko On Sat, Apr 14, 2018 at 8:50 AM, Souptick Joarder wrote: > Use new return type vm_fault_t for fault and > huge_fault handler. > > Signed-off-by: Souptick Joarder > Reviewed-by: Matthew Wilcox > --- > drivers/dax/device.c | 26 +++++++++++--------------- > 1 file changed, 11 insertions(+), 15 deletions(-) > > diff --git a/drivers/dax/device.c b/drivers/dax/device.c > index 2137dbc..a122701 100644 > --- a/drivers/dax/device.c > +++ b/drivers/dax/device.c > @@ -243,11 +243,11 @@ __weak phys_addr_t dax_pgoff_to_phys(struct dev_dax *dev_dax, pgoff_t pgoff, > return -1; > } > > -static int __dev_dax_pte_fault(struct dev_dax *dev_dax, struct vm_fault *vmf) > +static vm_fault_t __dev_dax_pte_fault(struct dev_dax *dev_dax, > + struct vm_fault *vmf) > { > struct device *dev = &dev_dax->dev; > struct dax_region *dax_region; > - int rc = VM_FAULT_SIGBUS; > phys_addr_t phys; > pfn_t pfn; > unsigned int fault_size = PAGE_SIZE; > @@ -274,17 +274,11 @@ static int __dev_dax_pte_fault(struct dev_dax *dev_dax, struct vm_fault *vmf) > > pfn = phys_to_pfn_t(phys, dax_region->pfn_flags); > > - rc = vm_insert_mixed(vmf->vma, vmf->address, pfn); > - > - if (rc == -ENOMEM) > - return VM_FAULT_OOM; > - if (rc < 0 && rc != -EBUSY) > - return VM_FAULT_SIGBUS; > - > - return VM_FAULT_NOPAGE; > + return vmf_insert_mixed(vmf->vma, vmf->address, pfn); Ugh, so this change to vmf_insert_mixed() went upstream without fixing the users? This changelog is now misleading as it does not mention that is now an urgent standalone fix. On first read I assumed this was part of a wider effort for 4.18. Grumble, we'll get this applied with a 'Fixes: 1c8f422059ae ("mm: change return type to vm_fault_t")' tag.