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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 57974C25B78 for ; Tue, 4 Jun 2024 16:22:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MU7GIi/0RnQF95OfGF5Q/DmSsmEa9yCOmVPa1+Skp9A=; b=1mYJjUxihK1PxG 3pIPFyv9KbB2z3trLrKXJ6DaFQlN1/KLcQ1k1NEMUmYtBssydqJtRgxt2jFnQ7HDGlNORo6Cy48YN 8zt/uNFU2u2NkA9kkG6b0SZcf7ovDlbWKvID0uKhCt8jFKf/mD8DUT4SGGHA61BFFAE1nZQtVVyx9 HxNWehC+xzwSqbKHwINUAYYexAfRVm22p4RclRYajekqDpuuhWLSAVF89OUI36SerzCzVpMzCBmEU a4DePHhhbQirS9ZYdYGTpUxohXEXkTP1LcGszclThDTJvut7szjmVxE/YBR8mWfv5xqEnrPzz+RoO rtxhDePM+og782B4lreQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEWvW-000000036ON-34Gf; Tue, 04 Jun 2024 16:22:22 +0000 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEWvT-000000036Ni-2Fmr for linux-arm-kernel@lists.infradead.org; Tue, 04 Jun 2024 16:22:21 +0000 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4213a2acc59so111055e9.1 for ; Tue, 04 Jun 2024 09:22:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1717518135; x=1718122935; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=69kRpuWxh68+JQDUzakiT+9vSzXmOCgYFNcr5dAKA5M=; b=jkoBaG0OfwY0nAnYzf2ill5//nTZJ/xHbALWoKXnn8KAqcpDwOZXfjmJMWrfdIiacW MdQrVDdN7UrxXU+HIIRumjifQxnD5T/kV7xchuZmMJlJWxhrB0Xi7nD5fCYSMskrUsrx uu0x0gR3k1cS65qT8j9WULYvlU94FNpwoNJ+qpAUWgqkG5aVkPOaad1FBhygTzx6Yu/3 p3gPv12FCmda95b6XeMMJ3CfvMCMBj9gxcqByrKDyB2O6aZL5xIk/33DN251+DG7KOhG ll+xGiUbvq4pwIQZiq0HjTq4f9OSp1xN5NgrbYwxpKopdkUwo/wUbgHYGBgvMHqJyicF nmhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717518135; x=1718122935; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=69kRpuWxh68+JQDUzakiT+9vSzXmOCgYFNcr5dAKA5M=; b=hAEhVZCwsmxAGqhQkRNzo1SYlGXALw19ugEy0c9zCPHdqtOKPec0KPf87Il8qpqsZp 5Ymc/S7s5doHOnmWHGJMH8Uq2eiPsjULBpIEuGYjOCxYfEzD0FPIDKHLywsGM35huRVh P8oixT/GvK5hio+hYUdzADlqOpnRdFCZhm7ZY6GVf+wAO95JQFro40ASYUNSmCevtnj2 b1IS2jLL2V5YSXsReMVzrukl5VUZ7BHse4OxQAFgI9o9kqYO1D59M2xK7c86A3PCuOmS NZJ7CXyTcqnRoc7bghKexxUFIHd9Bjv4hlmJufSpir7nOXYgjsLl4WEDBsORwxa+rJuP CdSg== X-Forwarded-Encrypted: i=1; AJvYcCXHbzW5gs5SVaU9TwytJg1ZovjjzjhaMfMFKDabwYubwWBWbArnB+/M2zjbrvYu6AP/P09WYpz2qu8OXGQElb/wDBiarsRlburQUCoJcY+Ze89I4Ms= X-Gm-Message-State: AOJu0YxuKtzl2+GsI0g2S0QB68IlBpQgbvXXQcXEM/WmO1tydV3qCUsW sp97cE1bH1dUrc6SpJR3pJQH8zBOOQJ7tU2UfNI5AW7nssatZg0fZpWRnm4M6w== X-Google-Smtp-Source: AGHT+IFHEt2e3Pj1nYGPA3j0RWpr3Krfpq7OpnL3UxZ5y5n1w2lAF8qBJKCqPcvPTCGtPLzRttnNNA== X-Received: by 2002:a7b:ca46:0:b0:41b:8715:1158 with SMTP id 5b1f17b1804b1-4214947b20amr2926995e9.6.1717518135213; Tue, 04 Jun 2024 09:22:15 -0700 (PDT) Received: from google.com (230.213.79.34.bc.googleusercontent.com. [34.79.213.230]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd062fe2csm12068058f8f.69.2024.06.04.09.22.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 09:22:14 -0700 (PDT) Date: Tue, 4 Jun 2024 16:22:11 +0000 From: Mostafa Saleh To: Jason Gunthorpe Cc: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Ryan Roberts Subject: Re: [PATCH 7/7] iommu/arm-smmu-v3: Use the new rb tree helpers Message-ID: References: <0-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> <7-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <7-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240604_092219_608601_351A0FC9 X-CRM114-Status: GOOD ( 24.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Jason, On Mon, Jun 03, 2024 at 07:31:33PM -0300, Jason Gunthorpe wrote: > Since v5.12 the rbtree has gained some simplifying helpers aimed at making > rb tree users write less convoluted boiler plate code. Instead the caller > provides a single comparison function and the helpers generate the prior > open-coded stuff. > > Update smmu->streams to use rb_find_add() and rb_find(). > > Signed-off-by: Jason Gunthorpe Reviewed-by: Mostafa Saleh > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 68 ++++++++++----------- > 1 file changed, 31 insertions(+), 37 deletions(-) > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > index 7a6c9aac4cd450..25bae0b05a488c 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -1667,26 +1667,37 @@ static int arm_smmu_init_l2_strtab(struct arm_smmu_device *smmu, u32 sid) > return 0; > } > > +static int arm_smmu_streams_cmp_key(const void *lhs, const struct rb_node *rhs) > +{ > + struct arm_smmu_stream *stream_rhs = > + rb_entry(rhs, struct arm_smmu_stream, node); > + const u32 *sid_lhs = lhs; > + > + if (*sid_lhs < stream_rhs->id) > + return -1; > + if (*sid_lhs > stream_rhs->id) > + return 1; > + return 0; > +} > + > +static int arm_smmu_streams_cmp_node(struct rb_node *lhs, > + const struct rb_node *rhs) > +{ > + return arm_smmu_streams_cmp_key( > + &rb_entry(lhs, struct arm_smmu_stream, node)->id, rhs); > +} > + > static struct arm_smmu_master * > arm_smmu_find_master(struct arm_smmu_device *smmu, u32 sid) > { > struct rb_node *node; > - struct arm_smmu_stream *stream; > > lockdep_assert_held(&smmu->streams_mutex); > > - node = smmu->streams.rb_node; > - while (node) { > - stream = rb_entry(node, struct arm_smmu_stream, node); > - if (stream->id < sid) > - node = node->rb_right; > - else if (stream->id > sid) > - node = node->rb_left; > - else > - return stream->master; > - } > - > - return NULL; > + node = rb_find(&sid, &smmu->streams, arm_smmu_streams_cmp_key); > + if (!node) > + return NULL; > + return rb_entry(node, struct arm_smmu_stream, node)->master; > } > > /* IRQ and event handlers */ > @@ -2795,8 +2806,6 @@ static int arm_smmu_insert_master(struct arm_smmu_device *smmu, > { > int i; > int ret = 0; > - struct arm_smmu_stream *new_stream, *cur_stream; > - struct rb_node **new_node, *parent_node = NULL; > struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(master->dev); > > master->streams = kcalloc(fwspec->num_ids, sizeof(*master->streams), > @@ -2807,9 +2816,9 @@ static int arm_smmu_insert_master(struct arm_smmu_device *smmu, > > mutex_lock(&smmu->streams_mutex); > for (i = 0; i < fwspec->num_ids; i++) { > + struct arm_smmu_stream *new_stream = &master->streams[i]; > u32 sid = fwspec->ids[i]; > > - new_stream = &master->streams[i]; > new_stream->id = sid; > new_stream->master = master; > > @@ -2818,28 +2827,13 @@ static int arm_smmu_insert_master(struct arm_smmu_device *smmu, > break; > > /* Insert into SID tree */ > - new_node = &(smmu->streams.rb_node); > - while (*new_node) { > - cur_stream = rb_entry(*new_node, struct arm_smmu_stream, > - node); > - parent_node = *new_node; > - if (cur_stream->id > new_stream->id) { > - new_node = &((*new_node)->rb_left); > - } else if (cur_stream->id < new_stream->id) { > - new_node = &((*new_node)->rb_right); > - } else { > - dev_warn(master->dev, > - "stream %u already in tree\n", > - cur_stream->id); > - ret = -EINVAL; > - break; > - } > - } > - if (ret) > + if (rb_find_add(&new_stream->node, &smmu->streams, > + arm_smmu_streams_cmp_node)) { > + dev_warn(master->dev, "stream %u already in tree\n", > + sid); > + ret = -EINVAL; > break; > - > - rb_link_node(&new_stream->node, parent_node, new_node); > - rb_insert_color(&new_stream->node, &smmu->streams); > + } > } > > if (ret) { > -- > 2.45.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel