From patchwork Fri Feb 14 22:43:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Washington X-Patchwork-Id: 13975700 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 7F45E1DE2B4 for ; Fri, 14 Feb 2025 22:44:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739573091; cv=none; b=ZBdH56zvOv1tGWKbBwSHYkCTXgwkHAVLCJnEguWXaW8EzG03xvTHiL/5dUGIWfU6qoYhmzW5anKK+r8G/pYkKcx08W2Sw2wQltcTG1D0MrSYM0zp2WjNZTLziGqQNd8QUG60NfuCPGA6U0wRfnjt4ZDVFEKj5i3WifFAj5yecOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739573091; c=relaxed/simple; bh=C9A3LWRVVEvM4OBlqT9wYA0yWCdJj2Hpz7Z1pzmG8wU=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=R/Lvod17lLJL3XC8Qm/Qnb7S68ByrAhXMqZncfw0SEyqL4SpAPybMNNpznq4NRlpAvw/yw8bUmqcSb54IzArvRlpnxBfvNMspMPy1iykRUdqvo3QzET4t5fyS8esd08INBvatU/KMu0VGJIKBpjEThANKB7uPKDA2QdGwTNHDoQ= 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=sj/IziDH; arc=none smtp.client-ip=209.85.214.202 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="sj/IziDH" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-220fb031245so16639385ad.3 for ; Fri, 14 Feb 2025 14:44:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739573088; x=1740177888; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=tUNETmfCcN16mATl/cudDdX8wxXBFFNsGuPJIeAzz7o=; b=sj/IziDHroH5kXw5DjtQJdNC0AeZGArJJh2x98x4jO7HBS6Lp7Tzk+QZzpa8dqlUYP jfqLmNconmo8MCmiAOPWrPLU/TCV3nuJNTehQ/OVNXbbLClxjaiAiLNxLKA5WIblBQb6 7NoOkVtNjckuuQY10tkKmL4ZsEAR3d5lWYDpM75KGEDAxgp+m2fYP1Z6XITeuCKYkuE6 EZvFJYqiDjBQytspQ5rYqzYceWstJ4fS8EdgThrk+ZAyL1e4Qh6ok/h5O40PPUJ0zsCk QI4C36QMidbIjO60BKbHmGiHDc68GtFC1NeQFj5F+cM5sPeA2uzs/3ZHZvbPbRvlR/LM DFmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739573088; x=1740177888; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=tUNETmfCcN16mATl/cudDdX8wxXBFFNsGuPJIeAzz7o=; b=LLn53Japy+OpIVBe9guiYqeL6VS0fEWYmf9orKxGWGqLSE7u+zbBsceTbNsRCgRMHz mgpgQKo89yOBDLCnOgva0jRnZOY6e4ser/6P/L8mq35yYRha/uX1uCDelEVWbQSfvzwu HH1NxBpm99erByyUUUw14fRBv+vjT3Cnpx+tpEW0I4ay9MMu7uFm5LCrSegvUYo/1eyG LuCURbNJ0SMImC8bhawWAUShryZ/E8t067GmgT9kUVebbHFTWgNHIaWvCRfWUmSgWmYx /KLrpaZfEUi4jbSLOTibXFIXoSyplAENlNz+yuobt6fqzc6POWb4bD86HCEz5+LFuqT5 T6/Q== X-Forwarded-Encrypted: i=1; AJvYcCW5cdy12Ut56ea7i+y+t5OpnPOKe6c1+thrNhlB75AUBmLUSACVh3/4Pj0GeeY74Htb+7s=@vger.kernel.org X-Gm-Message-State: AOJu0YzZmj4FBDRl6h3PXgcdCOvW/AFoW/SrTZuJ+EaSrtlY+PmBv+lB 2uRra8kBkD6131/EisKcFVp9PoQcnHFW9ivBWOKur9usRXjCrv0p4q3Hi7/pJRVVAP903CBtnnq Y+by1fEOKkg== X-Google-Smtp-Source: AGHT+IFipCMt7qHod8wE+QJEnJFVy+GDVWXm+FNM4uL263Au9RAnEUGi4OFC3Gq37Yk5dRgHAwAYikh+aCfyzw== X-Received: from pjbtb14.prod.google.com ([2002:a17:90b:53ce:b0:2ea:756d:c396]) (user=joshwash job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:986:b0:215:5ea2:6544 with SMTP id d9443c01a7336-22103efa6e3mr14484155ad.7.1739573087787; Fri, 14 Feb 2025 14:44:47 -0800 (PST) Date: Fri, 14 Feb 2025 14:43:59 -0800 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250214224417.1237818-1-joshwash@google.com> Subject: [PATCH net] gve: set xdp redirect target only when it is available From: joshwash@google.com To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, stable@kernel.org, Joshua Washington , stable@vger.kernel.org, Praveen Kaligineedi , Jeroen de Borst , Harshitha Ramamurthy , Andrew Lunn , Eric Dumazet , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Willem de Bruijn , Ziwei Xiao , Shailend Chand , open list , "open list:XDP (eXpress Data Path):Keyword:(?:b|_)xdp(?:b|_)" X-Patchwork-Delegate: kuba@kernel.org From: Joshua Washington Before this patch the NETDEV_XDP_ACT_NDO_XMIT XDP feature flag is set by default as part of driver initialization, and is never cleared. However, this flag differs from others in that it is used as an indicator for whether the driver is ready to perform the ndo_xdp_xmit operation as part of an XDP_REDIRECT. Kernel helpers xdp_features_(set|clear)_redirect_target exist to convey this meaning. This patch ensures that the netdev is only reported as a redirect target when XDP queues exist to forward traffic. Fixes: 39a7f4aa3e4a ("gve: Add XDP REDIRECT support for GQI-QPL format") Cc: stable@vger.kernel.org Reviewed-by: Praveen Kaligineedi Reviewed-by: Jeroen de Borst Signed-off-by: Joshua Washington --- drivers/net/ethernet/google/gve/gve.h | 10 ++++++++++ drivers/net/ethernet/google/gve/gve_main.c | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h index 8167cc5fb0df..78d2a19593d1 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -1116,6 +1116,16 @@ static inline u32 gve_xdp_tx_start_queue_id(struct gve_priv *priv) return gve_xdp_tx_queue_id(priv, 0); } +static inline bool gve_supports_xdp_xmit(struct gve_priv *priv) +{ + switch (priv->queue_format) { + case GVE_GQI_QPL_FORMAT: + return true; + default: + return false; + } +} + /* gqi napi handler defined in gve_main.c */ int gve_napi_poll(struct napi_struct *napi, int budget); diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 533e659b15b3..92237fb0b60c 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1903,6 +1903,8 @@ static void gve_turndown(struct gve_priv *priv) /* Stop tx queues */ netif_tx_disable(priv->dev); + xdp_features_clear_redirect_target(priv->dev); + gve_clear_napi_enabled(priv); gve_clear_report_stats(priv); @@ -1972,6 +1974,9 @@ static void gve_turnup(struct gve_priv *priv) napi_schedule(&block->napi); } + if (priv->num_xdp_queues && gve_supports_xdp_xmit(priv)) + xdp_features_set_redirect_target(priv->dev, false); + gve_set_napi_enabled(priv); } @@ -2246,7 +2251,6 @@ static void gve_set_netdev_xdp_features(struct gve_priv *priv) if (priv->queue_format == GVE_GQI_QPL_FORMAT) { xdp_features = NETDEV_XDP_ACT_BASIC; xdp_features |= NETDEV_XDP_ACT_REDIRECT; - xdp_features |= NETDEV_XDP_ACT_NDO_XMIT; xdp_features |= NETDEV_XDP_ACT_XSK_ZEROCOPY; } else { xdp_features = 0;