| Message ID | 20210930140651.2249972-1-bigeasy@linutronix.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] ixgbe: Consider xsk pool's frame size for MTU size | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 39 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
On Thu, Sep 30, 2021 at 04:06:51PM +0200, Sebastian Andrzej Siewior wrote: > The driver has to a ensure that a network packet is not using more than > one page for its data if a XDP program is used. > This results in an upper limit of 1500 bytes. This can be increased a > little if the MTU was programmed to 1514..3072 bytes before loading the > XDP program. By setting this increased MTU size the driver will set the > __IXGBE_RX_3K_BUFFER flag which in turn will allow to use 3KiB as the > upper limit. > This looks like a hack and the upper limit is could increased further. > If the user configured a memory pool then PAGE_SIZE is used as BSIZEPKT > and RLPML is set to pool's memory size as is the card's maximum frame > size. From what I can tell this is only true for hw->mac.type != ixgbe_mac_82599EB. > The result is that a MTU of 3520 bytes can be programmed and every > packet is stored a single page. How did you come up with 3520 bytes? Is this what xsk_pool_get_rx_frame_size returns on your system? Or is it: 4k - XDP_HEADROOM (256) - sizeof skb_shared_info (320) = 3520? I think I also need a bit more of a context in here what you are solving here. Bare in mind that xsk_pool being present on Rx ring implies a different memory model than the standard one where __IXGBE_RX_3K_BUFFER is not valid. It seems to me that you were using the copy mode for xsk socket, or is my assumption wrong? If yes, then how did you end up with xsk_pool being present on a ring? > > If a RX ring has a pool assigned use its size while comparing for the > maximal MTU size. Were you trying to change the MTU with xsk socket loaded on a queue? > > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > --- > v1…v2: Remove RFC. Repost of > https://lore.kernel.org/r/20210622162616.eadk2u5hmf4ru5jd@linutronix.de > > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 21 +++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > index 24e06ba6f5e93..ed451f32e1980 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > @@ -6722,6 +6722,23 @@ static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter) > ixgbe_free_rx_resources(adapter->rx_ring[i]); > } > > +static int ixgbe_validate_frame_size(unsigned int frame_size, > + struct ixgbe_ring *ring) > +{ > + struct xsk_buff_pool *xsk_pool; > + unsigned int buf_len; > + > + xsk_pool = ring->xsk_pool; > + if (xsk_pool) > + buf_len = xsk_pool_get_rx_frame_size(xsk_pool); I still don't get what is being solved in here, but shouldn't we repeat the logic from ixgbe_configure_srrctl in here? if (xsk_pool) { if (hw->mac.type != ixgbe_mac_82599EB) buf_len = PAGE_SIZE; else buf_len = xsk_pool_get_rx_frame_size(xsk_pool); } else { buf_len = ixgbe_rx_bufsz(ring); } > + else > + buf_len = ixgbe_rx_bufsz(ring); > + > + if (frame_size > buf_len) > + return -EINVAL; > + return 0; > +} > + > /** > * ixgbe_change_mtu - Change the Maximum Transfer Unit > * @netdev: network interface device structure > @@ -6741,7 +6758,7 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu) > for (i = 0; i < adapter->num_rx_queues; i++) { > struct ixgbe_ring *ring = adapter->rx_ring[i]; > > - if (new_frame_size > ixgbe_rx_bufsz(ring)) { > + if (ixgbe_validate_frame_size(new_frame_size, ring)) { > e_warn(probe, "Requested MTU size is not supported with XDP\n"); > return -EINVAL; > } > @@ -10126,7 +10143,7 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog) > if (ring_is_rsc_enabled(ring)) > return -EINVAL; > > - if (frame_size > ixgbe_rx_bufsz(ring)) > + if (ixgbe_validate_frame_size(frame_size, ring)) > return -EINVAL; > } > > -- > 2.33.0 >
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 24e06ba6f5e93..ed451f32e1980 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -6722,6 +6722,23 @@ static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter) ixgbe_free_rx_resources(adapter->rx_ring[i]); } +static int ixgbe_validate_frame_size(unsigned int frame_size, + struct ixgbe_ring *ring) +{ + struct xsk_buff_pool *xsk_pool; + unsigned int buf_len; + + xsk_pool = ring->xsk_pool; + if (xsk_pool) + buf_len = xsk_pool_get_rx_frame_size(xsk_pool); + else + buf_len = ixgbe_rx_bufsz(ring); + + if (frame_size > buf_len) + return -EINVAL; + return 0; +} + /** * ixgbe_change_mtu - Change the Maximum Transfer Unit * @netdev: network interface device structure @@ -6741,7 +6758,7 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu) for (i = 0; i < adapter->num_rx_queues; i++) { struct ixgbe_ring *ring = adapter->rx_ring[i]; - if (new_frame_size > ixgbe_rx_bufsz(ring)) { + if (ixgbe_validate_frame_size(new_frame_size, ring)) { e_warn(probe, "Requested MTU size is not supported with XDP\n"); return -EINVAL; } @@ -10126,7 +10143,7 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog) if (ring_is_rsc_enabled(ring)) return -EINVAL; - if (frame_size > ixgbe_rx_bufsz(ring)) + if (ixgbe_validate_frame_size(frame_size, ring)) return -EINVAL; }
The driver has to a ensure that a network packet is not using more than one page for its data if a XDP program is used. This results in an upper limit of 1500 bytes. This can be increased a little if the MTU was programmed to 1514..3072 bytes before loading the XDP program. By setting this increased MTU size the driver will set the __IXGBE_RX_3K_BUFFER flag which in turn will allow to use 3KiB as the upper limit. This looks like a hack and the upper limit is could increased further. If the user configured a memory pool then PAGE_SIZE is used as BSIZEPKT and RLPML is set to pool's memory size as is the card's maximum frame size. The result is that a MTU of 3520 bytes can be programmed and every packet is stored a single page. If a RX ring has a pool assigned use its size while comparing for the maximal MTU size. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- v1…v2: Remove RFC. Repost of https://lore.kernel.org/r/20210622162616.eadk2u5hmf4ru5jd@linutronix.de drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)