[Bugfix] Prevent out-of-bounds access in FlashInfer SM90 sparse MLA mixed batches (#56969)

Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
This commit is contained in:
Chauncey
2026-09-15 15:03:58 +00:00
committed by GitHub
parent 9446ea1680
commit 836bb3839f
2 changed files with 27 additions and 7 deletions
@@ -151,32 +151,44 @@ def test_forward_wiring(monkeypatch, qk_rope, kv_dtype):
assert kwargs == {} assert kwargs == {}
def test_builder_attaches_its_state(monkeypatch): @pytest.mark.parametrize("use_mha", [False, True])
@pytest.mark.parametrize("num_decodes", [0, 1])
def test_builder_plans_only_rows_dispatched_to_mqa(monkeypatch, use_mha, num_decodes):
"""MHA prefill rows must not make the MQA kernel read beyond its query."""
builder = object.__new__(FlashInferMLASparseSM90Builder) builder = object.__new__(FlashInferMLASparseSM90Builder)
builder._index_topk = 2048 builder._index_topk = 2048
builder._index_kpool = 4 builder._index_kpool = 4
builder._async_scheduling = False builder._async_scheduling = False
builder.state = FakeState(TOPK) builder.state = FakeState(TOPK)
builder._attention_layer = SimpleNamespace(_use_sparse_mha=lambda _: use_mha)
metadata = object.__new__(sm90_mod.FlashInferMLASparseSM90Metadata) metadata = object.__new__(sm90_mod.FlashInferMLASparseSM90Metadata)
metadata.state = None metadata.state = None
metadata.num_prefills = 1
metadata.num_decode_tokens = num_decodes
monkeypatch.setattr( monkeypatch.setattr(
sm90_mod.FlashInferMLASparseMetadataBuilder, sm90_mod.FlashInferMLASparseMetadataBuilder,
"build", "build",
lambda *_args, **_kwargs: metadata, lambda *_args, **_kwargs: metadata,
) )
cam = SimpleNamespace( cam = SimpleNamespace(
num_reqs=1, num_reqs=num_decodes + 1,
query_start_loc_cpu=torch.tensor([0, 1], dtype=torch.int32), query_start_loc_cpu=torch.tensor(
seq_lens=torch.tensor([1], dtype=torch.int32), [0, 1, 6] if num_decodes else [0, 5], dtype=torch.int32
seq_lens_cpu_upper_bound=torch.tensor([1], dtype=torch.int32), ),
seq_lens_cpu_upper_bound=torch.tensor(
[1402, 5] if num_decodes else [5], dtype=torch.int32
),
positions=None, positions=None,
) )
result = builder.build(0, cam) result = builder.build(0, cam)
assert result.state is builder.state assert result.state is builder.state
assert builder.state.plan_calls[0][0] == 1 expected_lens = [1402] if num_decodes else []
assert builder.state.plan_calls[0][1].tolist() == [1] if not use_mha:
expected_lens += [1, 2, 3, 4, 5]
assert builder.state.plan_calls[0][0] == len(expected_lens)
assert builder.state.plan_calls[0][1].tolist() == expected_lens
def test_plan_uses_state_params(monkeypatch): def test_plan_uses_state_params(monkeypatch):
@@ -277,6 +277,7 @@ class FlashInferMLASparseSM90Builder(FlashInferMLASparseMetadataBuilder):
attention_layer = vllm_config.compilation_config.static_forward_context[ attention_layer = vllm_config.compilation_config.static_forward_context[
layer_names[0] layer_names[0]
] ]
self._attention_layer = attention_layer
impl = attention_layer.impl impl = attention_layer.impl
if not isinstance(impl, FlashInferMLASparseSM90Impl): if not isinstance(impl, FlashInferMLASparseSM90Impl):
raise TypeError( raise TypeError(
@@ -376,6 +377,13 @@ class FlashInferMLASparseSM90Builder(FlashInferMLASparseMetadataBuilder):
# Replan every step outside any CUDA graph capture with this step's # Replan every step outside any CUDA graph capture with this step's
# exact per-row lengths; captured runs read the refreshed buffers. # exact per-row lengths; captured runs read the refreshed buffers.
num_rows, kv_lens = self._kv_lens_host(common_attn_metadata) num_rows, kv_lens = self._kv_lens_host(common_attn_metadata)
# MHA prefills are removed from q before forward_mqa. Plan only the
# decode prefix in that case, using the same routing decision as MLA.
if metadata.num_prefills > 0 and self._attention_layer._use_sparse_mha(
metadata
):
num_rows = metadata.num_decode_tokens
kv_lens = kv_lens[:num_rows]
self.state.plan(num_rows, kv_lens) self.state.plan(num_rows, kv_lens)
metadata.state = self.state metadata.state = self.state
return metadata return metadata