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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A871BC4338F for ; Wed, 4 Aug 2021 19:37:53 +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 6793160F58 for ; Wed, 4 Aug 2021 19:37:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6793160F58 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 888826E223; Wed, 4 Aug 2021 19:37:52 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 294556E223; Wed, 4 Aug 2021 19:37:52 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10066"; a="193589690" X-IronPort-AV: E=Sophos;i="5.84,295,1620716400"; d="scan'208";a="193589690" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2021 12:37:51 -0700 X-IronPort-AV: E=Sophos;i="5.84,295,1620716400"; d="scan'208";a="637097050" Received: from dut151-iclu.fm.intel.com ([10.105.23.43]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2021 12:37:51 -0700 Date: Wed, 4 Aug 2021 19:37:49 +0000 From: Matthew Brost To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH 1/4] drm/i915: Do not define vma on stack Message-ID: <20210804193749.GA87546@DUT151-ICLU.fm.intel.com> References: <20210803051121.72017-1-matthew.brost@intel.com> <20210803051121.72017-2-matthew.brost@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210803051121.72017-2-matthew.brost@intel.com> 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Aug 02, 2021 at 10:11:18PM -0700, Matthew Brost wrote: > From: Venkata Sandeep Dhanalakota > > Defining vma on stack can cause stack overflow, if > vma gets populated with new fields. > > Cc: Daniele Ceraolo Spurio > Cc: Tvrtko Ursulin > Signed-off-by: Venkata Sandeep Dhanalakota > Signef-off-by: Matthew Brost Reviewed-by: Matthew Brost > --- > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 18 +++++++++--------- > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 ++ > 2 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > index 3a16d08608a5..f632dbd32b42 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > @@ -413,20 +413,20 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw) > { > struct drm_i915_gem_object *obj = uc_fw->obj; > struct i915_ggtt *ggtt = __uc_fw_to_gt(uc_fw)->ggtt; > - struct i915_vma dummy = { > - .node.start = uc_fw_ggtt_offset(uc_fw), > - .node.size = obj->base.size, > - .pages = obj->mm.pages, > - .vm = &ggtt->vm, > - }; > + struct i915_vma *dummy = &uc_fw->dummy; > + > + dummy->node.start = uc_fw_ggtt_offset(uc_fw); > + dummy->node.size = obj->base.size; > + dummy->pages = obj->mm.pages; > + dummy->vm = &ggtt->vm; > > GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj)); > - GEM_BUG_ON(dummy.node.size > ggtt->uc_fw.size); > + GEM_BUG_ON(dummy->node.size > ggtt->uc_fw.size); > > /* uc_fw->obj cache domains were not controlled across suspend */ > - drm_clflush_sg(dummy.pages); > + drm_clflush_sg(dummy->pages); > > - ggtt->vm.insert_entries(&ggtt->vm, &dummy, I915_CACHE_NONE, 0); > + ggtt->vm.insert_entries(&ggtt->vm, dummy, I915_CACHE_NONE, 0); > } > > static void uc_fw_unbind_ggtt(struct intel_uc_fw *uc_fw) > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h > index 99bb1fe1af66..693cc0ebcd63 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h > @@ -10,6 +10,7 @@ > #include "intel_uc_fw_abi.h" > #include "intel_device_info.h" > #include "i915_gem.h" > +#include "i915_vma.h" > > struct drm_printer; > struct drm_i915_private; > @@ -75,6 +76,7 @@ struct intel_uc_fw { > bool user_overridden; > size_t size; > struct drm_i915_gem_object *obj; > + struct i915_vma dummy; > > /* > * The firmware build process will generate a version header file with major and > -- > 2.28.0 >