Skip to content

Commit

Permalink
linux/ena: Bump driver version to 2.6.0
Browse files Browse the repository at this point in the history 
Update driver version from 2.5 to 2.6 in all places.
Add release notes for version 2.6.0

Change-Id: Ia3a5531e1c5f9bc880bcae340a59944f3c2d5811
Signed-off-by: Shay Agroskin <shayagr@amazon.com>
  • Loading branch information
@ShayAgros
ShayAgros committed Oct 5, 2021
1 parent b952df8 commit ef3736a
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 10 deletions.
17 changes: 17 additions & 0 deletions kernel/linux/ena/RELEASENOTES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,23 @@ The driver was verified on the following distributions:
SUSE Linux Enterprise Server 12 SP2
SUSE Linux Enterprise Server 12 SP3

## r2.6.0 release notes
**New Features**
* Add "capabilities" field to negotiate device capabilities
* Add support for kernel 5.14
* Allow the device to signal the driver if features renogotiation is required

**Bug Fixes**
* Fix XDP packet fowarding on 6th generaion instances
* Prevent device reset when device isn't responsive

**Minor Changes**
* Move Local Page Cache (LPC) code to a separate file
* Reset device when receiving wrong request id on RX
* Cosmetic changes and code restructuring
* Fix typo in README
* Remove redundant code

## r2.5.0 release notes
**New Features**
* Unify skb allocation path and use build_skb()
Expand Down
2 changes: 1 addition & 1 deletion kernel/linux/ena/ena_netdev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "ena_eth_com.h"

#define DRV_MODULE_GEN_MAJOR 2
#define DRV_MODULE_GEN_MINOR 5
#define DRV_MODULE_GEN_MINOR 6
#define DRV_MODULE_GEN_SUBMINOR 0

#define DRV_MODULE_NAME "ena"
Expand Down
2 changes: 1 addition & 1 deletion kernel/linux/rpm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Author: Cristian Gafton <gafton@amazon.com>

NAME = ena
VERSION = 2.5.0
VERSION = 2.6.0

TOPDIR := $(shell git rev-parse --show-toplevel)

Expand Down
12 changes: 6 additions & 6 deletions kernel/linux/rpm/README-rpm.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Once the pre-requisites have been installed, you can simply issue a
"make" in this directory to build the kmod src.rpm package:

bash$ make
cd .. && git archive --format=tar --prefix=ena-2.5.0/ -o rpm/ena-2.5.0.tar ena_linux_2.5.0
cd .. && git archive --format=tar --prefix=ena-2.6.0/ -o rpm/ena-2.6.0.tar ena_linux_2.6.0
rpmbuild -bs \
--define '_topdir %(pwd)' --define '_ntopdir %(pwd)' \
--define '_builddir %{_ntopdir}' \
Expand All @@ -41,7 +41,7 @@ rpmbuild -bs \
--define '_rpmdir %{_ntopdir}' \
--define '_srcrpmdir %{_ntopdir}' \
ena.spec
Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.5.0-1.el7.3.src.rpm
Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.6.0-1.el7.3.src.rpm
bash$ _


Expand All @@ -50,16 +50,16 @@ COMPILING AND INSTALLING
Once the src.rpm has been created, you can build binary packages for
the installed kernel-devel and kernel-headers environments:

bash$ rpmbuild --rebuild ena-2.5.0-1.el7.3.src.rpm
bash$ rpmbuild --rebuild ena-2.6.0-1.el7.3.src.rpm
[....]
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.5.0-1.el7.3.x86_64.rpm
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.5.0-1.el7.3.x86_64.rpm
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.6.0-1.el7.3.x86_64.rpm
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.6.0-1.el7.3.x86_64.rpm
[...]
bash$ _

Now you should be able to install/deploy the resulting binary rpm
packages using your preferred rpm install too. For example, using yum:

bash$ sudo yum -y localinstall
/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.5.0-1.el7.3.x86_64.rpm
/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.6.0-1.el7.3.x86_64.rpm

7 changes: 5 additions & 2 deletions kernel/linux/rpm/ena.spec
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%define kmod_name ena
%define kmod_driver_version 2.5.0
%define kmod_driver_version 2.6.0
%define kmod_rpm_release 1
%define kmod_git_hash 3ac3e0bf079b2c0468f759f2213541e214a6dd77
%define kmod_kbuild_dir kernel/linux/ena
Expand All @@ -22,7 +22,7 @@ Source7: preamble

Name: %{kmod_name}
Version: %{kmod_driver_version}
Release: %{kmod_rpm_release}%{?dist}.31
Release: %{kmod_rpm_release}%{?dist}.32
Summary: %{kmod_name} kernel module

Group: System/Kernel
Expand Down Expand Up @@ -99,6 +99,9 @@ install -m 644 -D source/%{kmod_kbuild_dir}/RELEASENOTES.md $RPM_BUILD_ROOT/usr/
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed Sep 29 2021 Shay Agroskin shayagr@amazon.com - 2.6.0-1.32
- Update ENA driver to version 2.6.0

* Wed Mar 03 2021 Arthur Kiyanovski akiyano@amazon.com - 2.5.0-1.31
- Update ENA driver to version 2.5.0

Expand Down

2 comments on commit ef3736a

@analytically
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AWS is talking about version 3 of this driver, but doesn't seem released? https://aws.amazon.com/about-aws/whats-new/2021/10/amazon-ec2-c6i-instances/

@zorikm
Copy link
Contributor

@zorikm zorikm commented on ef3736a Oct 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Mathias,
Thank you for catching this. C6i announcement has a wrong mentioning of the ENA driver requirements and we are going to fix this ASAP. Our apologies for this confusion.
Please refer to https://github.com/amzn/amzn-drivers/blob/master/kernel/linux/ena/ENA_Linux_Best_Practices.rst. In "General FAQs" section the first 3 questions refer to the driver versions that should be used.

Please sign in to comment.