From patchwork Sun Mar 20 06:57:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 12786441 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5616C433EF for ; Sun, 20 Mar 2022 06:58:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244891AbiCTHAF (ORCPT ); Sun, 20 Mar 2022 03:00:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244910AbiCTG7w (ORCPT ); Sun, 20 Mar 2022 02:59:52 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0456622535 for ; Sat, 19 Mar 2022 23:58:30 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id o68-20020a17090a0a4a00b001c686a48263so5506210pjo.1 for ; Sat, 19 Mar 2022 23:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Mu4RXUyMEcY9BCt9wrjmyuq8+jG0KjVzu6DX/J1dGEU=; b=SzjN+guyVDKPX+Y71Yq4Dz3z6yQRkycR+pFTVGNTyedg8im6r/HiqFF8H0RUtj35zy VbGn7PKj5Rqk7lgvg6LROP+maqO8UZA7i3zByBtBsaH3hZkZ7hPNWOytGliRPk+AcB4M 4+GXw/mkw4ziUOWOQiwYPiwgMC5OFDLnv4yhg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Mu4RXUyMEcY9BCt9wrjmyuq8+jG0KjVzu6DX/J1dGEU=; b=ug96gMxWaR7AX3TYzvUDgjxHoXYEP/7JMBnf+bOFJk7n5HnsMN3vtpcMYGjfPZ2nuh pvJKolvIIdGOZztIjewc6bVB9iFVSZD12yl8L7zBkOTNaWAuhLWiLh8EoW/EFknWQT74 eWFOx+vEUAGxv9uDm+gGj709+TYoaZ1LLcugDBypXm7t+6We6syVhLJsor7sdForn/Qy oXMdkGrskEjwF04H8LjmvqTShAvk6ukqJOJl2TRonIajhBTXC6gFN0mLyOo6nqKHlSop jdpXqvd+4W5UhEjfOvNwN+pvNUgnVin0wQfqlNJzCgw7hyQ7RX4+Q13S8yTcWRGe3jGn sb+w== X-Gm-Message-State: AOAM530dmYwL4QEukCzfEYbZ2nC+qN9G1EA+fqqfNOzpE1bDginYloid 9xcx+pPVOdTPq2MXp8b4RdN8fQ== X-Google-Smtp-Source: ABdhPJwRpBuWvND0vAeOr8OOJCmCR0X+bPYHdrZwlD7NYFtMypRlmKyJP5O5sLXXx5t+1SA8EidfOQ== X-Received: by 2002:a17:902:e889:b0:151:a56d:eb8f with SMTP id w9-20020a170902e88900b00151a56deb8fmr7096627plg.142.1647759509347; Sat, 19 Mar 2022 23:58:29 -0700 (PDT) Received: from localhost.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id q4-20020a056a00150400b004f78d4821a0sm15359334pfu.204.2022.03.19.23.58.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Mar 2022 23:58:28 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, kuba@kernel.org, gospo@broadcom.com Subject: [PATCH net-next 11/11] bnxt: XDP multibuffer enablement Date: Sun, 20 Mar 2022 02:57:53 -0400 Message-Id: <1647759473-2414-12-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1647759473-2414-1-git-send-email-michael.chan@broadcom.com> References: <1647759473-2414-1-git-send-email-michael.chan@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Andy Gospodarek Allow aggregation buffers to be in place in the receive path and allow XDP programs to be attached when using a larger than 4k MTU. Signed-off-by: Andy Gospodarek Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +-- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 84c89ee7dc2f..4f7213af1955 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -1937,8 +1937,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, xdp_active = true; } - /* skip running XDP prog if there are aggregation bufs */ - if (!agg_bufs && xdp_active) { + if (xdp_active) { if (bnxt_rx_xdp(bp, rxr, cons, xdp, data, &len, event)) { rc = 1; goto next_rx; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c index 42f39e89f6fb..ff0454b70aa3 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c @@ -375,11 +375,6 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) int tx_xdp = 0, rc, tc; struct bpf_prog *old; - if (prog && bp->dev->mtu > BNXT_MAX_PAGE_MODE_MTU) { - netdev_warn(dev, "MTU %d larger than largest XDP supported MTU %d.\n", - bp->dev->mtu, BNXT_MAX_PAGE_MODE_MTU); - return -EOPNOTSUPP; - } if (!(bp->flags & BNXT_FLAG_SHARED_RINGS)) { netdev_warn(dev, "ethtool rx/tx channels must be combined to support XDP.\n"); return -EOPNOTSUPP;