Commit 96da9d67 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Tony Nguyen
Browse files

idpf: enable XSk features and ndo_xsk_wakeup 



Now that AF_XDP functionality is fully implemented, advertise XSk XDP
feature and add .ndo_xsk_wakeup() callback to be able to use it with
this driver.

Co-developed-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Signed-off-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Tested-by: default avatarRamu R <ramu.r@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 9705d655

drivers/net/ethernet/intel/idpf/idpf.h

+7 −0
Original line number Diff line number Diff line
@@ -995,6 +995,13 @@ static inline void idpf_vport_ctrl_unlock(struct net_device *netdev) 
	mutex_unlock(&np->adapter->vport_ctrl_lock);

}



static inline bool idpf_vport_ctrl_is_locked(struct net_device *netdev)

{

	struct idpf_netdev_priv *np = netdev_priv(netdev);



	return mutex_is_locked(&np->adapter->vport_ctrl_lock);

}



void idpf_statistics_task(struct work_struct *work);

void idpf_init_task(struct work_struct *work);

void idpf_service_task(struct work_struct *work);

drivers/net/ethernet/intel/idpf/idpf_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "idpf_virtchnl.h"

#include "idpf_ptp.h"

#include "xdp.h"

#include "xsk.h"



static const struct net_device_ops idpf_netdev_ops;
@@ -2618,4 +2619,5 @@ static const struct net_device_ops idpf_netdev_ops = { 
	.ndo_hwtstamp_set = idpf_hwtstamp_set,

	.ndo_bpf = idpf_xdp,

	.ndo_xdp_xmit = idpf_xdp_xmit,

	.ndo_xsk_wakeup = idpf_xsk_wakeup,

};

drivers/net/ethernet/intel/idpf/idpf_txrx.c

+3 −0
Original line number Diff line number Diff line
@@ -1210,6 +1210,8 @@ static int idpf_qp_enable(const struct idpf_queue_set *qs, u32 qid) 
		if (!idpf_queue_has(XSK, q->txq))

			continue;



		idpf_xsk_init_wakeup(q_vector);



		q->txq->q_vector = q_vector;

		q_vector->xsksq[q_vector->num_xsksq++] = q->txq;

	}
@@ -4418,6 +4420,7 @@ static void idpf_vport_intr_map_vector_to_qs(struct idpf_vport *vport) 
			continue;



		qv = idpf_find_rxq_vec(vport, i);

		idpf_xsk_init_wakeup(qv);



		xdpsq->q_vector = qv;

		qv->xsksq[qv->num_xsksq++] = xdpsq;

drivers/net/ethernet/intel/idpf/idpf_txrx.h

+7 −3
Original line number Diff line number Diff line
@@ -374,9 +374,10 @@ struct idpf_intr_reg { 
 * @complq: array of completion queues

 * @xsksq: array of XSk send queues

 * @intr_reg: See struct idpf_intr_reg

 * @napi: napi handler

 * @csd: XSk wakeup CSD

 * @total_events: Number of interrupts processed

 * @wb_on_itr: whether WB on ITR is enabled

 * @napi: napi handler

 * @tx_dim: Data for TX net_dim algorithm

 * @tx_itr_value: TX interrupt throttling rate

 * @tx_intr_mode: Dynamic ITR or not
@@ -406,10 +407,13 @@ struct idpf_q_vector { 
	__cacheline_group_end_aligned(read_mostly);



	__cacheline_group_begin_aligned(read_write);

	struct napi_struct napi;

	call_single_data_t csd;



	u16 total_events;

	bool wb_on_itr;



	struct napi_struct napi;



	struct dim tx_dim;

	u16 tx_itr_value;

	bool tx_intr_mode;
@@ -427,7 +431,7 @@ struct idpf_q_vector { 
	__cacheline_group_end_aligned(cold);

};

libeth_cacheline_set_assert(struct idpf_q_vector, 136,

			    24 + sizeof(struct napi_struct) +

			    56 + sizeof(struct napi_struct) +

			    2 * sizeof(struct dim),

			    8);

drivers/net/ethernet/intel/idpf/xdp.c

+3 −1
Original line number Diff line number Diff line
@@ -400,7 +400,9 @@ void idpf_xdp_set_features(const struct idpf_vport *vport) 
	if (!idpf_is_queue_model_split(vport->rxq_model))

		return;



	libeth_xdp_set_features_noredir(vport->netdev, &idpf_xdpmo);

	libeth_xdp_set_features_noredir(vport->netdev, &idpf_xdpmo,

					idpf_get_max_tx_bufs(vport->adapter),

					libeth_xsktmo);

}



static int idpf_xdp_setup_prog(struct idpf_vport *vport,