From nobody Sat Apr 11 10:48:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37498C25B0C for ; Thu, 11 Aug 2022 15:32:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235942AbiHKPcd (ORCPT ); Thu, 11 Aug 2022 11:32:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235869AbiHKPb6 (ORCPT ); Thu, 11 Aug 2022 11:31:58 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C779B85A9F for ; Thu, 11 Aug 2022 08:30:51 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id bs25so3303643wrb.2 for ; Thu, 11 Aug 2022 08:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=lsxU9RpxEtZA+Mk40O6yVmrf9Fu1AMs9ElIAZHptX+c=; b=p8TKVMzq5DwZ3OnqS3RJd818yoMLzy+vFjFcKzlWiosox7p8z1M/5PW/gBrz2e7ZOq RcCm2WazhJYvmqLcaMpSIbJowOeXPTikATddJwIFDDcXMr8NuVwx2A/6WmqWRNmnnSPW kxyxTRS7cc3d9M84ZexCGh/qOj90dgR3qwfhD8P+cNePNgofGMJMpOeMNCzRj9fwiUjR gxwLTFlId5B58kby9P2uQkwS5i9TlF/0qS/Y07//QrDxQYLLlxxo8q2Bi2H14qK4iLZX RABxL/E2v0VJN6Xq/qw/FBepYmww8/tuh6n+VQg0D9qaCoReL5dJ8aBFnN8BWFtXqIYK 4nGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=lsxU9RpxEtZA+Mk40O6yVmrf9Fu1AMs9ElIAZHptX+c=; b=x1wTMI+a3BVLGOm6ST05Pwskecj7jkFDRPone+eNWnoVLr+IhjvmVigMqHiTheOGfM M+++um5rOsB3gK1iEcRhaDPAU1eJYnXGYtwogo1wKDl4vKlnXIH4LxNMKwArrsdBdrCH hOXAG1UoGhsQvmHj7QSaEy1oJeQ1C+VRd1R3/vrcgFD0RdmPVDsbLnS2TKkUeAaRPvgo LiCYHr3XT0MpLsYIJ5ygwh1FJVNdtdy4pXiAPUnHWsS1uOnNbzOnK3kp2PsNPhTIE9PY cLynlu6c0vMm8v+o9AHCeLek7yZqRwed4N3zeDUFRgO6RV1mKXYyZAsZyyoDUmeE4LRR zJww== X-Gm-Message-State: ACgBeo0dDlh9YUobrDdRI+crkOJdj0Vb2gK94PCyZ2r4vwEKlvsalxYz PKZ6JpqrjuTA78R3YEtkAhUUBUd/En0ECw== X-Google-Smtp-Source: AA6agR6B9bizQz9J53uYxM4sZolnfx+nbRLl41mveZTi8oUUOyyvs7b1h0H6QspWO+C/SmNj2BgX/A== X-Received: by 2002:adf:ea0a:0:b0:220:6222:ee48 with SMTP id q10-20020adfea0a000000b002206222ee48mr19221413wrm.243.1660231850215; Thu, 11 Aug 2022 08:30:50 -0700 (PDT) Received: from localhost.localdomain (host-79-27-108-198.retail.telecomitalia.it. [79.27.108.198]) by smtp.gmail.com with ESMTPSA id m7-20020a056000008700b00222ed7ea203sm9805502wrx.100.2022.08.11.08.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 08:30:48 -0700 (PDT) From: "Fabio M. De Francesco" To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , John Harrison , Matt Roper , Matthew Brost , Lucas De Marchi , Daniele Ceraolo Spurio , Matthew Auld , Ira Weiny , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" Subject: [PATCH 1/3] drm/i915: Replace kmap() with kmap_local_page() Date: Thu, 11 Aug 2022 17:30:39 +0200 Message-Id: <20220811153041.12795-2-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220811153041.12795-1-fmdefrancesco@gmail.com> References: <20220811153041.12795-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kmap() is being deprecated in favor of kmap_local_page(). There are two main problems with kmap(): (1) It comes with an overhead as mapping space is restricted and protected by a global lock for synchronization and (2) it also requires global TLB invalidation when the kmap=E2=80=99s pool wraps and it might block when the mapping space is fully utilized until a slot becomes available. With kmap_local_page() the mappings are per thread, CPU local, can take page faults, and can be called from any context (including interrupts). It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore, the tasks can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and are still valid. Since its use in i915_gem.c is safe everywhere, it should be preferred. Therefore, replace kmap() with kmap_local_page() in i915_gem.c Suggested-by: Ira Weiny Signed-off-by: Fabio M. De Francesco --- drivers/gpu/drm/i915/i915_gem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_ge= m.c index 702e5b89be22..43effce60e1b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -212,14 +212,14 @@ shmem_pread(struct page *page, int offset, int len, c= har __user *user_data, char *vaddr; int ret; =20 - vaddr =3D kmap(page); + vaddr =3D kmap_local_page(page); =20 if (needs_clflush) drm_clflush_virt_range(vaddr + offset, len); =20 ret =3D __copy_to_user(user_data, vaddr + offset, len); =20 - kunmap(page); + kunmap_local(vaddr); =20 return ret ? -EFAULT : 0; } @@ -634,7 +634,7 @@ shmem_pwrite(struct page *page, int offset, int len, ch= ar __user *user_data, char *vaddr; int ret; =20 - vaddr =3D kmap(page); + vaddr =3D kmap_local_page(page); =20 if (needs_clflush_before) drm_clflush_virt_range(vaddr + offset, len); @@ -643,7 +643,7 @@ shmem_pwrite(struct page *page, int offset, int len, ch= ar __user *user_data, if (!ret && needs_clflush_after) drm_clflush_virt_range(vaddr + offset, len); =20 - kunmap(page); + kunmap_local(vaddr); =20 return ret ? -EFAULT : 0; } --=20 2.37.1 From nobody Sat Apr 11 10:48:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43500C19F2A for ; Thu, 11 Aug 2022 15:32:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235791AbiHKPch (ORCPT ); Thu, 11 Aug 2022 11:32:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235678AbiHKPb7 (ORCPT ); Thu, 11 Aug 2022 11:31:59 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FAA59752E for ; Thu, 11 Aug 2022 08:30:55 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id j7so21782710wrh.3 for ; Thu, 11 Aug 2022 08:30:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=qZtGOXbRC+1H6SPLMpuq1SgPyHU7zMutv39GohgMBvo=; b=kHDbzD7P9eGWeR5QgJz8o1M4lnlOV+24zL4PIkoKaISN137ifaBEtwvYZGOrdPMJ1W 6cHV0oSmCKFcNNk0vpWxMajyRH6PYZfHGLxbZa6xz0nQ0PXYtFjJjeq4xbJ9n4t/PUbL m5WN1x1jV/pmiObU1mVXl4tO198NP8iOeBji/RR6eJUItHUSMiYtAhPQHerKaSrbAzxn n7RuZbkyl7A9sc/63XXdJd5sjQkdpw5IakaHG8aepNjjhcwZFSbPg1/73XwhReevGlY8 71gjrAj4jM4uDDj5iU3EAQ3hK34JOnyjeJLo0cTpTUI0OAWpe36RaEDXeM0oEZJKjmXJ UkZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=qZtGOXbRC+1H6SPLMpuq1SgPyHU7zMutv39GohgMBvo=; b=4iLHuXc2rQIFFaS3KWrdUdQw4ELVU9eOsQs5QGZfF+PDop0bhd9auGYNEF9bWOJ1To 6aANim+IVKtirk5zj/amQ+YxHov+Mif17Y437dl1fUlM+FEyjBOHSpARS96kghh6Soyy Rwnhto6xNIecn1F/7oCrtDM1r//XP5lnYyKrugx2rsrYA9sTnKny5nWeGFSbmxucNfHC qi9bRxT6s5dFoLyzNImUg8nwo9GbkiIRp/H1mEAlftbbbcCuHiDwgL4da/YbqAgbgQnv 5j5KaSakHFGVfuVmlLJoi1IXq+E6WNkbK4pK39a4jMBdOGUT3LqGe83gcCK7XRxayWtd CdnA== X-Gm-Message-State: ACgBeo2naSJFKqXu2wu+tIh3vWSMSA/0+BNGFPMF0aE82s2+xrxFjiuy wT18gRR+9Rp2MpIAm2uu7XI= X-Google-Smtp-Source: AA6agR5a9kzgqtDr+SyVjmXoGK7TQ3C9s6/ZzMuJhHCJyK48sU4+XUw9zEtEFNtg3FIup6WEqH0qNg== X-Received: by 2002:a5d:52cb:0:b0:21a:3cc5:f5f4 with SMTP id r11-20020a5d52cb000000b0021a3cc5f5f4mr20771696wrv.367.1660231853386; Thu, 11 Aug 2022 08:30:53 -0700 (PDT) Received: from localhost.localdomain (host-79-27-108-198.retail.telecomitalia.it. [79.27.108.198]) by smtp.gmail.com with ESMTPSA id m7-20020a056000008700b00222ed7ea203sm9805502wrx.100.2022.08.11.08.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 08:30:52 -0700 (PDT) From: "Fabio M. De Francesco" To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , John Harrison , Matt Roper , Matthew Brost , Lucas De Marchi , Daniele Ceraolo Spurio , Matthew Auld , Ira Weiny , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" Subject: [PATCH 2/3] drm/i915/gt: Replace kmap() with kmap_local_page() Date: Thu, 11 Aug 2022 17:30:40 +0200 Message-Id: <20220811153041.12795-3-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220811153041.12795-1-fmdefrancesco@gmail.com> References: <20220811153041.12795-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kmap() is being deprecated in favor of kmap_local_page(). There are two main problems with kmap(): (1) It comes with an overhead as mapping space is restricted and protected by a global lock for synchronization and (2) it also requires global TLB invalidation when the kmap=E2=80=99s pool wraps and it might block when the mapping space is fully utilized until a slot becomes available. With kmap_local_page() the mappings are per thread, CPU local, can take page faults, and can be called from any context (including interrupts). It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore, the tasks can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and are still valid. Since its use in i915/gt is safe everywhere, it should be preferred. Therefore, replace kmap() with kmap_local_page() in i915/gt Suggested-by: Ira Weiny Signed-off-by: Fabio M. De Francesco --- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 4 ++-- drivers/gpu/drm/i915/gt/shmem_utils.c | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c b/drivers/gpu/drm= /i915/gt/intel_ggtt_fencing.c index 6ebda3d65086..21d8ce40b897 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c @@ -747,7 +747,7 @@ static void swizzle_page(struct page *page) char *vaddr; int i; =20 - vaddr =3D kmap(page); + vaddr =3D kmap_local_page(page); =20 for (i =3D 0; i < PAGE_SIZE; i +=3D 128) { memcpy(temp, &vaddr[i], 64); @@ -755,7 +755,7 @@ static void swizzle_page(struct page *page) memcpy(&vaddr[i + 64], temp, 64); } =20 - kunmap(page); + kunmap_local(vaddr); } =20 /** diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.c b/drivers/gpu/drm/i915/g= t/shmem_utils.c index 402f085f3a02..48edbb8a33e5 100644 --- a/drivers/gpu/drm/i915/gt/shmem_utils.c +++ b/drivers/gpu/drm/i915/gt/shmem_utils.c @@ -98,22 +98,19 @@ static int __shmem_rw(struct file *file, loff_t off, unsigned int this =3D min_t(size_t, PAGE_SIZE - offset_in_page(off), len); struct page *page; - void *vaddr; =20 page =3D shmem_read_mapping_page_gfp(file->f_mapping, pfn, GFP_KERNEL); if (IS_ERR(page)) return PTR_ERR(page); =20 - vaddr =3D kmap(page); if (write) { - memcpy(vaddr + offset_in_page(off), ptr, this); + memcpy_to_page(page, offset_in_page(off), ptr, this); set_page_dirty(page); } else { - memcpy(ptr, vaddr + offset_in_page(off), this); + memcpy_from_page(ptr, page, offset_in_page(off), this); } mark_page_accessed(page); - kunmap(page); put_page(page); =20 len -=3D this; @@ -140,11 +137,11 @@ int shmem_read_to_iosys_map(struct file *file, loff_t= off, if (IS_ERR(page)) return PTR_ERR(page); =20 - vaddr =3D kmap(page); + vaddr =3D kmap_local_page(page); iosys_map_memcpy_to(map, map_off, vaddr + offset_in_page(off), this); mark_page_accessed(page); - kunmap(page); + kunmap_local(vaddr); put_page(page); =20 len -=3D this; --=20 2.37.1 From nobody Sat Apr 11 10:48:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9269DC19F2A for ; Thu, 11 Aug 2022 15:32:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235961AbiHKPcp (ORCPT ); Thu, 11 Aug 2022 11:32:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235882AbiHKPcA (ORCPT ); Thu, 11 Aug 2022 11:32:00 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D64E99276 for ; Thu, 11 Aug 2022 08:30:58 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id bv3so21734810wrb.5 for ; Thu, 11 Aug 2022 08:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=9LdlmQyOWQmNUkI2XSzFvRVcY0yH+3vXNaOXUWwwOG4=; b=eV6FwIVuQpB9dHkFnLwSKjT4FEK0Dhbo6bQOrKzw9FkfJkh5Oa/iuWccmmSpSzWe97 42QbvmI8RqNNXVaHyDhu7vGFqpBEV+2F2HRrL2nr1elvXGTuS9XooJwD3YJ5E94OV8Tx MJkOkq6sZcpSukalpkstesF6L8viUq+OGxS5No+nWxyhPkC1EaMvRFwSnwZhfpx2HNQ6 pF1bm0WsUfnBUf7xNmroMUFR9I7rg4M+ynn/WE/selpTONdzHKxccsUsCXJBd7xBz8Ap l+jAyYMMVg/OTe3TxF5I+9x9UR/flsUnsTz7D297O2Mh2UtG5HB3xzLO8t2t8ayyPy2i G22w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=9LdlmQyOWQmNUkI2XSzFvRVcY0yH+3vXNaOXUWwwOG4=; b=UbrtcquS0bmA44mjubx+C3lyKdyKbLszHzML4xqfYnp8p3+6RC9uoWHe3nXkvJ0JxU rPCmsiNF734sco467yPpcIqoYwRnV9fDU0aWRLs+n6BBSxRxiP9dq2wr1kwVAqXPLAAv NcVETt9lge97gn8uy88UsF0OQfG2pZgIM1X56QPY0Z1EX9qgoFY3eOLqU97+3JzUTHiD SISV8pOwVQUmEVjbFX/cyQNJgrrai2dyutDmHn/UATTj32yjftbL/5iXlvvzETsrWEoy Vfl8TJXjzbtv6gEh/9WkB/Vv0da9HcdOBFpeHVaC5iSVklXp/8sAqaj8VC1ohyjIpYn6 n0tw== X-Gm-Message-State: ACgBeo1SC+vV9+yVeh9bSiM/xX0Etlri4MlglW+yBU6feUO0xEBsQ9k0 Pws1xKiegIf77Y+decMVMNg= X-Google-Smtp-Source: AA6agR5M9utedSYDnsS5LO6FAtzaxLGA2AV5HP+vrf8nPzln6D1eAiA97OrCyHA9QEQ+h+6JgnjaQA== X-Received: by 2002:a5d:5989:0:b0:221:7c34:3943 with SMTP id n9-20020a5d5989000000b002217c343943mr15731861wri.441.1660231856621; Thu, 11 Aug 2022 08:30:56 -0700 (PDT) Received: from localhost.localdomain (host-79-27-108-198.retail.telecomitalia.it. [79.27.108.198]) by smtp.gmail.com with ESMTPSA id m7-20020a056000008700b00222ed7ea203sm9805502wrx.100.2022.08.11.08.30.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 08:30:55 -0700 (PDT) From: "Fabio M. De Francesco" To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , John Harrison , Matt Roper , Matthew Brost , Lucas De Marchi , Daniele Ceraolo Spurio , Matthew Auld , Ira Weiny , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" Subject: [PATCH 3/3] drm/i915/gem: Replace kmap() with kmap_local_page() Date: Thu, 11 Aug 2022 17:30:41 +0200 Message-Id: <20220811153041.12795-4-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220811153041.12795-1-fmdefrancesco@gmail.com> References: <20220811153041.12795-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kmap() is being deprecated in favor of kmap_local_page(). There are two main problems with kmap(): (1) It comes with an overhead as mapping space is restricted and protected by a global lock for synchronization and (2) it also requires global TLB invalidation when the kmap=E2=80=99s pool wraps and it might block when the mapping space is fully utilized until a slot becomes available. With kmap_local_page() the mappings are per thread, CPU local, can take page faults, and can be called from any context (including interrupts). It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore, the tasks can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and are still valid. Since its use in i915/gem is safe everywhere, it should be preferred. Therefore, replace kmap() with kmap_local_page() in i915/gem. Suggested-by: Ira Weiny Signed-off-by: Fabio M. De Francesco --- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 6 ++---- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i9= 15/gem/i915_gem_shmem.c index 4eed3dd90ba8..2bc6ab9964ff 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -640,16 +640,14 @@ i915_gem_object_create_shmem_from_data(struct drm_i91= 5_private *dev_priv, do { unsigned int len =3D min_t(typeof(size), size, PAGE_SIZE); struct page *page; - void *pgdata, *vaddr; + void *pgdata; =20 err =3D aops->write_begin(file, file->f_mapping, offset, len, &page, &pgdata); if (err < 0) goto fail; =20 - vaddr =3D kmap(page); - memcpy(vaddr, data, len); - kunmap(page); + memcpy_to_page(page, 0, data, len); =20 err =3D aops->write_end(file, file->f_mapping, offset, len, len, page, pgdata); diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/g= pu/drm/i915/gem/selftests/i915_gem_mman.c index 3ced9948a331..bb25b50b5688 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c @@ -153,7 +153,7 @@ static int check_partial_mapping(struct drm_i915_gem_ob= ject *obj, intel_gt_flush_ggtt_writes(to_gt(i915)); =20 p =3D i915_gem_object_get_page(obj, offset >> PAGE_SHIFT); - cpu =3D kmap(p) + offset_in_page(offset); + cpu =3D kmap_local_page(p) + offset_in_page(offset); drm_clflush_virt_range(cpu, sizeof(*cpu)); if (*cpu !=3D (u32)page) { pr_err("Partial view for %lu [%u] (offset=3D%llu, size=3D%u [%llu, row s= ize %u], fence=3D%d, tiling=3D%d, stride=3D%d) misalignment, expected write= to page (%llu + %u [0x%llx]) of 0x%x, found 0x%x\n", @@ -171,7 +171,7 @@ static int check_partial_mapping(struct drm_i915_gem_ob= ject *obj, } *cpu =3D 0; drm_clflush_virt_range(cpu, sizeof(*cpu)); - kunmap(p); + kunmap_local(cpu); =20 out: i915_gem_object_lock(obj, NULL); @@ -249,7 +249,7 @@ static int check_partial_mappings(struct drm_i915_gem_o= bject *obj, intel_gt_flush_ggtt_writes(to_gt(i915)); =20 p =3D i915_gem_object_get_page(obj, offset >> PAGE_SHIFT); - cpu =3D kmap(p) + offset_in_page(offset); + cpu =3D kmap_local_page(p) + offset_in_page(offset); drm_clflush_virt_range(cpu, sizeof(*cpu)); if (*cpu !=3D (u32)page) { pr_err("Partial view for %lu [%u] (offset=3D%llu, size=3D%u [%llu, row = size %u], fence=3D%d, tiling=3D%d, stride=3D%d) misalignment, expected writ= e to page (%llu + %u [0x%llx]) of 0x%x, found 0x%x\n", @@ -267,7 +267,7 @@ static int check_partial_mappings(struct drm_i915_gem_o= bject *obj, } *cpu =3D 0; drm_clflush_virt_range(cpu, sizeof(*cpu)); - kunmap(p); + kunmap_local(cpu); if (err) return err; =20 --=20 2.37.1