From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0090DA04B1 for ; Mon, 23 Nov 2020 15:50:06 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BACB437AF; Mon, 23 Nov 2020 15:50:05 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 132BA37AF for ; Mon, 23 Nov 2020 15:50:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606143001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHcKfNjxDEI5v7l7ZziWj9/hqba7a1N4OockvocLkMQ=; b=LiZni8kjWJVM/77YREV2vJe8Bbi072jiFsUxEC1pfduKWIq0b+BJt+1EdWd/UcxPaSSNtb cUkXXJfwh8WckcjwjrcZXXPZd+/QbWARCFmwMmRMad4zONmJp+QVztxkHnLnnxZM4z8LZV uUHN7CVe3EfyaV7ZFpvO3GIj4y5gURs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-230-7D9fUDLaM5mDMlujPNQjwQ-1; Mon, 23 Nov 2020 09:49:57 -0500 X-MC-Unique: 7D9fUDLaM5mDMlujPNQjwQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D208810CEFDE; Mon, 23 Nov 2020 14:49:55 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A2C45C1BD; Mon, 23 Nov 2020 14:49:54 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org, ferruh.yigit@intel.com Cc: bluca@debian.org, Kevin Traynor Date: Mon, 23 Nov 2020 14:49:48 +0000 Message-Id: <20201123144948.40420-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 18.11] kni: fix ethtool build error on kernel 5.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- 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