Skip to content

port: remove hardware vlan filter #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christophefontaine merged 1 commit into from
Dec 2, 2025
Merged

port: remove hardware vlan filter #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions modules/infra/control/bond.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,34 +141,6 @@ static int bond_promisc_set(struct iface *iface, bool enabled) {
return bond_all_members_set_flag(iface, GR_IFACE_F_PROMISC, enabled, iface_set_promisc);
}

static int bond_vlan_add(struct iface *iface, uint16_t vlan_id) {
struct iface_info_bond *bond = iface_info_bond(iface);
const struct iface *member;
int ret;

for (uint8_t i = 0; i < bond->n_members; i++) {
member = bond->members[i].iface;
if ((ret = iface_add_vlan(member->id, vlan_id)) < 0)
return ret;
}

return 0;
}

static int bond_vlan_del(struct iface *iface, uint16_t vlan_id) {
struct iface_info_bond *bond = iface_info_bond(iface);
const struct iface *member;
int ret;

for (uint8_t i = 0; i < bond->n_members; i++) {
member = bond->members[i].iface;
if ((ret = iface_del_vlan(member->id, vlan_id)) < 0)
return ret;
}

return 0;
}

static int bond_init_new_members(const struct iface *iface, const struct gr_iface_info_bond *new) {
struct iface_info_bond *bond = iface_info_bond(iface);
struct iface_info_port *port;
Expand Down Expand Up @@ -437,8 +409,6 @@ static struct iface_type iface_type_bond = {
.del_eth_addr = bond_mac_del,
.set_mtu = bond_mtu_set,
.set_promisc = bond_promisc_set,
.add_vlan = bond_vlan_add,
.del_vlan = bond_vlan_del,
.to_api = bond_to_api,
};

Expand Down
4 changes: 0 additions & 4 deletions modules/infra/control/gr_iface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ struct iface_type {
int (*set_up_down)(struct iface *, bool up);
int (*set_mtu)(struct iface *, uint16_t mtu);
int (*set_promisc)(struct iface *, bool enabled);
int (*add_vlan)(struct iface *, uint16_t vlan_id);
int (*del_vlan)(struct iface *, uint16_t vlan_id);
void (*to_api)(void *api_info, const struct iface *);
const char *name;
STAILQ_ENTRY(iface_type) next;
Expand All @@ -79,8 +77,6 @@ int iface_del_eth_addr(uint16_t ifid, const struct rte_ether_addr *);
int iface_set_mtu(uint16_t ifid, uint16_t mtu);
int iface_set_up_down(uint16_t ifid, bool up);
int iface_set_promisc(uint16_t ifid, bool enabled);
int iface_add_vlan(uint16_t ifid, uint16_t vlan_id);
int iface_del_vlan(uint16_t ifid, uint16_t vlan_id);
uint16_t ifaces_count(gr_iface_type_t type_id);
struct iface *iface_next(gr_iface_type_t type_id, const struct iface *prev);

Expand Down
30 changes: 0 additions & 30 deletions modules/infra/control/iface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,36 +392,6 @@ int iface_set_promisc(uint16_t ifid, bool enabled) {
return 0;
}

int iface_add_vlan(uint16_t ifid, uint16_t vlan_id) {
struct iface *iface = iface_from_id(ifid);
const struct iface_type *type;

if (iface == NULL)
return -errno;

type = iface_type_get(iface->type);
assert(type != NULL);
if (type->add_vlan == NULL)
return errno_set(EOPNOTSUPP);

return type->add_vlan(iface, vlan_id);
}

int iface_del_vlan(uint16_t ifid, uint16_t vlan_id) {
struct iface *iface = iface_from_id(ifid);
const struct iface_type *type;

if (iface == NULL)
return -errno;

type = iface_type_get(iface->type);
assert(type != NULL);
if (type->del_vlan == NULL)
return errno_set(EOPNOTSUPP);

return type->del_vlan(iface, vlan_id);
}

int iface_destroy(uint16_t ifid) {
struct iface *iface = iface_from_id(ifid);
const struct iface_type *type;
Expand Down
32 changes: 1 addition & 31 deletions modules/infra/control/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static struct rte_eth_conf default_port_config = {
},
},
.rxmode = {
.offloads = RTE_ETH_RX_OFFLOAD_CHECKSUM | RTE_ETH_RX_OFFLOAD_VLAN,
.offloads = RTE_ETH_RX_OFFLOAD_CHECKSUM | RTE_ETH_RX_OFFLOAD_VLAN_STRIP,
},
};

Expand Down Expand Up @@ -257,34 +257,6 @@ static int port_mtu_set(struct iface *iface, uint16_t mtu) {
return 0;
}

static int port_vlan_add(struct iface *iface, uint16_t vlan_id) {
struct iface_info_port *p = iface_info_port(iface);
int ret = rte_eth_dev_vlan_filter(p->port_id, vlan_id, true);
switch (ret) {
case 0:
case -ENOSYS:
case -EOPNOTSUPP:
break;
default:
return errno_log(-ret, "rte_eth_dev_vlan_filter");
}
return 0;
}

static int port_vlan_del(struct iface *iface, uint16_t vlan_id) {
struct iface_info_port *p = iface_info_port(iface);
int ret = rte_eth_dev_vlan_filter(p->port_id, vlan_id, false);
switch (ret) {
case 0:
case -ENOSYS:
case -EOPNOTSUPP:
break;
default:
return errno_log(-ret, "rte_eth_dev_vlan_filter");
}
return 0;
}

static int iface_port_reconfig(
struct iface *iface,
uint64_t set_attrs,
Expand Down Expand Up @@ -734,8 +706,6 @@ static struct iface_type iface_type_port = {
.set_mtu = port_mtu_set,
.set_up_down = port_up_down,
.set_promisc = port_promisc_set,
.add_vlan = port_vlan_add,
.del_vlan = port_vlan_del,
.to_api = port_to_api,
};

Expand Down
8 changes: 0 additions & 8 deletions modules/infra/control/vlan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,8 @@ static int iface_vlan_reconfig(

rte_hash_del_key(vlan_hash, &cur_key);
iface_del_subinterface(cur_parent, iface);

// remove previous vlan filter (ignore errors)
iface_del_vlan(cur->parent_id, cur->vlan_id);
}

if (iface_add_vlan(next->parent_id, next->vlan_id) < 0)
return -errno;
cur->parent_id = next->parent_id;
cur->vlan_id = next->vlan_id;
iface_add_subinterface(next_parent, iface);
Expand Down Expand Up @@ -111,9 +106,6 @@ static int iface_vlan_fini(struct iface *iface) {

rte_hash_del_key(vlan_hash, &(struct vlan_key) {vlan->parent_id, vlan->vlan_id});

if ((ret = iface_del_vlan(vlan->parent_id, vlan->vlan_id)) < 0)
status = ret;

if ((ret = iface_del_eth_addr(vlan->parent_id, &vlan->mac)) < 0)
status = status ?: ret;

Expand Down