From patchwork Tue Apr 17 14:53:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 899744 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40QfM13T5kz9s1d for ; Wed, 18 Apr 2018 08:00:29 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IHzIJ1S+"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40QfM11w3gzF20W for ; Wed, 18 Apr 2018 08:00:29 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IHzIJ1S+"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::243; helo=mail-pf0-x243.google.com; envelope-from=jrdr.linux@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IHzIJ1S+"; dkim-atps=neutral Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40QSrk4BbvzF21G for ; Wed, 18 Apr 2018 00:52:03 +1000 (AEST) Received: by mail-pf0-x243.google.com with SMTP id j11so5719170pff.10 for ; Tue, 17 Apr 2018 07:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=OPntlKhMG5e2pg1hTjNfD9IbVlVYA6OG2CjX1eJinaQ=; b=IHzIJ1S+a+6c4DdZ8MzhorsvEj+a1yqzFvMi1Fug7i6akuCf7tm6gfvyypyurwdRe8 R6UtJ2rOv3UzkakbOkEwV4rHRGXBJIPXin/jtFtMcodzVRtxEsnXrsUOAqe90NO/wk+F y5QYVrGawKkHtlulREGyIT6YxAmiOawa8HsBtGNTd+oZNsc/qKcfatZP4cwB4j8NY3Jv +4D+XwPCxWdlUCqEhRoLSMuwT1VfBN3R4oW1nnJ0chNfG9aKquvodCnqNEmDjF+gLU27 6jKSZRAR6SsvFl4e+J/ZKNKNCPIkXBm1+ALHZxHybZXxaxK1ciyCBrf//ch0OVU+8MBl 13lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=OPntlKhMG5e2pg1hTjNfD9IbVlVYA6OG2CjX1eJinaQ=; b=SNdnQr2bGUIHnQW9r0Z3nyug0AMrULhNMXTklairxEkthhq6HiVA4EKSD9Fd6Y/bPB Fc8mSt4rY5UMCXolD0oLaMkI+HiBGQ8jz27Z+m89NndvSRX1TVnJQ6m4jDjuLMeL4V20 qdDzIU5Mg8ylFWvY7Mq7yE31omEo4ffEDaF53KH15dPXlEOBigNeRIfa0bhe3NX8ECI5 cuRDiqAJ4z4HyZOIca7Xhlkk37dXGyoRcNUXxrbUb+XOiecIkF5wwZF6h1jJ05uDWo9Y k8VFIaP7DK9X/gVHumEXTow0JEu2QVKGHssZ+RAbzWbYSsqcec0QfJdUSS704qyYg5ZU hoog== X-Gm-Message-State: ALQs6tD6q1Bbk+UBZQjnFvoBIF/8DUumU01RhauA/bxDThnHX2qKoi5w IXM9oi/wxIIMbeZ9ZknJxJc= X-Google-Smtp-Source: AIpwx4/Ajtd7/iOpKkaSinPateJY+vW6QiRTJNpm9biPN2w6rvOIlIMVo7wQmz38My3XMCvvWc9+fQ== X-Received: by 10.99.173.7 with SMTP id g7mr2020180pgf.170.1523976720996; Tue, 17 Apr 2018 07:52:00 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([183.82.18.42]) by smtp.gmail.com with ESMTPSA id m66sm35110409pfb.82.2018.04.17.07.51.59 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Apr 2018 07:51:59 -0700 (PDT) Date: Tue, 17 Apr 2018 20:23:54 +0530 From: Souptick Joarder To: fbarrat@linux.vnet.ibm.com, andrew.donnellan@au1.ibm.com, arnd@arndb.de, gregkh@linuxfoundation.org Subject: [PATCH] misc: cxl: Change return type to vm_fault_t Message-ID: <20180417145354.GA31451@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Mailman-Approved-At: Wed, 18 Apr 2018 07:58:38 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, willy@infradead.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Use new return type vm_fault_t for fault handler. For now, this is just documenting that the function returns a VM_FAULT value rather than an errno. Once all instances are converted, vm_fault_t will become a distinct type. Reference id -> 1c8f422059ae ("mm: change return type to vm_fault_t") previously cxl_mmap_fault returns VM_FAULT_NOPAGE as default value irrespective of vm_insert_pfn() return value. This bug is fixed with new vmf_insert_pfn() which will return VM_FAULT_ type based on err. Signed-off-by: Souptick Joarder Acked-by: Andrew Donnellan Acked-by: Frederic Barrat --- drivers/misc/cxl/context.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 1.9.1 diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c index 7ff315a..c6ec872 100644 --- a/drivers/misc/cxl/context.c +++ b/drivers/misc/cxl/context.c @@ -128,11 +128,12 @@ void cxl_context_set_mapping(struct cxl_context *ctx, mutex_unlock(&ctx->mapping_lock); } -static int cxl_mmap_fault(struct vm_fault *vmf) +static vm_fault_t cxl_mmap_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct cxl_context *ctx = vma->vm_file->private_data; u64 area, offset; + vm_fault_t ret; offset = vmf->pgoff << PAGE_SHIFT; @@ -169,11 +170,11 @@ static int cxl_mmap_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; } - vm_insert_pfn(vma, vmf->address, (area + offset) >> PAGE_SHIFT); + ret = vmf_insert_pfn(vma, vmf->address, (area + offset) >> PAGE_SHIFT); mutex_unlock(&ctx->status_mutex); - return VM_FAULT_NOPAGE; + return ret; } static const struct vm_operations_struct cxl_mmap_vmops = {