From patchwork Mon Apr 17 10:38:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Fabio M. De Francesco" X-Patchwork-Id: 84156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2023496vqo; Mon, 17 Apr 2023 03:46:30 -0700 (PDT) X-Google-Smtp-Source: AKy350YQjgGQ4Z222bL40BQqPLjikEnguQjdTnU2R0oUp0nTCy7vqp18sCSNdnyRdYWX896fE5hF X-Received: by 2002:a17:90b:2692:b0:246:f5a3:e942 with SMTP id pl18-20020a17090b269200b00246f5a3e942mr22157295pjb.18.1681728390446; Mon, 17 Apr 2023 03:46:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681728390; cv=none; d=google.com; s=arc-20160816; b=sjxZ4TCCLrFWNXyH16rhbTmUlWdjuN6H13k9s9C/0l2E9GU362c3QC17/AGlOol9c8 A22D1jZ77GyQiJaHjOEt1/K0mZss0tHEe4/vGk2kOdr57cFpVPtNV1y9OIN53pEHcBMJ 1BEjmJb9HH0nR5is4IJjjSgoiYrCjpP1KrqejP93ndf4ztmNwPjnKbmhz9hJRkJA0elo VwBS6JXppbyK0b9hLWwtZLug2AQdU3I5nhtU7utdHT204o6DEC4vEcFIze06K9Hx+IIU sKsTf4fLlMFL4Gty9ldzO60p9COg+0hq5RJ0GNexgBjku1WVv840TQeZB0XEXu29niKw ZF0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mkh5X1oOnHmMtPThd/Ogb+Ei0/Iy+LdjudYL5nRHiA8=; b=N0imaZlpz41yLdmEq0Zd+2+5uqkmjsIYLCwUDnHs+qjope29qdh7VZZpg51Vv6wXI9 YidXoyKbwhb7iDNvG4zN97XbCQQwpdCibQulUIUwdFzD5X4yx2DuLMqj8QuOKZvBmh7y Gz1s+55k4/MRMlk411UlJiO3zVdf94Nl7Y5nkEsc3oPHG+EY9Bme5TNBcSJ34y2gZpMF Jtjvc+wZrmWOF/FtVkXbBTNxg069ZE9hJhwatL3lmWYcP5PRIMvxUopg2KiZWNP/WUSr qRZxcwshjqC6H+iqZUDN4+wiEKaBdPHHROmmGZIVpUtdMpyvgrApKbS50/Fb62tNGstH jKEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="XO/vfE0t"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d18-20020a63d712000000b0050c0c9d2930si11990386pgg.48.2023.04.17.03.46.16; Mon, 17 Apr 2023 03:46:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="XO/vfE0t"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231144AbjDQKk7 (ORCPT + 99 others); Mon, 17 Apr 2023 06:40:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230476AbjDQKky (ORCPT ); Mon, 17 Apr 2023 06:40:54 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33C48D8 for ; Mon, 17 Apr 2023 03:40:06 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f1763ee8f8so1408385e9.1 for ; Mon, 17 Apr 2023 03:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681727942; x=1684319942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mkh5X1oOnHmMtPThd/Ogb+Ei0/Iy+LdjudYL5nRHiA8=; b=XO/vfE0ttxJFtb+z+zDWyoXcM09x8Zs78N3GfyVo9gwDIuuHa3a1Gya8goc4sNmMJV vJR78/+//6TCZvI30CK/mDXRtQDDAPsnAizkwB7SubAmmPETo39N1bcxXg1o3cKdtQmJ iCoD6j4lKCLRHYwJI1MFIYJlEvuRAjgVkoOTZ/uX15pf4L+VkS92fyBzWSrLwGYY50At OR7OTpSJgtuz6ZDgg4F9K6kpnJv0D1ptjteBC4ZP3XgKXT3gyKF4/aYye3QW/JCfu8DK jN3oOf3Qkl4Z3pTExiIhOq34ri6WOzWaj3YJ2LKW9OBRVj7+1BrJHbhm4NXNHFDfBeZ8 h7ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681727942; x=1684319942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mkh5X1oOnHmMtPThd/Ogb+Ei0/Iy+LdjudYL5nRHiA8=; b=U1m7L5ORZDI5hB55r9iQECY4mBCGYXp8RaI4L1l4hLr+00qhJKfuOx3IZuNlVPkzYh oE+q6qHNwU7JHO9F5a5fIvZxTZGbP5zcOSDrEr4PE2W1WcK+5enGGTBYo/+HgqYlhYzD CQ4J4PmF1ElBK3Oiq4TiZrCiYH7ohuZuCyV87/nIGXIaAlDK1EpdE3sFejwfUC5/qurB FN6TNl0RYo3wFiwL2y2RYDP/R4I53yNJpY/4ayPa+AOvfW/IpeLu/KLY0ftSJWlCV715 d8dCAr90N6Jfj6q6KhdfYNen0v6AEDDR5j6NmgDeIuV8lxpTTV29Aqs7dX6DjuDNOwRc 0Acw== X-Gm-Message-State: AAQBX9cYMHV1TmjcTKrUz0s9Rk0UQsBjjE5avWrYR/5z7sktACVg5SCm gIId/ZFGX9i/Hy3bxPW6vAAOKChGPyc= X-Received: by 2002:a5d:6606:0:b0:2f8:dd25:f96e with SMTP id n6-20020a5d6606000000b002f8dd25f96emr4345092wru.6.1681727942023; Mon, 17 Apr 2023 03:39:02 -0700 (PDT) Received: from localhost.localdomain (host-87-19-108-254.retail.telecomitalia.it. [87.19.108.254]) by smtp.gmail.com with ESMTPSA id y12-20020a5d470c000000b002c70ce264bfsm10238018wrq.76.2023.04.17.03.39.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 03:39:01 -0700 (PDT) From: "Fabio M. De Francesco" To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Matt Roper , John Harrison , Daniele Ceraolo Spurio , Chris Wilson , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" , Ira Weiny Subject: [PATCH v2 1/3] drm/i915: Replace kmap() with kmap_local_page() Date: Mon, 17 Apr 2023 12:38:52 +0200 Message-Id: <20230417103854.23333-2-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230417103854.23333-1-fmdefrancesco@gmail.com> References: <20230417103854.23333-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763420028472614748?= X-GMAIL-MSGID: =?utf-8?q?1763420028472614748?= kmap() has been 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’s 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. Obviously, thread locality implies that the kernel voirtual addresses are valid only in the context of the callers. kmap_local_page() use in i915_gem.c doesn't break the above-mentioned constraint, so it should be preferred to kmap(). 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(-) -- 2.40.0 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 35950fa91406..c35248555e42 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, char __user *user_data, char *vaddr; int ret; - vaddr = kmap(page); + vaddr = kmap_local_page(page); if (needs_clflush) drm_clflush_virt_range(vaddr + offset, len); ret = __copy_to_user(user_data, vaddr + offset, len); - kunmap(page); + kunmap_local(vaddr); return ret ? -EFAULT : 0; } @@ -643,7 +643,7 @@ shmem_pwrite(struct page *page, int offset, int len, char __user *user_data, char *vaddr; int ret; - vaddr = kmap(page); + vaddr = kmap_local_page(page); if (needs_clflush_before) drm_clflush_virt_range(vaddr + offset, len); @@ -652,7 +652,7 @@ shmem_pwrite(struct page *page, int offset, int len, char __user *user_data, if (!ret && needs_clflush_after) drm_clflush_virt_range(vaddr + offset, len); - kunmap(page); + kunmap_local(vaddr); return ret ? -EFAULT : 0; } From patchwork Mon Apr 17 10:38:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Fabio M. De Francesco" X-Patchwork-Id: 84158 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2024605vqo; Mon, 17 Apr 2023 03:48:56 -0700 (PDT) X-Google-Smtp-Source: AKy350Y/yf7MKtK9rvNIHJ54pzQGM+lnd683MGpb8+RrokH+oByIvBqg588/ORdb468Kbko9v7XA X-Received: by 2002:a17:90a:a416:b0:240:d3b7:e850 with SMTP id y22-20020a17090aa41600b00240d3b7e850mr13000902pjp.49.1681728536364; Mon, 17 Apr 2023 03:48:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681728536; cv=none; d=google.com; s=arc-20160816; b=uWb7KrG0lwd1rapEKrBQOfTDcDDVqiQbEvZB6AfKGf4h2FX+3+g/bRP5jmxjgADmrl CbcArQFlVvit5Ls+EQ07P220dHg9uwMlPowjXRFgYBHGDHARfAraH0i3GTG50c1CfUfI e2MAF4HgsJlhHqwN4x/KcOHEJJ2UbQOgVzfjc6Zij+elO456zFCP5eETmd8Z2Z3mxSxB MfeJtdRP/UhvFGL0s6FBjYy7LMFCUOr3AvXbvC3tiyIRZ18OwB6g5pIULyuLjaBrQwqL 3XDXtRhT2hFU9SSPC+XmhNhDV/BW3iACsvz6sTguO/pOQZi54bceYyYBYVBAZYzdWqLQ KdKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dAW7sB6+Z5ZOltjkFBMt2NbhGjStc/CgCoci8oN9nks=; b=qNey76pERx34dZu8ELUOCpUZg3NtBkMujwoEOID5/Eb8rbV7VoFh1i/NTEUj6aqZjn fjBirw+UkT+OfWjQ+P82vcqWRqzaqGW+1NoBdn9wVgI9XTddjyi+avWSTOzooirbs8Nz XHaHY6GPxNxKgfgk9xwoDyd6Vtk3HX967albfStY2um5UP/uj0BlvFG0lCZyz/EejLYd T39fULFhz06USnhjur9KXzFTBxlae0duH5IN1SIYZwny97kEd9i2ccVSxLMGE00PFD4Z v2OIF5IiJRohe0cro5vKuuqc9wCp/UaCLVfZHlC7/Mvgym7t57NCsaBCwCA3Mcpwa77Q ddGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=lk90wuKk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k37-20020a635a65000000b00518a1800624si11892620pgm.307.2023.04.17.03.48.41; Mon, 17 Apr 2023 03:48:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=lk90wuKk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231232AbjDQKlH (ORCPT + 99 others); Mon, 17 Apr 2023 06:41:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230257AbjDQKk4 (ORCPT ); Mon, 17 Apr 2023 06:40:56 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E9F565AF for ; Mon, 17 Apr 2023 03:40:09 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id he11-20020a05600c540b00b003ef6d684102so11584086wmb.3 for ; Mon, 17 Apr 2023 03:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681727944; x=1684319944; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dAW7sB6+Z5ZOltjkFBMt2NbhGjStc/CgCoci8oN9nks=; b=lk90wuKk7kR9IX6uMik68yOAyW5/zZmQWcphsp7dCp9z3gtp/owgQL9h2aAbLKBZl4 fCT8G5zvkCrwE8UQwr3TI2qV7TEBSeuZSe9ChabtOXCucPLOySit4w+Ukcnt1MR6xcJD RBcU0cLyIawG1B8WldS9XwJKzvAn1uvF3XJQUQD4rxY6QsnOGA8yokADx7cMlcSkaxFs 5+cWcTxbRQ//yFlyW01nwMQQHtlmblF6pwjWClW/urNU4TC+6JZnbE5L8Bg4kfHflzxL /4UrOEAQM7KKog1/7dO7jGRKmFaB5tY3maCKiDRQFq5G039Z4m4zDMRjCuuJMMI16nKs eHFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681727944; x=1684319944; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dAW7sB6+Z5ZOltjkFBMt2NbhGjStc/CgCoci8oN9nks=; b=GGX0GN/bbEvuTs/BQ+LgMJ85EP11rMfTyWvaZUJT3qgmx4IVE76/2oy+fl6nWPcVtn ApZoLmwCYC/IxkW4hPABVNun+c1VftqtyBIxT+wCuXonxzs4lDAgKMyfanAiMZn0/iUL IAU+BekX+9cx0YLM/zBrdaqDzCt6NhaGyjItRcAuSBvj5aBD/H0B3kNubIg6q1lH+2NE w1M8C8poejuFLOxhjIsMoBjEy2QT1Parf1BBQiOyF1zWOQiKieyO6VSO7pp2kc8PEzYF gf3cB2pzDV/ySIX5NaZiUcT1UPzgrUO7P3R58gMs7OaQjJyo7PzEICbfbKTLCFhKvFcj RwXg== X-Gm-Message-State: AAQBX9d3UZlBbiKSBbCbJzujYk/hbk1ZUvt/V/90POeutcsUOwlIG8Cg 3I68MSBXJUPEJrcDQ6WMypk= X-Received: by 2002:a05:600c:4f46:b0:3f1:7443:6d6e with SMTP id m6-20020a05600c4f4600b003f174436d6emr1590807wmq.19.1681727943960; Mon, 17 Apr 2023 03:39:03 -0700 (PDT) Received: from localhost.localdomain (host-87-19-108-254.retail.telecomitalia.it. [87.19.108.254]) by smtp.gmail.com with ESMTPSA id y12-20020a5d470c000000b002c70ce264bfsm10238018wrq.76.2023.04.17.03.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 03:39:03 -0700 (PDT) From: "Fabio M. De Francesco" To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Matt Roper , John Harrison , Daniele Ceraolo Spurio , Chris Wilson , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" , Ira Weiny Subject: [PATCH v2 2/3] drm/i915/gt: Replace kmap() with kmap_local_page() Date: Mon, 17 Apr 2023 12:38:53 +0200 Message-Id: <20230417103854.23333-3-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230417103854.23333-1-fmdefrancesco@gmail.com> References: <20230417103854.23333-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763420181542094456?= X-GMAIL-MSGID: =?utf-8?q?1763420181542094456?= kmap() s been 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’s 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. Obviously, thread locality implies that the kernel virtual addresses are only valid in the context of the callers. The use of kmap_local_page() in i915/gt doesn't break the above-mentioned constraint, so it should be preferred to kmap(). 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(-) -- 2.40.0 diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c index 37d0b0fe791d..89295c6921d6 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c @@ -749,7 +749,7 @@ static void swizzle_page(struct page *page) char *vaddr; int i; - vaddr = kmap(page); + vaddr = kmap_local_page(page); for (i = 0; i < PAGE_SIZE; i += 128) { memcpy(temp, &vaddr[i], 64); @@ -757,7 +757,7 @@ static void swizzle_page(struct page *page) memcpy(&vaddr[i + 64], temp, 64); } - kunmap(page); + kunmap_local(vaddr); } /** diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.c b/drivers/gpu/drm/i915/gt/shmem_utils.c index 449c9ed44382..be809839a241 100644 --- a/drivers/gpu/drm/i915/gt/shmem_utils.c +++ b/drivers/gpu/drm/i915/gt/shmem_utils.c @@ -101,22 +101,19 @@ static int __shmem_rw(struct file *file, loff_t off, unsigned int this = min_t(size_t, PAGE_SIZE - offset_in_page(off), len); struct page *page; - void *vaddr; page = shmem_read_mapping_page_gfp(file->f_mapping, pfn, GFP_KERNEL); if (IS_ERR(page)) return PTR_ERR(page); - vaddr = 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); len -= this; @@ -143,11 +140,11 @@ int shmem_read_to_iosys_map(struct file *file, loff_t off, if (IS_ERR(page)) return PTR_ERR(page); - vaddr = kmap(page); + vaddr = 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); len -= this; From patchwork Mon Apr 17 10:38:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Fabio M. De Francesco" X-Patchwork-Id: 84153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2022973vqo; Mon, 17 Apr 2023 03:45:26 -0700 (PDT) X-Google-Smtp-Source: AKy350bQkKgl+DEO2bMxINdO1cx/HLZmtnOwPWrxUOhOYL7BIU+rqvx+pnB+tCdcT2VJDdOQccn9 X-Received: by 2002:a17:903:2cb:b0:1a6:b52a:b00b with SMTP id s11-20020a17090302cb00b001a6b52ab00bmr9087660plk.29.1681728326461; Mon, 17 Apr 2023 03:45:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681728326; cv=none; d=google.com; s=arc-20160816; b=x4J96tSLybvN+HuCLdlVhhfbBub+oGzPN2IKcVczPQ99y/FdwGI94dpaixV6bbFrSw m7myTnkYPTdpkRrggBUvSTF7mtCYDSBuUqF5xjkvdZTY/YtySIXYTB5AoPH7wChZxn07 pWDsV35R3VneDYmB8kunGZpYd86lwVrusrbOWdNxj4JE7/ydDOomBYFYZAQYHRTwaaYN A7WiNF+Uv314zzLi56obKzeBLA2rYqJKpih5pKNIKthVIDKkqu0o81IH94Ln0bGtKafG jWAfy/q2Ug5C25TM3r81k4Ur5iLqnn3Gp9eS9r5DgdZUHj/3lpzv8YKB/u2QgyB25y3H q7jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cH79Swn8ZRJ2/YarOj91Bz0xxg30p0nVIyjLTbfZHEk=; b=ZhaQbxr+3k/YdGJ7g0BcxqnqP2uX5lv8taTR/vNfUvyeDRqjhYJgAKctvjNJ2KYp65 T4mck6e5LGIleZPEgwKSv2+1fRwdBVY/De2cIDYaFfM12UhBKKnw8fhOLXTTd0HA2KBF vpxucKdGP2F79mIlHzrB1Bsr9zCBzTl5Rm73tZKGakalLjL5WPJtRCk1Ls8BmZ+tO8xJ XC8QBpl0Szb37Ef5uFMFMA2jexh7im/c3qnfR1nFyyqHrcAG+60VnfulTGmixqwpahS6 a1gLVM7h3DQBdu06xk3+jU2mQTQnpSr/bH0hiqnra3/jamix+CECXG2iz1zv+Yju5785 7uSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=YRKjuLMh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jj2-20020a170903048200b001a64a2b7921si10726978plb.8.2023.04.17.03.45.11; Mon, 17 Apr 2023 03:45:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=YRKjuLMh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231226AbjDQKlD (ORCPT + 99 others); Mon, 17 Apr 2023 06:41:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230490AbjDQKk5 (ORCPT ); Mon, 17 Apr 2023 06:40:57 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E2576EBF for ; Mon, 17 Apr 2023 03:40:09 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f16ecaadd1so11692205e9.1 for ; Mon, 17 Apr 2023 03:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681727946; x=1684319946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cH79Swn8ZRJ2/YarOj91Bz0xxg30p0nVIyjLTbfZHEk=; b=YRKjuLMhTl40C+QqFYNyd1bRihczrfYWx/yGU36IRsJfmSPwWm5zftNVBsPia6yv+S Zxqe6js3OrRVHvL9eVEwsHAVrpNhJPpvZcA3/CuoUjouJePIvyzvpsD+QqepRoAlloZ/ 0fsrKdoUG/TsMKLWUBTOHqggXyBAQ2C+BlCWcOm9TvmHiaIgIBq5KhCWjFeagOpEmB8d 1DAQ0WsJbDJw9QEjshxivpMLqq89xEmLpV7P0ecn/QKP2xODoAfG9PcVZbGxJetEzBPJ tD5YqlokKpW5QqC7IQ0a6OqDD1KDVY5I3WNXvmUYrxVtT80Kmg/URg+3ZpE9rLMH6zR0 2NkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681727946; x=1684319946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cH79Swn8ZRJ2/YarOj91Bz0xxg30p0nVIyjLTbfZHEk=; b=Iu8XvljOAjUbj48L0H5aC9fjQ4BVI/jq/utLLJmTi1Oq4ULnErhb2U4Sm8D4IzhSrS 8gqnjuXv1p1eEmtoDq6jaPz1mUC9CjYfycoBtK8NaT2DEf0DABKn/bJzHEjIRY51r3c7 xtlXdyeCY4OMuP2DTl1Gwyq5ZfTqAgypoUTF8jlnJ98s3zf3vXCdFmcLcOKvplj2IWyp gu6+73oJZ9Mi5BPkGOD8i6goagzMPFwV8UFgsDY9238AH5Z/h9mVIR8p2+6rwWDGImpC Kuh+dBDNdTzzK2K3LHqwOlBw7LjQoLniAxBi81r8aVC4xopoke81Uvaw4RGSYKZJoTZz woiw== X-Gm-Message-State: AAQBX9dCA6r2f3A0osGKfBLhR0jdEnXd5345nG90mbodnFv5iJ3GrRz8 O9fBj06k/oM+POGlzYA3DVU= X-Received: by 2002:adf:d085:0:b0:2fa:88f2:b04c with SMTP id y5-20020adfd085000000b002fa88f2b04cmr1956315wrh.20.1681727945938; Mon, 17 Apr 2023 03:39:05 -0700 (PDT) Received: from localhost.localdomain (host-87-19-108-254.retail.telecomitalia.it. [87.19.108.254]) by smtp.gmail.com with ESMTPSA id y12-20020a5d470c000000b002c70ce264bfsm10238018wrq.76.2023.04.17.03.39.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 03:39:05 -0700 (PDT) From: "Fabio M. De Francesco" To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Matt Roper , John Harrison , Daniele Ceraolo Spurio , Chris Wilson , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" , Ira Weiny Subject: [PATCH v2 3/3] drm/i915/gem: Replace kmap() with kmap_local_page() Date: Mon, 17 Apr 2023 12:38:54 +0200 Message-Id: <20230417103854.23333-4-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230417103854.23333-1-fmdefrancesco@gmail.com> References: <20230417103854.23333-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763419961375200806?= X-GMAIL-MSGID: =?utf-8?q?1763419961375200806?= kmap() s been 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’s 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. Obviously, thread locality implies that the kernel virtual addresses are only valid in the context of the callers. The kmap_local_page() use in i915/gem doesn't break the above-mentioned constraint, so it should be preferred to kmap(). Therefore, replace kmap() with kmap_local_page() in i915/gem and use memcpy_to_page() where it is possible to avoid the open coding of mapping + memcpy() + un-mapping. 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(-) -- 2.40.0 diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index 37d1efcd3ca6..8856a6409e83 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -657,16 +657,14 @@ i915_gem_object_create_shmem_from_data(struct drm_i915_private *dev_priv, do { unsigned int len = min_t(typeof(size), size, PAGE_SIZE); struct page *page; - void *pgdata, *vaddr; + void *pgdata; err = aops->write_begin(file, file->f_mapping, offset, len, &page, &pgdata); if (err < 0) goto fail; - vaddr = kmap(page); - memcpy(vaddr, data, len); - kunmap(page); + memcpy_to_page(page, 0, data, len); err = 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/gpu/drm/i915/gem/selftests/i915_gem_mman.c index 56279908ed30..5fd9e1ee2340 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c @@ -155,7 +155,7 @@ static int check_partial_mapping(struct drm_i915_gem_object *obj, intel_gt_flush_ggtt_writes(to_gt(i915)); p = i915_gem_object_get_page(obj, offset >> PAGE_SHIFT); - cpu = kmap(p) + offset_in_page(offset); + cpu = kmap_local_page(p) + offset_in_page(offset); drm_clflush_virt_range(cpu, sizeof(*cpu)); if (*cpu != (u32)page) { pr_err("Partial view for %lu [%u] (offset=%llu, size=%u [%llu, row size %u], fence=%d, tiling=%d, stride=%d) misalignment, expected write to page (%lu + %u [0x%lx]) of 0x%x, found 0x%x\n", @@ -173,7 +173,7 @@ static int check_partial_mapping(struct drm_i915_gem_object *obj, } *cpu = 0; drm_clflush_virt_range(cpu, sizeof(*cpu)); - kunmap(p); + kunmap_local(cpu); out: i915_gem_object_lock(obj, NULL); @@ -251,7 +251,7 @@ static int check_partial_mappings(struct drm_i915_gem_object *obj, intel_gt_flush_ggtt_writes(to_gt(i915)); p = i915_gem_object_get_page(obj, offset >> PAGE_SHIFT); - cpu = kmap(p) + offset_in_page(offset); + cpu = kmap_local_page(p) + offset_in_page(offset); drm_clflush_virt_range(cpu, sizeof(*cpu)); if (*cpu != (u32)page) { pr_err("Partial view for %lu [%u] (offset=%llu, size=%u [%llu, row size %u], fence=%d, tiling=%d, stride=%d) misalignment, expected write to page (%lu + %u [0x%lx]) of 0x%x, found 0x%x\n", @@ -269,7 +269,7 @@ static int check_partial_mappings(struct drm_i915_gem_object *obj, } *cpu = 0; drm_clflush_virt_range(cpu, sizeof(*cpu)); - kunmap(p); + kunmap_local(cpu); if (err) return err;