Merge "msm: ipa: Add additional cleanup in finish rt rule addition" (d8204f4d) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/platform/msm/ipa/ipa_v3/ipa_rt.c

+9 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
		* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
		*/

		#include <linux/bitops.h>
		@@ -1078,12 +1079,14 @@ static int __ipa_create_rt_entry(struct ipa3_rt_entry **entry,
		static int __ipa_finish_rt_rule_add(struct ipa3_rt_entry entry, u32 rule_hdl,
		struct ipa3_rt_tbl *tbl)
		{
		int id;
		int id, res = 0;

		if (tbl->rule_cnt < IPA_RULE_CNT_MAX)
		tbl->rule_cnt++;
		else
		return -EINVAL;
		else {
		res = -EINVAL;
		goto failed;
		}
		if (entry->hdr)
		entry->hdr->ref_cnt++;
		else if (entry->proc_ctx)
		@@ -1092,6 +1095,7 @@ static int __ipa_finish_rt_rule_add(struct ipa3_rt_entry entry, u32 rule_hdl,
		if (id < 0) {
		IPAERR_RL("failed to add to tree\n");
		WARN_ON_RATELIMIT_IPA(1);
		res = -EPERM;
		goto ipa_insert_failed;
		}
		IPADBG("add rt rule tbl_idx=%d rule_cnt=%d rule_id=%d\n",
		@@ -1106,10 +1110,11 @@ static int __ipa_finish_rt_rule_add(struct ipa3_rt_entry entry, u32 rule_hdl,
		entry->hdr->ref_cnt--;
		else if (entry->proc_ctx)
		entry->proc_ctx->ref_cnt--;
		failed:
		idr_remove(tbl->rule_ids, entry->rule_id);
		list_del(&entry->link);
		kmem_cache_free(ipa3_ctx->rt_rule_cache, entry);
		return -EPERM;
		return res;
		}

		static int __ipa_add_rt_rule(enum ipa_ip_type ip, const char *name,