Skip to content

Commit

Permalink
af_unix: Save O(n) setup of Tarjan's algo.
Browse files Browse the repository at this point in the history
Before starting Tarjan's algorithm, we need to mark all vertices
as unvisited.  We can save this O(n) setup by reserving two special
indices (0, 1) and using two variables.

The first time we link a vertex to unix_unvisited_vertices, we set
unix_vertex_unvisited_index to index.

During DFS, we can see that the index of unvisited vertices is the
same as unix_vertex_unvisited_index.

When we finalise SCC later, we set unix_vertex_grouped_index to each
vertex's index.

Then, we can know (i) that the vertex is on the stack if the index
of a visited vertex is >= 2 and (ii) that it is not on the stack and
belongs to a different SCC if the index is unix_vertex_grouped_index.

After the whole algorithm, all indices of vertices are set as
unix_vertex_grouped_index.

Next time we start DFS, we know that all unvisited vertices have
unix_vertex_grouped_index, and we can use unix_vertex_unvisited_index
as the not-on-stack marker.

To use the same variable in __unix_walk_scc(), we can swap
unix_vertex_(grouped|unvisited)_index at the end of Tarjan's
algorithm.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/20240325202425.60930-10-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Kuniyuki Iwashima authored and Jakub Kicinski committed Mar 29, 2024
1 parent dcf70df commit ba31b4a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
1 change: 0 additions & 1 deletion include/net/af_unix.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ struct unix_vertex {
unsigned long out_degree;
unsigned long index;
unsigned long lowlink;
bool on_stack;
};

struct unix_edge {
Expand Down
26 changes: 15 additions & 11 deletions net/unix/garbage.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,20 @@ static struct unix_vertex *unix_edge_successor(struct unix_edge *edge)
static LIST_HEAD(unix_unvisited_vertices);

enum unix_vertex_index {
UNIX_VERTEX_INDEX_UNVISITED,
UNIX_VERTEX_INDEX_MARK1,
UNIX_VERTEX_INDEX_MARK2,
UNIX_VERTEX_INDEX_START,
};

static unsigned long unix_vertex_unvisited_index = UNIX_VERTEX_INDEX_MARK1;

static void unix_add_edge(struct scm_fp_list *fpl, struct unix_edge *edge)
{
struct unix_vertex *vertex = edge->predecessor->vertex;

if (!vertex) {
vertex = list_first_entry(&fpl->vertices, typeof(*vertex), entry);
vertex->index = unix_vertex_unvisited_index;
vertex->out_degree = 0;
INIT_LIST_HEAD(&vertex->edges);

Expand Down Expand Up @@ -265,6 +269,7 @@ void unix_destroy_fpl(struct scm_fp_list *fpl)
}

static LIST_HEAD(unix_visited_vertices);
static unsigned long unix_vertex_grouped_index = UNIX_VERTEX_INDEX_MARK2;

static void __unix_walk_scc(struct unix_vertex *vertex)
{
Expand All @@ -274,10 +279,10 @@ static void __unix_walk_scc(struct unix_vertex *vertex)
LIST_HEAD(edge_stack);

next_vertex:
/* Push vertex to vertex_stack.
/* Push vertex to vertex_stack and mark it as on-stack
* (index >= UNIX_VERTEX_INDEX_START).
* The vertex will be popped when finalising SCC later.
*/
vertex->on_stack = true;
list_add(&vertex->scc_entry, &vertex_stack);

vertex->index = index;
Expand All @@ -291,7 +296,7 @@ static void __unix_walk_scc(struct unix_vertex *vertex)
if (!next_vertex)
continue;

if (next_vertex->index == UNIX_VERTEX_INDEX_UNVISITED) {
if (next_vertex->index == unix_vertex_unvisited_index) {
/* Iterative deepening depth first search
*
* 1. Push a forward edge to edge_stack and set
Expand All @@ -317,7 +322,7 @@ static void __unix_walk_scc(struct unix_vertex *vertex)
* to skip SCC finalisation.
*/
vertex->lowlink = min(vertex->lowlink, next_vertex->lowlink);
} else if (next_vertex->on_stack) {
} else if (next_vertex->index != unix_vertex_grouped_index) {
/* Loop detected by a back/cross edge.
*
* The successor is on vertex_stack, so two vertices are
Expand All @@ -344,7 +349,8 @@ static void __unix_walk_scc(struct unix_vertex *vertex)
/* Don't restart DFS from this vertex in unix_walk_scc(). */
list_move_tail(&vertex->entry, &unix_visited_vertices);

vertex->on_stack = false;
/* Mark vertex as off-stack. */
vertex->index = unix_vertex_grouped_index;
}

list_del(&scc);
Expand All @@ -357,20 +363,18 @@ static void __unix_walk_scc(struct unix_vertex *vertex)

static void unix_walk_scc(void)
{
struct unix_vertex *vertex;

list_for_each_entry(vertex, &unix_unvisited_vertices, entry)
vertex->index = UNIX_VERTEX_INDEX_UNVISITED;

/* Visit every vertex exactly once.
* __unix_walk_scc() moves visited vertices to unix_visited_vertices.
*/
while (!list_empty(&unix_unvisited_vertices)) {
struct unix_vertex *vertex;

vertex = list_first_entry(&unix_unvisited_vertices, typeof(*vertex), entry);
__unix_walk_scc(vertex);
}

list_replace_init(&unix_visited_vertices, &unix_unvisited_vertices);
swap(unix_vertex_unvisited_index, unix_vertex_grouped_index);
}

static LIST_HEAD(gc_candidates);
Expand Down

0 comments on commit ba31b4a

Please sign in to comment.