| Message ID | 20230728173923.1318596-18-larysa.zaremba@intel.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next,v4,01/21] ice: make RX hash reading code more reusable | expand |
Hi Larysa, kernel test robot noticed the following build warnings: [auto build test WARNING on bpf-next/master] url: https://github.com/intel-lab-lkp/linux/commits/Larysa-Zaremba/ice-make-RX-HW-timestamp-reading-code-more-reusable/20230729-023952 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master patch link: https://lore.kernel.org/r/20230728173923.1318596-18-larysa.zaremba%40intel.com patch subject: [PATCH bpf-next v4 17/21] veth: Implement VLAN tag and checksum XDP hint config: openrisc-randconfig-r081-20230730 (https://download.01.org/0day-ci/archive/20230730/202307300639.I0c6g7mz-lkp@intel.com/config) compiler: or1k-linux-gcc (GCC) 12.3.0 reproduce: (https://download.01.org/0day-ci/archive/20230730/202307300639.I0c6g7mz-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202307300639.I0c6g7mz-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) >> drivers/net/veth.c:1771:37: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] checksum @@ got restricted __wsum [usertype] csum @@ drivers/net/veth.c:1771:37: sparse: expected unsigned int [usertype] checksum drivers/net/veth.c:1771:37: sparse: got restricted __wsum [usertype] csum vim +1771 drivers/net/veth.c 1752 1753 static int veth_xdp_rx_csum(const struct xdp_md *ctx, 1754 enum xdp_csum_status *csum_status, 1755 union xdp_csum_info *csum_info) 1756 { 1757 struct veth_xdp_buff *_ctx = (void *)ctx; 1758 struct sk_buff *skb = _ctx->skb; 1759 1760 if (!skb) 1761 return -ENODATA; 1762 1763 if (skb->ip_summed == CHECKSUM_UNNECESSARY) { 1764 *csum_status = XDP_CHECKSUM_VALID_LVL0 + skb->csum_level; 1765 } else if (skb->ip_summed == CHECKSUM_PARTIAL) { 1766 *csum_status = XDP_CHECKSUM_PARTIAL; 1767 csum_info->csum_start = skb_checksum_start_offset(skb); 1768 csum_info->csum_offset = skb->csum_offset; 1769 } else if (skb->ip_summed == CHECKSUM_COMPLETE) { 1770 *csum_status = XDP_CHECKSUM_COMPLETE; > 1771 csum_info->checksum = skb->csum; 1772 } else { 1773 return -ENODATA; 1774 } 1775 1776 return 0; 1777 } 1778
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 614f3e3efab0..13933f080dcd 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -1732,6 +1732,50 @@ static int veth_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash, return 0; } +static int veth_xdp_rx_vlan_tag(const struct xdp_md *ctx, u16 *vlan_tci, + __be16 *vlan_proto) +{ + struct veth_xdp_buff *_ctx = (void *)ctx; + struct sk_buff *skb = _ctx->skb; + int err; + + if (!skb) + return -ENODATA; + + err = __vlan_hwaccel_get_tag(skb, vlan_tci); + if (err) + return err; + + *vlan_proto = skb->vlan_proto; + return err; +} + +static int veth_xdp_rx_csum(const struct xdp_md *ctx, + enum xdp_csum_status *csum_status, + union xdp_csum_info *csum_info) +{ + struct veth_xdp_buff *_ctx = (void *)ctx; + struct sk_buff *skb = _ctx->skb; + + if (!skb) + return -ENODATA; + + if (skb->ip_summed == CHECKSUM_UNNECESSARY) { + *csum_status = XDP_CHECKSUM_VALID_LVL0 + skb->csum_level; + } else if (skb->ip_summed == CHECKSUM_PARTIAL) { + *csum_status = XDP_CHECKSUM_PARTIAL; + csum_info->csum_start = skb_checksum_start_offset(skb); + csum_info->csum_offset = skb->csum_offset; + } else if (skb->ip_summed == CHECKSUM_COMPLETE) { + *csum_status = XDP_CHECKSUM_COMPLETE; + csum_info->checksum = skb->csum; + } else { + return -ENODATA; + } + + return 0; +} + static const struct net_device_ops veth_netdev_ops = { .ndo_init = veth_dev_init, .ndo_open = veth_open, @@ -1756,6 +1800,8 @@ static const struct net_device_ops veth_netdev_ops = { static const struct xdp_metadata_ops veth_xdp_metadata_ops = { .xmo_rx_timestamp = veth_xdp_rx_timestamp, .xmo_rx_hash = veth_xdp_rx_hash, + .xmo_rx_vlan_tag = veth_xdp_rx_vlan_tag, + .xmo_rx_csum = veth_xdp_rx_csum, }; #define VETH_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HW_CSUM | \
In order to test VLAN tag and checksum XDP hints in hardware-independent selftests, implement newly added XDP hints in veth driver. Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> --- drivers/net/veth.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)