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=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 74FE3C4363D for ; Fri, 25 Sep 2020 13:02:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E6A92076B for ; Fri, 25 Sep 2020 13:02:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728796AbgIYNCN (ORCPT ); Fri, 25 Sep 2020 09:02:13 -0400 Received: from mga06.intel.com ([134.134.136.31]:40472 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727733AbgIYNCM (ORCPT ); Fri, 25 Sep 2020 09:02:12 -0400 IronPort-SDR: KyH5qmpxGyonUpXu3pBCxmr1sFOd0fXZqlm78L3EYsEe0mnUat5kmhAkT3sGh/f9Vo/RQQGXuV IqMLAd3Wdydg== X-IronPort-AV: E=McAfee;i="6000,8403,9754"; a="223111328" X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="223111328" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 06:02:11 -0700 IronPort-SDR: OZamlwX2zWqLUrbLSEoIsVvtwGhUUsxA4uAx8BG9zebWwmpfo9ZeyTDwYsvjJeAEWzi0tdodhs m+aC4Xx9uiAA== X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="455821735" Received: from mlevy2-mobl.ger.corp.intel.com (HELO [10.251.176.131]) ([10.251.176.131]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 06:02:02 -0700 Subject: Re: [PATCH 07/11] drm/i915: stop using kmap in i915_gem_object_map To: Christoph Hellwig , Andrew Morton Cc: Peter Zijlstra , Boris Ostrovsky , Juergen Gross , Stefano Stabellini , Jani Nikula , Joonas Lahtinen , Chris Wilson , Matthew Auld , Rodrigo Vivi , Minchan Kim , Matthew Wilcox , Nitin Gupta , x86@kernel.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org References: <20200924135853.875294-1-hch@lst.de> <20200924135853.875294-8-hch@lst.de> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: <8d318fcb-f472-85ed-6639-18f9c45f30e4@linux.intel.com> Date: Fri, 25 Sep 2020 14:01:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200924135853.875294-8-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24/09/2020 14:58, Christoph Hellwig wrote: > kmap for !PageHighmem is just a convoluted way to say page_address, > and kunmap is a no-op in that case. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > index d6eeefab3d018b..6550c0bc824ea2 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > @@ -162,8 +162,6 @@ static void unmap_object(struct drm_i915_gem_object *obj, void *ptr) > { > if (is_vmalloc_addr(ptr)) > vunmap(ptr); > - else > - kunmap(kmap_to_page(ptr)); > } > > struct sg_table * > @@ -277,11 +275,10 @@ static void *i915_gem_object_map(struct drm_i915_gem_object *obj, > * forever. > * > * So if the page is beyond the 32b boundary, make an explicit > - * vmap. On 64b, this check will be optimised away as we can > - * directly kmap any page on the system. > + * vmap. > */ > if (!PageHighMem(page)) > - return kmap(page); > + return page_address(page); > } > > mem = stack; > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko 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=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 579B9C4727D for ; Fri, 25 Sep 2020 13:02:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 07CFB20756 for ; Fri, 25 Sep 2020 13:02:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07CFB20756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 13C656E214; Fri, 25 Sep 2020 13:02:25 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A1EE6E203; Fri, 25 Sep 2020 13:02:23 +0000 (UTC) IronPort-SDR: PKT3SLQO61EqLs8o3z64XjMC9iWk83/WWa8bOVTiO6eOAvTxKkwN1OPZwE70NzIGWsvOWX7u7D oy+sxLfKfPjw== X-IronPort-AV: E=McAfee;i="6000,8403,9754"; a="158862328" X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="158862328" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 06:02:10 -0700 IronPort-SDR: OZamlwX2zWqLUrbLSEoIsVvtwGhUUsxA4uAx8BG9zebWwmpfo9ZeyTDwYsvjJeAEWzi0tdodhs m+aC4Xx9uiAA== X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="455821735" Received: from mlevy2-mobl.ger.corp.intel.com (HELO [10.251.176.131]) ([10.251.176.131]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 06:02:02 -0700 Subject: Re: [PATCH 07/11] drm/i915: stop using kmap in i915_gem_object_map To: Christoph Hellwig , Andrew Morton References: <20200924135853.875294-1-hch@lst.de> <20200924135853.875294-8-hch@lst.de> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: <8d318fcb-f472-85ed-6639-18f9c45f30e4@linux.intel.com> Date: Fri, 25 Sep 2020 14:01:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200924135853.875294-8-hch@lst.de> Content-Language: en-US X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Matthew Wilcox , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Peter Zijlstra , linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, x86@kernel.org, Chris Wilson , Minchan Kim , Matthew Auld , Rodrigo Vivi , xen-devel@lists.xenproject.org, Boris Ostrovsky , Nitin Gupta Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 24/09/2020 14:58, Christoph Hellwig wrote: > kmap for !PageHighmem is just a convoluted way to say page_address, > and kunmap is a no-op in that case. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > index d6eeefab3d018b..6550c0bc824ea2 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > @@ -162,8 +162,6 @@ static void unmap_object(struct drm_i915_gem_object *obj, void *ptr) > { > if (is_vmalloc_addr(ptr)) > vunmap(ptr); > - else > - kunmap(kmap_to_page(ptr)); > } > > struct sg_table * > @@ -277,11 +275,10 @@ static void *i915_gem_object_map(struct drm_i915_gem_object *obj, > * forever. > * > * So if the page is beyond the 32b boundary, make an explicit > - * vmap. On 64b, this check will be optimised away as we can > - * directly kmap any page on the system. > + * vmap. > */ > if (!PageHighMem(page)) > - return kmap(page); > + return page_address(page); > } > > mem = stack; > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 1E6DEC4363D for ; Fri, 25 Sep 2020 13:02:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D4BD32076B for ; Fri, 25 Sep 2020 13:02:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4BD32076B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 506186E203; Fri, 25 Sep 2020 13:02:24 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A1EE6E203; Fri, 25 Sep 2020 13:02:23 +0000 (UTC) IronPort-SDR: PKT3SLQO61EqLs8o3z64XjMC9iWk83/WWa8bOVTiO6eOAvTxKkwN1OPZwE70NzIGWsvOWX7u7D oy+sxLfKfPjw== X-IronPort-AV: E=McAfee;i="6000,8403,9754"; a="158862328" X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="158862328" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 06:02:10 -0700 IronPort-SDR: OZamlwX2zWqLUrbLSEoIsVvtwGhUUsxA4uAx8BG9zebWwmpfo9ZeyTDwYsvjJeAEWzi0tdodhs m+aC4Xx9uiAA== X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="455821735" Received: from mlevy2-mobl.ger.corp.intel.com (HELO [10.251.176.131]) ([10.251.176.131]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 06:02:02 -0700 To: Christoph Hellwig , Andrew Morton References: <20200924135853.875294-1-hch@lst.de> <20200924135853.875294-8-hch@lst.de> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: <8d318fcb-f472-85ed-6639-18f9c45f30e4@linux.intel.com> Date: Fri, 25 Sep 2020 14:01:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200924135853.875294-8-hch@lst.de> Content-Language: en-US Subject: Re: [Intel-gfx] [PATCH 07/11] drm/i915: stop using kmap in i915_gem_object_map X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Matthew Wilcox , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Peter Zijlstra , linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, x86@kernel.org, Chris Wilson , Minchan Kim , Matthew Auld , xen-devel@lists.xenproject.org, Boris Ostrovsky , Nitin Gupta Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 24/09/2020 14:58, Christoph Hellwig wrote: > kmap for !PageHighmem is just a convoluted way to say page_address, > and kunmap is a no-op in that case. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > index d6eeefab3d018b..6550c0bc824ea2 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > @@ -162,8 +162,6 @@ static void unmap_object(struct drm_i915_gem_object *obj, void *ptr) > { > if (is_vmalloc_addr(ptr)) > vunmap(ptr); > - else > - kunmap(kmap_to_page(ptr)); > } > > struct sg_table * > @@ -277,11 +275,10 @@ static void *i915_gem_object_map(struct drm_i915_gem_object *obj, > * forever. > * > * So if the page is beyond the 32b boundary, make an explicit > - * vmap. On 64b, this check will be optimised away as we can > - * directly kmap any page on the system. > + * vmap. > */ > if (!PageHighMem(page)) > - return kmap(page); > + return page_address(page); > } > > mem = stack; > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx