From patchwork Wed Mar 29 07:32:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 76405 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp230439vqo; Wed, 29 Mar 2023 00:40:00 -0700 (PDT) X-Google-Smtp-Source: AKy350bAzMtNGfxI46VvgPYx4u9D4BpjM2hFaZ9Ctl8fZhta78D9J6kRnYD+ya6rlm8kceyQh1zi X-Received: by 2002:a05:6402:159:b0:501:caaf:1e5 with SMTP id s25-20020a056402015900b00501caaf01e5mr16329451edu.18.1680075599695; Wed, 29 Mar 2023 00:39:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680075599; cv=none; d=google.com; s=arc-20160816; b=jRy85qrWllWMPYcN5BpKqM3f+WpxzCQLyNib/wbBV1MYNadz9vptDw1kgnx+10x2Fy 4QghcquD1BFo1iIL9AyChaxp/ANb5bHD+6+qdweE8vJOWDSrLmQgnnqMCF6xwSSqalqy 75xdJREmr+mPZW3klshE1SanIC76JzZLDZCzqbCkvdHPTc4BJlvfO3VCP+RcmKB7UA+B T/B2aB7juEuInitAFb2+ec2GcXWQVor1xa9LDmrVdtUzlsGNqd0kiENRN0YMytEHTXkr FXSrW8nEEr05YEBc/s23CmyO+Qy/QgmGnL8JQr5zcJse7oSrQzxZ7VtBfrmAxWAF0iVf 5FTg== 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=sFFzaueMPL7aPjUAI3NNEBfnYC4e6HBL00ODGUNrdpE=; b=FahVqY9QuWzhX4w4eNZ7lj+WME8rAZeUQHHjupG2St5X6/LzfebxAI48MYcNEQ7+xC fM72kmK7DzLBS8tLplKba3rggF+9DTWAJqLqHbJbEr13LOPbZiNtLcbzUT7IQHMSfQWf AZejxCX5h0Yt8izWsa+/eLb5xJb3rzd4p1tEsuOUAOAr87qT7xRf6Yc8irPLGdOB0LGQ G6wAiXpsexnsk5ngMYgYGm4JAKVod3pkdnE3ju6v+nY5t7854SQ8M37JC8ve0jOT82mx IFeZ7bvWwzaEEkYEPnjlt50BsQAFPz3DGtqBxgC2S6ET1VpfsRA2rcBipVER5mgUkar3 Imyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Y06uoloS; 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=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p24-20020a17090635d800b009269fbb187csi28293843ejb.304.2023.03.29.00.39.35; Wed, 29 Mar 2023 00:39:59 -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=@intel.com header.s=Intel header.b=Y06uoloS; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230154AbjC2H1C (ORCPT + 99 others); Wed, 29 Mar 2023 03:27:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbjC2H0T (ORCPT ); Wed, 29 Mar 2023 03:26:19 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A510830D5 for ; Wed, 29 Mar 2023 00:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680074726; x=1711610726; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yyQdMm9uqDdypEaS6stlmLE4TXLEkbMEIetdKqrgHwo=; b=Y06uoloSWtxNP2nLpLOYMCuljv+FzsetuSWWfRNvftX6q2574Ivl4uJx SnEIkmcp9uVcYH0C1vlZnYT+EEFA/MkfEmNNWGhR9n9ASPHLEwwgvTg30 /DavM9++tmxmug5dZqEf8j8oc2igA6Wv/GkF2m+KhrX6mRAgJ8BCJSEJY 446CGeSupARiqf5tHDNJniqEfXC4WxAy/dnwco7tTJ5mec/8uxETw0gv0 d4XvQK90WTlCBJoNhAxbeObYioleJPgjRYcYVYt8cDWrE4Y3Fmj0tZH6t tevegI+8WZeMm3jdA3lJmZFZTwOHStXu9Sl6I+hjJ2b5QTU8MWNfO4jwT A==; X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="405746224" X-IronPort-AV: E=Sophos;i="5.98,300,1673942400"; d="scan'208";a="405746224" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2023 00:24:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="684160648" X-IronPort-AV: E=Sophos;i="5.98,300,1673942400"; d="scan'208";a="684160648" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.112]) by orsmga002.jf.intel.com with ESMTP; 29 Mar 2023 00:24:50 -0700 From: Zhao Liu To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Matthew Auld , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Nirmoy Das , Maarten Lankhorst , Chris Wilson , =?utf-8?q?Christian_K=C3=B6nig?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Ira Weiny , "Fabio M . De Francesco" , Zhenyu Wang , Zhao Liu , Dave Hansen Subject: [PATCH v2 8/9] drm/i915: Use kmap_local_page() in i915_cmd_parser.c Date: Wed, 29 Mar 2023 15:32:19 +0800 Message-Id: <20230329073220.3982460-9-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230329073220.3982460-1-zhao1.liu@linux.intel.com> References: <20230329073220.3982460-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761686952075697298?= X-GMAIL-MSGID: =?utf-8?q?1761686952075697298?= From: Zhao Liu The use of kmap_atomic() is being deprecated in favor of kmap_local_page()[1], and this patch converts the call from kmap_atomic() to kmap_local_page(). The main difference between atomic and local mappings is that local mappings doesn't disable page faults or preemption (the preemption is disabled for !PREEMPT_RT case, otherwise it only disables migration). With kmap_local_page(), we can avoid the often unwanted side effect of unnecessary page faults and preemption disables. There're 2 reasons why function copy_batch() doesn't need to disable pagefaults and preemption for mapping: 1. The flush operation is safe. In i915_cmd_parser.c, copy_batch() calls drm_clflush_virt_range() to use CLFLUSHOPT or WBINVD to flush. Since CLFLUSHOPT is global on x86 and WBINVD is called on each cpu in drm_clflush_virt_range(), the flush operation is global. 2. Any context switch caused by preemption or page faults (page fault may cause sleep) doesn't affect the validity of local mapping. Therefore, copy_batch() is a function where the use of kmap_local_page() in place of kmap_atomic() is correctly suited. Convert the calls of kmap_atomic() / kunmap_atomic() to kmap_local_page() / kunmap_local(). [1]: https://lore.kernel.org/all/20220813220034.806698-1-ira.weiny@intel.com v2: * Dropped hot plug related description since it has nothing to do with kmap_local_page(). * No code change since v1, and added description of the motivation of using kmap_local_page(). Suggested-by: Dave Hansen Suggested-by: Ira Weiny Suggested-by: Fabio M. De Francesco Signed-off-by: Zhao Liu Reviewed-by: Ira Weiny --- Suggested by credits: Dave: Referred to his explanation about cache flush. Ira: Referred to his task document, review comments and explanation about cache flush. Fabio: Referred to his boiler plate commit message and his description about why kmap_local_page() should be preferred. --- drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c index ddf49c2dbb91..2905df83e180 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -1211,11 +1211,11 @@ static u32 *copy_batch(struct drm_i915_gem_object *dst_obj, for (n = offset >> PAGE_SHIFT; remain; n++) { int len = min(remain, PAGE_SIZE - x); - src = kmap_atomic(i915_gem_object_get_page(src_obj, n)); + src = kmap_local_page(i915_gem_object_get_page(src_obj, n)); if (src_needs_clflush) drm_clflush_virt_range(src + x, len); memcpy(ptr, src + x, len); - kunmap_atomic(src); + kunmap_local(src); ptr += len; remain -= len;