@@ -238,6 +238,7 @@ struct tun_struct {
u32 rx_batched;
struct tun_pcpu_stats __percpu *pcpu_stats;
struct bpf_prog __rcu *xdp_prog;
+ struct bpf_prog __rcu *xdp_egress_prog;
struct tun_prog __rcu *steering_prog;
struct tun_prog __rcu *filter_prog;
struct ethtool_link_ksettings link_ksettings;
@@ -1156,15 +1157,21 @@ tun_net_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
}
static int tun_xdp_set(struct net_device *dev, struct bpf_prog *prog,
- struct netlink_ext_ack *extack)
+ bool egress, struct netlink_ext_ack *extack)
{
struct tun_struct *tun = netdev_priv(dev);
struct tun_file *tfile;
struct bpf_prog *old_prog;
int i;
- old_prog = rtnl_dereference(tun->xdp_prog);
- rcu_assign_pointer(tun->xdp_prog, prog);
+ if (egress) {
+ old_prog = rtnl_dereference(tun->xdp_egress_prog);
+ rcu_assign_pointer(tun->xdp_egress_prog, prog);
+ } else {
+ old_prog = rtnl_dereference(tun->xdp_prog);
+ rcu_assign_pointer(tun->xdp_prog, prog);
+ }
+
if (old_prog)
bpf_prog_put(old_prog);
@@ -1185,12 +1192,16 @@ static int tun_xdp_set(struct net_device *dev, struct bpf_prog *prog,
return 0;
}
-static u32 tun_xdp_query(struct net_device *dev)
+static u32 tun_xdp_query(struct net_device *dev, bool egress)
{
struct tun_struct *tun = netdev_priv(dev);
const struct bpf_prog *xdp_prog;
- xdp_prog = rtnl_dereference(tun->xdp_prog);
+ if (egress)
+ xdp_prog = rtnl_dereference(tun->xdp_egress_prog);
+ else
+ xdp_prog = rtnl_dereference(tun->xdp_prog);
+
if (xdp_prog)
return xdp_prog->aux->id;
@@ -1201,13 +1212,20 @@ static int tun_xdp(struct net_device *dev, struct netdev_bpf *xdp)
{
switch (xdp->command) {
case XDP_SETUP_PROG:
- return tun_xdp_set(dev, xdp->prog, xdp->extack);
+ return tun_xdp_set(dev, xdp->prog, false, xdp->extack);
+ case XDP_SETUP_PROG_EGRESS:
+ return tun_xdp_set(dev, xdp->prog, true, xdp->extack);
case XDP_QUERY_PROG:
- xdp->prog_id = tun_xdp_query(dev);
- return 0;
+ xdp->prog_id = tun_xdp_query(dev, false);
+ break;
+ case XDP_QUERY_PROG_EGRESS:
+ xdp->prog_id = tun_xdp_query(dev, true);
+ break;
default:
return -EINVAL;
}
+
+ return 0;
}
static int tun_net_change_carrier(struct net_device *dev, bool new_carrier)