| Message ID | 20201019080553.24353-4-sven.auhagen@voleatech.de |
|---|---|
| State | New |
| Headers | show |
| Series | igb: xdp patches followup | expand |
From: sven.auhagen@voleatech.de <sven.auhagen@voleatech.de> Sent: Monday, October 19, 2020 1:36 PM To: Nguyen, Anthony L <anthony.l.nguyen@intel.com>; Fijalkowski, Maciej <maciej.fijalkowski@intel.com>; kuba@kernel.org Cc: davem@davemloft.net; intel-wired-lan@lists.osuosl.org; netdev@vger.kernel.org; nhorman@redhat.com; sassmann@redhat.com; Penigalapati, Sandeep <sandeep.penigalapati@intel.com>; brouer@redhat.com Subject: [PATCH net v3 3/6] igb: XDP extack message on error From: Sven Auhagen <sven.auhagen@voleatech.de> Add an extack error message when the RX buffer size is too small for the frame size. Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> --- drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) Tested-by: Sandeep Penigalapati <sandeep.penigalapati@intel.com>
Dear Sven, Am 19.10.20 um 10:05 schrieb sven.auhagen@voleatech.de: > From: Sven Auhagen <sven.auhagen@voleatech.de> > > Add an extack error message when the RX buffer size is too small > for the frame size. > > Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> > --- > drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c > index 0a9198037b98..088f9ddb0093 100644 > --- a/drivers/net/ethernet/intel/igb/igb_main.c > +++ b/drivers/net/ethernet/intel/igb/igb_main.c > @@ -2824,20 +2824,22 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type, > } > } > > -static int igb_xdp_setup(struct net_device *dev, struct bpf_prog *prog) > +static int igb_xdp_setup(struct net_device *dev, struct netdev_bpf *bpf) > { > int i, frame_size = dev->mtu + IGB_ETH_PKT_HDR_PAD; > struct igb_adapter *adapter = netdev_priv(dev); > + struct bpf_prog *prog = bpf->prog, *old_prog; > bool running = netif_running(dev); > - struct bpf_prog *old_prog; > bool need_reset; > > /* verify igb ring attributes are sufficient for XDP */ > for (i = 0; i < adapter->num_rx_queues; i++) { > struct igb_ring *ring = adapter->rx_ring[i]; > > - if (frame_size > igb_rx_bufsz(ring)) > + if (frame_size > igb_rx_bufsz(ring)) { > + NL_SET_ERR_MSG_MOD(bpf->extack, "The RX buffer size is too small for the frame size"); Could you please also add both size values to the error message? > return -EINVAL; > + } > } > > old_prog = xchg(&adapter->xdp_prog, prog); > @@ -2869,7 +2871,7 @@ static int igb_xdp(struct net_device *dev, struct netdev_bpf *xdp) > { > switch (xdp->command) { > case XDP_SETUP_PROG: > - return igb_xdp_setup(dev, xdp->prog); > + return igb_xdp_setup(dev, xdp); > default: > return -EINVAL; > } > @@ -6499,7 +6501,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) > struct igb_ring *ring = adapter->rx_ring[i]; > > if (max_frame > igb_rx_bufsz(ring)) { > - netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP\n"); > + netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP. Max frame size is %d\n", max_frame); > return -EINVAL; > } > } > Kind regards, Paul PS: For commit message summaries, statements with verbs in imperative mood are quite common [1]. > igb: Print XDP extack error on too big frame size [1]: https://chris.beams.io/posts/git-commit/
On Wed, Nov 11, 2020 at 08:11:46AM +0100, Paul Menzel wrote: > Dear Sven, > > > Am 19.10.20 um 10:05 schrieb sven.auhagen@voleatech.de: > > From: Sven Auhagen <sven.auhagen@voleatech.de> > > > > Add an extack error message when the RX buffer size is too small > > for the frame size. > > > > Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> > > --- > > drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c > > index 0a9198037b98..088f9ddb0093 100644 > > --- a/drivers/net/ethernet/intel/igb/igb_main.c > > +++ b/drivers/net/ethernet/intel/igb/igb_main.c > > @@ -2824,20 +2824,22 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type, > > } > > } > > -static int igb_xdp_setup(struct net_device *dev, struct bpf_prog *prog) > > +static int igb_xdp_setup(struct net_device *dev, struct netdev_bpf *bpf) > > { > > int i, frame_size = dev->mtu + IGB_ETH_PKT_HDR_PAD; > > struct igb_adapter *adapter = netdev_priv(dev); > > + struct bpf_prog *prog = bpf->prog, *old_prog; > > bool running = netif_running(dev); > > - struct bpf_prog *old_prog; > > bool need_reset; > > /* verify igb ring attributes are sufficient for XDP */ > > for (i = 0; i < adapter->num_rx_queues; i++) { > > struct igb_ring *ring = adapter->rx_ring[i]; > > - if (frame_size > igb_rx_bufsz(ring)) > > + if (frame_size > igb_rx_bufsz(ring)) { > > + NL_SET_ERR_MSG_MOD(bpf->extack, "The RX buffer size is too small for the frame size"); > > Could you please also add both size values to the error message? Dear Paul, yes, sure. I will send a new series with that change. Best Sven > > > return -EINVAL; > > + } > > } > > old_prog = xchg(&adapter->xdp_prog, prog); > > @@ -2869,7 +2871,7 @@ static int igb_xdp(struct net_device *dev, struct netdev_bpf *xdp) > > { > > switch (xdp->command) { > > case XDP_SETUP_PROG: > > - return igb_xdp_setup(dev, xdp->prog); > > + return igb_xdp_setup(dev, xdp); > > default: > > return -EINVAL; > > } > > @@ -6499,7 +6501,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) > > struct igb_ring *ring = adapter->rx_ring[i]; > > if (max_frame > igb_rx_bufsz(ring)) { > > - netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP\n"); > > + netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP. Max frame size is %d\n", max_frame); > > return -EINVAL; > > } > > } > > > > > Kind regards, > > Paul > > > PS: For commit message summaries, statements with verbs in imperative mood > are quite common [1]. > > > igb: Print XDP extack error on too big frame size > > > [1]: https://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fchris.beams.io%2Fposts%2Fgit-commit%2F&data=04%7C01%7Csven.auhagen%40voleatech.de%7Cc2916e4caf384512cdf808d886110df9%7Cb82a99f679814a7295344d35298f847b%7C0%7C0%7C637406755112287943%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=wBvX6q4trM7FQLp5Nxccqrbo%2ForvF5KG1YG7TRc7cKQ%3D&reserved=0
On Wed, Nov 11, 2020 at 08:11:46AM +0100, Paul Menzel wrote: > Dear Sven, > > > Am 19.10.20 um 10:05 schrieb sven.auhagen@voleatech.de: > > From: Sven Auhagen <sven.auhagen@voleatech.de> > > > > Add an extack error message when the RX buffer size is too small > > for the frame size. > > > > Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> > > --- > > drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c > > index 0a9198037b98..088f9ddb0093 100644 > > --- a/drivers/net/ethernet/intel/igb/igb_main.c > > +++ b/drivers/net/ethernet/intel/igb/igb_main.c > > @@ -2824,20 +2824,22 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type, > > } > > } > > -static int igb_xdp_setup(struct net_device *dev, struct bpf_prog *prog) > > +static int igb_xdp_setup(struct net_device *dev, struct netdev_bpf *bpf) > > { > > int i, frame_size = dev->mtu + IGB_ETH_PKT_HDR_PAD; > > struct igb_adapter *adapter = netdev_priv(dev); > > + struct bpf_prog *prog = bpf->prog, *old_prog; > > bool running = netif_running(dev); > > - struct bpf_prog *old_prog; > > bool need_reset; > > /* verify igb ring attributes are sufficient for XDP */ > > for (i = 0; i < adapter->num_rx_queues; i++) { > > struct igb_ring *ring = adapter->rx_ring[i]; > > - if (frame_size > igb_rx_bufsz(ring)) > > + if (frame_size > igb_rx_bufsz(ring)) { > > + NL_SET_ERR_MSG_MOD(bpf->extack, "The RX buffer size is too small for the frame size"); Dear Paul, just to verify, NL_SET_ERR_MSG_MOD does not take any variable arguments for the text to print. What seems to be the common practive is to add a second log line with netdev_warn to print out the sizes. Is that what you are looking for? Best Sven > > Could you please also add both size values to the error message? > > > return -EINVAL; > > + } > > } > > old_prog = xchg(&adapter->xdp_prog, prog); > > @@ -2869,7 +2871,7 @@ static int igb_xdp(struct net_device *dev, struct netdev_bpf *xdp) > > { > > switch (xdp->command) { > > case XDP_SETUP_PROG: > > - return igb_xdp_setup(dev, xdp->prog); > > + return igb_xdp_setup(dev, xdp); > > default: > > return -EINVAL; > > } > > @@ -6499,7 +6501,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) > > struct igb_ring *ring = adapter->rx_ring[i]; > > if (max_frame > igb_rx_bufsz(ring)) { > > - netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP\n"); > > + netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP. Max frame size is %d\n", max_frame); > > return -EINVAL; > > } > > } > > > > > Kind regards, > > Paul > > > PS: For commit message summaries, statements with verbs in imperative mood > are quite common [1]. > > > igb: Print XDP extack error on too big frame size > > > [1]: https://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fchris.beams.io%2Fposts%2Fgit-commit%2F&data=04%7C01%7Csven.auhagen%40voleatech.de%7Cc2916e4caf384512cdf808d886110df9%7Cb82a99f679814a7295344d35298f847b%7C0%7C0%7C637406755112287943%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=wBvX6q4trM7FQLp5Nxccqrbo%2ForvF5KG1YG7TRc7cKQ%3D&reserved=0
On Wed, 11 Nov 2020 10:39:09 +0100 Sven Auhagen <sven.auhagen@voleatech.de> wrote: > On Wed, Nov 11, 2020 at 08:11:46AM +0100, Paul Menzel wrote: > > Dear Sven, > > > > > > Am 19.10.20 um 10:05 schrieb sven.auhagen@voleatech.de: > > > From: Sven Auhagen <sven.auhagen@voleatech.de> > > > > > > Add an extack error message when the RX buffer size is too small > > > for the frame size. > > > > > > Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > > Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > > Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > > Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> > > > --- > > > drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++++----- > > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > > > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c > > > index 0a9198037b98..088f9ddb0093 100644 > > > --- a/drivers/net/ethernet/intel/igb/igb_main.c > > > +++ b/drivers/net/ethernet/intel/igb/igb_main.c > > > @@ -2824,20 +2824,22 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type, > > > } > > > } > > > -static int igb_xdp_setup(struct net_device *dev, struct bpf_prog *prog) > > > +static int igb_xdp_setup(struct net_device *dev, struct netdev_bpf *bpf) > > > { > > > int i, frame_size = dev->mtu + IGB_ETH_PKT_HDR_PAD; > > > struct igb_adapter *adapter = netdev_priv(dev); > > > + struct bpf_prog *prog = bpf->prog, *old_prog; > > > bool running = netif_running(dev); > > > - struct bpf_prog *old_prog; > > > bool need_reset; > > > /* verify igb ring attributes are sufficient for XDP */ > > > for (i = 0; i < adapter->num_rx_queues; i++) { > > > struct igb_ring *ring = adapter->rx_ring[i]; > > > - if (frame_size > igb_rx_bufsz(ring)) > > > + if (frame_size > igb_rx_bufsz(ring)) { > > > + NL_SET_ERR_MSG_MOD(bpf->extack, "The RX buffer size is too small for the frame size"); > > > > Could you please also add both size values to the error message? > > Dear Paul, > > yes, sure. > I will send a new series with that change. I don't think it is possible to send this extra variable info via extack (but the macro might have improved since last I checked). -- Best regards, Jesper Dangaard Brouer MSc.CS, Principal Kernel Engineer at Red Hat LinkedIn: http://www.linkedin.com/in/brouer
Dear Sven, Am 11.11.20 um 11:10 schrieb Sven Auhagen: > On Wed, Nov 11, 2020 at 08:11:46AM +0100, Paul Menzel wrote: >> Am 19.10.20 um 10:05 schrieb sven.auhagen@voleatech.de: >>> From: Sven Auhagen <sven.auhagen@voleatech.de> >>> >>> Add an extack error message when the RX buffer size is too small >>> for the frame size. >>> >>> Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> >>> Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> >>> Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> >>> Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> >>> --- >>> drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++++----- >>> 1 file changed, 7 insertions(+), 5 deletions(-) >>> >>> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c >>> index 0a9198037b98..088f9ddb0093 100644 >>> --- a/drivers/net/ethernet/intel/igb/igb_main.c >>> +++ b/drivers/net/ethernet/intel/igb/igb_main.c >>> @@ -2824,20 +2824,22 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type, >>> } >>> } >>> -static int igb_xdp_setup(struct net_device *dev, struct bpf_prog *prog) >>> +static int igb_xdp_setup(struct net_device *dev, struct netdev_bpf *bpf) >>> { >>> int i, frame_size = dev->mtu + IGB_ETH_PKT_HDR_PAD; >>> struct igb_adapter *adapter = netdev_priv(dev); >>> + struct bpf_prog *prog = bpf->prog, *old_prog; >>> bool running = netif_running(dev); >>> - struct bpf_prog *old_prog; >>> bool need_reset; >>> /* verify igb ring attributes are sufficient for XDP */ >>> for (i = 0; i < adapter->num_rx_queues; i++) { >>> struct igb_ring *ring = adapter->rx_ring[i]; >>> - if (frame_size > igb_rx_bufsz(ring)) >>> + if (frame_size > igb_rx_bufsz(ring)) { >>> + NL_SET_ERR_MSG_MOD(bpf->extack, "The RX buffer size is too small for the frame size"); > just to verify, NL_SET_ERR_MSG_MOD does not take any variable arguments > for the text to print. Ah, Jesper remarked that too. Can the macro be extended? > What seems to be the common practice is to add a second log line > with netdev_warn to print out the sizes. > > Is that what you are looking for? Yes, though it sounds to cumbersome. So, yes, that’d be great for me, but up to you, if you think it’s useful. Kind regards, Paul >> Could you please also add both size values to the error message? >> >>> return -EINVAL; >>> + } >>> } >>> old_prog = xchg(&adapter->xdp_prog, prog); >>> @@ -2869,7 +2871,7 @@ static int igb_xdp(struct net_device *dev, struct netdev_bpf *xdp) >>> { >>> switch (xdp->command) { >>> case XDP_SETUP_PROG: >>> - return igb_xdp_setup(dev, xdp->prog); >>> + return igb_xdp_setup(dev, xdp); >>> default: >>> return -EINVAL; >>> } >>> @@ -6499,7 +6501,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) >>> struct igb_ring *ring = adapter->rx_ring[i]; >>> if (max_frame > igb_rx_bufsz(ring)) { >>> - netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP\n"); >>> + netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP. Max frame size is %d\n", max_frame); >>> return -EINVAL; >>> } >>> } >>> >> >> >> Kind regards, >> >> Paul >> >> >> PS: For commit message summaries, statements with verbs in imperative mood >> are quite common [1]. >> >>> igb: Print XDP extack error on too big frame size >> >> >> [1]: https://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fchris.beams.io%2Fposts%2Fgit-commit%2F&data=04%7C01%7Csven.auhagen%40voleatech.de%7Cc2916e4caf384512cdf808d886110df9%7Cb82a99f679814a7295344d35298f847b%7C0%7C0%7C637406755112287943%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=wBvX6q4trM7FQLp5Nxccqrbo%2ForvF5KG1YG7TRc7cKQ%3D&reserved=0
On Wed, Nov 11, 2020 at 11:35:44AM +0100, Paul Menzel wrote: > Dear Sven, > > > Am 11.11.20 um 11:10 schrieb Sven Auhagen: > > On Wed, Nov 11, 2020 at 08:11:46AM +0100, Paul Menzel wrote: > > > > Am 19.10.20 um 10:05 schrieb sven.auhagen@voleatech.de: > > > > From: Sven Auhagen <sven.auhagen@voleatech.de> > > > > > > > > Add an extack error message when the RX buffer size is too small > > > > for the frame size. > > > > > > > > Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > > > Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > > > Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > > > Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> > > > > --- > > > > drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++++----- > > > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > > > > > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c > > > > index 0a9198037b98..088f9ddb0093 100644 > > > > --- a/drivers/net/ethernet/intel/igb/igb_main.c > > > > +++ b/drivers/net/ethernet/intel/igb/igb_main.c > > > > @@ -2824,20 +2824,22 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type, > > > > } > > > > } > > > > -static int igb_xdp_setup(struct net_device *dev, struct bpf_prog *prog) > > > > +static int igb_xdp_setup(struct net_device *dev, struct netdev_bpf *bpf) > > > > { > > > > int i, frame_size = dev->mtu + IGB_ETH_PKT_HDR_PAD; > > > > struct igb_adapter *adapter = netdev_priv(dev); > > > > + struct bpf_prog *prog = bpf->prog, *old_prog; > > > > bool running = netif_running(dev); > > > > - struct bpf_prog *old_prog; > > > > bool need_reset; > > > > /* verify igb ring attributes are sufficient for XDP */ > > > > for (i = 0; i < adapter->num_rx_queues; i++) { > > > > struct igb_ring *ring = adapter->rx_ring[i]; > > > > - if (frame_size > igb_rx_bufsz(ring)) > > > > + if (frame_size > igb_rx_bufsz(ring)) { > > > > + NL_SET_ERR_MSG_MOD(bpf->extack, "The RX buffer size is too small for the frame size"); > > > just to verify, NL_SET_ERR_MSG_MOD does not take any variable arguments > > for the text to print. > > Ah, Jesper remarked that too. Can the macro be extended? It probably can be not as part of this patch series. > > > What seems to be the common practice is to add a second log line > > with netdev_warn to print out the sizes. > > > > Is that what you are looking for? > > Yes, though it sounds to cumbersome. So, yes, that’d be great for me, but up > to you, if you think it’s useful. > Let me add a netdev warn here so this patch can move forward and the information is available. Best Sven > > Kind regards, > > Paul > > > > > Could you please also add both size values to the error message? > > > > > > > return -EINVAL; > > > > + } > > > > } > > > > old_prog = xchg(&adapter->xdp_prog, prog); > > > > @@ -2869,7 +2871,7 @@ static int igb_xdp(struct net_device *dev, struct netdev_bpf *xdp) > > > > { > > > > switch (xdp->command) { > > > > case XDP_SETUP_PROG: > > > > - return igb_xdp_setup(dev, xdp->prog); > > > > + return igb_xdp_setup(dev, xdp); > > > > default: > > > > return -EINVAL; > > > > } > > > > @@ -6499,7 +6501,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) > > > > struct igb_ring *ring = adapter->rx_ring[i]; > > > > if (max_frame > igb_rx_bufsz(ring)) { > > > > - netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP\n"); > > > > + netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP. Max frame size is %d\n", max_frame); > > > > return -EINVAL; > > > > } > > > > } > > > > > > > > > > > > > Kind regards, > > > > > > Paul > > > > > > > > > PS: For commit message summaries, statements with verbs in imperative mood > > > are quite common [1]. > > > > > > > igb: Print XDP extack error on too big frame size > > > > > > > > > [1]: https://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fchris.beams.io%2Fposts%2Fgit-commit%2F&data=04%7C01%7Csven.auhagen%40voleatech.de%7C832ea50c701b4d89fd5508d8862d8c92%7Cb82a99f679814a7295344d35298f847b%7C0%7C0%7C637406877489969478%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=ITPcipxk%2Bg%2FR0QRssfiF5lm1K3mGJsB5wFkdF3SqiA0%3D&reserved=0
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 0a9198037b98..088f9ddb0093 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2824,20 +2824,22 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type, } } -static int igb_xdp_setup(struct net_device *dev, struct bpf_prog *prog) +static int igb_xdp_setup(struct net_device *dev, struct netdev_bpf *bpf) { int i, frame_size = dev->mtu + IGB_ETH_PKT_HDR_PAD; struct igb_adapter *adapter = netdev_priv(dev); + struct bpf_prog *prog = bpf->prog, *old_prog; bool running = netif_running(dev); - struct bpf_prog *old_prog; bool need_reset; /* verify igb ring attributes are sufficient for XDP */ for (i = 0; i < adapter->num_rx_queues; i++) { struct igb_ring *ring = adapter->rx_ring[i]; - if (frame_size > igb_rx_bufsz(ring)) + if (frame_size > igb_rx_bufsz(ring)) { + NL_SET_ERR_MSG_MOD(bpf->extack, "The RX buffer size is too small for the frame size"); return -EINVAL; + } } old_prog = xchg(&adapter->xdp_prog, prog); @@ -2869,7 +2871,7 @@ static int igb_xdp(struct net_device *dev, struct netdev_bpf *xdp) { switch (xdp->command) { case XDP_SETUP_PROG: - return igb_xdp_setup(dev, xdp->prog); + return igb_xdp_setup(dev, xdp); default: return -EINVAL; } @@ -6499,7 +6501,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) struct igb_ring *ring = adapter->rx_ring[i]; if (max_frame > igb_rx_bufsz(ring)) { - netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP\n"); + netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP. Max frame size is %d\n", max_frame); return -EINVAL; } }