Code changes to handle dev private ioctl
Subsystems (2)
PATCH 1/1 Code changes to handle dev private ioctl
Hi,
Please accept this patch into net-next tree to handle dev private ioctls. Thanks,
Sarvesh
--- drivers/net/benet/be_cmds.c | 20 ++++++++++++++++++ drivers/net/benet/be_cmds.h | 2 ++ drivers/net/benet/be_main.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 0 deletions(-)
drivers/net/benet/be_cmds.c +20 -0
@@ -859,3 +859,23 @@ int be_cmd_query_fw_cfg(struct be_ctrl_ispin_unlock (&ctrl->cmd_lock);return status; } + +int be_cmd_pass_ext_ioctl (struct be_ctrl_info *ctrl,dma_addr_t dma, +int req_size) +{ +struct be_mcc_wrb *wrb =wrb_from_mbox (&ctrl->mbox_mem); +struct be_sge *sge =nonembedded_sgl (wrb); +int status; + +spin_lock (&ctrl->cmd_lock); +memset (wrb,0 ,sizeof (*wrb)); +be_wrb_hdr_prepare (wrb, req_size, false,1 ); + sge->pa_hi =cpu_to_le32 (upper_32_bits (dma)); + sge->pa_lo =cpu_to_le32 (dma &0xFFFFFFFF ); + sge->len =cpu_to_le32 (req_size); + + status =be_mbox_db_ring (ctrl); + +spin_unlock (&ctrl->cmd_lock); +return status; +}
drivers/net/benet/be_cmds.h +2 -0
@@ -686,3 +686,5 @@ extern int be_cmd_set_flow_control(strucextern int be_cmd_get_flow_control (struct be_ctrl_info *ctrl,u32 *tx_fc,u32 *rx_fc);extern int be_cmd_query_fw_cfg (struct be_ctrl_info *ctrl,u32 *port_num); +extern int be_cmd_pass_ext_ioctl (struct be_ctrl_info *ctrl,dma_addr_t dma, +int req_size);
drivers/net/benet/be_main.c +48 -0
60 lines not on this page · raw message
Signature · 1 line
1.4.0
On Fri, 2009-05-22 at 19:03 +0530, Sarveshwar Bandi wrote:
[...]
Quoted 12 lines
drivers/net/benet/be_main.c +4
-0@@ -562,6 +562,53 @@ static void be_vlan_rem_vid(struct net_dbe_vid_config (netdev); } +static int be_do_ioctl (struct net_device *netdev, +struct ifreq *ifr,int cmd) +{ +struct be_adapter *adapter =netdev_priv (netdev);
drivers/net/benet/be_main.c static void be_vlan_rem_vid(struct net_d · line 578
Quoted 10 lines
drivers/net/benet/be_main.c +10
-0+struct be_cmd_req_hdr req; +struct be_cmd_resp_hdr *resp; +void *data = ifr->ifr_data; +void *va; +dma_addr_t dma; +u32 req_size, resp_size; +int status; + +switch (cmd) { +case SIOCDEVPRIVATE :
This probably needs a capability check, depending on what it's actually doing. Most configuration ioctl implementation use:
if (!capable(CAP_NET_ADMIN)) return -EPERM;
drivers/net/benet/be_main.c static void be_vlan_rem_vid(struct net_d · line 585
Quoted 7 lines
drivers/net/benet/be_main.c +7
-0+if (copy_from_user (&req, (struct be_cmd_req_hdr *)data, +sizeof (struct be_cmd_req_hdr ))) +return -EFAULT ; + + req_size = req.request_length +sizeof (struct be_cmd_req_hdr ); + + va =pci_alloc_consistent (adapter->pdev, req_size, &dma);
Needs an error check.
Quoted 7 lines
drivers/net/benet/be_main.c +7
-0+if (copy_from_user (va, (void *)data, req_size)) { +pci_free_consistent (adapter->pdev, req_size, va, dma); +return -EFAULT ; + } + + status =be_cmd_pass_ext_ioctl (&adapter->ctrl, dma, req_size); +if (!status) {
drivers/net/benet/be_main.c static void be_vlan_rem_vid(struct net_d · line 602
Quoted 10 lines
drivers/net/benet/be_main.c +10
-0+ resp = (struct be_cmd_resp_hdr *) va; + resp_size = resp->response_length +sizeof (*resp); +if (copy_to_user ((void *)data, va, resp_size)) { +pci_free_consistent (adapter->pdev, + req_size, va, dma); +return -EFAULT ; + } + }else { +pci_free_consistent (adapter->pdev, req_size, va, dma); +return -EFAULT ;
Why repeat this cleanup and return so many times? Kernel style is to put cleanup code at the end of the function and use "goto" to get there in case of error.
drivers/net/benet/be_main.c static void be_vlan_rem_vid(struct net_d · line 607
Quoted 5 lines
drivers/net/benet/be_main.c +5
-0+ } +pci_free_consistent (adapter->pdev, req_size, va, dma); +break ; +default : +return -EFAULT ;
[...]
Should be -EOPNOTSUPP.
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.