Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bcaa41b authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net/ipv6: Move release of fib6_info from pcpu routes to helper



Code move only; no functional change intended.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a87b7dc9
Loading
Loading
Loading
Loading
+23 −18
Original line number Diff line number Diff line
@@ -860,6 +860,27 @@ static struct fib6_node *fib6_add_1(struct net *net,
	return ln;
}

static void fib6_drop_pcpu_from(struct fib6_info *f6i,
				const struct fib6_table *table)
{
	int cpu;

	/* release the reference to this fib entry from
	 * all of its cached pcpu routes
	 */
	for_each_possible_cpu(cpu) {
		struct rt6_info **ppcpu_rt;
		struct rt6_info *pcpu_rt;

		ppcpu_rt = per_cpu_ptr(f6i->rt6i_pcpu, cpu);
		pcpu_rt = *ppcpu_rt;
		if (pcpu_rt) {
			fib6_info_release(pcpu_rt->from);
			pcpu_rt->from = NULL;
		}
	}
}

static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,
			  struct net *net)
{
@@ -887,24 +908,8 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,
				    lockdep_is_held(&table->tb6_lock));
		}

		if (rt->rt6i_pcpu) {
			int cpu;

			/* release the reference to this fib entry from
			 * all of its cached pcpu routes
			 */
			for_each_possible_cpu(cpu) {
				struct rt6_info **ppcpu_rt;
				struct rt6_info *pcpu_rt;

				ppcpu_rt = per_cpu_ptr(rt->rt6i_pcpu, cpu);
				pcpu_rt = *ppcpu_rt;
				if (pcpu_rt) {
					fib6_info_release(pcpu_rt->from);
					pcpu_rt->from = NULL;
				}
			}
		}
		if (rt->rt6i_pcpu)
			fib6_drop_pcpu_from(rt, table);
	}
}