From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT 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 CB3C4C433F4 for ; Thu, 20 Sep 2018 17:22:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 788B121531 for ; Thu, 20 Sep 2018 17:22:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LGS58myj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 788B121531 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730139AbeITXGx (ORCPT ); Thu, 20 Sep 2018 19:06:53 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:41544 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726990AbeITXGx (ORCPT ); Thu, 20 Sep 2018 19:06:53 -0400 Received: by mail-pf1-f193.google.com with SMTP id h79-v6so4681969pfk.8 for ; Thu, 20 Sep 2018 10:22:23 -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=FgPPmL4FXmwwtPC0Xu1PrMmEcptlwyIuJ2g4SGGX/tk=; b=LGS58myj7jtaUbLJ9icv/nST9eagTfgKafyQi93pZHOSJwDsUOo1K6b0mHV1dAkJpW 9rbbaoOj0JPrfbWdFFNHnxAc4BY/j8kxoQKNSHuVft30dK2u9LVkyHnuwOaltAPfaiDc TYWIgh1HGATZhPk9eezHBCAkisX4/bepmeM+j9RLfA6+fRrNtXC98PvKnQkaNy4ABeRB YawTkeSGfNmL8u8q2eM8Ud/hAbhhGahEzijuuE/aSAZTpapdFg0Eu/5BvvSh0P4WA0aC nygCrXddbmIfSp8JcnCBwCf8byxXZzA88HNczCni3J49TZyKcIw1KqnNq2EBF8FjHsne D66w== 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=FgPPmL4FXmwwtPC0Xu1PrMmEcptlwyIuJ2g4SGGX/tk=; b=eIoT3wB0/QkQDaQU5Dvigtm+z5w4yesIA9vOc2LEBO2DYt3QpJVWTymHcvNWApha3a bPo9W04tt9QG0l2wiw2/4QX7S31RGrcCnIf29QaqYhAiMV2QfeIHNPeiRRSmGqSd1WL2 RYuxp8SuhYDXI5HwDUSlmUzp4c+kOYF4ZleSuXil94cIxrCd5gm8a2qh07AI6GV+qEBN kmxr6KbvGn7PRPtwHbQ/bOeJ2OoxVU5/Bd/dhkf5BIGdx5OKB5h3V+u/fTZbFQVKx1VW LUUfz/G9rURHwxrkHYGFVTQgN/5BjpmrwHkVNQF8vp2KKaZObNz+DimQAg5CzYNcOT6m +QzA== X-Gm-Message-State: APzg51AmekVnM/wI9JUbLrNeA0KhZh/CNHRlV75nsdd1kiIKEmpSCsst X7v0t9MLPs68hxSkaa1yxNy6lE3Y X-Google-Smtp-Source: ANB0VdZgMxmq0O2NSu7jHCcAICpVGg2c/uZNuz4TPNvng0a9xKPgPoun8iT75yMssgEJbCSufunScA== X-Received: by 2002:a63:7003:: with SMTP id l3-v6mr15670906pgc.359.1537464142872; Thu, 20 Sep 2018 10:22:22 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([183.82.19.247]) by smtp.gmail.com with ESMTPSA id m15-v6sm74992743pfk.149.2018.09.20.10.22.20 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Sep 2018 10:22:21 -0700 (PDT) Date: Thu, 20 Sep 2018 22:55:29 +0530 From: Souptick Joarder To: willy@infradead.org, gregkh@linuxfoundation.org, arve@android.com, tkjos@android.com, maco@android.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: [PATCH] android/binder: Replace vm_insert_page with vmf_insert_page Message-ID: <20180920172528.GA22480@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is a plan to replace vm_insert_page with new API vmf_insert_page. As part of it, converting vm_insert_page to use vmf_insert_page. Signed-off-by: Souptick Joarder --- drivers/android/binder_alloc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 64fd96e..17368ef 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -238,6 +238,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, int ret; bool on_lru; size_t index; + vm_fault_t vmf; index = (page_addr - alloc->buffer) / PAGE_SIZE; page = &alloc->pages[index]; @@ -279,8 +280,8 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, } user_page_addr = (uintptr_t)page_addr + alloc->user_buffer_offset; - ret = vm_insert_page(vma, user_page_addr, page[0].page_ptr); - if (ret) { + vmf = vmf_insert_page(vma, user_page_addr, page[0].page_ptr); + if (vmf != VM_FAULT_NOPAGE) { pr_err("%d: binder_alloc_buf failed to map page at %lx in userspace\n", alloc->pid, user_page_addr); goto err_vm_insert_page_failed; -- 1.9.1