From: Larysa Zaremba <larysa.zaremba@intel.com>
To: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Cc: <bpf@vger.kernel.org>, <ast@kernel.org>, <daniel@iogearbox.net>,
<andrii@kernel.org>, <martin.lau@linux.dev>, <song@kernel.org>,
<yhs@fb.com>, <john.fastabend@gmail.com>, <kpsingh@kernel.org>,
<sdf@google.com>, <haoluo@google.com>, <jolsa@kernel.org>,
David Ahern <dsahern@gmail.com>, Jakub Kicinski <kuba@kernel.org>,
Willem de Bruijn <willemb@google.com>,
Jesper Dangaard Brouer <brouer@redhat.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Alexander Lobakin <alexandr.lobakin@intel.com>,
Magnus Karlsson <magnus.karlsson@gmail.com>,
Maryam Tahhan <mtahhan@redhat.com>, <xdp-hints@xdp-project.net>,
<netdev@vger.kernel.org>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Simon Horman <simon.horman@corigine.com>,
Tariq Toukan <tariqt@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Subject: Re: [xdp-hints] [RFC bpf-next 07/23] ice: Support RX hash XDP hint
Date: Tue, 5 Sep 2023 19:09:54 +0200 [thread overview]
Message-ID: <ZPdg4hYQ71B+dvmT@lincoln> (raw)
In-Reply-To: <ZPdMTG6INvxUV0Jh@boxer>
On Tue, Sep 05, 2023 at 05:42:04PM +0200, Maciej Fijalkowski wrote:
> On Thu, Aug 24, 2023 at 09:26:46PM +0200, Larysa Zaremba wrote:
> > RX hash XDP hint requests both hash value and type.
> > Type is XDP-specific, so we need a separate way to map
> > these values to the hardware ptypes, so create a lookup table.
> >
> > Instead of creating a new long list, reuse contents
> > of ice_decode_rx_desc_ptype[] through preprocessor.
> >
> > Current hash type enum does not contain ICMP packet type,
> > but ice devices support it, so also add a new type into core code.
> >
> > Then use previously refactored code and create a function
> > that allows XDP code to read RX hash.
> >
> > Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
> > ---
> > .../net/ethernet/intel/ice/ice_lan_tx_rx.h | 412 +++++++++---------
> > drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 73 ++++
> > include/net/xdp.h | 3 +
> > 3 files changed, 284 insertions(+), 204 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
> > index 89f986a75cc8..d384ddfcb83e 100644
> > --- a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
> > +++ b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
> > @@ -673,6 +673,212 @@ struct ice_tlan_ctx {
> > * Use the enum ice_rx_l2_ptype to decode the packet type
> > * ENDIF
> > */
> > +#define ICE_PTYPES \
>
> ERROR: Macros with complex values should be enclosed in parentheses
> #34: FILE: drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h:676:
> +#define ICE_PTYPES \
>
If I remember correctly, I have tried to fix this by adding parentheses, but
this would break the array definition.
Also XDP_METADATA_KFUNC_xxx is defined the same way.
> (...)
>
> > + /* L2 Packet types */ \
> > + ICE_PTT_UNUSED_ENTRY(0), \
> > + ICE_PTT(1, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2), \
> > + ICE_PTT_UNUSED_ENTRY(2), \
> > + ICE_PTT_UNUSED_ENTRY(3), \
> > + ICE_PTT_UNUSED_ENTRY(4), \
> > + ICE_PTT_UNUSED_ENTRY(5), \
> > + ICE_PTT(6, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE), \
> > + ICE_PTT(7, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE), \
> > + ICE_PTT_UNUSED_ENTRY(8), \
> > + ICE_PTT_UNUSED_ENTRY(9), \
> > + ICE_PTT(10, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE), \
> > + ICE_PTT(11, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE), \
> > + ICE_PTT_UNUSED_ENTRY(12), \
> > + ICE_PTT_UNUSED_ENTRY(13), \
> > + ICE_PTT_UNUSED_ENTRY(14), \
> > + ICE_PTT_UNUSED_ENTRY(15), \
> > + ICE_PTT_UNUSED_ENTRY(16), \
> > + ICE_PTT_UNUSED_ENTRY(17), \
> > + ICE_PTT_UNUSED_ENTRY(18), \
> > + ICE_PTT_UNUSED_ENTRY(19), \
> > + ICE_PTT_UNUSED_ENTRY(20), \
> > + ICE_PTT_UNUSED_ENTRY(21), \
> > + \
> > + /* Non Tunneled IPv4 */ \
> > + ICE_PTT(22, IP, IPV4, FRG, NONE, NONE, NOF, NONE, PAY3), \
> > + ICE_PTT(23, IP, IPV4, NOF, NONE, NONE, NOF, NONE, PAY3), \
> > + ICE_PTT(24, IP, IPV4, NOF, NONE, NONE, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(25), \
> > + ICE_PTT(26, IP, IPV4, NOF, NONE, NONE, NOF, TCP, PAY4), \
> > + ICE_PTT(27, IP, IPV4, NOF, NONE, NONE, NOF, SCTP, PAY4), \
> > + ICE_PTT(28, IP, IPV4, NOF, NONE, NONE, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv4 --> IPv4 */ \
> > + ICE_PTT(29, IP, IPV4, NOF, IP_IP, IPV4, FRG, NONE, PAY3), \
> > + ICE_PTT(30, IP, IPV4, NOF, IP_IP, IPV4, NOF, NONE, PAY3), \
> > + ICE_PTT(31, IP, IPV4, NOF, IP_IP, IPV4, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(32), \
> > + ICE_PTT(33, IP, IPV4, NOF, IP_IP, IPV4, NOF, TCP, PAY4), \
> > + ICE_PTT(34, IP, IPV4, NOF, IP_IP, IPV4, NOF, SCTP, PAY4), \
> > + ICE_PTT(35, IP, IPV4, NOF, IP_IP, IPV4, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv4 --> IPv6 */ \
> > + ICE_PTT(36, IP, IPV4, NOF, IP_IP, IPV6, FRG, NONE, PAY3), \
> > + ICE_PTT(37, IP, IPV4, NOF, IP_IP, IPV6, NOF, NONE, PAY3), \
> > + ICE_PTT(38, IP, IPV4, NOF, IP_IP, IPV6, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(39), \
> > + ICE_PTT(40, IP, IPV4, NOF, IP_IP, IPV6, NOF, TCP, PAY4), \
> > + ICE_PTT(41, IP, IPV4, NOF, IP_IP, IPV6, NOF, SCTP, PAY4), \
> > + ICE_PTT(42, IP, IPV4, NOF, IP_IP, IPV6, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv4 --> GRE/NAT */ \
> > + ICE_PTT(43, IP, IPV4, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3), \
> > + \
> > + /* IPv4 --> GRE/NAT --> IPv4 */ \
> > + ICE_PTT(44, IP, IPV4, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3), \
> > + ICE_PTT(45, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3), \
> > + ICE_PTT(46, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(47), \
> > + ICE_PTT(48, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, TCP, PAY4), \
> > + ICE_PTT(49, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4), \
> > + ICE_PTT(50, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv4 --> GRE/NAT --> IPv6 */ \
> > + ICE_PTT(51, IP, IPV4, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3), \
> > + ICE_PTT(52, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3), \
> > + ICE_PTT(53, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(54), \
> > + ICE_PTT(55, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, TCP, PAY4), \
> > + ICE_PTT(56, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4), \
> > + ICE_PTT(57, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv4 --> GRE/NAT --> MAC */ \
> > + ICE_PTT(58, IP, IPV4, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3), \
> > + \
> > + /* IPv4 --> GRE/NAT --> MAC --> IPv4 */ \
> > + ICE_PTT(59, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3), \
> > + ICE_PTT(60, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3), \
> > + ICE_PTT(61, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(62), \
> > + ICE_PTT(63, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP, PAY4), \
> > + ICE_PTT(64, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4), \
> > + ICE_PTT(65, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv4 --> GRE/NAT -> MAC --> IPv6 */ \
> > + ICE_PTT(66, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3), \
> > + ICE_PTT(67, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3), \
> > + ICE_PTT(68, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(69), \
> > + ICE_PTT(70, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP, PAY4), \
> > + ICE_PTT(71, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4), \
> > + ICE_PTT(72, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv4 --> GRE/NAT --> MAC/VLAN */ \
> > + ICE_PTT(73, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3), \
> > + \
> > + /* IPv4 ---> GRE/NAT -> MAC/VLAN --> IPv4 */ \
> > + ICE_PTT(74, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3), \
> > + ICE_PTT(75, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3), \
> > + ICE_PTT(76, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(77), \
> > + ICE_PTT(78, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP, PAY4), \
> > + ICE_PTT(79, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4), \
> > + ICE_PTT(80, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv4 -> GRE/NAT -> MAC/VLAN --> IPv6 */ \
> > + ICE_PTT(81, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3), \
> > + ICE_PTT(82, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3), \
> > + ICE_PTT(83, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(84), \
> > + ICE_PTT(85, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP, PAY4), \
> > + ICE_PTT(86, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4), \
> > + ICE_PTT(87, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4), \
> > + \
> > + /* Non Tunneled IPv6 */ \
> > + ICE_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3), \
> > + ICE_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3), \
> > + ICE_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(91), \
> > + ICE_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP, PAY4), \
> > + ICE_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4), \
> > + ICE_PTT(94, IP, IPV6, NOF, NONE, NONE, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv6 --> IPv4 */ \
> > + ICE_PTT(95, IP, IPV6, NOF, IP_IP, IPV4, FRG, NONE, PAY3), \
> > + ICE_PTT(96, IP, IPV6, NOF, IP_IP, IPV4, NOF, NONE, PAY3), \
> > + ICE_PTT(97, IP, IPV6, NOF, IP_IP, IPV4, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(98), \
> > + ICE_PTT(99, IP, IPV6, NOF, IP_IP, IPV4, NOF, TCP, PAY4), \
> > + ICE_PTT(100, IP, IPV6, NOF, IP_IP, IPV4, NOF, SCTP, PAY4), \
> > + ICE_PTT(101, IP, IPV6, NOF, IP_IP, IPV4, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv6 --> IPv6 */ \
> > + ICE_PTT(102, IP, IPV6, NOF, IP_IP, IPV6, FRG, NONE, PAY3), \
> > + ICE_PTT(103, IP, IPV6, NOF, IP_IP, IPV6, NOF, NONE, PAY3), \
> > + ICE_PTT(104, IP, IPV6, NOF, IP_IP, IPV6, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(105), \
> > + ICE_PTT(106, IP, IPV6, NOF, IP_IP, IPV6, NOF, TCP, PAY4), \
> > + ICE_PTT(107, IP, IPV6, NOF, IP_IP, IPV6, NOF, SCTP, PAY4), \
> > + ICE_PTT(108, IP, IPV6, NOF, IP_IP, IPV6, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv6 --> GRE/NAT */ \
> > + ICE_PTT(109, IP, IPV6, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3), \
> > + \
> > + /* IPv6 --> GRE/NAT -> IPv4 */ \
> > + ICE_PTT(110, IP, IPV6, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3), \
> > + ICE_PTT(111, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3), \
> > + ICE_PTT(112, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(113), \
> > + ICE_PTT(114, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, TCP, PAY4), \
> > + ICE_PTT(115, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4), \
> > + ICE_PTT(116, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv6 --> GRE/NAT -> IPv6 */ \
> > + ICE_PTT(117, IP, IPV6, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3), \
> > + ICE_PTT(118, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3), \
> > + ICE_PTT(119, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(120), \
> > + ICE_PTT(121, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, TCP, PAY4), \
> > + ICE_PTT(122, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4), \
> > + ICE_PTT(123, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv6 --> GRE/NAT -> MAC */ \
> > + ICE_PTT(124, IP, IPV6, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3), \
> > + \
> > + /* IPv6 --> GRE/NAT -> MAC -> IPv4 */ \
> > + ICE_PTT(125, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3), \
> > + ICE_PTT(126, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3), \
> > + ICE_PTT(127, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(128), \
> > + ICE_PTT(129, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP, PAY4), \
> > + ICE_PTT(130, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4), \
> > + ICE_PTT(131, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv6 --> GRE/NAT -> MAC -> IPv6 */ \
> > + ICE_PTT(132, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3), \
> > + ICE_PTT(133, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3), \
> > + ICE_PTT(134, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(135), \
> > + ICE_PTT(136, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP, PAY4), \
> > + ICE_PTT(137, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4), \
> > + ICE_PTT(138, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv6 --> GRE/NAT -> MAC/VLAN */ \
> > + ICE_PTT(139, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3), \
> > + \
> > + /* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv4 */ \
> > + ICE_PTT(140, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3), \
> > + ICE_PTT(141, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3), \
> > + ICE_PTT(142, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(143), \
> > + ICE_PTT(144, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP, PAY4), \
> > + ICE_PTT(145, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4), \
> > + ICE_PTT(146, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4), \
> > + \
> > + /* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv6 */ \
> > + ICE_PTT(147, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3), \
> > + ICE_PTT(148, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3), \
> > + ICE_PTT(149, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP, PAY4), \
> > + ICE_PTT_UNUSED_ENTRY(150), \
> > + ICE_PTT(151, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP, PAY4), \
> > + ICE_PTT(152, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4), \
> > + ICE_PTT(153, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),
> > +
> > +#define ICE_NUM_DEFINED_PTYPES 154
> >
> > /* macro to make the table lines short, use explicit indexing with [PTYPE] */
> > #define ICE_PTT(PTYPE, OUTER_IP, OUTER_IP_VER, OUTER_FRAG, T, TE, TEF, I, PL)\
> > @@ -695,212 +901,10 @@ struct ice_tlan_ctx {
> >
> > /* Lookup table mapping in the 10-bit HW PTYPE to the bit field for decoding */
> > static const struct ice_rx_ptype_decoded ice_ptype_lkup[BIT(10)] = {
> > - /* L2 Packet types */
> > - ICE_PTT_UNUSED_ENTRY(0),
> > - ICE_PTT(1, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
> > - ICE_PTT_UNUSED_ENTRY(2),
> > - ICE_PTT_UNUSED_ENTRY(3),
> > - ICE_PTT_UNUSED_ENTRY(4),
> > - ICE_PTT_UNUSED_ENTRY(5),
> > - ICE_PTT(6, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),
> > - ICE_PTT(7, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),
> > - ICE_PTT_UNUSED_ENTRY(8),
> > - ICE_PTT_UNUSED_ENTRY(9),
> > - ICE_PTT(10, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),
> > - ICE_PTT(11, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),
> > - ICE_PTT_UNUSED_ENTRY(12),
> > - ICE_PTT_UNUSED_ENTRY(13),
> > - ICE_PTT_UNUSED_ENTRY(14),
> > - ICE_PTT_UNUSED_ENTRY(15),
> > - ICE_PTT_UNUSED_ENTRY(16),
> > - ICE_PTT_UNUSED_ENTRY(17),
> > - ICE_PTT_UNUSED_ENTRY(18),
> > - ICE_PTT_UNUSED_ENTRY(19),
> > - ICE_PTT_UNUSED_ENTRY(20),
> > - ICE_PTT_UNUSED_ENTRY(21),
> > -
> > - /* Non Tunneled IPv4 */
> > - ICE_PTT(22, IP, IPV4, FRG, NONE, NONE, NOF, NONE, PAY3),
> > - ICE_PTT(23, IP, IPV4, NOF, NONE, NONE, NOF, NONE, PAY3),
> > - ICE_PTT(24, IP, IPV4, NOF, NONE, NONE, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(25),
> > - ICE_PTT(26, IP, IPV4, NOF, NONE, NONE, NOF, TCP, PAY4),
> > - ICE_PTT(27, IP, IPV4, NOF, NONE, NONE, NOF, SCTP, PAY4),
> > - ICE_PTT(28, IP, IPV4, NOF, NONE, NONE, NOF, ICMP, PAY4),
> > -
> > - /* IPv4 --> IPv4 */
> > - ICE_PTT(29, IP, IPV4, NOF, IP_IP, IPV4, FRG, NONE, PAY3),
> > - ICE_PTT(30, IP, IPV4, NOF, IP_IP, IPV4, NOF, NONE, PAY3),
> > - ICE_PTT(31, IP, IPV4, NOF, IP_IP, IPV4, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(32),
> > - ICE_PTT(33, IP, IPV4, NOF, IP_IP, IPV4, NOF, TCP, PAY4),
> > - ICE_PTT(34, IP, IPV4, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),
> > - ICE_PTT(35, IP, IPV4, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),
> > -
> > - /* IPv4 --> IPv6 */
> > - ICE_PTT(36, IP, IPV4, NOF, IP_IP, IPV6, FRG, NONE, PAY3),
> > - ICE_PTT(37, IP, IPV4, NOF, IP_IP, IPV6, NOF, NONE, PAY3),
> > - ICE_PTT(38, IP, IPV4, NOF, IP_IP, IPV6, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(39),
> > - ICE_PTT(40, IP, IPV4, NOF, IP_IP, IPV6, NOF, TCP, PAY4),
> > - ICE_PTT(41, IP, IPV4, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),
> > - ICE_PTT(42, IP, IPV4, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),
> > -
> > - /* IPv4 --> GRE/NAT */
> > - ICE_PTT(43, IP, IPV4, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),
> > -
> > - /* IPv4 --> GRE/NAT --> IPv4 */
> > - ICE_PTT(44, IP, IPV4, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),
> > - ICE_PTT(45, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),
> > - ICE_PTT(46, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(47),
> > - ICE_PTT(48, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, TCP, PAY4),
> > - ICE_PTT(49, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),
> > - ICE_PTT(50, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),
> > -
> > - /* IPv4 --> GRE/NAT --> IPv6 */
> > - ICE_PTT(51, IP, IPV4, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),
> > - ICE_PTT(52, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),
> > - ICE_PTT(53, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(54),
> > - ICE_PTT(55, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, TCP, PAY4),
> > - ICE_PTT(56, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),
> > - ICE_PTT(57, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),
> > -
> > - /* IPv4 --> GRE/NAT --> MAC */
> > - ICE_PTT(58, IP, IPV4, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),
> > -
> > - /* IPv4 --> GRE/NAT --> MAC --> IPv4 */
> > - ICE_PTT(59, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),
> > - ICE_PTT(60, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),
> > - ICE_PTT(61, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(62),
> > - ICE_PTT(63, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP, PAY4),
> > - ICE_PTT(64, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),
> > - ICE_PTT(65, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),
> > -
> > - /* IPv4 --> GRE/NAT -> MAC --> IPv6 */
> > - ICE_PTT(66, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),
> > - ICE_PTT(67, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),
> > - ICE_PTT(68, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(69),
> > - ICE_PTT(70, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP, PAY4),
> > - ICE_PTT(71, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),
> > - ICE_PTT(72, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),
> > -
> > - /* IPv4 --> GRE/NAT --> MAC/VLAN */
> > - ICE_PTT(73, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),
> > -
> > - /* IPv4 ---> GRE/NAT -> MAC/VLAN --> IPv4 */
> > - ICE_PTT(74, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),
> > - ICE_PTT(75, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),
> > - ICE_PTT(76, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(77),
> > - ICE_PTT(78, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP, PAY4),
> > - ICE_PTT(79, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),
> > - ICE_PTT(80, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),
> > -
> > - /* IPv4 -> GRE/NAT -> MAC/VLAN --> IPv6 */
> > - ICE_PTT(81, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),
> > - ICE_PTT(82, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),
> > - ICE_PTT(83, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(84),
> > - ICE_PTT(85, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP, PAY4),
> > - ICE_PTT(86, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),
> > - ICE_PTT(87, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),
> > -
> > - /* Non Tunneled IPv6 */
> > - ICE_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3),
> > - ICE_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3),
> > - ICE_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(91),
> > - ICE_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP, PAY4),
> > - ICE_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4),
> > - ICE_PTT(94, IP, IPV6, NOF, NONE, NONE, NOF, ICMP, PAY4),
> > -
> > - /* IPv6 --> IPv4 */
> > - ICE_PTT(95, IP, IPV6, NOF, IP_IP, IPV4, FRG, NONE, PAY3),
> > - ICE_PTT(96, IP, IPV6, NOF, IP_IP, IPV4, NOF, NONE, PAY3),
> > - ICE_PTT(97, IP, IPV6, NOF, IP_IP, IPV4, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(98),
> > - ICE_PTT(99, IP, IPV6, NOF, IP_IP, IPV4, NOF, TCP, PAY4),
> > - ICE_PTT(100, IP, IPV6, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),
> > - ICE_PTT(101, IP, IPV6, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),
> > -
> > - /* IPv6 --> IPv6 */
> > - ICE_PTT(102, IP, IPV6, NOF, IP_IP, IPV6, FRG, NONE, PAY3),
> > - ICE_PTT(103, IP, IPV6, NOF, IP_IP, IPV6, NOF, NONE, PAY3),
> > - ICE_PTT(104, IP, IPV6, NOF, IP_IP, IPV6, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(105),
> > - ICE_PTT(106, IP, IPV6, NOF, IP_IP, IPV6, NOF, TCP, PAY4),
> > - ICE_PTT(107, IP, IPV6, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),
> > - ICE_PTT(108, IP, IPV6, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),
> > -
> > - /* IPv6 --> GRE/NAT */
> > - ICE_PTT(109, IP, IPV6, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),
> > -
> > - /* IPv6 --> GRE/NAT -> IPv4 */
> > - ICE_PTT(110, IP, IPV6, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),
> > - ICE_PTT(111, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),
> > - ICE_PTT(112, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(113),
> > - ICE_PTT(114, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, TCP, PAY4),
> > - ICE_PTT(115, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),
> > - ICE_PTT(116, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),
> > -
> > - /* IPv6 --> GRE/NAT -> IPv6 */
> > - ICE_PTT(117, IP, IPV6, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),
> > - ICE_PTT(118, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),
> > - ICE_PTT(119, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(120),
> > - ICE_PTT(121, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, TCP, PAY4),
> > - ICE_PTT(122, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),
> > - ICE_PTT(123, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),
> > -
> > - /* IPv6 --> GRE/NAT -> MAC */
> > - ICE_PTT(124, IP, IPV6, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),
> > -
> > - /* IPv6 --> GRE/NAT -> MAC -> IPv4 */
> > - ICE_PTT(125, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),
> > - ICE_PTT(126, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),
> > - ICE_PTT(127, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(128),
> > - ICE_PTT(129, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP, PAY4),
> > - ICE_PTT(130, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),
> > - ICE_PTT(131, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),
> > -
> > - /* IPv6 --> GRE/NAT -> MAC -> IPv6 */
> > - ICE_PTT(132, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),
> > - ICE_PTT(133, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),
> > - ICE_PTT(134, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(135),
> > - ICE_PTT(136, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP, PAY4),
> > - ICE_PTT(137, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),
> > - ICE_PTT(138, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),
> > -
> > - /* IPv6 --> GRE/NAT -> MAC/VLAN */
> > - ICE_PTT(139, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),
> > -
> > - /* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv4 */
> > - ICE_PTT(140, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),
> > - ICE_PTT(141, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),
> > - ICE_PTT(142, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(143),
> > - ICE_PTT(144, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP, PAY4),
> > - ICE_PTT(145, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),
> > - ICE_PTT(146, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),
> > -
> > - /* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv6 */
> > - ICE_PTT(147, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),
> > - ICE_PTT(148, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),
> > - ICE_PTT(149, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP, PAY4),
> > - ICE_PTT_UNUSED_ENTRY(150),
> > - ICE_PTT(151, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP, PAY4),
> > - ICE_PTT(152, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),
> > - ICE_PTT(153, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),
> > + ICE_PTYPES
> >
> > /* unused entries */
> > - [154 ... 1023] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
> > + [ICE_NUM_DEFINED_PTYPES ... 1023] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
> > };
> >
> > static inline struct ice_rx_ptype_decoded ice_decode_rx_desc_ptype(u16 ptype)
> > diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> > index 463d9e5cbe05..b11cfaedb81c 100644
> > --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> > +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> > @@ -567,6 +567,79 @@ static int ice_xdp_rx_hw_ts(const struct xdp_md *ctx, u64 *ts_ns)
> > return 0;
> > }
> >
> > +/* Define a ptype index -> XDP hash type lookup table.
> > + * It uses the same ptype definitions as ice_decode_rx_desc_ptype[],
> > + * avoiding possible copy-paste errors.
> > + */
> > +#undef ICE_PTT
> > +#undef ICE_PTT_UNUSED_ENTRY
> > +
> > +#define ICE_PTT(PTYPE, OUTER_IP, OUTER_IP_VER, OUTER_FRAG, T, TE, TEF, I, PL)\
> > + [PTYPE] = XDP_RSS_L3_##OUTER_IP_VER | XDP_RSS_L4_##I | XDP_RSS_TYPE_##PL
> > +
> > +#define ICE_PTT_UNUSED_ENTRY(PTYPE) [PTYPE] = 0
>
> ERROR: space prohibited before open square bracket '['
> #476: FILE: drivers/net/ethernet/intel/ice/ice_txrx_lib.c:580:
> +#define ICE_PTT_UNUSED_ENTRY(PTYPE) [PTYPE] = 0
>
> total: 2 errors, 0 warnings, 0 checks, 525 lines checked
Now, this one is a true false positive. Seems like checkpatch would stop
complainining, if I did:
#define ICE_PTT_UNUSED_ENTRY(PTYPE)\
[PTYPE] = 0
But is it worth it?
>
> > +
> > +/* A few supplementary definitions for when XDP hash types do not coincide
> > + * with what can be generated from ptype definitions
> > + * by means of preprocessor concatenation.
> > + */
> > +#define XDP_RSS_L3_NONE XDP_RSS_TYPE_NONE
> > +#define XDP_RSS_L4_NONE XDP_RSS_TYPE_NONE
> > +#define XDP_RSS_TYPE_PAY2 XDP_RSS_TYPE_L2
> > +#define XDP_RSS_TYPE_PAY3 XDP_RSS_TYPE_NONE
> > +#define XDP_RSS_TYPE_PAY4 XDP_RSS_L4
> > +
> > +static const enum xdp_rss_hash_type
> > +ice_ptype_to_xdp_hash[ICE_NUM_DEFINED_PTYPES] = {
> > + ICE_PTYPES
> > +};
> > +
> > +#undef XDP_RSS_L3_NONE
> > +#undef XDP_RSS_L4_NONE
> > +#undef XDP_RSS_TYPE_PAY2
> > +#undef XDP_RSS_TYPE_PAY3
> > +#undef XDP_RSS_TYPE_PAY4
> > +
> > +#undef ICE_PTT
> > +#undef ICE_PTT_UNUSED_ENTRY
> > +
> > +/**
> > + * ice_xdp_rx_hash_type - Get XDP-specific hash type from the RX descriptor
> > + * @eop_desc: End of Packet descriptor
> > + */
> > +static enum xdp_rss_hash_type
> > +ice_xdp_rx_hash_type(const union ice_32b_rx_flex_desc *eop_desc)
> > +{
> > + u16 ptype = ice_get_ptype(eop_desc);
> > +
> > + if (unlikely(ptype >= ICE_NUM_DEFINED_PTYPES))
> > + return 0;
> > +
> > + return ice_ptype_to_xdp_hash[ptype];
> > +}
> > +
> > +/**
> > + * ice_xdp_rx_hash - RX hash XDP hint handler
> > + * @ctx: XDP buff pointer
> > + * @hash: hash destination address
> > + * @rss_type: XDP hash type destination address
> > + *
> > + * Copy RX hash (if available) and its type to the destination address.
> > + */
> > +static int ice_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash,
> > + enum xdp_rss_hash_type *rss_type)
> > +{
> > + const struct ice_xdp_buff *xdp_ext = (void *)ctx;
> > +
> > + *hash = ice_get_rx_hash(xdp_ext->pkt_ctx.eop_desc);
> > + *rss_type = ice_xdp_rx_hash_type(xdp_ext->pkt_ctx.eop_desc);
> > + if (!likely(*hash))
> > + return -ENODATA;
> > +
> > + return 0;
> > +}
> > +
> > const struct xdp_metadata_ops ice_xdp_md_ops = {
> > .xmo_rx_timestamp = ice_xdp_rx_hw_ts,
> > + .xmo_rx_hash = ice_xdp_rx_hash,
> > };
> > diff --git a/include/net/xdp.h b/include/net/xdp.h
> > index de08c8e0d134..1e9870d5f025 100644
> > --- a/include/net/xdp.h
> > +++ b/include/net/xdp.h
> > @@ -416,6 +416,7 @@ enum xdp_rss_hash_type {
> > XDP_RSS_L4_UDP = BIT(5),
> > XDP_RSS_L4_SCTP = BIT(6),
> > XDP_RSS_L4_IPSEC = BIT(7), /* L4 based hash include IPSEC SPI */
> > + XDP_RSS_L4_ICMP = BIT(8),
> >
> > /* Second part: RSS hash type combinations used for driver HW mapping */
> > XDP_RSS_TYPE_NONE = 0,
> > @@ -431,11 +432,13 @@ enum xdp_rss_hash_type {
> > XDP_RSS_TYPE_L4_IPV4_UDP = XDP_RSS_L3_IPV4 | XDP_RSS_L4 | XDP_RSS_L4_UDP,
> > XDP_RSS_TYPE_L4_IPV4_SCTP = XDP_RSS_L3_IPV4 | XDP_RSS_L4 | XDP_RSS_L4_SCTP,
> > XDP_RSS_TYPE_L4_IPV4_IPSEC = XDP_RSS_L3_IPV4 | XDP_RSS_L4 | XDP_RSS_L4_IPSEC,
> > + XDP_RSS_TYPE_L4_IPV4_ICMP = XDP_RSS_L3_IPV4 | XDP_RSS_L4 | XDP_RSS_L4_ICMP,
> >
> > XDP_RSS_TYPE_L4_IPV6_TCP = XDP_RSS_L3_IPV6 | XDP_RSS_L4 | XDP_RSS_L4_TCP,
> > XDP_RSS_TYPE_L4_IPV6_UDP = XDP_RSS_L3_IPV6 | XDP_RSS_L4 | XDP_RSS_L4_UDP,
> > XDP_RSS_TYPE_L4_IPV6_SCTP = XDP_RSS_L3_IPV6 | XDP_RSS_L4 | XDP_RSS_L4_SCTP,
> > XDP_RSS_TYPE_L4_IPV6_IPSEC = XDP_RSS_L3_IPV6 | XDP_RSS_L4 | XDP_RSS_L4_IPSEC,
> > + XDP_RSS_TYPE_L4_IPV6_ICMP = XDP_RSS_L3_IPV6 | XDP_RSS_L4 | XDP_RSS_L4_ICMP,
> >
> > XDP_RSS_TYPE_L4_IPV6_TCP_EX = XDP_RSS_TYPE_L4_IPV6_TCP | XDP_RSS_L3_DYNHDR,
> > XDP_RSS_TYPE_L4_IPV6_UDP_EX = XDP_RSS_TYPE_L4_IPV6_UDP | XDP_RSS_L3_DYNHDR,
> > --
> > 2.41.0
> >
next prev parent reply other threads:[~2023-09-05 17:24 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 19:26 [RFC bpf-next 00/23] XDP metadata via kfuncs for ice + mlx5 Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 01/23] ice: make RX hash reading code more reusable Larysa Zaremba
2023-09-04 14:37 ` [xdp-hints] " Maciej Fijalkowski
2023-09-06 12:23 ` Alexander Lobakin
2023-09-14 16:12 ` Alexander Lobakin
2023-09-14 16:15 ` Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 02/23] ice: make RX HW timestamp " Larysa Zaremba
2023-09-04 14:56 ` Maciej Fijalkowski
2023-09-04 16:29 ` Larysa Zaremba
2023-09-05 15:22 ` Maciej Fijalkowski
2023-08-24 19:26 ` [RFC bpf-next 03/23] ice: make RX checksum checking " Larysa Zaremba
2023-09-04 15:02 ` [xdp-hints] " Maciej Fijalkowski
2023-09-04 18:01 ` Larysa Zaremba
2023-09-05 15:37 ` Maciej Fijalkowski
2023-09-05 16:53 ` Larysa Zaremba
2023-09-05 17:44 ` Maciej Fijalkowski
2023-09-06 9:28 ` Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 04/23] ice: Make ptype internal to descriptor info processing Larysa Zaremba
2023-09-04 15:04 ` Maciej Fijalkowski
2023-08-24 19:26 ` [RFC bpf-next 05/23] ice: Introduce ice_xdp_buff Larysa Zaremba
2023-09-04 15:32 ` [xdp-hints] " Maciej Fijalkowski
2023-09-04 18:11 ` Larysa Zaremba
2023-09-05 17:53 ` Maciej Fijalkowski
2023-09-07 14:21 ` Larysa Zaremba
2023-09-07 16:33 ` Stanislav Fomichev
2023-09-07 16:42 ` Maciej Fijalkowski
2023-09-07 16:43 ` Maciej Fijalkowski
2023-09-13 15:40 ` Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 06/23] ice: Support HW timestamp hint Larysa Zaremba
2023-09-04 15:38 ` Maciej Fijalkowski
2023-09-04 18:12 ` Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 07/23] ice: Support RX hash XDP hint Larysa Zaremba
2023-09-05 15:42 ` [xdp-hints] " Maciej Fijalkowski
2023-09-05 17:09 ` Larysa Zaremba [this message]
2023-09-06 12:03 ` Alexander Lobakin
2023-09-14 16:54 ` Alexander Lobakin
2023-09-14 16:59 ` Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 08/23] ice: Support XDP hints in AF_XDP ZC mode Larysa Zaremba
2023-09-04 15:42 ` [xdp-hints] " Maciej Fijalkowski
2023-09-04 18:14 ` Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 09/23] xdp: Add VLAN tag hint Larysa Zaremba
2023-08-24 22:02 ` kernel test robot
2023-09-14 16:18 ` Alexander Lobakin
2023-09-14 16:21 ` Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 10/23] ice: Implement " Larysa Zaremba
2023-09-04 16:00 ` Maciej Fijalkowski
2023-09-04 18:18 ` Larysa Zaremba
2023-09-14 16:25 ` [xdp-hints] " Alexander Lobakin
2023-09-14 16:28 ` Larysa Zaremba
2023-09-14 16:38 ` Alexander Lobakin
2023-09-14 17:02 ` Larysa Zaremba
2023-09-18 14:07 ` Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 11/23] ice: use VLAN proto from ring packet context in skb path Larysa Zaremba
2023-09-14 16:30 ` Alexander Lobakin
2023-09-14 16:30 ` Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 12/23] xdp: Add checksum hint Larysa Zaremba
2023-08-24 22:56 ` kernel test robot
2023-09-14 16:34 ` Alexander Lobakin
2023-08-24 19:26 ` [RFC bpf-next 13/23] ice: Implement " Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 14/23] selftests/bpf: Allow VLAN packets in xdp_hw_metadata Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 15/23] net, xdp: allow metadata > 32 Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 16/23] selftests/bpf: Add flags and new hints to xdp_hw_metadata Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 17/23] veth: Implement VLAN tag and checksum XDP hint Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 18/23] net: make vlan_get_tag() return -ENODATA instead of -EINVAL Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 19/23] selftests/bpf: Use AF_INET for TX in xdp_metadata Larysa Zaremba
2023-08-24 19:26 ` [RFC bpf-next 20/23] selftests/bpf: Check VLAN tag and proto " Larysa Zaremba
2023-08-24 19:27 ` [RFC bpf-next 21/23] selftests/bpf: check checksum state " Larysa Zaremba
2023-08-24 19:27 ` [RFC bpf-next 22/23] mlx5: implement VLAN tag XDP hint Larysa Zaremba
2023-08-24 19:27 ` [RFC bpf-next 23/23] mlx5: implement RX checksum " Larysa Zaremba
2023-08-31 14:50 ` [RFC bpf-next 00/23] XDP metadata via kfuncs for ice + mlx5 Larysa Zaremba
2023-09-04 16:06 ` [xdp-hints] " Maciej Fijalkowski
2023-09-06 14:09 ` Larysa Zaremba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZPdg4hYQ71B+dvmT@lincoln \
--to=larysa.zaremba@intel.com \
--cc=alexandr.lobakin@intel.com \
--cc=alexei.starovoitov@gmail.com \
--cc=anatoly.burakov@intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@gmail.com \
--cc=martin.lau@linux.dev \
--cc=mtahhan@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
--cc=sdf@google.com \
--cc=simon.horman@corigine.com \
--cc=song@kernel.org \
--cc=tariqt@mellanox.com \
--cc=willemb@google.com \
--cc=willemdebruijn.kernel@gmail.com \
--cc=xdp-hints@xdp-project.net \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.