mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
581d28606c
The netif_get_rx_queue_lease_locked() API hides the locking
and the descend onto the leased queue. Making the code
harder to follow (at least to me). Remove the API and open
code the descend a bit. Most of the code now looks like:
if (!leased)
return __helper(x);
hw_rxq = ..
netdev_lock(hw_rxq->dev);
ret = __helper(x);
netdev_unlock(hw_rxq->dev);
return ret;
Of course if we have more code paths that need the wrapping
we may need to revisit. For now, IMHO, having to know what
netif_get_rx_queue_lease_locked() does is not worth the 20LoC
it saves.
Link: https://patch.msgid.link/20260408151251.72bd2482@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
85 lines
2.2 KiB
C
85 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _LINUX_NETDEV_RX_QUEUE_H
|
|
#define _LINUX_NETDEV_RX_QUEUE_H
|
|
|
|
#include <linux/kobject.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/sysfs.h>
|
|
#include <net/xdp.h>
|
|
#include <net/page_pool/types.h>
|
|
#include <net/netdev_queues.h>
|
|
#include <net/rps-types.h>
|
|
|
|
/* This structure contains an instance of an RX queue. */
|
|
struct netdev_rx_queue {
|
|
struct xdp_rxq_info xdp_rxq;
|
|
#ifdef CONFIG_RPS
|
|
struct rps_map __rcu *rps_map;
|
|
rps_tag_ptr rps_flow_table;
|
|
#endif
|
|
struct kobject kobj;
|
|
const struct attribute_group **groups;
|
|
struct net_device *dev;
|
|
netdevice_tracker dev_tracker;
|
|
|
|
/* All fields below are "ops protected",
|
|
* see comment about net_device::lock
|
|
*/
|
|
#ifdef CONFIG_XDP_SOCKETS
|
|
struct xsk_buff_pool *pool;
|
|
#endif
|
|
struct napi_struct *napi;
|
|
struct netdev_queue_config qcfg;
|
|
struct pp_memory_provider_params mp_params;
|
|
|
|
/* If a queue is leased, then the lease pointer is always
|
|
* valid. From the physical device it points to the virtual
|
|
* queue, and from the virtual device it points to the
|
|
* physical queue.
|
|
*/
|
|
struct netdev_rx_queue *lease;
|
|
netdevice_tracker lease_tracker;
|
|
} ____cacheline_aligned_in_smp;
|
|
|
|
/*
|
|
* RX queue sysfs structures and functions.
|
|
*/
|
|
struct rx_queue_attribute {
|
|
struct attribute attr;
|
|
ssize_t (*show)(struct netdev_rx_queue *queue, char *buf);
|
|
ssize_t (*store)(struct netdev_rx_queue *queue,
|
|
const char *buf, size_t len);
|
|
};
|
|
|
|
static inline struct netdev_rx_queue *
|
|
__netif_get_rx_queue(struct net_device *dev, unsigned int rxq)
|
|
{
|
|
return dev->_rx + rxq;
|
|
}
|
|
|
|
static inline unsigned int
|
|
get_netdev_rx_queue_index(struct netdev_rx_queue *queue)
|
|
{
|
|
struct net_device *dev = queue->dev;
|
|
int index = queue - dev->_rx;
|
|
|
|
BUG_ON(index >= dev->num_rx_queues);
|
|
return index;
|
|
}
|
|
|
|
enum netif_lease_dir {
|
|
NETIF_VIRT_TO_PHYS,
|
|
NETIF_PHYS_TO_VIRT,
|
|
};
|
|
|
|
struct netdev_rx_queue *
|
|
__netif_get_rx_queue_lease(struct net_device **dev, unsigned int *rxq,
|
|
enum netif_lease_dir dir);
|
|
|
|
int netdev_rx_queue_restart(struct net_device *dev, unsigned int rxq);
|
|
void netdev_rx_queue_lease(struct netdev_rx_queue *rxq_dst,
|
|
struct netdev_rx_queue *rxq_src);
|
|
void netdev_rx_queue_unlease(struct netdev_rx_queue *rxq_dst,
|
|
struct netdev_rx_queue *rxq_src);
|
|
#endif /* _LINUX_NETDEV_RX_QUEUE_H */
|