mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
ebd83ad818
Remove the incorrect check for mask in ixgbe_configure_clsu32 and drop the 'mask' field that is not required in struct ixgbe_mat_field Verified with the following filters: #tc qdisc add dev p4p1 ingress #tc filter add dev p4p1 parent ffff: protocol ip prio 99 \ handle 800:0:1 u32 ht 800: \ match ip dst 10.0.0.1/8 match ip src 10.0.0.2/8 action drop #tc filter add dev p4p1 parent ffff: protocol ip prio 99 \ handle 800:0:2 u32 ht 800: \ match ip dst 11.0.0.1/16 match ip src 11.0.0.2/16 action drop #tc filter add dev p4p1 parent ffff: protocol ip prio 99 \ handle 800:0:3 u32 ht 800: \ match ip dst 12.0.0.1/24 match ip src 12.0.0.2/24 action drop #tc filter add dev p4p1 parent ffff: protocol ip prio 99 \ handle 800:0:4 u32 ht 800: \ match ip dst 13.0.0.1/32 match ip src 13.0.0.2/32 action drop Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com> Acked-by: John Fastabend <john.r.fastabend@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
111 lines
3.2 KiB
C
111 lines
3.2 KiB
C
/*******************************************************************************
|
|
*
|
|
* Intel 10 Gigabit PCI Express Linux drive
|
|
* Copyright(c) 2016 Intel Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* The full GNU General Public License is included in this distribution in
|
|
* the file called "COPYING".
|
|
*
|
|
* Contact Information:
|
|
* e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
|
|
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
|
*
|
|
******************************************************************************/
|
|
|
|
#ifndef _IXGBE_MODEL_H_
|
|
#define _IXGBE_MODEL_H_
|
|
|
|
#include "ixgbe.h"
|
|
#include "ixgbe_type.h"
|
|
|
|
struct ixgbe_mat_field {
|
|
unsigned int off;
|
|
int (*val)(struct ixgbe_fdir_filter *input,
|
|
union ixgbe_atr_input *mask,
|
|
u32 val, u32 m);
|
|
unsigned int type;
|
|
};
|
|
|
|
static inline int ixgbe_mat_prgm_sip(struct ixgbe_fdir_filter *input,
|
|
union ixgbe_atr_input *mask,
|
|
u32 val, u32 m)
|
|
{
|
|
input->filter.formatted.src_ip[0] = val;
|
|
mask->formatted.src_ip[0] = m;
|
|
return 0;
|
|
}
|
|
|
|
static inline int ixgbe_mat_prgm_dip(struct ixgbe_fdir_filter *input,
|
|
union ixgbe_atr_input *mask,
|
|
u32 val, u32 m)
|
|
{
|
|
input->filter.formatted.dst_ip[0] = val;
|
|
mask->formatted.dst_ip[0] = m;
|
|
return 0;
|
|
}
|
|
|
|
static struct ixgbe_mat_field ixgbe_ipv4_fields[] = {
|
|
{ .off = 12, .val = ixgbe_mat_prgm_sip,
|
|
.type = IXGBE_ATR_FLOW_TYPE_IPV4},
|
|
{ .off = 16, .val = ixgbe_mat_prgm_dip,
|
|
.type = IXGBE_ATR_FLOW_TYPE_IPV4},
|
|
{ .val = NULL } /* terminal node */
|
|
};
|
|
|
|
static inline int ixgbe_mat_prgm_sport(struct ixgbe_fdir_filter *input,
|
|
union ixgbe_atr_input *mask,
|
|
u32 val, u32 m)
|
|
{
|
|
input->filter.formatted.src_port = val & 0xffff;
|
|
mask->formatted.src_port = m & 0xffff;
|
|
return 0;
|
|
};
|
|
|
|
static inline int ixgbe_mat_prgm_dport(struct ixgbe_fdir_filter *input,
|
|
union ixgbe_atr_input *mask,
|
|
u32 val, u32 m)
|
|
{
|
|
input->filter.formatted.dst_port = val & 0xffff;
|
|
mask->formatted.dst_port = m & 0xffff;
|
|
return 0;
|
|
};
|
|
|
|
static struct ixgbe_mat_field ixgbe_tcp_fields[] = {
|
|
{.off = 0, .val = ixgbe_mat_prgm_sport,
|
|
.type = IXGBE_ATR_FLOW_TYPE_TCPV4},
|
|
{.off = 2, .val = ixgbe_mat_prgm_dport,
|
|
.type = IXGBE_ATR_FLOW_TYPE_TCPV4},
|
|
{ .val = NULL } /* terminal node */
|
|
};
|
|
|
|
struct ixgbe_nexthdr {
|
|
/* offset, shift, and mask of position to next header */
|
|
unsigned int o;
|
|
u32 s;
|
|
u32 m;
|
|
/* match criteria to make this jump*/
|
|
unsigned int off;
|
|
u32 val;
|
|
u32 mask;
|
|
/* location of jump to make */
|
|
struct ixgbe_mat_field *jump;
|
|
};
|
|
|
|
static struct ixgbe_nexthdr ixgbe_ipv4_jumps[] = {
|
|
{ .o = 0, .s = 6, .m = 0xf,
|
|
.off = 8, .val = 0x600, .mask = 0xff00, .jump = ixgbe_tcp_fields},
|
|
{ .jump = NULL } /* terminal node */
|
|
};
|
|
#endif /* _IXGBE_MODEL_H_ */
|