* [PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off
@ 2024-07-12 23:51 John Hubbard
2024-07-13 0:01 ` John Hubbard
0 siblings, 1 reply; 3+ messages in thread
From: John Hubbard @ 2024-07-12 23:51 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Shuah Khan, David S . Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Steffen Klassert, Herbert Xu, Andreas Färber,
Manivannan Sadhasivam, Matthieu Baerts, Mat Martineau,
Geliang Tang, Pravin B Shelar, Willem de Bruijn,
Alexander Mikhalitsyn, zhujun2, Petr Machata, Ido Schimmel,
Hangbin Liu, Nikolay Aleksandrov, Benjamin Poirier,
Sebastian Andrzej Siewior, Dmitry Safonov, netdev,
linux-arm-kernel, linux-actions, mptcp, dev, linux-kselftest,
LKML, llvm, John Hubbard, stable, Ignat Korchagin
Linux 6.6 does not have an opt_ipproto_off variable in gro.c at all (it
was added in later kernel versions), so attempting to initialize one
breaks the build.
Fixes: c80d53c484e8 ("selftests/net: fix uninitialized variables")
Cc: <stable@vger.kernel.org> # 6.6
Reported-by: Ignat Korchagin <ignat@cloudflare.com>
Closes: https://lore.kernel.org/all/8B1717DB-8C4A-47EE-B28C-170B630C4639@cloudflare.com/#t
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
tools/testing/selftests/net/gro.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tools/testing/selftests/net/gro.c b/tools/testing/selftests/net/gro.c
index b204df4f3332..30024d0ed373 100644
--- a/tools/testing/selftests/net/gro.c
+++ b/tools/testing/selftests/net/gro.c
@@ -113,9 +113,6 @@ static void setup_sock_filter(int fd)
next_off = offsetof(struct ipv6hdr, nexthdr);
ipproto_off = ETH_HLEN + next_off;
- /* Overridden later if exthdrs are used: */
- opt_ipproto_off = ipproto_off;
-
if (strcmp(testname, "ip") == 0) {
if (proto == PF_INET)
optlen = sizeof(struct ip_timestamp);
base-commit: 2ced7518a03d002284999ed8336ffac462a358ec
--
2.45.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off
2024-07-12 23:51 [PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off John Hubbard
@ 2024-07-13 0:01 ` John Hubbard
2024-07-15 12:11 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: John Hubbard @ 2024-07-13 0:01 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Shuah Khan, David S . Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Steffen Klassert, Herbert Xu, Andreas Färber,
Manivannan Sadhasivam, Matthieu Baerts, Mat Martineau,
Geliang Tang, Pravin B Shelar, Willem de Bruijn,
Alexander Mikhalitsyn, zhujun2, Petr Machata, Ido Schimmel,
Hangbin Liu, Nikolay Aleksandrov, Benjamin Poirier,
Sebastian Andrzej Siewior, Dmitry Safonov, netdev,
linux-arm-kernel, linux-actions, mptcp, dev, linux-kselftest,
LKML, llvm, stable, Ignat Korchagin
On 7/12/24 4:51 PM, John Hubbard wrote:
> Linux 6.6 does not have an opt_ipproto_off variable in gro.c at all (it
> was added in later kernel versions), so attempting to initialize one
> breaks the build.
This is the first time I've tried to fix something in linux-stable, and
I'm not sure that I've made it completely clear. This is only for
linux-6.6.y in linux-stable.
thanks,
--
John Hubbard
NVIDIA
>
> Fixes: c80d53c484e8 ("selftests/net: fix uninitialized variables")
> Cc: <stable@vger.kernel.org> # 6.6
> Reported-by: Ignat Korchagin <ignat@cloudflare.com>
> Closes: https://lore.kernel.org/all/8B1717DB-8C4A-47EE-B28C-170B630C4639@cloudflare.com/#t
> Signed-off-by: John Hubbard <jhubbard@nvidia.com>
> ---
> tools/testing/selftests/net/gro.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/tools/testing/selftests/net/gro.c b/tools/testing/selftests/net/gro.c
> index b204df4f3332..30024d0ed373 100644
> --- a/tools/testing/selftests/net/gro.c
> +++ b/tools/testing/selftests/net/gro.c
> @@ -113,9 +113,6 @@ static void setup_sock_filter(int fd)
> next_off = offsetof(struct ipv6hdr, nexthdr);
> ipproto_off = ETH_HLEN + next_off;
>
> - /* Overridden later if exthdrs are used: */
> - opt_ipproto_off = ipproto_off;
> -
> if (strcmp(testname, "ip") == 0) {
> if (proto == PF_INET)
> optlen = sizeof(struct ip_timestamp);
>
> base-commit: 2ced7518a03d002284999ed8336ffac462a358ec
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off
2024-07-13 0:01 ` John Hubbard
@ 2024-07-15 12:11 ` Greg Kroah-Hartman
0 siblings, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2024-07-15 12:11 UTC (permalink / raw)
To: John Hubbard
Cc: Shuah Khan, David S . Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Steffen Klassert, Herbert Xu, Andreas Färber,
Manivannan Sadhasivam, Matthieu Baerts, Mat Martineau,
Geliang Tang, Pravin B Shelar, Willem de Bruijn,
Alexander Mikhalitsyn, zhujun2, Petr Machata, Ido Schimmel,
Hangbin Liu, Nikolay Aleksandrov, Benjamin Poirier,
Sebastian Andrzej Siewior, Dmitry Safonov, netdev,
linux-arm-kernel, linux-actions, mptcp, dev, linux-kselftest,
LKML, llvm, stable, Ignat Korchagin
On Fri, Jul 12, 2024 at 05:01:38PM -0700, John Hubbard wrote:
> On 7/12/24 4:51 PM, John Hubbard wrote:
> > Linux 6.6 does not have an opt_ipproto_off variable in gro.c at all (it
> > was added in later kernel versions), so attempting to initialize one
> > breaks the build.
>
> This is the first time I've tried to fix something in linux-stable, and
> I'm not sure that I've made it completely clear. This is only for
> linux-6.6.y in linux-stable.
This worked just fine, now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-15 12:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-12 23:51 [PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off John Hubbard
2024-07-13 0:01 ` John Hubbard
2024-07-15 12:11 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox