UPSTREAM: af_unix: Assign a unique index to SCC.

commit bfdb01283ee8f2f3089656c3ff8f62bb072dabb2 upstream.

The definition of the lowlink in Tarjan's algorithm is the
smallest index of a vertex that is reachable with at most one
back-edge in SCC.  This is not useful for a cross-edge.

If we start traversing from A in the following graph, the final
lowlink of D is 3.  The cross-edge here is one between D and C.

  A -> B -> D   D = (4, 3)  (index, lowlink)
  ^    |    |   C = (3, 1)
  |    V    |   B = (2, 1)
  `--- C <--'   A = (1, 1)

This is because the lowlink of D is updated with the index of C.

In the following patch, we detect a dead SCC by checking two
conditions for each vertex.

  1) vertex has no edge directed to another SCC (no bridge)
  2) vertex's out_degree is the same as the refcount of its file

If 1) is false, there is a receiver of all fds of the SCC and
its ancestor SCC.

To evaluate 1), we need to assign a unique index to each SCC and
assign it to all vertices in the SCC.

This patch changes the lowlink update logic for cross-edge so
that in the example above, the lowlink of D is updated with the
lowlink of C.

  A -> B -> D   D = (4, 1)  (index, lowlink)
  ^    |    |   C = (3, 1)
  |    V    |   B = (2, 1)
  `--- C <--'   A = (1, 1)

Then, all vertices in the same SCC have the same lowlink, and we
can quickly find the bridge connecting to different SCC if exists.

However, it is no longer called lowlink, so we rename it to
scc_index.  (It's sometimes called lowpoint.)

Also, we add a global variable to hold the last index used in DFS
so that we do not reset the initial index in each DFS.

This patch can be squashed to the SCC detection patch but is
split deliberately for anyone wondering why lowlink is not used
as used in the original Tarjan's algorithm and many reference
implementations.

Bug: 404256079
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/20240325202425.60930-13-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 324005012f)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I4228a6bcf2247a6a2236338f458205851e954ab0
This commit is contained in:
Kuniyuki Iwashima
2025-05-21 14:45:26 +00:00
committed by Lee Jones
parent b22b0a7597
commit b9f8dfdb54
4 changed files with 27 additions and 22 deletions

View File

@@ -126569,12 +126569,6 @@ member {
type_id: 0x6d7f5ff6
offset: 45416
}
member {
id: 0x03c71124
name: "lowlink"
type_id: 0x33756485
offset: 512
}
member {
id: 0x8b23da1a
name: "lowmem_reserve"
@@ -180405,6 +180399,12 @@ member {
type_id: 0xd3c80119
offset: 256
}
member {
id: 0x027dfeed
name: "scc_index"
type_id: 0x33756485
offset: 512
}
member {
id: 0x0ac848fc
name: "scdc"
@@ -277537,7 +277537,7 @@ struct_union {
member_id: 0xd741c1b9
member_id: 0x0fc2a957
member_id: 0xad0a7aac
member_id: 0x03c71124
member_id: 0x027dfeed
}
}
struct_union {

View File

@@ -188,3 +188,7 @@ type 'struct unix_vertex' changed
byte size changed from 80 to 72
member 'bool on_stack' was removed
type 'struct unix_vertex' changed
member 'unsigned long lowlink' was removed
member 'unsigned long scc_index' was added

View File

@@ -36,7 +36,7 @@ struct unix_vertex {
struct list_head scc_entry;
unsigned long out_degree;
unsigned long index;
unsigned long lowlink;
unsigned long scc_index;
};
struct unix_edge {

View File

@@ -312,9 +312,8 @@ static bool unix_scc_cyclic(struct list_head *scc)
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)
static void __unix_walk_scc(struct unix_vertex *vertex, unsigned long *last_index)
{
unsigned long index = UNIX_VERTEX_INDEX_START;
LIST_HEAD(vertex_stack);
struct unix_edge *edge;
LIST_HEAD(edge_stack);
@@ -326,9 +325,9 @@ next_vertex:
*/
list_add(&vertex->scc_entry, &vertex_stack);
vertex->index = index;
vertex->lowlink = index;
index++;
vertex->index = *last_index;
vertex->scc_index = *last_index;
(*last_index)++;
/* Explore neighbour vertices (receivers of the current vertex's fd). */
list_for_each_entry(edge, &vertex->edges, vertex_entry) {
@@ -358,30 +357,30 @@ prev_vertex:
next_vertex = vertex;
vertex = edge->predecessor->vertex;
/* If the successor has a smaller lowlink, two vertices
* are in the same SCC, so propagate the smaller lowlink
/* If the successor has a smaller scc_index, two vertices
* are in the same SCC, so propagate the smaller scc_index
* to skip SCC finalisation.
*/
vertex->lowlink = min(vertex->lowlink, next_vertex->lowlink);
vertex->scc_index = min(vertex->scc_index, next_vertex->scc_index);
} 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
* in the same SCC. If the successor has a smaller index,
* The successor is on vertex_stack, so two vertices are in
* the same SCC. If the successor has a smaller *scc_index*,
* propagate it to skip SCC finalisation.
*/
vertex->lowlink = min(vertex->lowlink, next_vertex->index);
vertex->scc_index = min(vertex->scc_index, next_vertex->scc_index);
} else {
/* The successor was already grouped as another SCC */
}
}
if (vertex->index == vertex->lowlink) {
if (vertex->index == vertex->scc_index) {
struct list_head scc;
/* SCC finalised.
*
* If the lowlink was not updated, all the vertices above on
* If the scc_index was not updated, all the vertices above on
* vertex_stack are in the same SCC. Group them using scc_entry.
*/
__list_cut_position(&scc, &vertex_stack, &vertex->scc_entry);
@@ -407,6 +406,8 @@ prev_vertex:
static void unix_walk_scc(void)
{
unsigned long last_index = UNIX_VERTEX_INDEX_START;
unix_graph_maybe_cyclic = false;
/* Visit every vertex exactly once.
@@ -416,7 +417,7 @@ static void unix_walk_scc(void)
struct unix_vertex *vertex;
vertex = list_first_entry(&unix_unvisited_vertices, typeof(*vertex), entry);
__unix_walk_scc(vertex);
__unix_walk_scc(vertex, &last_index);
}
list_replace_init(&unix_visited_vertices, &unix_unvisited_vertices);