| Message ID | e45d1c9f17356d431b03b419f60b8b763d2ff768.1729000481.git.pabeni@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d811ac148f0afd2f3f7e1cd7f54de8da973ec5e3 |
| Headers | show |
| Series | [iwl-next] virtchnl: fix m68k build. | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
From: Paolo Abeni <pabeni@redhat.com> Date: Tue, 15 Oct 2024 15:56:35 +0200 > The kernel test robot reported a build failure on m68k in the intel > driver due to the recent shapers-related changes. > > The mentioned arch has funny alignment properties, let's be explicit > about the binary layout expectation introducing a padding field. > > Fixes: 608a5c05c39b ("virtchnl: support queue rate limit and quanta size configuration") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202410131710.71Wt6LKO-lkp@intel.com/ > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- > include/linux/avf/virtchnl.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h > index 223e433c39fe..13a11f3c09b8 100644 > --- a/include/linux/avf/virtchnl.h > +++ b/include/linux/avf/virtchnl.h > @@ -1499,6 +1499,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_queue_chunk); > > struct virtchnl_quanta_cfg { > u16 quanta_size; > + u16 pad; > struct virtchnl_queue_chunk queue_select; > }; Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com> Thanks, Olek
Dear Paolo, Thank you for the patch. I’d remove the dot/period at the end of the summary/title though, and maybe I’d be also more specific: virtchnl: Introduce padding field to fix m68k build Am 15.10.24 um 15:56 schrieb Paolo Abeni: > The kernel test robot reported a build failure on m68k in the intel > driver due to the recent shapers-related changes. > > The mentioned arch has funny alignment properties, let's be explicit > about the binary layout expectation introducing a padding field. > > Fixes: 608a5c05c39b ("virtchnl: support queue rate limit and quanta size configuration") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202410131710.71Wt6LKO-lkp@intel.com/ > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- > include/linux/avf/virtchnl.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h > index 223e433c39fe..13a11f3c09b8 100644 > --- a/include/linux/avf/virtchnl.h > +++ b/include/linux/avf/virtchnl.h > @@ -1499,6 +1499,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_queue_chunk); > > struct virtchnl_quanta_cfg { > u16 quanta_size; > + u16 pad; > struct virtchnl_queue_chunk queue_select; > }; Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de> Kind regards, Paul
On 10/15/2024 6:56 AM, Paolo Abeni wrote: > The kernel test robot reported a build failure on m68k in the intel > driver due to the recent shapers-related changes. > > The mentioned arch has funny alignment properties, let's be explicit > about the binary layout expectation introducing a padding field. > > Fixes: 608a5c05c39b ("virtchnl: support queue rate limit and quanta size configuration") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202410131710.71Wt6LKO-lkp@intel.com/ > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- > include/linux/avf/virtchnl.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h > index 223e433c39fe..13a11f3c09b8 100644 > --- a/include/linux/avf/virtchnl.h > +++ b/include/linux/avf/virtchnl.h > @@ -1499,6 +1499,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_queue_chunk); > > struct virtchnl_quanta_cfg { > u16 quanta_size; > + u16 pad; > struct virtchnl_queue_chunk queue_select; There's a hidden 2 byte padding because queue_select requires 4-byte alignment. We assume this, as the VIRTCHNL_CHECK_STRUCT_LEN for this structure is 12 bytes. On mk68k, we must not be adding this padding, which results in a 10 byte structure, failing the size check for VIRTCHNL_CHECK_STRUCT_LEN, resulting in the compilation error? Adding the explicit size aligns with the actual expected layout and size for this structure, fixing mk68k without affecting the other architectures. Ok. Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> > }; >
On 10/17/24 00:49, Jacob Keller wrote: > On 10/15/2024 6:56 AM, Paolo Abeni wrote: >> The kernel test robot reported a build failure on m68k in the intel >> driver due to the recent shapers-related changes. >> >> The mentioned arch has funny alignment properties, let's be explicit >> about the binary layout expectation introducing a padding field. >> >> Fixes: 608a5c05c39b ("virtchnl: support queue rate limit and quanta size configuration") >> Reported-by: kernel test robot <lkp@intel.com> >> Closes: https://lore.kernel.org/oe-kbuild-all/202410131710.71Wt6LKO-lkp@intel.com/ >> Signed-off-by: Paolo Abeni <pabeni@redhat.com> >> --- >> include/linux/avf/virtchnl.h | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h >> index 223e433c39fe..13a11f3c09b8 100644 >> --- a/include/linux/avf/virtchnl.h >> +++ b/include/linux/avf/virtchnl.h >> @@ -1499,6 +1499,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_queue_chunk); >> >> struct virtchnl_quanta_cfg { >> u16 quanta_size; >> + u16 pad; >> struct virtchnl_queue_chunk queue_select; > > There's a hidden 2 byte padding because queue_select requires 4-byte > alignment. We assume this, as the VIRTCHNL_CHECK_STRUCT_LEN for this > structure is 12 bytes. > > On mk68k, we must not be adding this padding, which results in a 10 byte > structure, failing the size check for VIRTCHNL_CHECK_STRUCT_LEN, > resulting in the compilation error? Exactly! > Adding the explicit size aligns with the actual expected layout and size > for this structure, fixing mk68k without affecting the other architectures. > > Ok. > > Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Thanks, Please LMK if you prefer/agree to have this one applied directly on net-next, to reduce build issues spawning around ASAP. Paolo
On 10/17/24 08:39, Paolo Abeni wrote: > On 10/17/24 00:49, Jacob Keller wrote: >> On 10/15/2024 6:56 AM, Paolo Abeni wrote: >>> The kernel test robot reported a build failure on m68k in the intel >>> driver due to the recent shapers-related changes. >>> >>> The mentioned arch has funny alignment properties, let's be explicit >>> about the binary layout expectation introducing a padding field. >>> >>> Fixes: 608a5c05c39b ("virtchnl: support queue rate limit and quanta >>> size configuration") >>> Reported-by: kernel test robot <lkp@intel.com> >>> Closes: https://lore.kernel.org/oe-kbuild-all/202410131710.71Wt6LKO- >>> lkp@intel.com/ >>> Signed-off-by: Paolo Abeni <pabeni@redhat.com> >>> --- >>> include/linux/avf/virtchnl.h | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h >>> index 223e433c39fe..13a11f3c09b8 100644 >>> --- a/include/linux/avf/virtchnl.h >>> +++ b/include/linux/avf/virtchnl.h >>> @@ -1499,6 +1499,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(8, >>> virtchnl_queue_chunk); >>> struct virtchnl_quanta_cfg { >>> u16 quanta_size; >>> + u16 pad; >>> struct virtchnl_queue_chunk queue_select; >> >> There's a hidden 2 byte padding because queue_select requires 4-byte >> alignment. We assume this, as the VIRTCHNL_CHECK_STRUCT_LEN for this >> structure is 12 bytes. >> >> On mk68k, we must not be adding this padding, which results in a 10 byte >> structure, failing the size check for VIRTCHNL_CHECK_STRUCT_LEN, >> resulting in the compilation error? > > Exactly! > >> Adding the explicit size aligns with the actual expected layout and size >> for this structure, fixing mk68k without affecting the other >> architectures. >> >> Ok. >> >> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> > > Thanks, > > Please LMK if you prefer/agree to have this one applied directly on net- > next, to reduce build issues spawning around ASAP. > > Paolo > Would be convenient, no objections!
> -----Original Message----- > From: Kitszel, Przemyslaw <przemyslaw.kitszel@intel.com> > Sent: Friday, October 18, 2024 5:58 AM > To: Paolo Abeni <pabeni@redhat.com>; Keller, Jacob E > <jacob.e.keller@intel.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com> > Cc: netdev@vger.kernel.org; intel-wired-lan@lists.osuosl.org; Wenjun Wu > <wenjun1.wu@intel.com>; Jakub Kicinski <kuba@kernel.org> > Subject: Re: [Intel-wired-lan] [PATCH iwl-next] virtchnl: fix m68k build. > > On 10/17/24 08:39, Paolo Abeni wrote: > > On 10/17/24 00:49, Jacob Keller wrote: > >> On 10/15/2024 6:56 AM, Paolo Abeni wrote: > >>> The kernel test robot reported a build failure on m68k in the intel > >>> driver due to the recent shapers-related changes. > >>> > >>> The mentioned arch has funny alignment properties, let's be explicit > >>> about the binary layout expectation introducing a padding field. > >>> > >>> Fixes: 608a5c05c39b ("virtchnl: support queue rate limit and quanta > >>> size configuration") > >>> Reported-by: kernel test robot <lkp@intel.com> > >>> Closes: https://lore.kernel.org/oe-kbuild-all/202410131710.71Wt6LKO- > >>> lkp@intel.com/ > >>> Signed-off-by: Paolo Abeni <pabeni@redhat.com> > >>> --- > >>> include/linux/avf/virtchnl.h | 1 + > >>> 1 file changed, 1 insertion(+) > >>> > >>> diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h > >>> index 223e433c39fe..13a11f3c09b8 100644 > >>> --- a/include/linux/avf/virtchnl.h > >>> +++ b/include/linux/avf/virtchnl.h > >>> @@ -1499,6 +1499,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(8, > >>> virtchnl_queue_chunk); > >>> struct virtchnl_quanta_cfg { > >>> u16 quanta_size; > >>> + u16 pad; > >>> struct virtchnl_queue_chunk queue_select; > >> > >> There's a hidden 2 byte padding because queue_select requires 4-byte > >> alignment. We assume this, as the VIRTCHNL_CHECK_STRUCT_LEN for this > >> structure is 12 bytes. > >> > >> On mk68k, we must not be adding this padding, which results in a 10 byte > >> structure, failing the size check for VIRTCHNL_CHECK_STRUCT_LEN, > >> resulting in the compilation error? > > > > Exactly! > > > >> Adding the explicit size aligns with the actual expected layout and size > >> for this structure, fixing mk68k without affecting the other > >> architectures. > >> > >> Ok. > >> > >> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> > > > > Thanks, > > > > Please LMK if you prefer/agree to have this one applied directly on net- > > next, to reduce build issues spawning around ASAP. > > > > Paolo > > > > Would be convenient, no objections! Yes please. I applied it to iwl-next yesterday, but I think its great if you can take it immediately Thanks, Jake
Hello: This patch was applied to netdev/net-next.git (main) by Paolo Abeni <pabeni@redhat.com>: On Tue, 15 Oct 2024 15:56:35 +0200 you wrote: > The kernel test robot reported a build failure on m68k in the intel > driver due to the recent shapers-related changes. > > The mentioned arch has funny alignment properties, let's be explicit > about the binary layout expectation introducing a padding field. > > Fixes: 608a5c05c39b ("virtchnl: support queue rate limit and quanta size configuration") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202410131710.71Wt6LKO-lkp@intel.com/ > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > > [...] Here is the summary with links: - [iwl-next] virtchnl: fix m68k build. https://git.kernel.org/netdev/net-next/c/d811ac148f0a You are awesome, thank you!
diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h index 223e433c39fe..13a11f3c09b8 100644 --- a/include/linux/avf/virtchnl.h +++ b/include/linux/avf/virtchnl.h @@ -1499,6 +1499,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_queue_chunk); struct virtchnl_quanta_cfg { u16 quanta_size; + u16 pad; struct virtchnl_queue_chunk queue_select; };
The kernel test robot reported a build failure on m68k in the intel driver due to the recent shapers-related changes. The mentioned arch has funny alignment properties, let's be explicit about the binary layout expectation introducing a padding field. Fixes: 608a5c05c39b ("virtchnl: support queue rate limit and quanta size configuration") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202410131710.71Wt6LKO-lkp@intel.com/ Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- include/linux/avf/virtchnl.h | 1 + 1 file changed, 1 insertion(+)