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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7FD04C433EF for ; Tue, 19 Jul 2022 17:55:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D8D0814B52B; Tue, 19 Jul 2022 17:55:00 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9182A14B8D2 for ; Tue, 19 Jul 2022 17:54:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658253299; x=1689789299; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=0g4g4tEgi6NzruPpELJxDLMlyE1/7uGybfIahvq5VPs=; b=hT2ZQUHjE+KnHRvQFE8zFQ7LBbo4RuMBMATZCGNoSwXYJDU7EEONtRQI oZWf8Txlzq9/dXf447OX0e+3zPzmamF+Ikgy9Hmx/GA8AxIM1wA5fAXHc Nl0uvPo5A8aTVR2o7ZtTerFHaUGOA+WjBKERpDItl+Hl4C2cepO/kwjt8 JhU/wgDb+V5oDKm7kHp5YO2YI1b4oTBQrQOeZPrGMq3mOfhewkD4G70SB et7775TwhZmwhmYvVmjMR5Xnryv9A3tDizSWbKn+6/K2IzDOmR6R75BdB suqQa6WlF3wDNpBh+LNkTAmbQG0/vOYTIuy/3+KNP/ixtegiutYa3F6Ho Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10413"; a="285310449" X-IronPort-AV: E=Sophos;i="5.92,284,1650956400"; d="scan'208";a="285310449" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2022 10:54:43 -0700 X-IronPort-AV: E=Sophos;i="5.92,284,1650956400"; d="scan'208";a="625292726" Received: from adixit-mobl.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.209.70.164]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2022 10:54:42 -0700 Date: Tue, 19 Jul 2022 10:54:00 -0700 Message-ID: <87o7xlaszr.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Alan Previn In-Reply-To: <20220509210151.1843173-3-alan.previn.teres.alexis@intel.com> References: <20220509210151.1843173-1-alan.previn.teres.alexis@intel.com> <20220509210151.1843173-3-alan.previn.teres.alexis@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Subject: Re: [Intel-gfx] [Intel-gfx 2/6] drm/i915/guc: Add unaligned wc memcpy for copying GuC Log 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: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, 09 May 2022 14:01:47 -0700, Alan Previn wrote: > > Add usage of unaligned wc mempy in read_update_log_buffer > as newer formats of GuC debug-log-events are no longer > guaranteed to be exactly 4-dwords long per event. > > Signed-off-by: Alan Previn > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > index 09f4d5fbca82..d902b40ded0e 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > @@ -301,13 +301,16 @@ static void _guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log) > > /* Just copy the newly written data */ > if (read_offset > write_offset) { > - i915_memcpy_from_wc(dst_data, src_data, write_offset); > + if (!i915_memcpy_from_wc(dst_data, src_data, write_offset)) > + i915_unaligned_memcpy_from_wc(dst_data, src_data, write_offset); > bytes_to_copy = buffer_size - read_offset; > } else { > bytes_to_copy = write_offset - read_offset; > } > - i915_memcpy_from_wc(dst_data + read_offset, > - src_data + read_offset, bytes_to_copy); > + if (!i915_memcpy_from_wc(dst_data + read_offset, > + src_data + read_offset, bytes_to_copy)) > + i915_unaligned_memcpy_from_wc(dst_data + read_offset, > + src_data + read_offset, bytes_to_copy); It should be possible to call i915_unaligned_memcpy_from_wc() unconditionally? Looks like it would work but not sure of the performance gain between first attempting an aligned copy and falling back to unaligned. Assuming there is some, this is: Reviewed-by: Ashutosh Dixit