net: ena: switch to dim algorithm for rx adaptive interrupt moderation (282faf61) · Commits · 戴 / test

drivers/net/ethernet/amazon/ena/ena_com.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2839,9 +2839,7 @@ int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)
		delay_resolution = get_resp.u.intr_moderation.intr_delay_resolution;
		ena_com_update_intr_delay_resolution(ena_dev, delay_resolution);

		/* Disable adaptive moderation by default - can be enabled from
		* ethtool
		*/
		/* Disable adaptive moderation by default - can be enabled later */
		ena_com_disable_adaptive_moderation(ena_dev);

		return 0;

drivers/net/ethernet/amazon/ena/ena_netdev.c

+37 −18

Original line number	Diff line number	Diff line
		@@ -196,6 +196,7 @@ static void ena_init_io_rings(struct ena_adapter *adapter)
		rxr->smoothed_interval =
		ena_com_get_nonadaptive_moderation_interval_rx(ena_dev);
		rxr->empty_rx_queue = 0;
		adapter->ena_napi[i].dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
		}
		}

		@@ -712,6 +713,7 @@ static void ena_destroy_all_rx_queues(struct ena_adapter *adapter)

		for (i = 0; i < adapter->num_queues; i++) {
		ena_qid = ENA_IO_RXQ_IDX(i);
		cancel_work_sync(&adapter->ena_napi[i].dim.work);
		ena_com_destroy_io_queue(adapter->ena_dev, ena_qid);
		}
		}
		@@ -1155,23 +1157,35 @@ error:
		return 0;
		}

		void ena_adjust_intr_moderation(struct ena_ring *rx_ring,
		struct ena_ring *tx_ring)
		static void ena_dim_work(struct work_struct *w)
		{
		/* We apply adaptive moderation on Rx path only.
		* Tx uses static interrupt moderation.
		*/
		ena_com_calculate_interrupt_delay(rx_ring->ena_dev,
		rx_ring->per_napi_packets,
		rx_ring->per_napi_bytes,
		&rx_ring->smoothed_interval,
		&rx_ring->moder_tbl_idx);

		/* Reset per napi packets/bytes */
		tx_ring->per_napi_packets = 0;
		tx_ring->per_napi_bytes = 0;
		struct dim *dim = container_of(w, struct dim, work);
		struct dim_cq_moder cur_moder =
		net_dim_get_rx_moderation(dim->mode, dim->profile_ix);
		struct ena_napi *ena_napi = container_of(dim, struct ena_napi, dim);

		ena_napi->rx_ring->smoothed_interval = cur_moder.usec;
		dim->state = DIM_START_MEASURE;
		}

		static void ena_adjust_adaptive_rx_intr_moderation(struct ena_napi *ena_napi)
		{
		struct dim_sample dim_sample;
		struct ena_ring *rx_ring = ena_napi->rx_ring;

		if (!rx_ring->per_napi_packets)
		return;

		rx_ring->non_empty_napi_events++;

		dim_update_sample(rx_ring->non_empty_napi_events,
		rx_ring->rx_stats.cnt,
		rx_ring->rx_stats.bytes,
		&dim_sample);

		net_dim(&ena_napi->dim, dim_sample);

		rx_ring->per_napi_packets = 0;
		rx_ring->per_napi_bytes = 0;
		}

		static void ena_unmask_interrupt(struct ena_ring *tx_ring,
		@@ -1260,9 +1274,11 @@ static int ena_io_poll(struct napi_struct *napi, int budget)
		* from the interrupt context (vs from sk_busy_loop)
		*/
		if (napi_complete_done(napi, rx_work_done)) {
		/* Tx and Rx share the same interrupt vector */
		/* We apply adaptive moderation on Rx path only.
		* Tx uses static interrupt moderation.
		*/
		if (ena_com_get_adaptive_moderation_enabled(rx_ring->ena_dev))
		ena_adjust_intr_moderation(rx_ring, tx_ring);
		ena_adjust_adaptive_rx_intr_moderation(ena_napi);

		ena_unmask_interrupt(tx_ring, rx_ring);
		}
		@@ -1740,13 +1756,16 @@ static int ena_create_all_io_rx_queues(struct ena_adapter *adapter)
		rc = ena_create_io_rx_queue(adapter, i);
		if (rc)
		goto create_err;
		INIT_WORK(&adapter->ena_napi[i].dim.work, ena_dim_work);
		}

		return 0;

		create_err:
		while (i--)
		while (i--) {
		cancel_work_sync(&adapter->ena_napi[i].dim.work);
		ena_com_destroy_io_queue(ena_dev, ENA_IO_RXQ_IDX(i));
		}

		return rc;
		}

drivers/net/ethernet/amazon/ena/ena_netdev.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		#define ENA_H

		#include <linux/bitops.h>
		#include <linux/dim.h>
		#include <linux/etherdevice.h>
		#include <linux/inetdevice.h>
		#include <linux/interrupt.h>
		@@ -153,6 +154,7 @@ struct ena_napi {
		struct ena_ring *tx_ring;
		struct ena_ring *rx_ring;
		u32 qid;
		struct dim dim;
		};

		struct ena_calc_queue_size_ctx {
		@@ -280,6 +282,7 @@ struct ena_ring {
		u32 per_napi_packets;
		u32 per_napi_bytes;
		enum ena_intr_moder_level moder_tbl_idx;
		u16 non_empty_napi_events;
		struct u64_stats_sync syncp;
		union {
		struct ena_stats_tx tx_stats;

Admin message