patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: stable@dpdk.org, ferruh.yigit@intel.com
Cc: bluca@debian.org, Kevin Traynor <ktraynor@redhat.com>
Subject: [dpdk-stable] [PATCH 18.11] kni: fix ethtool build error on kernel 5.9
Date: Mon, 23 Nov 2020 14:49:48 +0000	[thread overview]
Message-ID: <20201123144948.40420-1-ktraynor@redhat.com> (raw)

read_barrier_depends() is removed from kernel 5.9 as per Linux
commit 93fab07c2293 ("locking/barriers: Remove definitions for [smp_]read_barrier_depends()")

It is used by ethtool and produces an error when building on kernel 5.9:

/kernel/linux/kni/ethtool/igb/igb_main.c: In function ‘igb_clean_tx_irq’:
/dpdk-stable/kernel/linux/kni/ethtool/igb/igb_main.c:7067:3:
error: implicit declaration of function ‘read_barrier_depends’
[-Werror=implicit-function-declaration]
 7067 |   read_barrier_depends();
      |   ^~~~~~~~~~~~~~~~~~~~

Fix by replacing with rmb() as is done for < 2.6 kernels.

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
---
 kernel/linux/kni/ethtool/igb/kcompat.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h
index 459fda3dad..e89033818a 100644
--- a/kernel/linux/kni/ethtool/igb/kcompat.h
+++ b/kernel/linux/kni/ethtool/igb/kcompat.h
@@ -3974,3 +3974,7 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+#define read_barrier_depends() rmb()
+#endif
+
 #endif /* _KCOMPAT_H_ */
-- 
2.26.2


             reply	other threads:[~2020-11-23 14:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-23 14:49 Kevin Traynor [this message]
2020-11-23 15:05 ` Luca Boccassi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201123144948.40420-1-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=bluca@debian.org \
    --cc=ferruh.yigit@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).