| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 31 May 2024 12:10:06 +0530
From: Yojana Mallik <y-mallik@...com>
To: <y-mallik@...com>, <schnelle@...ux.ibm.com>,
<wsa+renesas@...g-engineering.com>, <diogo.ivo@...mens.com>,
<rdunlap@...radead.org>, <horms@...nel.org>, <vigneshr@...com>,
<rogerq@...com>, <danishanwar@...com>, <pabeni@...hat.com>,
<kuba@...nel.org>, <edumazet@...gle.com>, <davem@...emloft.net>
CC: <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>, <srk@...com>,
<rogerq@...nel.org>
Subject: [PATCH net-next v2 3/3] net: ethernet: ti: icve: Add support for multicast filtering
Add support for multicast filtering for ICVE driver. Implement the
ndo_set_rx_mode callback as icve_set_rx_mode() API. rx_mode_workqueue is
initialized in icve_rpmsg_probe() and queued in icve_set_rx_mode().
Signed-off-by: Yojana Mallik <y-mallik@...com>
---
drivers/net/ethernet/ti/icve_rpmsg_common.h | 4 ++
drivers/net/ethernet/ti/inter_core_virt_eth.c | 63 ++++++++++++++++++-
drivers/net/ethernet/ti/inter_core_virt_eth.h | 4 ++
3 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/ti/icve_rpmsg_common.h b/drivers/net/ethernet/ti/icve_rpmsg_common.h
index 2e3833de14bd..793baa93e135 100644
--- a/drivers/net/ethernet/ti/icve_rpmsg_common.h
+++ b/drivers/net/ethernet/ti/icve_rpmsg_common.h
@@ -19,10 +19,14 @@ enum icve_rpmsg_type {
/* Request types */
ICVE_REQ_SHM_INFO = 0,
ICVE_REQ_SET_MAC_ADDR,
+ ICVE_REQ_ADD_MC_ADDR,
+ ICVE_REQ_DEL_MC_ADDR,
/* Response types */
ICVE_RESP_SHM_INFO,
ICVE_RESP_SET_MAC_ADDR,
+ ICVE_RESP_ADD_MC_ADDR,
+ ICVE_RESP_DEL_MC_ADDR,
/* Notification types */
ICVE_NOTIFY_PORT_UP,
diff --git a/drivers/net/ethernet/ti/inter_core_virt_eth.c b/drivers/net/ethernet/ti/inter_core_virt_eth.c
index d96547d317fe..908425af0014 100644
--- a/drivers/net/ethernet/ti/inter_core_virt_eth.c
+++ b/drivers/net/ethernet/ti/inter_core_virt_eth.c
@@ -46,6 +46,11 @@ static int create_request(struct icve_common *common,
ether_addr_copy(msg->req_msg.mac_addr.addr,
common->port->ndev->dev_addr);
break;
+ case ICVE_REQ_ADD_MC_ADDR:
+ case ICVE_REQ_DEL_MC_ADDR:
+ ether_addr_copy(msg->req_msg.mac_addr.addr,
+ common->mcast_addr);
+ break;
case ICVE_NOTIFY_PORT_UP:
case ICVE_NOTIFY_PORT_DOWN:
msg->msg_hdr.msg_type = ICVE_NOTIFY_MSG;
@@ -87,6 +92,26 @@ static int icve_create_send_request(struct icve_common *common,
return ret;
}
+static int icve_add_mc_addr(struct net_device *ndev, const u8 *addr)
+{
+ struct icve_common *common = icve_ndev_to_common(ndev);
+ int ret = 0;
+
+ ether_addr_copy(common->mcast_addr, addr);
+ icve_create_send_request(common, ICVE_REQ_ADD_MC_ADDR, true);
+ return ret;
+}
+
+static int icve_del_mc_addr(struct net_device *ndev, const u8 *addr)
+{
+ struct icve_common *common = icve_ndev_to_common(ndev);
+ int ret = 0;
+
+ ether_addr_copy(common->mcast_addr, addr);
+ icve_create_send_request(common, ICVE_REQ_DEL_MC_ADDR, true);
+ return ret;
+}
+
static void icve_state_machine(struct work_struct *work)
{
struct delayed_work *dwork = to_delayed_work(work);
@@ -211,6 +236,10 @@ static int icve_rpmsg_cb(struct rpmsg_device *rpdev, void *data, int len,
break;
case ICVE_RESP_SET_MAC_ADDR:
break;
+ case ICVE_RESP_ADD_MC_ADDR:
+ case ICVE_RESP_DEL_MC_ADDR:
+ complete(&common->sync_msg);
+ break;
}
break;
@@ -395,10 +424,35 @@ static int icve_set_mac_address(struct net_device *ndev, void *addr)
return ret;
}
+static void icve_ndo_set_rx_mode_work(struct work_struct *work)
+{
+ struct icve_common *common;
+ struct net_device *ndev;
+
+ common = container_of(work, struct icve_common, rx_mode_work);
+ ndev = common->port->ndev;
+
+ /* make a mc list copy */
+ netif_addr_lock_bh(ndev);
+ __hw_addr_sync(&common->mc_list, &ndev->mc, ndev->addr_len);
+ netif_addr_unlock_bh(ndev);
+
+ __hw_addr_sync_dev(&common->mc_list, ndev, icve_add_mc_addr,
+ icve_del_mc_addr);
+}
+
+static void icve_set_rx_mode(struct net_device *ndev)
+{
+ struct icve_common *common = icve_ndev_to_common(ndev);
+
+ queue_work(common->cmd_wq, &common->rx_mode_work);
+}
+
static const struct net_device_ops icve_netdev_ops = {
.ndo_open = icve_ndo_open,
.ndo_stop = icve_ndo_stop,
.ndo_start_xmit = icve_start_xmit,
+ .ndo_set_rx_mode = icve_set_rx_mode,
.ndo_set_mac_address = icve_set_mac_address,
};
@@ -491,7 +545,13 @@ static int icve_rpmsg_probe(struct rpmsg_device *rpdev)
mutex_init(&common->state_lock);
INIT_DELAYED_WORK(&common->state_work, icve_state_machine);
init_completion(&common->sync_msg);
-
+ __hw_addr_init(&common->mc_list);
+ INIT_WORK(&common->rx_mode_work, icve_ndo_set_rx_mode_work);
+ common->cmd_wq = create_singlethread_workqueue("icve_rx_work");
+ if (!common->cmd_wq) {
+ dev_err(dev, "Failure requesting workqueue\n");
+ return -ENOMEM;
+ }
/* Register the network device */
ret = icve_init_ndev(common);
if (ret)
@@ -506,6 +566,7 @@ static void icve_rpmsg_remove(struct rpmsg_device *rpdev)
netif_napi_del(&port->rx_napi);
del_timer_sync(&port->rx_timer);
+ destroy_workqueue(common->cmd_wq);
dev_info(&rpdev->dev, "icve rpmsg client driver is removed\n");
}
diff --git a/drivers/net/ethernet/ti/inter_core_virt_eth.h b/drivers/net/ethernet/ti/inter_core_virt_eth.h
index 4fc420cb9eab..02c4d23395f5 100644
--- a/drivers/net/ethernet/ti/inter_core_virt_eth.h
+++ b/drivers/net/ethernet/ti/inter_core_virt_eth.h
@@ -47,7 +47,11 @@ struct icve_common {
enum icve_state state;
struct mutex state_lock; /* Lock to be used while changing the interface state */
struct delayed_work state_work;
+ struct work_struct rx_mode_work;
+ struct workqueue_struct *cmd_wq;
+ struct netdev_hw_addr_list mc_list;
struct completion sync_msg;
+ u8 mcast_addr[ETH_ALEN];
};
struct icve_ndev_priv {
--
2.40.1
Powered by blists - more mailing lists