* [PATCH 0/1] wireguard-linux-compat: fix build on Ubuntu 18.04
@ 2021-04-23 17:19 Thadeu Lima de Souza Cascardo
2021-04-23 17:19 ` [PATCH 1/1] Revert "compat: skb_mark_not_on_list will be backported to Ubuntu 18.04" Thadeu Lima de Souza Cascardo
2021-04-23 20:32 ` [PATCH 0/1] wireguard-linux-compat: fix build on Ubuntu 18.04 Jason A. Donenfeld
0 siblings, 2 replies; 4+ messages in thread
From: Thadeu Lima de Souza Cascardo @ 2021-04-23 17:19 UTC (permalink / raw)
To: wireguard; +Cc: Thadeu Lima de Souza Cascardo
Back in February, we were looking into backporting a commit to Ubuntu 18.04 GA
kernel that introduces skb_mark_not_on_list.
That would break wireguard-linux-compat when building against that kernel, so a
change was submitted as that commit would be introduced soon.
However, that plan did not work out as intended, and since then,
wireguard-linux-compat CI has been broken on Ubuntu 18.04.
Jason, thanks for bringing that up to our attention, and sorry that we broke
wireguard-linux-compat CI.
We will resend a fix as soon as we sort out when that commit will be applied.
Thanks.
Cascardo.
Thadeu Lima de Souza Cascardo (1):
Revert "compat: skb_mark_not_on_list will be backported to Ubuntu
18.04"
src/compat/compat.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.27.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] Revert "compat: skb_mark_not_on_list will be backported to Ubuntu 18.04"
2021-04-23 17:19 [PATCH 0/1] wireguard-linux-compat: fix build on Ubuntu 18.04 Thadeu Lima de Souza Cascardo
@ 2021-04-23 17:19 ` Thadeu Lima de Souza Cascardo
2021-04-23 20:33 ` Jason A. Donenfeld
2021-04-23 20:32 ` [PATCH 0/1] wireguard-linux-compat: fix build on Ubuntu 18.04 Jason A. Donenfeld
1 sibling, 1 reply; 4+ messages in thread
From: Thadeu Lima de Souza Cascardo @ 2021-04-23 17:19 UTC (permalink / raw)
To: wireguard; +Cc: Thadeu Lima de Souza Cascardo
This reverts commit cad80597c7947f0def83caf8cb56aff0149c83a8.
Because this commit has not been backported so far, due to the implications
of building Ubuntu's backport of wireguard in a timely manner.
For now, reverting this fix would allow wireguard-linux-compat CI to work
on Ubuntu 18.04.
A different fix or the same one can be applied again when the time is
right.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---
src/compat/compat.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compat/compat.h b/src/compat/compat.h
index 26a6d7ec2d6b..91d4388824ea 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -823,7 +823,7 @@ static __always_inline void old_rcu_barrier(void)
#define COMPAT_CANNOT_DEPRECIATE_BH_RCU
#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8) && !defined(ISUBUNTU1804)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)
static inline void skb_mark_not_on_list(struct sk_buff *skb)
{
skb->next = NULL;
--
2.27.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/1] wireguard-linux-compat: fix build on Ubuntu 18.04
2021-04-23 17:19 [PATCH 0/1] wireguard-linux-compat: fix build on Ubuntu 18.04 Thadeu Lima de Souza Cascardo
2021-04-23 17:19 ` [PATCH 1/1] Revert "compat: skb_mark_not_on_list will be backported to Ubuntu 18.04" Thadeu Lima de Souza Cascardo
@ 2021-04-23 20:32 ` Jason A. Donenfeld
1 sibling, 0 replies; 4+ messages in thread
From: Jason A. Donenfeld @ 2021-04-23 20:32 UTC (permalink / raw)
To: Thadeu Lima de Souza Cascardo; +Cc: WireGuard mailing list
Hi Cascardo,
Thanks for the patch. I appreciate you fixing this. Hopefully next
time there's not a several month period of CI being broken and me
having to bug apw about it. :)
Jason
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-23 20:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-23 17:19 [PATCH 0/1] wireguard-linux-compat: fix build on Ubuntu 18.04 Thadeu Lima de Souza Cascardo
2021-04-23 17:19 ` [PATCH 1/1] Revert "compat: skb_mark_not_on_list will be backported to Ubuntu 18.04" Thadeu Lima de Souza Cascardo
2021-04-23 20:33 ` Jason A. Donenfeld
2021-04-23 20:32 ` [PATCH 0/1] wireguard-linux-compat: fix build on Ubuntu 18.04 Jason A. Donenfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).