From: Greg Kroah-Hartman Date: Mon, 16 Oct 2023 08:29:39 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.15.136~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9457239b12523391f13280d3029b8212acb67a6a;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: eth-remove-remaining-copies-of-the-napi_poll_weight-define.patch --- diff --git a/queue-5.15/eth-remove-remaining-copies-of-the-napi_poll_weight-define.patch b/queue-5.15/eth-remove-remaining-copies-of-the-napi_poll_weight-define.patch new file mode 100644 index 00000000000..f0ccea15df3 --- /dev/null +++ b/queue-5.15/eth-remove-remaining-copies-of-the-napi_poll_weight-define.patch @@ -0,0 +1,85 @@ +From 36ffca1afea9b429d3e49aa0b6a68ecd93f3be11 Mon Sep 17 00:00:00 2001 +From: Jakub Kicinski +Date: Fri, 29 Apr 2022 10:43:30 -0700 +Subject: eth: remove remaining copies of the NAPI_POLL_WEIGHT define + +From: Jakub Kicinski + +commit 36ffca1afea9b429d3e49aa0b6a68ecd93f3be11 upstream. + +Defining local versions of NAPI_POLL_WEIGHT with the same +values in the drivers just makes refactoring harder. + +This patch covers three more drivers which I missed in +commit 5f012b40ef63 ("eth: remove copies of the NAPI_POLL_WEIGHT define"). + +Signed-off-by: Jakub Kicinski +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 4 +--- + drivers/net/ethernet/brocade/bna/bnad.c | 3 +-- + drivers/net/ethernet/nvidia/forcedeth.c | 6 +++--- + 3 files changed, 5 insertions(+), 8 deletions(-) + +--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c ++++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c +@@ -31,8 +31,6 @@ MODULE_LICENSE("GPL"); + + #define ENA_MAX_RINGS min_t(unsigned int, ENA_MAX_NUM_IO_QUEUES, num_possible_cpus()) + +-#define ENA_NAPI_BUDGET 64 +- + #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | \ + NETIF_MSG_TX_DONE | NETIF_MSG_TX_ERR | NETIF_MSG_RX_ERR) + +@@ -2303,7 +2301,7 @@ static void ena_init_napi_in_range(struc + netif_napi_add(adapter->netdev, + &napi->napi, + ENA_IS_XDP_INDEX(adapter, i) ? ena_xdp_io_poll : ena_io_poll, +- ENA_NAPI_BUDGET); ++ NAPI_POLL_WEIGHT); + + if (!ENA_IS_XDP_INDEX(adapter, i)) { + napi->rx_ring = &adapter->rx_ring[i]; +--- a/drivers/net/ethernet/brocade/bna/bnad.c ++++ b/drivers/net/ethernet/brocade/bna/bnad.c +@@ -1881,7 +1881,6 @@ poll_exit: + return rcvd; + } + +-#define BNAD_NAPI_POLL_QUOTA 64 + static void + bnad_napi_add(struct bnad *bnad, u32 rx_id) + { +@@ -1892,7 +1891,7 @@ bnad_napi_add(struct bnad *bnad, u32 rx_ + for (i = 0; i < bnad->num_rxp_per_rx; i++) { + rx_ctrl = &bnad->rx_info[rx_id].rx_ctrl[i]; + netif_napi_add(bnad->netdev, &rx_ctrl->napi, +- bnad_napi_poll_rx, BNAD_NAPI_POLL_QUOTA); ++ bnad_napi_poll_rx, NAPI_POLL_WEIGHT); + } + } + +--- a/drivers/net/ethernet/nvidia/forcedeth.c ++++ b/drivers/net/ethernet/nvidia/forcedeth.c +@@ -56,8 +56,8 @@ + + #include + +-#define TX_WORK_PER_LOOP 64 +-#define RX_WORK_PER_LOOP 64 ++#define TX_WORK_PER_LOOP NAPI_POLL_WEIGHT ++#define RX_WORK_PER_LOOP NAPI_POLL_WEIGHT + + /* + * Hardware access: +@@ -5869,7 +5869,7 @@ static int nv_probe(struct pci_dev *pci_ + else + dev->netdev_ops = &nv_netdev_ops_optimized; + +- netif_napi_add(dev, &np->napi, nv_napi_poll, RX_WORK_PER_LOOP); ++ netif_napi_add(dev, &np->napi, nv_napi_poll, NAPI_POLL_WEIGHT); + dev->ethtool_ops = &ops; + dev->watchdog_timeo = NV_WATCHDOG_TIMEO; + diff --git a/queue-5.15/series b/queue-5.15/series index c6295023dfd..9233c1f3731 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -99,3 +99,4 @@ arm64-armv8_deprecated-rework-deprected-instruction-handling.patch arm64-armv8_deprecated-fix-unused-function-error.patch revert-kernel-sched-modify-initial-boot-task-idle-setup.patch usb-hub-guard-against-accesses-to-uninitialized-bos-descriptors.patch +eth-remove-remaining-copies-of-the-napi_poll_weight-define.patch