From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 953FA3E8C78 for ; Fri, 14 Aug 2026 23:49:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.197 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786751366; cv=none; b=OAF3ZGfHrLvuk8kyuLzqap5wMnLgyqM7TYvlc5ZGX0f2ADYG8u5uMBltY21P5ueDH9Ty4pL8NoBOXp/WqhxVtWMzUQv1pRzxBb9w00U4nsnmCW90jdGfs0MZBchMqXPuQdm5m8Z3u1wwZd9mQ7kt2Nj8Lh0o4ZLR3Ealb9/gZDQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786751366; c=relaxed/simple; bh=KmaIFs7Rsf1wuaaVKDkIGKBAJHwoNkoAEaDWZtWjD3U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DBwWDbuH/pueV3YsKzPo/UXOtqqLHG8rw3o6nEWsSVcfak9SOOdtCruBjPWlOys1d6cN3PDgpV46lTGxfzxkc3cWCoJAqjppTvjEgpbPMHwaR7WyAe7tkjzhiF7qjo0cTYFvNYp1dHPnL3GLQOrFnia1xPFNjAl+AKqMkPq9aRY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--joshwash.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=UVaaoPbs; arc=none smtp.client-ip=209.85.215.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--joshwash.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="UVaaoPbs" Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-cbe77d6864dso2296703a12.2 for ; Fri, 14 Aug 2026 16:49:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786751361; x=1787356161; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=QlrIN2FE+vOMvXseiBIppZAdIzkDPz9iddK1/8i1Wos=; b=UVaaoPbsqrV5ch0ZVmXBRc+6nwn8OWS97VXQgVgCHyRF1es8O5mvIp80nCjIhUXpi2 Kjo77kNN0L+w8iz1WjyR7lxcYokrQtEgj3R4R1n6Hr4DE4XCrqGzfKCLkwZB+xQwWuH1 9+HMJlKuRW4fPc2DxC+EnpnBGrrrRlGrxCuOtXzjlqSchzQn3iGdMWcONKg/xV9XxNs/ ePccmBWTFjwkNA8ydXi2gV9IxgXapuS8WwolD4FV3EU/3xVuJXPGauTVFzjipmQ6gLuf kphBUOPAmr1ayp55feEGIlSylEO5xN8pZbfTDXGBgrrD6fDlm43tmFEs+zk+osPhpw+z 2otA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786751361; x=1787356161; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=QlrIN2FE+vOMvXseiBIppZAdIzkDPz9iddK1/8i1Wos=; b=K7vcRRThTIIh9G23P61hZ35sd7ZhZYlC08ba0Zuls97w92NKHOxX6SoIP8wPCHsid0 kksUiES9Xevhpg+j9LbMfia1XhboMNSOaQX4TlswH+PFbd1O33hxcaZySyQ5ZFjrWcuH GfRrQKp5GS2cQUR/ELdaNUvljO5nWDekRdj/5DCBsnAt1IuD3S+FJlNTmn6ClKEUxd7n pS3W4rs89pOgumn5A353poXUq10XITDhml0u5vEDWBpdhqe1uSCsIfhmcBJ61USioXqY ITRw+dHNz5LDqIHmV1qOTIzRlLHLlkrkMomSZhWI6f95r6ZEl1YalbFRxYrF4jm7nVB7 /qsQ== X-Forwarded-Encrypted: i=1; AHgh+Rr7Ft2GOVYq4t3BJYWZRhYNQrPUZJrD3YF+f2lgXXVEYSvEK9HRJ9UVBRwG/Akx9Q0jkgtp+beL4wgARkY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6XQh1ctIRK3Sm8Ty0mM5AJW9cFXPDzRRd7WLpvrJTev9UK2oU PqSMU9u2R8MBrJC9QWA4k218yUUKlWbtUBe3TqE1bgg1mXBLXW6YsZp1OZ4IMc5wTHxprhZ7pEt 7Q5i39w7h9LaQFA== X-Received: from pgcm29.prod.google.com ([2002:a63:711d:0:b0:cbe:ddc9:c670]) (user=joshwash job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:350f:b0:3c3:724d:ae7a with SMTP id adf61e73a8af0-3cc71a2975amr12638942637.9.1786751360785; Fri, 14 Aug 2026 16:49:20 -0700 (PDT) Date: Fri, 14 Aug 2026 16:48:44 -0700 In-Reply-To: <20260814234845.773189-1-joshwash@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260814234845.773189-1-joshwash@google.com> X-Mailer: git-send-email 2.55.0.691.gc56d675ccc-goog Message-ID: <20260814234845.773189-6-joshwash@google.com> Subject: [PATCH net 5/6] gve: fix napi_disable deadlock when attempting to disable XSK pools From: Joshua Washington To: netdev@vger.kernel.org Cc: Joshua Washington , Harshitha Ramamurthy , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jordan Rhee , Willem de Bruijn , Ankit Garg , Tim Hostetler , Praveen Kaligineedi , Jeroen de Borst , Stanislav Fomichev , linux-kernel@vger.kernel.org, bpf@vger.kernel.org, stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" When disabling XSK pools, GVE calls the unlocked versions of napi_disable and napi_enable. However, the netdev lock has already been acquired before ndo_bpf is called because GVE supports queue management ops. Calling the unlocked versions of napi_disable/enable results in a deadlock when attempting to disable XSK pools, as the thread attempts to re-acquire a lock it already holds. Update the NAPI calls to use the locked versions. Fixes: 606048cbd834 ("net: designate XSK pool pointers in queues as "ops protected"") Cc: stable@vger.kernel.org Reviewed-by: Harshitha Ramamurthy Reviewed-by: Jordan Rhee Signed-off-by: Joshua Washington --- drivers/net/ethernet/google/gve/gve_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 453b304016b6..e084b367a92d 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1706,17 +1706,17 @@ static int gve_xsk_pool_disable(struct net_device *dev, } napi_rx = &priv->ntfy_blocks[priv->rx[qid].ntfy_id].napi; - napi_disable(napi_rx); /* make sure current rx poll is done */ + napi_disable_locked(napi_rx); /* make sure current rx poll is done */ tx_qid = gve_xdp_tx_queue_id(priv, qid); napi_tx = &priv->ntfy_blocks[priv->tx[tx_qid].ntfy_id].napi; - napi_disable(napi_tx); /* make sure current tx poll is done */ + napi_disable_locked(napi_tx); /* make sure current tx poll is done */ gve_unreg_xsk_pool(priv, qid); smp_mb(); /* Make sure it is visible to the workers on datapath */ - napi_enable(napi_rx); - napi_enable(napi_tx); + napi_enable_locked(napi_rx); + napi_enable_locked(napi_tx); if (gve_is_gqi(priv)) { if (gve_rx_work_pending(&priv->rx[qid])) napi_schedule(napi_rx); -- 2.55.0.691.gc56d675ccc-goog