Skip to content

Commit 1eb846a

Browse files
Alexander DuyckJeff Kirsher
authored andcommitted
i40e: Strip out debugfs hook for Flow Director filter programming
This interface was only ever meant for debug only. Since it is not supposed to be here we are removing it. Change-ID: Id771a1e5e7d3e2b4b7f56591b61fb48c921e1d04 Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
1 parent 5e02f28 commit 1eb846a

File tree

3 files changed

+3
-84
lines changed

3 files changed

+3
-84
lines changed

drivers/net/ethernet/intel/i40e/i40e.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -710,8 +710,6 @@ struct rtnl_link_stats64 *i40e_get_vsi_stats_struct(struct i40e_vsi *vsi);
710710
int i40e_fetch_switch_configuration(struct i40e_pf *pf,
711711
bool printconfig);
712712

713-
int i40e_program_fdir_filter(struct i40e_fdir_filter *fdir_data, u8 *raw_packet,
714-
struct i40e_pf *pf, bool add);
715713
int i40e_add_del_fdir(struct i40e_vsi *vsi,
716714
struct i40e_fdir_filter *input, bool add);
717715
void i40e_fdir_check_and_reenable(struct i40e_pf *pf);

drivers/net/ethernet/intel/i40e/i40e_debugfs.c

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,84 +1430,6 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
14301430
buff = NULL;
14311431
kfree(desc);
14321432
desc = NULL;
1433-
} else if ((strncmp(cmd_buf, "add fd_filter", 13) == 0) ||
1434-
(strncmp(cmd_buf, "rem fd_filter", 13) == 0)) {
1435-
struct i40e_fdir_filter fd_data;
1436-
u16 packet_len, i, j = 0;
1437-
char *asc_packet;
1438-
u8 *raw_packet;
1439-
bool add = false;
1440-
int ret;
1441-
1442-
if (!(pf->flags & I40E_FLAG_FD_SB_ENABLED))
1443-
goto command_write_done;
1444-
1445-
if (strncmp(cmd_buf, "add", 3) == 0)
1446-
add = true;
1447-
1448-
if (add && (pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED))
1449-
goto command_write_done;
1450-
1451-
asc_packet = kzalloc(I40E_FDIR_MAX_RAW_PACKET_SIZE,
1452-
GFP_KERNEL);
1453-
if (!asc_packet)
1454-
goto command_write_done;
1455-
1456-
raw_packet = kzalloc(I40E_FDIR_MAX_RAW_PACKET_SIZE,
1457-
GFP_KERNEL);
1458-
1459-
if (!raw_packet) {
1460-
kfree(asc_packet);
1461-
asc_packet = NULL;
1462-
goto command_write_done;
1463-
}
1464-
1465-
cnt = sscanf(&cmd_buf[13],
1466-
"%hx %2hhx %2hhx %hx %2hhx %2hhx %hx %x %hd %511s",
1467-
&fd_data.q_index,
1468-
&fd_data.flex_off, &fd_data.pctype,
1469-
&fd_data.dest_vsi, &fd_data.dest_ctl,
1470-
&fd_data.fd_status, &fd_data.cnt_index,
1471-
&fd_data.fd_id, &packet_len, asc_packet);
1472-
if (cnt != 10) {
1473-
dev_info(&pf->pdev->dev,
1474-
"program fd_filter: bad command string, cnt=%d\n",
1475-
cnt);
1476-
kfree(asc_packet);
1477-
asc_packet = NULL;
1478-
kfree(raw_packet);
1479-
goto command_write_done;
1480-
}
1481-
1482-
/* fix packet length if user entered 0 */
1483-
if (packet_len == 0)
1484-
packet_len = I40E_FDIR_MAX_RAW_PACKET_SIZE;
1485-
1486-
/* make sure to check the max as well */
1487-
packet_len = min_t(u16,
1488-
packet_len, I40E_FDIR_MAX_RAW_PACKET_SIZE);
1489-
1490-
for (i = 0; i < packet_len; i++) {
1491-
cnt = sscanf(&asc_packet[j], "%2hhx ", &raw_packet[i]);
1492-
if (!cnt)
1493-
break;
1494-
j += 3;
1495-
}
1496-
dev_info(&pf->pdev->dev, "FD raw packet dump\n");
1497-
print_hex_dump(KERN_INFO, "FD raw packet: ",
1498-
DUMP_PREFIX_OFFSET, 16, 1,
1499-
raw_packet, packet_len, true);
1500-
ret = i40e_program_fdir_filter(&fd_data, raw_packet, pf, add);
1501-
if (!ret) {
1502-
dev_info(&pf->pdev->dev, "Filter command send Status : Success\n");
1503-
} else {
1504-
dev_info(&pf->pdev->dev,
1505-
"Filter command send failed %d\n", ret);
1506-
}
1507-
kfree(raw_packet);
1508-
raw_packet = NULL;
1509-
kfree(asc_packet);
1510-
asc_packet = NULL;
15111433
} else if (strncmp(cmd_buf, "fd current cnt", 14) == 0) {
15121434
dev_info(&pf->pdev->dev, "FD current total filter count for this interface: %d\n",
15131435
i40e_get_current_fd_count(pf));
@@ -1732,8 +1654,6 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
17321654
dev_info(&pf->pdev->dev, " globr\n");
17331655
dev_info(&pf->pdev->dev, " send aq_cmd <flags> <opcode> <datalen> <retval> <cookie_h> <cookie_l> <param0> <param1> <param2> <param3>\n");
17341656
dev_info(&pf->pdev->dev, " send indirect aq_cmd <flags> <opcode> <datalen> <retval> <cookie_h> <cookie_l> <param0> <param1> <param2> <param3> <buffer_len>\n");
1735-
dev_info(&pf->pdev->dev, " add fd_filter <dest q_index> <flex_off> <pctype> <dest_vsi> <dest_ctl> <fd_status> <cnt_index> <fd_id> <packet_len> <packet>\n");
1736-
dev_info(&pf->pdev->dev, " rem fd_filter <dest q_index> <flex_off> <pctype> <dest_vsi> <dest_ctl> <fd_status> <cnt_index> <fd_id> <packet_len> <packet>\n");
17371657
dev_info(&pf->pdev->dev, " fd current cnt");
17381658
dev_info(&pf->pdev->dev, " lldp start\n");
17391659
dev_info(&pf->pdev->dev, " lldp stop\n");

drivers/net/ethernet/intel/i40e/i40e_txrx.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,9 @@ static void i40e_fdir(struct i40e_ring *tx_ring,
111111
* @pf: The PF pointer
112112
* @add: True for add/update, False for remove
113113
**/
114-
int i40e_program_fdir_filter(struct i40e_fdir_filter *fdir_data, u8 *raw_packet,
115-
struct i40e_pf *pf, bool add)
114+
static int i40e_program_fdir_filter(struct i40e_fdir_filter *fdir_data,
115+
u8 *raw_packet, struct i40e_pf *pf,
116+
bool add)
116117
{
117118
struct i40e_tx_buffer *tx_buf, *first;
118119
struct i40e_tx_desc *tx_desc;

0 commit comments

Comments
 (0)