From patchwork Mon Jul 22 04:30:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11051705 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 555EB138D for ; Mon, 22 Jul 2019 07:08:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 403F028495 for ; Mon, 22 Jul 2019 07:08:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 343D82849B; Mon, 22 Jul 2019 07:08:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E72A728495 for ; Mon, 22 Jul 2019 07:08:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E506D89B62; Mon, 22 Jul 2019 07:08:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4222089A76 for ; Mon, 22 Jul 2019 04:30:17 +0000 (UTC) Received: by mail-pl1-x641.google.com with SMTP id k8so18584220plt.3 for ; Sun, 21 Jul 2019 21:30:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WbaMzabtgu3hCeOMPX09tru106PZHAIJnqruZQI71c8=; b=sw3kolf+epe+hkbfpsy4+0o7b3EQLFoU3ZrDBSL6mo14SHrtLfbiWiNlRQ1Sv1R6SA g4Oh/BeTrvir5fGO/DM9hyfkCYjCsHMQBxACRNx9QOdU60ZLDlzhC2VX093n7a0qGLTq EcRtcWyDXxQLbi928BRadQc2+zAGgQaPueyUWnVZsh8enYgI6DgLmcFH0GJYf9aCdbW6 EPEIQDmqzNQsmjPQ1cGvYyT08QifJaSZiZRIJ0WSCKdpzYAPSP3yPALOFJTVUBYN0JL2 2BQovfvM/WnTr14gy/3IxdTEA9DQ7rv/MdrAml18R1bETAiywKSXmox/majVFP5AlzIR P6sw== X-Gm-Message-State: APjAAAXVqynDyFi76grt/XwfsltKYAuEXlIzAqiE+sLCnhZ/l6kvrGYs YUift/nnZdxtpwHdNpNfwZw= X-Google-Smtp-Source: APXvYqyKR4WrwxhhqPsiCdGlG1x0qIsswj14hIfFs7IMQOgAz1KccUwekZlyy0ZSOgH/yneXklBTJA== X-Received: by 2002:a17:902:ac87:: with SMTP id h7mr75701953plr.36.1563769816971; Sun, 21 Jul 2019 21:30:16 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id t96sm34285690pjb.1.2019.07.21.21.30.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 21 Jul 2019 21:30:16 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Subject: [PATCH 1/3] drivers/gpu/drm/via: convert put_page() to put_user_page*() Date: Sun, 21 Jul 2019 21:30:10 -0700 Message-Id: <20190722043012.22945-2-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190722043012.22945-1-jhubbard@nvidia.com> References: <20190722043012.22945-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Mailman-Approved-At: Mon, 22 Jul 2019 07:08:15 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WbaMzabtgu3hCeOMPX09tru106PZHAIJnqruZQI71c8=; b=p3HGgaINx4UXmNtxMRxq9ZG6NzncIA85CDVJwUAyirDvW3yCo2di+TLZl5eFlPnNmI tKBmRpm/+GE33EtGsFzwMuLEx975vOoVhficjaLeRIsopct9Hcl7v/XU1KBwOEf2xMZN BHRmQquzbiIcI70dnx/HawsVNNS5fDl4FFWtUv/EmNTaCRi74oUprzweRieVqW1lCakX xGU3Yfp0T2yQHASWYcYkRONsVHYAjwfmIRSdrvV1yxpWlXG/IgI4pD2tDC41W7YDhh8Y 2xv+vtpzYgX36LzrXQsbqLPBzjZi80AqFoHhWGNEYVEtoMdLjAhgYaYrgI/kXAfMuWv+ Cbsw== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boaz Harrosh , Jan Kara , David Airlie , Dave Chinner , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Christoph Hellwig , Sage Weil , Miklos Szeredi , linux-rdma@vger.kernel.org, Matthew Wilcox , Jason Gunthorpe , Johannes Thumshirn , Ilya Dryomov , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , John Hubbard , Santosh Shilimkar , Ming Lei , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Alexander Viro , Dan Williams , Magnus Karlsson , Jens Axboe , netdev@vger.kernel.org, LKML , Yan Zheng , bpf@vger.kernel.org, "David S . Miller" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages(). This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions"). Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Hubbard --- drivers/gpu/drm/via/via_dmablit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 062067438f1d..219827ae114f 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -189,8 +189,9 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) for (i = 0; i < vsg->num_pages; ++i) { if (NULL != (page = vsg->pages[i])) { if (!PageReserved(page) && (DMA_FROM_DEVICE == vsg->direction)) - SetPageDirty(page); - put_page(page); + put_user_pages_dirty(&page, 1); + else + put_user_page(page); } } /* fall through */ From patchwork Mon Jul 22 04:30:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11051703 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 24B94138D for ; Mon, 22 Jul 2019 07:08:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F27228495 for ; Mon, 22 Jul 2019 07:08:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 032E72849B; Mon, 22 Jul 2019 07:08:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8AEC128495 for ; Mon, 22 Jul 2019 07:08:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3AF2089B46; Mon, 22 Jul 2019 07:08:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by gabe.freedesktop.org (Postfix) with ESMTPS id 880CE89A76 for ; Mon, 22 Jul 2019 04:30:18 +0000 (UTC) Received: by mail-pl1-x642.google.com with SMTP id a93so18529413pla.7 for ; Sun, 21 Jul 2019 21:30:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D+V1JOqHKw89xuQJyKyrQPxBPg1TKqg5mmM4KBGZiv0=; b=t4Jhq/hkEPZBr27S8t0P3pTo5oqKIqUjYL7aFw/XR/NMA/U+q4B9r9tNwj6wkydvMs /gg5F+EJVRf2BM3bGp/3cxDSi4oSb8LG9H0zxuI14J67quoNnPqvG39uGZ3OnfT76rbX xMDuWW1EpCmkdZ9hv0CwBekN2NFnF1aSX69rAsv/ShOhbFlZCCLxRQrHH3NoAPV3gLly JwqfPHOXh3/Sbj4FtwC0sHVWv+qvi8ZzkTcADhSVZ9RrxJfg9Eu0+JhV9LP9mIWVqLhK o2liP/eNSz0xdI+ZTiUDbDYmAPscy37SkEjARwxEcjgXBHx0SesIp2EFZF72TwF8J0f/ sNew== X-Gm-Message-State: APjAAAUnNyW+hY80qtXtMuMQBxblAqWRJkCNGpX+bQ6CrsiabloeXFCe e50Wv4F55/LXjk2OC3v0Bj4= X-Google-Smtp-Source: APXvYqxl80v/klDkLGiV/45cokVowIxuUImE7kMceTFkzRgYtQ9KqbkKZkwGuHiecTAs8feNRgDMBA== X-Received: by 2002:a17:902:6b86:: with SMTP id p6mr74936264plk.14.1563769818237; Sun, 21 Jul 2019 21:30:18 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id t96sm34285690pjb.1.2019.07.21.21.30.17 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 21 Jul 2019 21:30:17 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Subject: [PATCH 2/3] net/xdp: convert put_page() to put_user_page*() Date: Sun, 21 Jul 2019 21:30:11 -0700 Message-Id: <20190722043012.22945-3-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190722043012.22945-1-jhubbard@nvidia.com> References: <20190722043012.22945-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Mailman-Approved-At: Mon, 22 Jul 2019 07:08:15 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D+V1JOqHKw89xuQJyKyrQPxBPg1TKqg5mmM4KBGZiv0=; b=ZjncIryvRUENukVshJFmndluvLLU2arKIPK+YYicUChsIoVAk47zJe62/xRGnaP5sO 2dIVuxokgzVnbQHvCzkTXpkUYAmteOI1byf9i0Eh4Nry32SQ9hACfIfRqzVmd9cJiRLV K9HwOtYgSWbkF9G0wSK5xDI2GGAAixptvpE4fTe363E9YhkxmADQ/Mu9XRx8bTc2aorh N1o7z9m3WHPe2EsrnhH9xUt6CS36Mz9r/OpIcDwkj8s1H6FUiNK+g6MeR3C2qRQdfIdw al2E1lXQJ0Y1vWlKKViZ99Kmj6ELgJUAJ+cq1tdYD2dh7ezt2sYlt89O5gvFrEpEQJG1 ZAOA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boaz Harrosh , Jan Kara , David Airlie , Dave Chinner , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Christoph Hellwig , Sage Weil , Miklos Szeredi , linux-rdma@vger.kernel.org, Matthew Wilcox , Jason Gunthorpe , Johannes Thumshirn , Ilya Dryomov , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , John Hubbard , Santosh Shilimkar , Ming Lei , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Alexander Viro , Dan Williams , Magnus Karlsson , Jens Axboe , netdev@vger.kernel.org, LKML , Yan Zheng , bpf@vger.kernel.org, "David S . Miller" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages(). This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions"). Cc: Björn Töpel Cc: Magnus Karlsson Cc: David S. Miller Cc: netdev@vger.kernel.org Signed-off-by: John Hubbard --- net/xdp/xdp_umem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 83de74ca729a..9cbbb96c2a32 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -171,8 +171,7 @@ static void xdp_umem_unpin_pages(struct xdp_umem *umem) for (i = 0; i < umem->npgs; i++) { struct page *page = umem->pgs[i]; - set_page_dirty_lock(page); - put_page(page); + put_user_pages_dirty_lock(&page, 1); } kfree(umem->pgs); From patchwork Mon Jul 22 04:30:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11051701 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AAD136C5 for ; Mon, 22 Jul 2019 07:08:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93BD228495 for ; Mon, 22 Jul 2019 07:08:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87BA428496; Mon, 22 Jul 2019 07:08:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F083F284AF for ; Mon, 22 Jul 2019 07:08:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 69D6289B30; Mon, 22 Jul 2019 07:08:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id CCAE289A83 for ; Mon, 22 Jul 2019 04:30:19 +0000 (UTC) Received: by mail-pf1-x441.google.com with SMTP id q10so16729356pff.9 for ; Sun, 21 Jul 2019 21:30:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Buo/x1ku3lZhKwc/x7LZHJLCV0/VJfVJkEd+jUfSemQ=; b=Gx15j3TtrOCx2wffa9uP9I2HSLBnYeaIDxMnl+FBITDBsH3AsWr99dDjldyacc5v3d 6vKb0CUVcrAEwJHJGbccv3dLR7cyGtIqWxTuoyttCZbLZjTWRK7UUw79ThaaGarAwCim 8P0yp1heJaeP+B7lzGsZxh+7dXCtqibo4+IzsiZyVjU13CmTeFEjo6Cl7lS6PjsdnGnW fc1uiuRUgonKITyGPvJqWu4nHlBZQML+8j+pe2TO6gI1fbWv7O9Jc1NHHqTGzGsQWnbF 8CCGX+XMvDV3Zc4K89lQBLp/xFSwsvg1rhaDDs7z7xUjYuae5MT01W6Gu7jl+67oQCqH CEcg== X-Gm-Message-State: APjAAAUhXcG4rl6BhUM7tm11NVu9PR74vboIQvmls18+uZ8UXXeRrCK2 WUDcXQR7TVxyWavnNI4H6q0= X-Google-Smtp-Source: APXvYqz665JUdaZ8/qhWBT5//AwERdP9iGLvt+InEi3nlWem4n0SFx0hcOfAG8MfqjlewAESAxZqZQ== X-Received: by 2002:a17:90a:9488:: with SMTP id s8mr76721358pjo.2.1563769819486; Sun, 21 Jul 2019 21:30:19 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id t96sm34285690pjb.1.2019.07.21.21.30.18 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 21 Jul 2019 21:30:19 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Subject: [PATCH 3/3] gup: new put_user_page_dirty*() helpers Date: Sun, 21 Jul 2019 21:30:12 -0700 Message-Id: <20190722043012.22945-4-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190722043012.22945-1-jhubbard@nvidia.com> References: <20190722043012.22945-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Mailman-Approved-At: Mon, 22 Jul 2019 07:08:15 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Buo/x1ku3lZhKwc/x7LZHJLCV0/VJfVJkEd+jUfSemQ=; b=t+zktHb7vIG4ts5I2ltkQHV48J0ZrgypJDZXuh8Drmfq8ZU2ILeEdq1vHcQdIM9gdw V6T9AQozh+PvM/HqMIqy5Tm11lI/PpLyTVp0Vd74SuF5mClFEjFXDGjMIfpge1xQoCsm IhnhiaeU9cdQMTgVUWSOM6j8abtFujQkLro/ZEGxc5vfgAlJ/A2fXKxi+6ua/RqGJsAJ aF9WRDRmvUFsceuLPU8ZX2StoJI42RECfxqG70NX1cGm7d70CaK3aiDy2ueHCoMs6WN3 fMhhkyT7kmlOi6Ja/WZU2mwWlGLAtDglCCekSpcUu5Vy9dQccxZDeZv6fJknPIHGCBXz Jv+w== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boaz Harrosh , Jan Kara , David Airlie , Dave Chinner , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Christoph Hellwig , Sage Weil , Miklos Szeredi , linux-rdma@vger.kernel.org, Matthew Wilcox , Jason Gunthorpe , Johannes Thumshirn , Ilya Dryomov , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , John Hubbard , Santosh Shilimkar , Ming Lei , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Alexander Viro , Dan Williams , Magnus Karlsson , Jens Axboe , netdev@vger.kernel.org, LKML , Yan Zheng , bpf@vger.kernel.org, "David S . Miller" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard While converting call sites to use put_user_page*() [1], quite a few places ended up needing a single-page routine to put and dirty a page. Provide put_user_page_dirty() and put_user_page_dirty_lock(), and use them in a few places: net/xdp, drm/via/, drivers/infiniband. Cc: Jason Gunthorpe Cc: Jan Kara Signed-off-by: John Hubbard --- drivers/gpu/drm/via/via_dmablit.c | 2 +- drivers/infiniband/core/umem.c | 2 +- drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- include/linux/mm.h | 10 ++++++++++ net/xdp/xdp_umem.c | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 219827ae114f..d30b2d75599f 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -189,7 +189,7 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) for (i = 0; i < vsg->num_pages; ++i) { if (NULL != (page = vsg->pages[i])) { if (!PageReserved(page) && (DMA_FROM_DEVICE == vsg->direction)) - put_user_pages_dirty(&page, 1); + put_user_page_dirty(page); else put_user_page(page); } diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 08da840ed7ee..a7337cc3ca20 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -55,7 +55,7 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d for_each_sg_page(umem->sg_head.sgl, &sg_iter, umem->sg_nents, 0) { page = sg_page_iter_page(&sg_iter); if (umem->writable && dirty) - put_user_pages_dirty_lock(&page, 1); + put_user_page_dirty_lock(page); else put_user_page(page); } diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index 0b0237d41613..d2ded624fb2a 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -76,7 +76,7 @@ static void usnic_uiom_put_pages(struct list_head *chunk_list, int dirty) page = sg_page(sg); pa = sg_phys(sg); if (dirty) - put_user_pages_dirty_lock(&page, 1); + put_user_page_dirty_lock(page); else put_user_page(page); usnic_dbg("pa: %pa\n", &pa); diff --git a/include/linux/mm.h b/include/linux/mm.h index 0334ca97c584..c0584c6d9d78 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1061,6 +1061,16 @@ void put_user_pages_dirty(struct page **pages, unsigned long npages); void put_user_pages_dirty_lock(struct page **pages, unsigned long npages); void put_user_pages(struct page **pages, unsigned long npages); +static inline void put_user_page_dirty(struct page *page) +{ + put_user_pages_dirty(&page, 1); +} + +static inline void put_user_page_dirty_lock(struct page *page) +{ + put_user_pages_dirty_lock(&page, 1); +} + #if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) #define SECTION_IN_PAGE_FLAGS #endif diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 9cbbb96c2a32..1d122e52c6de 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -171,7 +171,7 @@ static void xdp_umem_unpin_pages(struct xdp_umem *umem) for (i = 0; i < umem->npgs; i++) { struct page *page = umem->pgs[i]; - put_user_pages_dirty_lock(&page, 1); + put_user_page_dirty_lock(page); } kfree(umem->pgs);