Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp2021306rdf; Mon, 6 Nov 2023 02:15:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnn+VLdeW6TqIiv8addCUGun5fA95GT/RzuLrHWaa9jpCUk4kct7R3oeoQ3t/zwYQaCEZZ X-Received: by 2002:a05:6a00:248a:b0:6c0:148f:74de with SMTP id c10-20020a056a00248a00b006c0148f74demr14498562pfv.5.1699265746832; Mon, 06 Nov 2023 02:15:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699265746; cv=none; d=google.com; s=arc-20160816; b=dfHjZuKYqN5j07QFsrIal52jBaktn6eYJlksS+ycqmP7Wc/5wPvvFYDiBAiVcc/4cW we3Sq4lF4wvAFlTVcMdqyDjuFFsbhG5wL7cGOFNngnB/MhspjW1wp5k77eBQI40ujQm8 XxtRfLb2LXmfIZegA5AaEi+vl3rN2oNs2r/P4GbAXMZUYTy6WjWS6cJoPoIiBdW/IJT6 ApJZ6lf4fexVmNdLh+h3LPQeCCe0y/Z4nv+mEPSL82H3OJPs2naV6cOp+R4EDPEUPWel zrrunWYzc+gNGqnpPqvzh/6sbwntUvCqs9KLj7JGkFnFfYu9ckIeMx2ujL9tXLrt10KG 3T8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :organization:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:dkim-signature; bh=Jm91x90XUMUmHrZd72WEgDb82wW5PTLg6Ut6FtxuG3s=; fh=zx2oeQHV6Aq+G1oGJBz26VURUUw6A64NJ3IJ8TcI4G8=; b=hxc7/wQC7UfltBOM1zUKRaeFaOxf7yrfzc/eLgXTfQgHWDix0EVcKdVkegi2kqfec+ 7PJ1CoU3byHNRTk5hvC6SQTTYcROqyZ0g6D5h4QESQ8gGlmd2lQmtF4MCf4in3OPVUcb ow0sYPlmeHC3P0k3FSfNlago9fiBzqEETnbVnxhy7no3MOTRh/ZRje9O5Tj5lvI8ZKH9 2oTV9hW4X+GacNQxmhhklAjeI4nyVZA6/oeGmsI9MpioiR0NJKLuPtoc1FY3xJw/xMCa 3u0kMaJDtjcZRcg3FdQHIfu9MS9tjaPEWFQ3Vv5BZc7FA+kyR09pNQsqwtWfVNplHpDE 8siA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jgbbYbfm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id u22-20020aa78496000000b006be15fece6csi7383646pfn.360.2023.11.06.02.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 02:15:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jgbbYbfm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id AD4EF80B120E; Mon, 6 Nov 2023 02:15:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229478AbjKFKPb (ORCPT + 99 others); Mon, 6 Nov 2023 05:15:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229875AbjKFKPa (ORCPT ); Mon, 6 Nov 2023 05:15:30 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02CF493; Mon, 6 Nov 2023 02:15:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699265726; x=1730801726; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=x338Ogbpp9uWR2sIcLcKna5qVpCr3xQ+iG9tZ2WPL/g=; b=jgbbYbfmxTAOJA77GviU4LKgrJ6UmAuveOvnIV3zjJ/+wE7Pj9Jm3wJl sC4SqsC3dBeosQLlLaSWdNiZ2uHKvMX2dD1aqjBOcSIAY8MtxUW8H3ISO +82eUjBx6OIHyam33HgxZ1KYb7729477vWFB2wCEzJFi6nM5gil+e+W53 SiDmi/E3vtxNzKq+WeVVkfb/pfHxMRX+dsDEfmwo/+pIYvuV882mT402w c+wRiR9yLsUbpx6TOiVl70uYkSBL78Lp+A1ifO+v01CeaVK4tLAleYL42 NR+ffED14Lv+pltmKl/6qaFZOI2U/VtkgwOlqqedQLem3JWjlwQqRV7ea Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10885"; a="455729333" X-IronPort-AV: E=Sophos;i="6.03,281,1694761200"; d="scan'208";a="455729333" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2023 02:15:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10885"; a="765906552" X-IronPort-AV: E=Sophos;i="6.03,281,1694761200"; d="scan'208";a="765906552" Received: from ajayshan-mobl.ger.corp.intel.com (HELO [10.213.234.152]) ([10.213.234.152]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2023 02:15:22 -0800 Message-ID: Date: Mon, 6 Nov 2023 10:15:20 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] drm/i915: Fix potential spectre vulnerability Content-Language: en-US To: Andi Shyti , Kunwu Chan Cc: airlied@gmail.com, alan.previn.teres.alexis@intel.com, andrzej.hajda@intel.com, chris.p.wilson@intel.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, jani.nikula@linux.intel.com, jonathan.cavitt@intel.com, joonas.lahtinen@linux.intel.com, kunwu.chan@hotmail.com, linux-kernel@vger.kernel.org, robdclark@chromium.org, rodrigo.vivi@intel.com, stable@vger.kernel.org References: <20231103023257.58199-1-chentao@kylinos.cn> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 06 Nov 2023 02:15:42 -0800 (PST) On 06/11/2023 09:57, Andi Shyti wrote: > Hi Kunwu, > > On Fri, Nov 03, 2023 at 10:32:57AM +0800, Kunwu Chan wrote: >> Fix smatch warning: >> drivers/gpu/drm/i915/gem/i915_gem_context.c:847 set_proto_ctx_sseu() >> warn: potential spectre issue 'pc->user_engines' [r] (local cap) >> >> Fixes: d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)") >> Cc: # v5.15+ >> Signed-off-by: Kunwu Chan >> Suggested-by: Tvrtko Ursulin >> Reviewed-by: Tvrtko Ursulin >> Link: https://lore.kernel.org/all/20231102101642.52988-1-chentao@kylinos.cn >> --- >> drivers/gpu/drm/i915/gem/i915_gem_context.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c >> index 9a9ff84c90d7..e38f06a6e56e 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c >> @@ -844,6 +844,7 @@ static int set_proto_ctx_sseu(struct drm_i915_file_private *fpriv, >> if (idx >= pc->num_user_engines) >> return -EINVAL; >> >> + idx = array_index_nospec(idx, pc->num_user_engines); > > you ignored my comment, though. Sorry it was me, I considered it fine as is given it is the same pattern as elsewhere in the file. I've merged the patch btw. Regards, Tvrtko > > Andi > >> pe = &pc->user_engines[idx]; >> >> /* Only render engine supports RPCS configuration. */ >> -- >> 2.34.1