Received-SPF: pass (google.com: domain of linux-kernel+bounces-144421-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Sun, 14 Apr 2024 23:41:28 +0000
From: Matthew Brost <matthew.brost@intel.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
CC: Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen
	<joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>,
	Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>, David Airlie
	<airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
	<intel-gfx@lists.freedesktop.org>, <kernel-janitors@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915/guc: Remove usage of the deprecated
 ida_simple_xx() API
Message-ID: <ZhxpqC9ynm34+00y@DUT025-TGLU.fm.intel.com>
References: <7108c1871c6cb08d403c4fa6534bc7e6de4cb23d.1705245316.git.christophe.jaillet@wanadoo.fr>
 <ZbGlqD6zyyp4DsmH@DUT025-TGLU.fm.intel.com>
 <a788ee2e-ee51-476f-8aee-aa344f221f9c@wanadoo.fr>
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <a788ee2e-ee51-476f-8aee-aa344f221f9c@wanadoo.fr>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?PZV/BXBiQEnUZdw2te0o3953fBHRSP+Kc/La2DSGm6at78LxhZrTLhG9tx?=
 =?iso-8859-1?Q?T/p0NH8Hnv+NH5sfTGD86wMGg8uGDBo66sFwi62AjPYWsB71MhF1kyjpKX?=
 =?iso-8859-1?Q?JlJQlHyCxZwW36IEIjo6+wKr9gBjKnBD+U9Yj2N412tifRnnnh9EnPV2Ow?=
 =?iso-8859-1?Q?iutebm7vrkIOFhAFPn8cmXT0Zk+v8zLGjqrosfvwVY5Z/oLtUynSeQeisG?=
 =?iso-8859-1?Q?0Q449huZpQ4uJ/UKxdOrVXRQPDxBbiTJnWQ+hryTNIZeg+cC+8DPVgR/ni?=
 =?iso-8859-1?Q?rWxR/g04Z1oZl/0qa9/aa5tWGFEu0eR7ivSbeC2SjzHOuCotAh8hHWHUSk?=
 =?iso-8859-1?Q?JV7rf3x3kRFjoeo5KQpAHc58o2wkuPdzcrzDhxyhrmLjTylfdjaTpwE7NA?=
 =?iso-8859-1?Q?tYDr9t6gE/iaGK1nJLdAX2uWQDf/k7kKXkUrRgzoME5fP6Kn5RMjFNSKrp?=
 =?iso-8859-1?Q?Jn05oPDBK9CEtp6y0Jc66Bzu3+8T52tuEqO2vRJK899c0Q6PDyiKwsah9x?=
 =?iso-8859-1?Q?TdV46xZYrJH8Ta4Y/30fQ67RtU1kSswchZ6HibuGvmMdV5MiaawRwdCAXe?=
 =?iso-8859-1?Q?V2keX28v8SJHMjWritCLK5u+aCRSeYrF8QhojK1PhQqq55ukS9FTt0nd0U?=
 =?iso-8859-1?Q?WqihlkY3HZDojh39/YLR7ecasNBBaDmSpticvo25GEB1Hb4vt1joR6E8H9?=
 =?iso-8859-1?Q?5wsV6t56+fckJVVt5dFz9/wotb/lGdasU2KrwWWxFmnht3H18P9W0La5bp?=
 =?iso-8859-1?Q?5X/NdllUpFwn8HrvOmH3raVW0420Yz+w/4ryp8V8EVPptXxioyPkC/xGtk?=
 =?iso-8859-1?Q?v5U1jqSCBvzIQ9CKdhyejszKXaJRVUPHaEWzqgsdaxx+CfB+f+Su5MqCMa?=
 =?iso-8859-1?Q?mXz/Tmn+6DrzVjtv0vSC/Iks1/ot3Jn0bAjiO+1DgU8b8MHGqghbGuH/0P?=
 =?iso-8859-1?Q?Cy9ENAeGD5tS6Df2pvB3ix0JCrXAbd4xtuaLGpBx952iILC3q+ocqliP7m?=
 =?iso-8859-1?Q?4zk82Vb9gtd42W8j7aaWCq7AXUQY4nzFGmaOFmxHRxjTgObts+0JxlSZMV?=
 =?iso-8859-1?Q?7sT/LR0dSPsU2shB/NAV5qJF/rLMT8t5H7uw250zD6di3oQYOTvTnuQIWN?=
 =?iso-8859-1?Q?DWJ43n9xvIjEy7QnJ2eU4md8i+j3IoM0kKT/tbWFXj0Dx0DvB6qkBSWB0w?=
 =?iso-8859-1?Q?TVNjV9lXzDr4G3kiyeNR21hccj7de7fH6CferVKCs+ES0AAJCv7xHc3cWZ?=
 =?iso-8859-1?Q?59/yHlMc/V2DHdwphAwAGR+G6LWgBRzlERkucw4nxLDe/k2XO28Km0mXQA?=
 =?iso-8859-1?Q?bVt8IQhicWV2rg2T+QxIOaqkCYp9ZSH0vlEOu/3PPye03hIV8A4rIklOK8?=
 =?iso-8859-1?Q?VaG+Yo6qUmZe2+MQ5FMoWtzGqF5xZcH886vEKd2LM8WmNp9zzF8+cRQaK6?=
 =?iso-8859-1?Q?3cbhmsZ7iH6un0fd/s8RhR7Uw0kqGpN4WUaUvjb/DKvZnDTigf8uDWFpGQ?=
 =?iso-8859-1?Q?QspxmyO8MjemG4nSDXms2aUohymo4d72prbMo3LmcOQ62o3rudH/wkvqgO?=
 =?iso-8859-1?Q?q4SUWyMJkW6hl95UBs5nB5K9jwdXau1/F82+N7cTGbZWLIBBfvxUeXghmN?=
 =?iso-8859-1?Q?W4oWEgtKkK5E/MK4Qns6HQxemRdwO1FeOLdH1GVcwlXn1od7CvQqjJgA?=
 =?iso-8859-1?Q?=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: d4bd77c1-c6f8-4089-9340-08dc5cdc992f
X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB6522.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2024 23:42:51.3813
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9ChlNg2XwGViZ6ztID0nzi7bP71SGVSe5VW6dg3wKNTSK8kAkrJD5erZUEAaOz3dn6qqOW3E6l9pNtIqHP1IwA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7529
X-OriginatorOrg: intel.com

On Sun, Apr 14, 2024 at 10:26:35AM +0200, Christophe JAILLET wrote:
> Le 25/01/2024 ? 01:04, Matthew Brost a ?crit?:
> > On Sun, Jan 14, 2024 at 04:15:34PM +0100, Christophe JAILLET wrote:
> > > ida_alloc() and ida_free() should be preferred to the deprecated
> > > ida_simple_get() and ida_simple_remove().
> > > 
> > > Note that the upper limit of ida_simple_get() is exclusive, but the one of
> > > ida_alloc_range() is inclusive. So a -1 has been added when needed.
> > > 
> > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> > 
> > Reviewed-by: Matthew Brost <matthew.brost@intel.com>
> 
> Hi,
> 
> polite reminder ;-)
> 

Merged. Thanks for the patch.

Matt

> CJ
> 
> > 
> > > ---
> > >   drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 13 ++++++-------
> > >   1 file changed, 6 insertions(+), 7 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> > > index a259f1118c5a..73ce21ddf682 100644
> > > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> > > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> > > @@ -2156,11 +2156,10 @@ static int new_guc_id(struct intel_guc *guc, struct intel_context *ce)
> > >   					      order_base_2(ce->parallel.number_children
> > >   							   + 1));
> > >   	else
> > > -		ret = ida_simple_get(&guc->submission_state.guc_ids,
> > > -				     NUMBER_MULTI_LRC_GUC_ID(guc),
> > > -				     guc->submission_state.num_guc_ids,
> > > -				     GFP_KERNEL | __GFP_RETRY_MAYFAIL |
> > > -				     __GFP_NOWARN);
> > > +		ret = ida_alloc_range(&guc->submission_state.guc_ids,
> > > +				      NUMBER_MULTI_LRC_GUC_ID(guc),
> > > +				      guc->submission_state.num_guc_ids - 1,
> > > +				      GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN);
> > >   	if (unlikely(ret < 0))
> > >   		return ret;
> > > @@ -2183,8 +2182,8 @@ static void __release_guc_id(struct intel_guc *guc, struct intel_context *ce)
> > >   							   + 1));
> > >   		} else {
> > >   			--guc->submission_state.guc_ids_in_use;
> > > -			ida_simple_remove(&guc->submission_state.guc_ids,
> > > -					  ce->guc_id.id);
> > > +			ida_free(&guc->submission_state.guc_ids,
> > > +				 ce->guc_id.id);
> > >   		}
> > >   		clr_ctx_id_mapping(guc, ce->guc_id.id);
> > >   		set_context_guc_id_invalid(ce);
> > > -- 
> > > 2.43.0
> > > 
> > 
> > 
>