Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Fabian Grünbichler
|
feca6913f4 | ||
|
Fabian Grünbichler
|
751aa23b36 | ||
|
Fabian Grünbichler
|
ef94c5ecdc | ||
|
Fabian Grünbichler
|
79bfa1e66d | ||
|
Fabian Grünbichler
|
1bc507a7ee | ||
|
Fabian Grünbichler
|
522a29d09c |
@@ -1,2 +1 @@
|
||||
ubuntu-zesty
|
||||
*.prepared
|
||||
|
||||
+9
-6
@@ -1,6 +1,9 @@
|
||||
[submodule "submodules/zfsonlinux"]
|
||||
path = submodules/zfsonlinux
|
||||
url = ../zfsonlinux
|
||||
[submodule "submodules/ubuntu-impish"]
|
||||
path = submodules/ubuntu-impish
|
||||
url = ../mirror_ubuntu-impish-kernel
|
||||
[submodule "submodules/ubuntu-zesty"]
|
||||
path = submodules/ubuntu-zesty
|
||||
url = ../mirror_ubuntu-zesty-kernel
|
||||
[submodule "submodules/zfs-module"]
|
||||
path = submodules/zfs-module
|
||||
url = ../mirror_zfs-debian
|
||||
[submodule "submodules/spl-module"]
|
||||
path = submodules/spl-module
|
||||
url = ../mirror_spl-debian
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
From b776ff7db868804129b9f364825fd4e949a493ee Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Tue, 19 Sep 2017 09:36:43 +0200
|
||||
Subject: [PATCH] Revert "net: reduce skb_warn_bad_offload() noise"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit b2504a5dbef3305ef41988ad270b0e8ec289331c.
|
||||
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
---
|
||||
net/core/dev.c | 12 +++---------
|
||||
1 file changed, 3 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/net/core/dev.c b/net/core/dev.c
|
||||
index 73d5644fa834..7c8959936169 100644
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -2702,12 +2702,11 @@ static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path)
|
||||
struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
|
||||
netdev_features_t features, bool tx_path)
|
||||
{
|
||||
- struct sk_buff *segs;
|
||||
-
|
||||
if (unlikely(skb_needs_check(skb, tx_path))) {
|
||||
int err;
|
||||
|
||||
- /* We're going to init ->check field in TCP or UDP header */
|
||||
+ skb_warn_bad_offload(skb);
|
||||
+
|
||||
err = skb_cow_head(skb, 0);
|
||||
if (err < 0)
|
||||
return ERR_PTR(err);
|
||||
@@ -2735,12 +2734,7 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
|
||||
skb_reset_mac_header(skb);
|
||||
skb_reset_mac_len(skb);
|
||||
|
||||
- segs = skb_mac_gso_segment(skb, features);
|
||||
-
|
||||
- if (unlikely(skb_needs_check(skb, tx_path)))
|
||||
- skb_warn_bad_offload(skb);
|
||||
-
|
||||
- return segs;
|
||||
+ return skb_mac_gso_segment(skb, features);
|
||||
}
|
||||
EXPORT_SYMBOL(__skb_gso_segment);
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
From 6fa9fc0ce1032710ce017c444b0c66eaf9e77782 Mon Sep 17 00:00:00 2001
|
||||
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
Date: Mon, 22 May 2017 00:17:30 +0200
|
||||
Subject: [PATCH linux] netfilter: nft_set_rbtree: handle re-addition element
|
||||
after deletion
|
||||
|
||||
The existing code selects no next branch to be inspected when
|
||||
re-inserting an inactive element into the rb-tree, looping endlessly.
|
||||
This patch restricts the check for active elements to the EEXIST case
|
||||
only.
|
||||
|
||||
Fixes: e701001e7cbe ("netfilter: nft_rbtree: allow adjacent intervals with dynamic updates")
|
||||
Reported-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
||||
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
---
|
||||
net/netfilter/nft_set_rbtree.c | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
|
||||
index f06f55e..51ff879 100644
|
||||
--- a/net/netfilter/nft_set_rbtree.c
|
||||
+++ b/net/netfilter/nft_set_rbtree.c
|
||||
@@ -118,17 +118,17 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,
|
||||
else if (d > 0)
|
||||
p = &parent->rb_right;
|
||||
else {
|
||||
- if (nft_set_elem_active(&rbe->ext, genmask)) {
|
||||
- if (nft_rbtree_interval_end(rbe) &&
|
||||
- !nft_rbtree_interval_end(new))
|
||||
- p = &parent->rb_left;
|
||||
- else if (!nft_rbtree_interval_end(rbe) &&
|
||||
- nft_rbtree_interval_end(new))
|
||||
- p = &parent->rb_right;
|
||||
- else {
|
||||
- *ext = &rbe->ext;
|
||||
- return -EEXIST;
|
||||
- }
|
||||
+ if (nft_rbtree_interval_end(rbe) &&
|
||||
+ !nft_rbtree_interval_end(new)) {
|
||||
+ p = &parent->rb_left;
|
||||
+ } else if (!nft_rbtree_interval_end(rbe) &&
|
||||
+ nft_rbtree_interval_end(new)) {
|
||||
+ p = &parent->rb_right;
|
||||
+ } else if (nft_set_elem_active(&rbe->ext, genmask)) {
|
||||
+ *ext = &rbe->ext;
|
||||
+ return -EEXIST;
|
||||
+ } else {
|
||||
+ p = &parent->rb_left;
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From d747a7a51b00984127a88113cdbbc26f91e9d815 Mon Sep 17 00:00:00 2001
|
||||
From: WANG Cong <xiyou.wangcong@gmail.com>
|
||||
Date: Sat, 24 Jun 2017 23:50:30 -0700
|
||||
Subject: [PATCH] tcp: reset sk_rx_dst in tcp_disconnect()
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
We have to reset the sk->sk_rx_dst when we disconnect a TCP
|
||||
connection, because otherwise when we re-connect it this
|
||||
dst reference is simply overridden in tcp_finish_connect().
|
||||
|
||||
This fixes a dst leak which leads to a loopback dev refcnt
|
||||
leak. It is a long-standing bug, Kevin reported a very similar
|
||||
(if not same) bug before. Thanks to Andrei for providing such
|
||||
a reliable reproducer which greatly narrows down the problem.
|
||||
|
||||
Fixes: 41063e9dd119 ("ipv4: Early TCP socket demux.")
|
||||
Reported-by: Andrei Vagin <avagin@gmail.com>
|
||||
Reported-by: Kevin Xu <kaiwen.xu@hulu.com>
|
||||
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
---
|
||||
net/ipv4/tcp.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
|
||||
index b5ea036ca781..40aca7803cf2 100644
|
||||
--- a/net/ipv4/tcp.c
|
||||
+++ b/net/ipv4/tcp.c
|
||||
@@ -2330,6 +2330,8 @@ int tcp_disconnect(struct sock *sk, int flags)
|
||||
tcp_init_send_head(sk);
|
||||
memset(&tp->rx_opt, 0, sizeof(tp->rx_opt));
|
||||
__sk_dst_reset(sk);
|
||||
+ dst_release(sk->sk_rx_dst);
|
||||
+ sk->sk_rx_dst = NULL;
|
||||
tcp_saved_syn_free(tp);
|
||||
|
||||
/* Clean up fastopen related fields */
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
# also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
|
||||
KERNEL_MAJ=5
|
||||
KERNEL_MIN=13
|
||||
KERNEL_PATCHLEVEL=19
|
||||
# increment KREL if the ABI changes (abicheck target in debian/rules)
|
||||
# rebuild packages with new KREL and run 'make abiupdate'
|
||||
KREL=6
|
||||
RELEASE=5.0
|
||||
|
||||
PKGREL=14
|
||||
# also update proxmox-ve/changelog if you change KERNEL_VER or KREL
|
||||
KERNEL_VER=4.10.17
|
||||
PKGREL=25
|
||||
# also include firmware of previous version into
|
||||
# the fw package: fwlist-2.6.32-PREV-pve
|
||||
KREL=5
|
||||
|
||||
KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
|
||||
KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
|
||||
KERNEL_SRC=ubuntu-zesty
|
||||
KERNEL_SRC_SUBMODULE=submodules/ubuntu-zesty
|
||||
|
||||
EXTRAVERSION=-${KREL}-pve
|
||||
KVNAME=${KERNEL_VER}${EXTRAVERSION}
|
||||
@@ -17,6 +16,7 @@ PACKAGE=pve-kernel-${KVNAME}
|
||||
HDRPACKAGE=pve-headers-${KVNAME}
|
||||
|
||||
ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
|
||||
NPROCS=$(shell nproc)
|
||||
|
||||
# amd64/x86_64/x86 share the arch subdirectory in the kernel, 'x86' so we need
|
||||
# a mapping
|
||||
@@ -26,122 +26,343 @@ KERNEL_ARCH=${ARCH}
|
||||
endif
|
||||
|
||||
GITVERSION:=$(shell git rev-parse HEAD)
|
||||
CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate -lchangelog.Debian)
|
||||
export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp -lchangelog.Debian)
|
||||
|
||||
SKIPABI=0
|
||||
|
||||
BUILD_DIR=build
|
||||
TOP=$(shell pwd)
|
||||
|
||||
KERNEL_SRC=ubuntu-impish
|
||||
KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
|
||||
KERNEL_CFG_ORG=config-${KERNEL_VER}.org
|
||||
|
||||
ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
|
||||
E1000EDIR=e1000e-3.3.5.3
|
||||
E1000ESRC=${E1000EDIR}.tar.gz
|
||||
|
||||
IGBDIR=igb-5.3.5.4
|
||||
IGBSRC=${IGBDIR}.tar.gz
|
||||
|
||||
IXGBEDIR=ixgbe-5.0.4
|
||||
IXGBESRC=${IXGBEDIR}.tar.gz
|
||||
|
||||
SPLDIR=pkg-spl
|
||||
SPLSRC=submodules/spl-module
|
||||
ZFSDIR=pkg-zfs
|
||||
|
||||
MODULES=modules
|
||||
MODULE_DIRS=${ZFSDIR}
|
||||
|
||||
# exported to debian/rules via debian/rules.d/dirs.mk
|
||||
DIRS=KERNEL_SRC ZFSDIR MODULES
|
||||
ZFSSRC=submodules/zfs-module
|
||||
ZFS_KO=zfs.ko
|
||||
ZFS_KO_REST=zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko icp.ko
|
||||
ZFS_MODULES=$(ZFS_KO) $(ZFS_KO_REST)
|
||||
SPL_KO=spl.ko
|
||||
SPL_KO_REST=splat.ko
|
||||
SPL_MODULES=$(SPL_KO) $(SPL_KO_REST)
|
||||
|
||||
DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
|
||||
HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
|
||||
USR_HDR_DEB=pve-kernel-libc-dev_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
|
||||
LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
|
||||
LINUX_TOOLS_DBG_DEB=linux-tools-$(KERNEL_MAJMIN)-dbgsym_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
|
||||
PVEPKG=proxmox-ve
|
||||
PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
|
||||
VIRTUALHDRPACKAGE=pve-headers
|
||||
VIRTUAL_HDR_DEB=${VIRTUALHDRPACKAGE}_${RELEASE}-${PKGREL}_all.deb
|
||||
|
||||
DEBS=${DST_DEB} ${HDR_DEB} ${USR_HDR_DEB} ${LINUX_TOOLS_DEB} ${LINUX_TOOLS_DBG_DEB}
|
||||
LINUX_TOOLS_PKG=linux-tools-4.10
|
||||
LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
|
||||
|
||||
all: deb
|
||||
DEBS=${DST_DEB} ${HDR_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB}
|
||||
|
||||
all: check_gcc deb
|
||||
deb: ${DEBS}
|
||||
|
||||
${LINUX_TOOLS_DEB} ${HDR_DEB}: ${DST_DEB}
|
||||
${DST_DEB}: ${BUILD_DIR}.prepared
|
||||
cd ${BUILD_DIR}; dpkg-buildpackage --jobs=auto -b -uc -us
|
||||
pve: $(PVE_DEB)
|
||||
${PVE_DEB}: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS}
|
||||
rm -rf proxmox-ve/data
|
||||
mkdir -p proxmox-ve/data/DEBIAN
|
||||
mkdir -p proxmox-ve/data/usr/share/doc/${PVEPKG}/
|
||||
mkdir -p proxmox-ve/data/etc/apt/trusted.gpg.d
|
||||
install -m 0644 proxmox-ve/proxmox-release-5.x.pubkey proxmox-ve/data/etc/apt/trusted.gpg.d/proxmox-ve-release-5.x.gpg
|
||||
sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' <proxmox-ve/control >proxmox-ve/data/DEBIAN/control
|
||||
sed -e 's/@KVNAME@/${KVNAME}/' <proxmox-ve/postinst >proxmox-ve/data/DEBIAN/postinst
|
||||
chmod 0755 proxmox-ve/data/DEBIAN/postinst
|
||||
install -m 0755 proxmox-ve/postrm proxmox-ve/data/DEBIAN/postrm
|
||||
echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${PVEPKG}/SOURCE
|
||||
install -m 0644 proxmox-ve/copyright proxmox-ve/data/usr/share/doc/${PVEPKG}
|
||||
install -m 0644 proxmox-ve/changelog.Debian proxmox-ve/data/usr/share/doc/${PVEPKG}
|
||||
gzip -n --best proxmox-ve/data/usr/share/doc/${PVEPKG}/changelog.Debian
|
||||
dpkg-deb --build proxmox-ve/data ${PVE_DEB}
|
||||
|
||||
pve-headers: $(VIRTUAL_HDR_DEB)
|
||||
${VIRTUAL_HDR_DEB}: proxmox-ve/pve-headers.control
|
||||
rm -rf pve-headers/data
|
||||
mkdir -p pve-headers/data/DEBIAN
|
||||
mkdir -p pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}/
|
||||
sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' <proxmox-ve/pve-headers.control >pve-headers/data/DEBIAN/control
|
||||
echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}/SOURCE
|
||||
install -m 0644 proxmox-ve/copyright pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}
|
||||
install -m 0644 proxmox-ve/changelog.Debian pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}
|
||||
gzip -n --best pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}/changelog.Debian
|
||||
dpkg-deb --build pve-headers/data ${VIRTUAL_HDR_DEB}
|
||||
|
||||
check_gcc:
|
||||
ifeq ($(CC), cc)
|
||||
gcc --version|grep "6\.3" || false
|
||||
else
|
||||
$(CC) --version|grep "6\.3" || false
|
||||
endif
|
||||
|
||||
${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.Debian | fwcheck abicheck
|
||||
mkdir -p data/DEBIAN
|
||||
sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' -e 's/@ARCH@/${ARCH}/' <control.in >data/DEBIAN/control
|
||||
sed -e 's/@@KVNAME@@/${KVNAME}/g' <prerm.in >data/DEBIAN/prerm
|
||||
chmod 0755 data/DEBIAN/prerm
|
||||
sed -e 's/@@KVNAME@@/${KVNAME}/g' <postinst.in >data/DEBIAN/postinst
|
||||
chmod 0755 data/DEBIAN/postinst
|
||||
sed -e 's/@@KVNAME@@/${KVNAME}/g' <postrm.in >data/DEBIAN/postrm
|
||||
chmod 0755 data/DEBIAN/postrm
|
||||
install -D -m 644 copyright data/usr/share/doc/${PACKAGE}/copyright
|
||||
install -D -m 644 changelog.Debian data/usr/share/doc/${PACKAGE}/changelog.Debian
|
||||
echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > data/usr/share/doc/${PACKAGE}/SOURCE
|
||||
gzip -n -f --best data/usr/share/doc/${PACKAGE}/changelog.Debian
|
||||
rm -f data/lib/modules/${KVNAME}/source
|
||||
rm -f data/lib/modules/${KVNAME}/build
|
||||
dpkg-deb --build data ${DST_DEB}
|
||||
lintian ${DST_DEB}
|
||||
#lintian ${HDR_DEB}
|
||||
|
||||
LINUX_TOOLS_DH_LIST=strip installchangelogs installdocs compress shlibdeps gencontrol md5sums builddeb
|
||||
|
||||
${LINUX_TOOLS_DEB}: .compile_mark control.tools changelog.Debian copyright
|
||||
rm -rf linux-tools ${LINUX_TOOLS_DEB}
|
||||
mkdir -p linux-tools/debian
|
||||
cp control.tools linux-tools/debian/control
|
||||
echo 9 > linux-tools/debian/compat
|
||||
cp changelog.Debian linux-tools/debian/changelog
|
||||
cp copyright linux-tools/debian
|
||||
mkdir -p linux-tools/debian/linux-tools-4.10/usr/bin
|
||||
install -m 0755 ${KERNEL_SRC}/tools/perf/perf linux-tools/debian/linux-tools-4.10/usr/bin/perf_4.10
|
||||
cd linux-tools; for i in ${LINUX_TOOLS_DH_LIST}; do dh_$$i; done
|
||||
lintian ${LINUX_TOOLS_DEB}
|
||||
|
||||
${BUILD_DIR}.prepared: $(addsuffix .prepared,${KERNEL_SRC} ${MODULES} debian)
|
||||
cp -a fwlist-previous ${BUILD_DIR}/
|
||||
cp -a abi-prev-* ${BUILD_DIR}/
|
||||
cp -a abi-blacklist ${BUILD_DIR}/
|
||||
fwlist-${KVNAME}: data
|
||||
./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
|
||||
mv fwlist.tmp $@
|
||||
|
||||
.PHONY: fwcheck
|
||||
fwcheck: fwlist-${KVNAME} fwlist-previous
|
||||
@echo "checking fwlist for changes since last built firmware package.."
|
||||
@echo "if this check fails, add fwlist-${KVNAME} to the pve-firmware repository and upload a new firmware package together with the ${KVNAME} kernel"
|
||||
sort fwlist-previous | uniq > fwlist-previous.sorted
|
||||
sort fwlist-${KVNAME} | uniq > fwlist-${KVNAME}.sorted
|
||||
diff -up -N fwlist-previous.sorted fwlist-${KVNAME}.sorted > fwlist.diff
|
||||
rm fwlist.diff fwlist-previous.sorted fwlist-${KVNAME}.sorted
|
||||
@echo "done, no need to rebuild pve-firmware"
|
||||
|
||||
|
||||
abi-${KVNAME}: .compile_mark
|
||||
sed -e 's/^\(.\+\)[[:space:]]\+\(.\+\)[[:space:]]\(.\+\)$$/\3 \2 \1/' ${KERNEL_SRC}/Module.symvers | sort > abi-${KVNAME}
|
||||
|
||||
.PHONY: abicheck
|
||||
abicheck: abi-${KVNAME} abi-previous abi-blacklist
|
||||
./abi-check abi-${KVNAME} abi-previous ${SKIPABI}
|
||||
|
||||
data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES}
|
||||
rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
|
||||
mkdir tmp/boot
|
||||
install -m 644 ${KERNEL_SRC}/.config tmp/boot/config-${KVNAME}
|
||||
install -m 644 ${KERNEL_SRC}/System.map tmp/boot/System.map-${KVNAME}
|
||||
install -m 644 ${KERNEL_SRC}/arch/${KERNEL_ARCH}/boot/bzImage tmp/boot/vmlinuz-${KVNAME}
|
||||
cd ${KERNEL_SRC}; make INSTALL_MOD_PATH=../tmp/ modules_install
|
||||
## install latest ibg driver
|
||||
install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
|
||||
# install latest ixgbe driver
|
||||
install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
|
||||
# install latest e1000e driver
|
||||
install -m 644 e1000e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
|
||||
# install zfs drivers
|
||||
install -d -m 0755 tmp/lib/modules/${KVNAME}/zfs
|
||||
install -m 644 ${SPL_MODULES} ${ZFS_MODULES} tmp/lib/modules/${KVNAME}/zfs
|
||||
# remove firmware
|
||||
rm -rf tmp/lib/firmware
|
||||
# strip debug info
|
||||
find tmp/lib/modules -name \*.ko -print | while read f ; do strip --strip-debug "$$f"; done
|
||||
# finalize
|
||||
/sbin/depmod -b tmp/ ${KVNAME}
|
||||
# Autogenerate blacklist for watchdog devices (see README)
|
||||
install -m 0755 -d tmp/lib/modprobe.d
|
||||
ls tmp/lib/modules/${KVNAME}/kernel/drivers/watchdog/ > watchdog-blacklist.tmp
|
||||
echo ipmi_watchdog.ko >> watchdog-blacklist.tmp
|
||||
cat watchdog-blacklist.tmp|sed -e 's/^/blacklist /' -e 's/.ko$$//'|sort -u > tmp/lib/modprobe.d/blacklist_${PACKAGE}.conf
|
||||
mv tmp data
|
||||
|
||||
PVE_CONFIG_OPTS= \
|
||||
-m INTEL_MEI_WDT \
|
||||
-d CONFIG_SND_PCM_OSS \
|
||||
-e CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \
|
||||
-d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \
|
||||
-m CONFIG_CEPH_FS \
|
||||
-m CONFIG_BLK_DEV_NBD \
|
||||
-m CONFIG_BLK_DEV_RBD \
|
||||
-m CONFIG_BCACHE \
|
||||
-m CONFIG_JFS_FS \
|
||||
-m CONFIG_HFS_FS \
|
||||
-m CONFIG_HFSPLUS_FS \
|
||||
-e CONFIG_BRIDGE \
|
||||
-e CONFIG_BRIDGE_NETFILTER \
|
||||
-e CONFIG_BLK_DEV_SD \
|
||||
-e CONFIG_BLK_DEV_SR \
|
||||
-e CONFIG_BLK_DEV_DM \
|
||||
-e CONFIG_BLK_DEV_NVME \
|
||||
-d CONFIG_INPUT_EVBUG \
|
||||
-d CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND \
|
||||
-e CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE \
|
||||
-d CONFIG_MODULE_SIG \
|
||||
-d CONFIG_MEMCG_DISABLED \
|
||||
-e CONFIG_MEMCG_SWAP_ENABLED \
|
||||
-e CONFIG_MEMCG_KMEM \
|
||||
-d CONFIG_DEFAULT_CFQ \
|
||||
-e CONFIG_DEFAULT_DEADLINE \
|
||||
-e CONFIG_MODVERSIONS \
|
||||
-d CONFIG_DEFAULT_SECURITY_DAC \
|
||||
-e CONFIG_DEFAULT_SECURITY_APPARMOR \
|
||||
--set-str CONFIG_DEFAULT_SECURITY apparmor
|
||||
|
||||
.compile_mark: ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}
|
||||
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
|
||||
cp ${KERNEL_CFG_ORG} ${KERNEL_SRC}/.config
|
||||
cd ${KERNEL_SRC}; ./scripts/config ${PVE_CONFIG_OPTS}
|
||||
cd ${KERNEL_SRC}; make oldconfig
|
||||
cd ${KERNEL_SRC}; make KBUILD_BUILD_VERSION_TIMESTAMP="PVE ${KERNEL_VER}-${PKGREL} (${CHANGELOG_DATE})" -j ${NPROCS}
|
||||
make -C ${KERNEL_SRC}/tools/perf prefix=/usr HAVE_CPLUS_DEMANGLE=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python2.7
|
||||
make -C ${KERNEL_SRC}/tools/perf man
|
||||
touch $@
|
||||
|
||||
debian.prepared: debian
|
||||
rm -rf ${BUILD_DIR}/debian
|
||||
mkdir -p ${BUILD_DIR}
|
||||
cp -a debian ${BUILD_DIR}/debian
|
||||
echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > ${BUILD_DIR}/debian/SOURCE
|
||||
@$(foreach dir, ${DIRS},echo "${dir}=${${dir}}" >> ${BUILD_DIR}/debian/rules.d/env.mk;)
|
||||
echo "KVNAME=${KVNAME}" >> ${BUILD_DIR}/debian/rules.d/env.mk
|
||||
echo "KERNEL_MAJMIN=${KERNEL_MAJMIN}" >> ${BUILD_DIR}/debian/rules.d/env.mk
|
||||
cd ${BUILD_DIR}; debian/rules debian/control
|
||||
${KERNEL_CFG_ORG}: ${KERNEL_SRC}/README
|
||||
${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodule
|
||||
rm -rf ${KERNEL_SRC}
|
||||
cp -a ${KERNEL_SRC_SUBMODULE} ${KERNEL_SRC}
|
||||
cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
|
||||
cd ${KERNEL_SRC}; patch -p1 < ../uname-version-timestamp.patch
|
||||
cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
|
||||
#cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
|
||||
#cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch
|
||||
cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
|
||||
#cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch
|
||||
cd ${KERNEL_SRC}; patch -p1 < ../kvm-dynamic-halt-polling-disable-default.patch
|
||||
cd ${KERNEL_SRC}; patch -p1 < ../cgroup-cpuset-add-cpuset.remap_cpus.patch
|
||||
cd ${KERNEL_SRC}; patch -p1 < ../0001-netfilter-nft_set_rbtree-handle-re-addition-element-.patch # DoS from within (unpriv) containers
|
||||
cd ${KERNEL_SRC}; patch -p1 < ../0001-tcp-reset-sk_rx_dst-in-tcp_disconnect.patch
|
||||
cd ${KERNEL_SRC}; patch -p1 < ../0001-Revert-net-reduce-skb_warn_bad_offload-noise.patch
|
||||
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
|
||||
touch $@
|
||||
|
||||
${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} | submodule
|
||||
rm -rf ${BUILD_DIR}/${KERNEL_SRC} $@
|
||||
mkdir -p ${BUILD_DIR}
|
||||
cp -a ${KERNEL_SRC_SUBMODULE} ${BUILD_DIR}/${KERNEL_SRC}
|
||||
# TODO: split for archs, track and diff in our repository?
|
||||
cat ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
|
||||
cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config
|
||||
sed -i ${BUILD_DIR}/${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
|
||||
rm -rf ${BUILD_DIR}/${KERNEL_SRC}/debian ${BUILD_DIR}/${KERNEL_SRC}/debian.master
|
||||
set -e; cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/kernel/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
|
||||
touch $@
|
||||
e1000e.ko e1000e: .compile_mark ${E1000ESRC}
|
||||
rm -rf ${E1000EDIR}
|
||||
tar xf ${E1000ESRC}
|
||||
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
|
||||
cd ${E1000EDIR}; patch -p1 < ../intel-module-gcc6-compat.patch
|
||||
cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_compat.patch
|
||||
cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_max-mtu.patch
|
||||
cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
|
||||
cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
|
||||
|
||||
${MODULES}.prepared: $(addsuffix .prepared,${MODULE_DIRS})
|
||||
touch $@
|
||||
igb.ko igb: .compile_mark ${IGBSRC}
|
||||
rm -rf ${IGBDIR}
|
||||
tar xf ${IGBSRC}
|
||||
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
|
||||
cd ${IGBDIR}; patch -p1 < ../intel-module-gcc6-compat.patch
|
||||
cd ${IGBDIR}; patch -p1 < ../igb_4.9_compat.patch
|
||||
cd ${IGBDIR}; patch -p1 < ../igb_4.10_compat.patch
|
||||
cd ${IGBDIR}; patch -p1 < ../igb_4.10_max-mtu.patch
|
||||
cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
|
||||
cp ${IGBDIR}/src/igb.ko igb.ko
|
||||
|
||||
${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
|
||||
rm -rf ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@
|
||||
mkdir -p ${BUILD_DIR}/${MODULES}/tmp
|
||||
cp -a ${ZFSONLINUX_SUBMODULE}/* ${BUILD_DIR}/${MODULES}/tmp
|
||||
cd ${BUILD_DIR}/${MODULES}/tmp; make kernel
|
||||
rm -rf ${BUILD_DIR}/${MODULES}/tmp
|
||||
touch ${ZFSDIR}.prepared
|
||||
ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
|
||||
rm -rf ${IXGBEDIR}
|
||||
tar xf ${IXGBESRC}
|
||||
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
|
||||
cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_compat.patch
|
||||
cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_max-mtu.patch
|
||||
cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
|
||||
cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
|
||||
|
||||
$(SPL_KO_REST): $(SPL_KO)
|
||||
$(SPL_KO): .compile_mark ${SPLSRC}
|
||||
rm -rf ${SPLDIR}
|
||||
rsync -ra ${SPLSRC}/ ${SPLDIR}
|
||||
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
|
||||
cd ${SPLDIR}; ./autogen.sh
|
||||
cd ${SPLDIR}; ./configure --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
|
||||
cd ${SPLDIR}; make
|
||||
cp ${SPLDIR}/module/spl/spl.ko spl.ko
|
||||
cp ${SPLDIR}/module/splat/splat.ko splat.ko
|
||||
|
||||
$(ZFS_KO_REST): $(ZFS_KO)
|
||||
$(ZFS_KO): .compile_mark ${ZFSSRC}
|
||||
rm -rf ${ZFSDIR}
|
||||
rsync -ra ${ZFSSRC}/ ${ZFSDIR}
|
||||
[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
|
||||
cd ${ZFSDIR}; ./autogen.sh
|
||||
cd ${ZFSDIR}; ./configure --with-spl=${TOP}/${SPLDIR} --with-spl-obj=${TOP}/${SPLDIR} --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
|
||||
cd ${ZFSDIR}; make
|
||||
cp ${ZFSDIR}/module/zfs/zfs.ko zfs.ko
|
||||
cp ${ZFSDIR}/module/avl/zavl.ko zavl.ko
|
||||
cp ${ZFSDIR}/module/nvpair/znvpair.ko znvpair.ko
|
||||
cp ${ZFSDIR}/module/unicode/zunicode.ko zunicode.ko
|
||||
cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
|
||||
cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
|
||||
cp ${ZFSDIR}/module/icp/icp.ko icp.ko
|
||||
|
||||
headers_tmp := $(CURDIR)/tmp-headers
|
||||
headers_dir := $(headers_tmp)/usr/src/linux-headers-${KVNAME}
|
||||
|
||||
hdr: $(HDR_DEB)
|
||||
${HDR_DEB}: .compile_mark headers-control.in headers-postinst.in
|
||||
rm -rf $(headers_tmp)
|
||||
install -d $(headers_tmp)/DEBIAN $(headers_dir)/include/
|
||||
sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' -e 's/@ARCH@/${ARCH}/' <headers-control.in >$(headers_tmp)/DEBIAN/control
|
||||
sed -e 's/@@KVNAME@@/${KVNAME}/g' <headers-postinst.in >$(headers_tmp)/DEBIAN/postinst
|
||||
chmod 0755 $(headers_tmp)/DEBIAN/postinst
|
||||
install -D -m 644 copyright $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/copyright
|
||||
install -D -m 644 changelog.Debian $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/changelog.Debian
|
||||
echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/SOURCE
|
||||
gzip -n -f --best $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/changelog.Debian
|
||||
install -m 0644 ${KERNEL_SRC}/.config $(headers_dir)
|
||||
install -m 0644 ${KERNEL_SRC}/Module.symvers $(headers_dir)
|
||||
cd ${KERNEL_SRC}; find . -path './debian/*' -prune -o -path './include/*' -prune -o -path './Documentation' -prune \
|
||||
-o -path './scripts' -prune -o -type f \
|
||||
\( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
|
||||
-name '*.sh' -o -name '*.pl' \) \
|
||||
-print | cpio -pd --preserve-modification-time $(headers_dir)
|
||||
cd ${KERNEL_SRC}; cp -a include scripts $(headers_dir)
|
||||
cd ${KERNEL_SRC}; (find arch/${KERNEL_ARCH} -name include -type d -print | \
|
||||
xargs -n1 -i: find : -type f) | \
|
||||
cpio -pd --preserve-modification-time $(headers_dir)
|
||||
mkdir -p ${headers_tmp}/lib/modules/${KVNAME}
|
||||
ln -sf /usr/src/linux-headers-${KVNAME} ${headers_tmp}/lib/modules/${KVNAME}/build
|
||||
dpkg-deb --build $(headers_tmp) ${HDR_DEB}
|
||||
#lintian ${HDR_DEB}
|
||||
|
||||
.PHONY: upload
|
||||
upload: ${DEBS}
|
||||
tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch ${ARCH}
|
||||
tar cf - ${DEBS}|ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
|
||||
|
||||
.PHONY: distclean
|
||||
distclean: clean
|
||||
git submodule deinit --all
|
||||
rm -rf linux-firmware.git dvb-firmware.git ${KERNEL_SRC}.org
|
||||
|
||||
# upgrade to current master
|
||||
.PHONY: update_modules
|
||||
update_modules: submodule
|
||||
git submodule foreach 'git pull --ff-only origin master'
|
||||
cd ${ZFSONLINUX_SUBMODULE}; git pull --ff-only origin master
|
||||
|
||||
# make sure submodules were initialized
|
||||
.PHONY: submodule
|
||||
submodule:
|
||||
test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init ${KERNEL_SRC_SUBMODULE}
|
||||
test -f "${ZFSONLINUX_SUBMODULE}/Makefile" || git submodule update --init --recursive ${ZFSONLINUX_SUBMODULE}
|
||||
test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init
|
||||
test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
|
||||
test -f "${SPLSRC}/debian/changelog" || git submodule update --init
|
||||
|
||||
# call after ABI bump with header deb in working directory
|
||||
.PHONY: abiupdate
|
||||
abiupdate: abi-prev-${KVNAME}
|
||||
abi-prev-${KVNAME}: abi-tmp-${KVNAME}
|
||||
ifneq ($(strip $(shell git status --untracked-files=no --porcelain -z)),)
|
||||
@echo "working directory unclean, aborting!"
|
||||
@false
|
||||
else
|
||||
git rm "abi-prev-*"
|
||||
mv $< $@
|
||||
git add $@
|
||||
git commit -s -m "update ABI file for ${KVNAME}" -m "(generated with debian/scripts/abi-generate)"
|
||||
@echo "update abi-prev-${KVNAME} committed!"
|
||||
endif
|
||||
|
||||
abi-tmp-${KVNAME}:
|
||||
@ test -e ${HDR_DEB} || (echo "need ${HDR_DEB} to extract ABI data!" && false)
|
||||
debian/scripts/abi-generate ${HDR_DEB} $@ ${KVNAME} 1
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -rf *~ build *.prepared ${KERNEL_CFG_ORG}
|
||||
rm -f *.deb *.changes *.buildinfo
|
||||
rm -rf *~ .compile_mark watchdog-blacklist.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC} ${KERNEL_SRC}.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC}.org orig tmp data proxmox-ve/data *.deb ${headers_tmp} fwdata fwlist.tmp *.ko abi-${KVNAME} fwlist-${KVNAME} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR} ${DRBDDIR} drbd-9.0 ${IGBDIR} igb.ko ${IXGBEDIR} ixgbe.ko ${E1000EDIR} e1000e.ko linux-tools ${LINUX_TOOLS_DEB}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -3,96 +3,70 @@ KERNEL SOURCE:
|
||||
|
||||
We currently use the Ubuntu kernel sources, available from:
|
||||
|
||||
http://kernel.ubuntu.com/git/ubuntu/ubuntu-impish.git/
|
||||
http://kernel.ubuntu.com/git/ubuntu/ubuntu-xenial.git/
|
||||
|
||||
Ubuntu will maintain those kernels till:
|
||||
|
||||
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
|
||||
or
|
||||
https://pve.proxmox.com/pve-docs/chapter-pve-faq.html#faq-support-table
|
||||
|
||||
whatever happens to be earlier.
|
||||
|
||||
|
||||
Additional/Updated Modules:
|
||||
---------------------------
|
||||
|
||||
- include latest e1000e driver from intel/sourceforge
|
||||
|
||||
- include latest ixgbe driver from intel/sourceforge
|
||||
|
||||
- include latest igb driver from intel/sourceforge
|
||||
|
||||
# Note: hpsa does not compile with kernel 3.19.8
|
||||
#- include latest HPSA driver (HP Smart Array)
|
||||
#
|
||||
# * http://sourceforge.net/projects/cciss/
|
||||
|
||||
- include native OpenZFS filesystem kernel modules for Linux
|
||||
|
||||
* https://github.com/zfsonlinux/
|
||||
|
||||
For licensing questions, see: http://open-zfs.org/wiki/Talk:FAQ
|
||||
|
||||
- include latest DRBD 9 driver, see http://drbd.linbit.com/home/what-is-drbd/
|
||||
|
||||
SUBMODULE
|
||||
|
||||
FIRMWARE:
|
||||
=========
|
||||
|
||||
We track the current upstream repository as submodule. Besides obvious
|
||||
advantages over tracking binary tar archives this also has some implications.
|
||||
We create our own firmware package, which includes the firmware for
|
||||
all proxmox-ve kernels. So far this include
|
||||
|
||||
For building the submodule directory gets copied into build/ and a few patches
|
||||
get applied with the `patch` tool. From a git point-of-view, the copied
|
||||
directory remains clean even with extra patches applied since it does not
|
||||
contain a .git directory, but a reference to the (still pristine) submodule:
|
||||
pve-kernel-2.6.18
|
||||
pve-kernel-2.6.24
|
||||
pve-kernel-2.6.32
|
||||
pve-kernel-3.10.0
|
||||
pve-kernel-3.19.0
|
||||
|
||||
$ cat build/ubuntu-impish/.git
|
||||
We use 'find-firmware.pl' to extract lists of required firmeware
|
||||
files. The script 'assemble-firmware.pl' is used to read those lists
|
||||
and copy the files from various source directory into a target
|
||||
directory.
|
||||
|
||||
If you mistakenly cloned the upstream repo as "normal" clone (not via the
|
||||
submodule mechanics) this means that you have a real .git directory with its
|
||||
independent objects and tracking info when copying for building, thus git
|
||||
operates on the copied directory - and "sees" that it was dirtied by `patch`,
|
||||
and thus the kernel buildsystem sees this too and will add a '+' to the version
|
||||
as a result. This changes the output directories for modules and other build
|
||||
artefacts and let's then the build fail on packaging.
|
||||
We do not include firmeware for some wireless HW when there is a
|
||||
separate debian package for that, for example:
|
||||
|
||||
So always ensure that you really checked it out as submodule, not as full
|
||||
"normal" clone. You can also explicitly set the LOCALVERSION variable to
|
||||
undefined with: `export LOCALVERSION= but that should only be done for test
|
||||
builds.
|
||||
|
||||
RELATED PACKAGES:
|
||||
=================
|
||||
|
||||
proxmox-ve
|
||||
----------
|
||||
|
||||
top level meta package, depends on current default kernel series meta package.
|
||||
|
||||
git clone git://git.proxmox.com/git/proxmox-ve.git
|
||||
|
||||
pve-kernel-meta
|
||||
---------------
|
||||
|
||||
depends on latest kernel and header package within a certain kernel series,
|
||||
e.g., pve-kernel-5.11 / pve-headers-5.11
|
||||
|
||||
git clone git://git.proxmox.com/git/pve-kernel-meta.git
|
||||
|
||||
pve-firmware
|
||||
------------
|
||||
|
||||
contains the firmware for all released PVE kernels.
|
||||
|
||||
git clone git://git.proxmox.com/git/pve-firmware.git
|
||||
zd1211-firmware
|
||||
atmel-firmware
|
||||
bluez-firmware
|
||||
|
||||
|
||||
NOTES:
|
||||
======
|
||||
PATCHES:
|
||||
--------
|
||||
|
||||
ABI versions, package versions and package name:
|
||||
------------------------------------------------
|
||||
bridge-patch.diff: Avoid bridge problems with changing MAC
|
||||
see also: http://forum.openvz.org/index.php?t=msg&th=5291
|
||||
|
||||
We follow debian's versioning w.r.t ABI changes:
|
||||
|
||||
https://kernel-team.pages.debian.net/kernel-handbook/ch-versions.html
|
||||
https://wiki.debian.org/DebianKernelABIChanges
|
||||
|
||||
The debian/rules file has a target comparing the build kernel's ABI against the
|
||||
version stored in the repository and indicates when an ABI bump is necessary.
|
||||
An ABI bump within one upstream version consists of incrementing the KREL
|
||||
variable in the Makefile, rebuilding the packages and running 'make abiupdate'
|
||||
(the 'abiupdate' target in 'Makefile' contains the steps for consistently
|
||||
updating the repository).
|
||||
Behaviour after 2.6.27 has changed slighly - after setting mac address
|
||||
of bridge device, then address won't change. So we could omit
|
||||
that patch, requiring to set hwaddress in /etc/network/interfaces.
|
||||
|
||||
Watchdog blacklist
|
||||
------------------
|
||||
@@ -102,74 +76,77 @@ which device is actually used for /dev/watchdog.
|
||||
We ship this list in /lib/modprobe.d/blacklist_pve-kernel-<VERSION>.conf
|
||||
The user typically edit /etc/modules to enable a specific watchdog device.
|
||||
|
||||
Debug kernel and modules
|
||||
------------------------
|
||||
|
||||
In order to build a -dbgsym package containing an unstripped copy of the kernel
|
||||
image and modules, enable the 'pkg.pve-kernel.debug' build profile (e.g. by
|
||||
exporting DEB_BUILD_PROFILES='pkg.pve-kernel.debug'). The resulting package can
|
||||
be used together with 'crash'/'kdump-tools' to debug kernel crashes.
|
||||
|
||||
Note: the -dbgsym package is only valid for the pve-kernel packages produced by
|
||||
the same build. A kernel/module from a different build will likely not match,
|
||||
even if both builds are of the same kernel and package version.
|
||||
|
||||
Additional information
|
||||
----------------------
|
||||
|
||||
We use the default configuration provided by Ubuntu, and apply
|
||||
the following modifications:
|
||||
the following modification:
|
||||
|
||||
NOTE: For the exact and current list see debian/rules (PVE_CONFIG_OPTS)
|
||||
|
||||
- enable INTEL_MEI_WDT=m (to allow disabling via patch)
|
||||
|
||||
- disable CONFIG_SND_PCM_OSS (enabled by default in Ubuntu, not needed)
|
||||
|
||||
- switch CONFIG_TRANSPARENT_HUGEPAGE to MADVISE from ALWAYS
|
||||
see Makefile (PVE_CONFIG_OPTS)
|
||||
|
||||
- enable CONFIG_CEPH_FS=m (request from user)
|
||||
|
||||
- enable common CONFIG_BLK_DEV_XXX to avoid hardware detection
|
||||
problems (udev, update-initramfs have serious problems without that)
|
||||
problems (udev, undate-initramfs have serious problems without that)
|
||||
|
||||
CONFIG_BLK_DEV_SD=y
|
||||
CONFIG_BLK_DEV_SR=y
|
||||
CONFIG_BLK_DEV_DM=y
|
||||
|
||||
- add workaround for Debian bug #807000 (see
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807000)
|
||||
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
|
||||
- compile NBD and RBD modules
|
||||
CONFIG_BLK_DEV_NBD=m
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
|
||||
- enable IBM JFS file system as module
|
||||
requested by users (bug #64)
|
||||
- set LOOP_MIN_COUNT to 8 (debian defaults)
|
||||
CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
|
||||
|
||||
- enable apple HFS and HFSPLUS as module
|
||||
requested by users
|
||||
- disable module signatures (CONFIG_MODULE_SIG)
|
||||
|
||||
- enable IBM JFS file system
|
||||
|
||||
This is disabled in RHEL kernel for no real reason, so we enable
|
||||
it as requested by users (bug #64)
|
||||
|
||||
- enable apple HFS and HFSPLUS
|
||||
|
||||
This is disabled in RHEL kernel for no real reason, so we enable
|
||||
it as requested by users
|
||||
|
||||
- enable CONFIG_BCACHE=m (requested by user)
|
||||
|
||||
- enable CONFIG_BRIDGE=y
|
||||
to avoid warnings on boot, e.g. that net.bridge.bridge-nf-call-iptables is an unknown key
|
||||
|
||||
Else we get warnings on boot, that
|
||||
net.bridge.bridge-nf-call-iptables is an unknown key
|
||||
|
||||
- enable CONFIG_DEFAULT_SECURITY_APPARMOR
|
||||
We need this for lxc
|
||||
|
||||
We need this for lxc
|
||||
|
||||
- set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
|
||||
because if not set, it can give some dynamic memory or cpu frequencies
|
||||
change, and vms can crash (mainly windows guest).
|
||||
|
||||
see http://forum.proxmox.com/threads/18238-Windows-7-x64-VMs-crashing-randomly-during-process-termination?p=93273#post93273
|
||||
|
||||
- use 'deadline' as default scheduler
|
||||
This is the suggested setting for KVM. We also measure bad fsync performance with ext4 and cfq.
|
||||
|
||||
This is the suggested setting for KVM. We also measure bad fsync
|
||||
performance with ext4 and cfq.
|
||||
|
||||
- disable CONFIG_INPUT_EVBUG
|
||||
Module evbug is not blacklisted on debian, so we simply disable it to avoid
|
||||
key-event logs (which is a big security problem)
|
||||
|
||||
- enable CONFIG_MODVERSIONS (needed for ABI tracking)
|
||||
Module evbug is not blacklisted on debian, so we simply disable it
|
||||
to avoid key-event logs (which is a big security problem)
|
||||
|
||||
- switch default UNWINDER to FRAME_POINTER
|
||||
the recently introduced ORC_UNWINDER is not 100% stable yet, especially in combination with ZFS
|
||||
Testing final kernel with kvm
|
||||
-----------------------------
|
||||
|
||||
kvm -kernel data/boot/vmlinuz-3.19.8-1-pve -initrd initrd.img-3.19.8-1-pve -append "vga=791 video=vesafb:ywrap,mtrr" /dev/zero
|
||||
|
||||
- enable CONFIG_PAGE_TABLE_ISOLATION (Meltdown mitigation)
|
||||
|
||||
@@ -4,14 +4,8 @@ my $abinew = shift;
|
||||
my $abiold = shift;
|
||||
my $skipabi = shift;
|
||||
|
||||
# to catch multiple abi-prev-* files being passed in
|
||||
die "invalid value for skipabi parameter\n"
|
||||
if (defined($skipabi) && $skipabi !~ /^[01]$/);
|
||||
|
||||
$abinew =~ /abi-(.*)/;
|
||||
my $abistr = $1;
|
||||
$abiold =~ /abi-prev-(.*)/;
|
||||
my $prev_abistr = $1;
|
||||
my $abinum = $1;
|
||||
|
||||
my $fail_exit = 1;
|
||||
my $EE = "EE:";
|
||||
@@ -29,12 +23,12 @@ if ($skipabi) {
|
||||
$EE = "WW:";
|
||||
}
|
||||
|
||||
if ($prev_abistr ne $abistr) {
|
||||
print "II: Different ABI's, running in no-fail mode\n";
|
||||
$fail_exit = 0;
|
||||
$EE = "WW:";
|
||||
}
|
||||
|
||||
#if ($prev_abinum != $abinum) {
|
||||
# print "II: Different ABI's, running in no-fail mode\n";
|
||||
# $fail_exit = 0;
|
||||
# $EE = "WW:";
|
||||
#}
|
||||
#
|
||||
if (not -f "$abinew" or not -f "$abiold") {
|
||||
print "EE: Previous or current ABI file missing!\n";
|
||||
print " $abinew\n" if not -f "$abinew";
|
||||
@@ -89,7 +83,7 @@ sub is_ignored($$) {
|
||||
}
|
||||
|
||||
# Read new syms first
|
||||
print " Reading new symbols ($abistr)...";
|
||||
print " Reading new symbols ($abinum)...";
|
||||
$count = 0;
|
||||
open(NEW, "< $abinew") or
|
||||
die "Could not open $abinew";
|
||||
-25907
File diff suppressed because it is too large
Load Diff
+21375
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,14 @@
|
||||
--- linux-2.6-3.10.0/net/bridge/br_stp_if.c.orig 2013-11-26 22:20:20.000000000 +0100
|
||||
+++ linux-2.6-3.10.0/net/bridge/br_stp_if.c 2013-12-17 08:42:10.004428223 +0100
|
||||
@@ -228,10 +228,7 @@
|
||||
return false;
|
||||
|
||||
list_for_each_entry(p, &br->port_list, list) {
|
||||
- if (addr == br_mac_zero ||
|
||||
- memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
|
||||
- addr = p->dev->dev_addr;
|
||||
-
|
||||
+ addr = p->dev->dev_addr;
|
||||
}
|
||||
|
||||
if (ether_addr_equal(br->bridge_id.addr, addr))
|
||||
@@ -0,0 +1,137 @@
|
||||
commit 8974189222159154c55f24ddad33e3613960521a
|
||||
Author: Peter Zijlstra <peterz@infradead.org>
|
||||
Date: Thu Jun 16 10:50:40 2016 +0200
|
||||
|
||||
sched/fair: Fix cfs_rq avg tracking underflow
|
||||
|
||||
As per commit:
|
||||
|
||||
b7fa30c9cc48 ("sched/fair: Fix post_init_entity_util_avg() serialization")
|
||||
|
||||
> the code generated from update_cfs_rq_load_avg():
|
||||
>
|
||||
> if (atomic_long_read(&cfs_rq->removed_load_avg)) {
|
||||
> s64 r = atomic_long_xchg(&cfs_rq->removed_load_avg, 0);
|
||||
> sa->load_avg = max_t(long, sa->load_avg - r, 0);
|
||||
> sa->load_sum = max_t(s64, sa->load_sum - r * LOAD_AVG_MAX, 0);
|
||||
> removed_load = 1;
|
||||
> }
|
||||
>
|
||||
> turns into:
|
||||
>
|
||||
> ffffffff81087064: 49 8b 85 98 00 00 00 mov 0x98(%r13),%rax
|
||||
> ffffffff8108706b: 48 85 c0 test %rax,%rax
|
||||
> ffffffff8108706e: 74 40 je ffffffff810870b0 <update_blocked_averages+0xc0>
|
||||
> ffffffff81087070: 4c 89 f8 mov %r15,%rax
|
||||
> ffffffff81087073: 49 87 85 98 00 00 00 xchg %rax,0x98(%r13)
|
||||
> ffffffff8108707a: 49 29 45 70 sub %rax,0x70(%r13)
|
||||
> ffffffff8108707e: 4c 89 f9 mov %r15,%rcx
|
||||
> ffffffff81087081: bb 01 00 00 00 mov $0x1,%ebx
|
||||
> ffffffff81087086: 49 83 7d 70 00 cmpq $0x0,0x70(%r13)
|
||||
> ffffffff8108708b: 49 0f 49 4d 70 cmovns 0x70(%r13),%rcx
|
||||
>
|
||||
> Which you'll note ends up with sa->load_avg -= r in memory at
|
||||
> ffffffff8108707a.
|
||||
|
||||
So I _should_ have looked at other unserialized users of ->load_avg,
|
||||
but alas. Luckily nikbor reported a similar /0 from task_h_load() which
|
||||
instantly triggered recollection of this here problem.
|
||||
|
||||
Aside from the intermediate value hitting memory and causing problems,
|
||||
there's another problem: the underflow detection relies on the signed
|
||||
bit. This reduces the effective width of the variables, IOW its
|
||||
effectively the same as having these variables be of signed type.
|
||||
|
||||
This patch changes to a different means of unsigned underflow
|
||||
detection to not rely on the signed bit. This allows the variables to
|
||||
use the 'full' unsigned range. And it does so with explicit LOAD -
|
||||
STORE to ensure any intermediate value will never be visible in
|
||||
memory, allowing these unserialized loads.
|
||||
|
||||
Note: GCC generates crap code for this, might warrant a look later.
|
||||
|
||||
Note2: I say 'full' above, if we end up at U*_MAX we'll still explode;
|
||||
maybe we should do clamping on add too.
|
||||
|
||||
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
|
||||
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
|
||||
Cc: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Cc: Mike Galbraith <efault@gmx.de>
|
||||
Cc: Peter Zijlstra <peterz@infradead.org>
|
||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: Yuyang Du <yuyang.du@intel.com>
|
||||
Cc: bsegall@google.com
|
||||
Cc: kernel@kyup.com
|
||||
Cc: morten.rasmussen@arm.com
|
||||
Cc: pjt@google.com
|
||||
Cc: steve.muckle@linaro.org
|
||||
Fixes: 9d89c257dfb9 ("sched/fair: Rewrite runnable load and utilization average tracking")
|
||||
Link: http://lkml.kernel.org/r/20160617091948.GJ30927@twins.programming.kicks-ass.net
|
||||
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||||
|
||||
---
|
||||
kernel/sched/fair.c | 33 +++++++++++++++++++++++++--------
|
||||
1 file changed, 25 insertions(+), 8 deletions(-)
|
||||
|
||||
--- a/kernel/sched/fair.c
|
||||
+++ b/kernel/sched/fair.c
|
||||
@@ -2682,6 +2682,23 @@ static inline void update_tg_load_avg(st
|
||||
|
||||
static inline u64 cfs_rq_clock_task(struct cfs_rq *cfs_rq);
|
||||
|
||||
+/*
|
||||
+ * Unsigned subtract and clamp on underflow.
|
||||
+ *
|
||||
+ * Explicitly do a load-store to ensure the intermediate value never hits
|
||||
+ * memory. This allows lockless observations without ever seeing the negative
|
||||
+ * values.
|
||||
+ */
|
||||
+#define sub_positive(_ptr, _val) do { \
|
||||
+ typeof(_ptr) ptr = (_ptr); \
|
||||
+ typeof(*ptr) val = (_val); \
|
||||
+ typeof(*ptr) res, var = READ_ONCE(*ptr); \
|
||||
+ res = var - val; \
|
||||
+ if (res > var) \
|
||||
+ res = 0; \
|
||||
+ WRITE_ONCE(*ptr, res); \
|
||||
+} while (0)
|
||||
+
|
||||
/* Group cfs_rq's load_avg is used for task_h_load and update_cfs_share */
|
||||
static inline int update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq)
|
||||
{
|
||||
@@ -2690,15 +2707,15 @@ static inline int update_cfs_rq_load_avg
|
||||
|
||||
if (atomic_long_read(&cfs_rq->removed_load_avg)) {
|
||||
s64 r = atomic_long_xchg(&cfs_rq->removed_load_avg, 0);
|
||||
- sa->load_avg = max_t(long, sa->load_avg - r, 0);
|
||||
- sa->load_sum = max_t(s64, sa->load_sum - r * LOAD_AVG_MAX, 0);
|
||||
+ sub_positive(&sa->load_avg, r);
|
||||
+ sub_positive(&sa->load_sum, r * LOAD_AVG_MAX);
|
||||
removed = 1;
|
||||
}
|
||||
|
||||
if (atomic_long_read(&cfs_rq->removed_util_avg)) {
|
||||
long r = atomic_long_xchg(&cfs_rq->removed_util_avg, 0);
|
||||
- sa->util_avg = max_t(long, sa->util_avg - r, 0);
|
||||
- sa->util_sum = max_t(s32, sa->util_sum - r * LOAD_AVG_MAX, 0);
|
||||
+ sub_positive(&sa->util_avg, r);
|
||||
+ sub_positive(&sa->util_sum, r * LOAD_AVG_MAX);
|
||||
}
|
||||
|
||||
decayed = __update_load_avg(now, cpu_of(rq_of(cfs_rq)), sa,
|
||||
@@ -2764,10 +2781,10 @@ static void detach_entity_load_avg(struc
|
||||
&se->avg, se->on_rq * scale_load_down(se->load.weight),
|
||||
cfs_rq->curr == se, NULL);
|
||||
|
||||
- cfs_rq->avg.load_avg = max_t(long, cfs_rq->avg.load_avg - se->avg.load_avg, 0);
|
||||
- cfs_rq->avg.load_sum = max_t(s64, cfs_rq->avg.load_sum - se->avg.load_sum, 0);
|
||||
- cfs_rq->avg.util_avg = max_t(long, cfs_rq->avg.util_avg - se->avg.util_avg, 0);
|
||||
- cfs_rq->avg.util_sum = max_t(s32, cfs_rq->avg.util_sum - se->avg.util_sum, 0);
|
||||
+ sub_positive(&cfs_rq->avg.load_avg, se->avg.load_avg);
|
||||
+ sub_positive(&cfs_rq->avg.load_sum, se->avg.load_sum);
|
||||
+ sub_positive(&cfs_rq->avg.util_avg, se->avg.util_avg);
|
||||
+ sub_positive(&cfs_rq->avg.util_sum, se->avg.util_sum);
|
||||
}
|
||||
|
||||
/* Add the load generated by se into cfs_rq's load average */
|
||||
@@ -0,0 +1,178 @@
|
||||
From 40d641241a5399afc93d4eb75d8794f72fe3c0fb Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
||||
Date: Wed, 21 Dec 2016 15:37:20 +0100
|
||||
Subject: [PATCH] cgroup, cpuset: add cpuset.remap_cpus
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Changes a cpuset, recursively remapping all its descendants
|
||||
to the new range.
|
||||
|
||||
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
---
|
||||
include/linux/cpumask.h | 17 ++++++++++++++++
|
||||
kernel/cpuset.c | 54 +++++++++++++++++++++++++++++++++++++++----------
|
||||
2 files changed, 60 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
|
||||
index 59915ea..f5487c8 100644
|
||||
--- a/include/linux/cpumask.h
|
||||
+++ b/include/linux/cpumask.h
|
||||
@@ -514,6 +514,23 @@ static inline void cpumask_copy(struct cpumask *dstp,
|
||||
}
|
||||
|
||||
/**
|
||||
+ * cpumask_remap - *dstp = map(old, new)(*srcp)
|
||||
+ * @dstp: the result
|
||||
+ * @srcp: the input cpumask
|
||||
+ * @oldp: the old mask
|
||||
+ * @newp: the new mask
|
||||
+ */
|
||||
+static inline void cpumask_remap(struct cpumask *dstp,
|
||||
+ const struct cpumask *srcp,
|
||||
+ const struct cpumask *oldp,
|
||||
+ const struct cpumask *newp)
|
||||
+{
|
||||
+ bitmap_remap(cpumask_bits(dstp), cpumask_bits(srcp),
|
||||
+ cpumask_bits(oldp), cpumask_bits(newp),
|
||||
+ nr_cpumask_bits);
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
* cpumask_any - pick a "random" cpu from *srcp
|
||||
* @srcp: the input cpumask
|
||||
*
|
||||
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
|
||||
index 7e78cfe..ff5ff3a 100644
|
||||
--- a/kernel/cpuset.c
|
||||
+++ b/kernel/cpuset.c
|
||||
@@ -462,7 +462,8 @@ static void free_trial_cpuset(struct cpuset *trial)
|
||||
* Return 0 if valid, -errno if not.
|
||||
*/
|
||||
|
||||
-static int validate_change(struct cpuset *cur, struct cpuset *trial)
|
||||
+static int validate_change(struct cpuset *cur, struct cpuset *trial,
|
||||
+ int remap)
|
||||
{
|
||||
struct cgroup_subsys_state *css;
|
||||
struct cpuset *c, *par;
|
||||
@@ -470,11 +471,13 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial)
|
||||
|
||||
rcu_read_lock();
|
||||
|
||||
- /* Each of our child cpusets must be a subset of us */
|
||||
- ret = -EBUSY;
|
||||
- cpuset_for_each_child(c, css, cur)
|
||||
- if (!is_cpuset_subset(c, trial))
|
||||
- goto out;
|
||||
+ if (!remap) {
|
||||
+ /* Each of our child cpusets must be a subset of us */
|
||||
+ ret = -EBUSY;
|
||||
+ cpuset_for_each_child(c, css, cur)
|
||||
+ if (!is_cpuset_subset(c, trial))
|
||||
+ goto out;
|
||||
+ }
|
||||
|
||||
/* Remaining checks don't apply to root cpuset */
|
||||
ret = 0;
|
||||
@@ -937,11 +940,15 @@ static void update_cpumasks_hier(struct cpuset *cs, struct cpumask *new_cpus)
|
||||
* @cs: the cpuset to consider
|
||||
* @trialcs: trial cpuset
|
||||
* @buf: buffer of cpu numbers written to this cpuset
|
||||
+ * @remap: recursively remap all child nodes
|
||||
*/
|
||||
static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
|
||||
- const char *buf)
|
||||
+ const char *buf, int remap)
|
||||
{
|
||||
int retval;
|
||||
+ struct cpuset *cp;
|
||||
+ struct cgroup_subsys_state *pos_css;
|
||||
+ struct cpumask tempmask;
|
||||
|
||||
/* top_cpuset.cpus_allowed tracks cpu_online_mask; it's read-only */
|
||||
if (cs == &top_cpuset)
|
||||
@@ -969,11 +976,25 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
|
||||
if (cpumask_equal(cs->cpus_allowed, trialcs->cpus_allowed))
|
||||
return 0;
|
||||
|
||||
- retval = validate_change(cs, trialcs);
|
||||
+ retval = validate_change(cs, trialcs, remap);
|
||||
if (retval < 0)
|
||||
return retval;
|
||||
|
||||
spin_lock_irq(&callback_lock);
|
||||
+ if (remap) {
|
||||
+ rcu_read_lock();
|
||||
+ cpuset_for_each_descendant_pre(cp, pos_css, cs) {
|
||||
+ /* skip empty subtrees */
|
||||
+ if (cpumask_empty(cp->cpus_allowed)) {
|
||||
+ pos_css = css_rightmost_descendant(pos_css);
|
||||
+ continue;
|
||||
+ }
|
||||
+ cpumask_copy(&tempmask, cp->cpus_allowed);
|
||||
+ cpumask_remap(cp->cpus_allowed, &tempmask,
|
||||
+ cs->cpus_allowed, trialcs->cpus_allowed);
|
||||
+ }
|
||||
+ rcu_read_unlock();
|
||||
+ }
|
||||
cpumask_copy(cs->cpus_allowed, trialcs->cpus_allowed);
|
||||
spin_unlock_irq(&callback_lock);
|
||||
|
||||
@@ -1250,7 +1271,7 @@ static int update_nodemask(struct cpuset *cs, struct cpuset *trialcs,
|
||||
retval = 0; /* Too easy - nothing to do */
|
||||
goto done;
|
||||
}
|
||||
- retval = validate_change(cs, trialcs);
|
||||
+ retval = validate_change(cs, trialcs, 0);
|
||||
if (retval < 0)
|
||||
goto done;
|
||||
|
||||
@@ -1337,7 +1358,7 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs,
|
||||
else
|
||||
clear_bit(bit, &trialcs->flags);
|
||||
|
||||
- err = validate_change(cs, trialcs);
|
||||
+ err = validate_change(cs, trialcs, 0);
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
||||
@@ -1596,6 +1617,7 @@ static void cpuset_attach(struct cgroup_taskset *tset)
|
||||
typedef enum {
|
||||
FILE_MEMORY_MIGRATE,
|
||||
FILE_CPULIST,
|
||||
+ FILE_REMAP_CPULIST,
|
||||
FILE_MEMLIST,
|
||||
FILE_EFFECTIVE_CPULIST,
|
||||
FILE_EFFECTIVE_MEMLIST,
|
||||
@@ -1728,7 +1750,10 @@ static ssize_t cpuset_write_resmask(struct kernfs_open_file *of,
|
||||
|
||||
switch (of_cft(of)->private) {
|
||||
case FILE_CPULIST:
|
||||
- retval = update_cpumask(cs, trialcs, buf);
|
||||
+ retval = update_cpumask(cs, trialcs, buf, 0);
|
||||
+ break;
|
||||
+ case FILE_REMAP_CPULIST:
|
||||
+ retval = update_cpumask(cs, trialcs, buf, 1);
|
||||
break;
|
||||
case FILE_MEMLIST:
|
||||
retval = update_nodemask(cs, trialcs, buf);
|
||||
@@ -1845,6 +1870,13 @@ static struct cftype files[] = {
|
||||
},
|
||||
|
||||
{
|
||||
+ .name = "remap_cpus",
|
||||
+ .write = cpuset_write_resmask,
|
||||
+ .max_write_len = (100U + 6 * NR_CPUS),
|
||||
+ .private = FILE_REMAP_CPULIST,
|
||||
+ },
|
||||
+
|
||||
+ {
|
||||
.name = "mems",
|
||||
.seq_show = cpuset_common_seq_show,
|
||||
.write = cpuset_write_resmask,
|
||||
--
|
||||
2.1.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+11
@@ -0,0 +1,11 @@
|
||||
Package: pve-kernel-@KVNAME@
|
||||
Version: @KERNEL_VER@-@PKGREL@
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Architecture: @ARCH@
|
||||
Provides: linux-image, linux-image-2.6
|
||||
Suggests: pve-firmware
|
||||
Depends: grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub-efi-arm64, initramfs-tools, busybox
|
||||
Maintainer: Proxmox Support Team <support@proxmox.com>
|
||||
Description: The Proxmox PVE Kernel Image
|
||||
This package contains the linux kernel and initial ramdisk used for booting
|
||||
@@ -0,0 +1,12 @@
|
||||
Source: pve-kernel
|
||||
Maintainer: Proxmox Support Team <support@proxmox.com>
|
||||
|
||||
Package: linux-tools-4.10
|
||||
Architecture: any
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}, linux-base
|
||||
Description: Linux kernel version specific tools for version 4.10
|
||||
This package provides the architecture dependent parts for kernel
|
||||
version locked tools (such as perf and x86_energy_perf_policy)
|
||||
|
||||
@@ -26,5 +26,6 @@ The complete text of the GNU General Public License can be found in
|
||||
`/usr/share/common-licenses/GPL-2'.
|
||||
|
||||
|
||||
ZFS module is licensed under the Common Development and Distribution
|
||||
ZFS module is licensed under the Common Development and Distribution
|
||||
License (CDDL).
|
||||
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
10
|
||||
Vendored
-93
@@ -1,93 +0,0 @@
|
||||
Source: pve-kernel
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Maintainer: Proxmox Support Team <support@proxmox.com>
|
||||
Build-Depends: asciidoc-base,
|
||||
automake,
|
||||
bc,
|
||||
bison,
|
||||
cpio,
|
||||
debhelper (>= 10~),
|
||||
dh-python,
|
||||
dwarves,
|
||||
file,
|
||||
flex,
|
||||
gcc (>= 8.3.0-6),
|
||||
git,
|
||||
kmod,
|
||||
libdw-dev,
|
||||
libelf-dev,
|
||||
libiberty-dev,
|
||||
libnuma-dev,
|
||||
libpve-common-perl,
|
||||
libslang2-dev,
|
||||
libssl-dev,
|
||||
libtool,
|
||||
lintian,
|
||||
lz4,
|
||||
perl-modules,
|
||||
python3-minimal,
|
||||
rsync,
|
||||
sed,
|
||||
sphinx-common,
|
||||
tar,
|
||||
xmlto,
|
||||
zlib1g-dev,
|
||||
zstd,
|
||||
Build-Conflicts: pve-headers-@KVNAME@
|
||||
Vcs-Git: git://git.proxmox.com/git/pve-kernel
|
||||
Vcs-Browser: https://git.proxmox.com/?p=pve-kernel.git
|
||||
|
||||
Package: linux-tools-@KVMAJMIN@
|
||||
Architecture: any
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Depends: linux-base, ${misc:Depends}, ${shlibs:Depends}
|
||||
Description: Linux kernel version specific tools for version @KVMAJMIN@
|
||||
This package provides the architecture dependent parts for kernel
|
||||
version locked tools (such as perf and x86_energy_perf_policy)
|
||||
|
||||
Package: pve-headers-@KVNAME@
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Architecture: any
|
||||
Provides: linux-headers-@KVNAME@-amd64
|
||||
Depends: coreutils | fileutils (>= 4.0)
|
||||
Description: The Proxmox PVE Kernel Headers
|
||||
This package contains the linux kernel headers
|
||||
|
||||
Package: pve-kernel-@KVNAME@
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Architecture: any
|
||||
Provides: linux-image-@KVNAME@-amd64
|
||||
Suggests: pve-firmware
|
||||
Depends: busybox, initramfs-tools
|
||||
Recommends: grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub-efi-arm64
|
||||
Description: The Proxmox PVE Kernel Image
|
||||
This package contains the linux kernel and initial ramdisk used for booting
|
||||
|
||||
Package: pve-kernel-@KVNAME@-dbgsym
|
||||
Architecture: any
|
||||
Provides: linux-debug
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Build-Profiles: <pkg.pve-kernel.debug>
|
||||
Description: The Proxmox PVE Kernel debug image
|
||||
This package provides the kernel debug image for version @KVNAME@. The debug
|
||||
kernel image contained in this package is NOT meant to boot from - it is
|
||||
uncompressed, and unstripped, and suitable for use with crash/kdump-tools/..
|
||||
to analyze kernel crashes. This package also contains the pve-kernel modules
|
||||
in their unstripped version.
|
||||
|
||||
Package: pve-kernel-libc-dev
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Architecture: any
|
||||
Provides: linux-libc-dev (=${binary:Version})
|
||||
Conflicts: linux-libc-dev
|
||||
Replaces: linux-libc-dev
|
||||
Depends: ${misc:Depends}
|
||||
Description: Linux support headers for userspace development
|
||||
This package provides userspaces headers from the Linux kernel. These headers
|
||||
are used by the installed headers for GNU libc and other system libraries.
|
||||
Vendored
-289
@@ -1,289 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
# -*- makefile -*-
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
# TODO: check for headers not being installed
|
||||
BUILD_DIR=$(shell pwd)
|
||||
|
||||
include /usr/share/dpkg/default.mk
|
||||
include debian/rules.d/env.mk
|
||||
include debian/rules.d/${DEB_BUILD_ARCH}.mk
|
||||
|
||||
CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)
|
||||
|
||||
PVE_KERNEL_PKG=pve-kernel-${KVNAME}
|
||||
PVE_DEBUG_KERNEL_PKG=pve-kernel-${KVNAME}-dbgsym
|
||||
PVE_HEADER_PKG=pve-headers-${KVNAME}
|
||||
PVE_USR_HEADER_PKG=pve-kernel-libc-dev
|
||||
LINUX_TOOLS_PKG=linux-tools-${KERNEL_MAJMIN}
|
||||
KERNEL_SRC_COPY=${KERNEL_SRC}_tmp
|
||||
|
||||
# TODO: split for archs, move to files?
|
||||
PVE_CONFIG_OPTS= \
|
||||
-m INTEL_MEI_WDT \
|
||||
-d CONFIG_SND_PCM_OSS \
|
||||
-e CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \
|
||||
-d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \
|
||||
-m CONFIG_CEPH_FS \
|
||||
-m CONFIG_BLK_DEV_NBD \
|
||||
-m CONFIG_BLK_DEV_RBD \
|
||||
-d CONFIG_SND_PCSP \
|
||||
-m CONFIG_BCACHE \
|
||||
-m CONFIG_JFS_FS \
|
||||
-m CONFIG_HFS_FS \
|
||||
-m CONFIG_HFSPLUS_FS \
|
||||
-e CIFS_SMB_DIRECT \
|
||||
-e CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU \
|
||||
-e CONFIG_BRIDGE \
|
||||
-e CONFIG_BRIDGE_NETFILTER \
|
||||
-e CONFIG_BLK_DEV_SD \
|
||||
-e CONFIG_BLK_DEV_SR \
|
||||
-e CONFIG_BLK_DEV_DM \
|
||||
-m CONFIG_BLK_DEV_NVME \
|
||||
-e CONFIG_NLS_ISO8859_1 \
|
||||
-d CONFIG_INPUT_EVBUG \
|
||||
-d CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND \
|
||||
-d CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL \
|
||||
-e CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE \
|
||||
-d CONFIG_MODULE_SIG \
|
||||
-d CONFIG_MEMCG_DISABLED \
|
||||
-e CONFIG_MEMCG_SWAP_ENABLED \
|
||||
-e CONFIG_HYPERV \
|
||||
-m CONFIG_VFIO_IOMMU_TYPE1 \
|
||||
-m CONFIG_VFIO_VIRQFD \
|
||||
-m CONFIG_VFIO \
|
||||
-m CONFIG_VFIO_PCI \
|
||||
-m CONFIG_USB_XHCI_HCD \
|
||||
-m CONFIG_USB_XHCI_PCI \
|
||||
-m CONFIG_USB_EHCI_HCD \
|
||||
-m CONFIG_USB_EHCI_PCI \
|
||||
-m CONFIG_USB_EHCI_HCD_PLATFORM \
|
||||
-m CONFIG_USB_OHCI_HCD \
|
||||
-m CONFIG_USB_OHCI_HCD_PCI \
|
||||
-m CONFIG_USB_OHCI_HCD_PLATFORM \
|
||||
-d CONFIG_USB_OHCI_HCD_SSB \
|
||||
-m CONFIG_USB_UHCI_HCD \
|
||||
-d CONFIG_USB_SL811_HCD_ISO \
|
||||
-e CONFIG_MEMCG_KMEM \
|
||||
-d CONFIG_DEFAULT_CFQ \
|
||||
-e CONFIG_DEFAULT_DEADLINE \
|
||||
-e CONFIG_MODVERSIONS \
|
||||
-d CONFIG_DEFAULT_SECURITY_DAC \
|
||||
-e CONFIG_DEFAULT_SECURITY_APPARMOR \
|
||||
--set-str CONFIG_DEFAULT_SECURITY apparmor \
|
||||
-d CONFIG_UNWINDER_ORC \
|
||||
-d CONFIG_UNWINDER_GUESS \
|
||||
-e CONFIG_UNWINDER_FRAME_POINTER \
|
||||
--set-str CONFIG_SYSTEM_TRUSTED_KEYS ""\
|
||||
--set-str CONFIG_SYSTEM_REVOCATION_KEYS ""\
|
||||
-d CONFIG_SECURITY_LOCKDOWN_LSM \
|
||||
-d CONFIG_SECURITY_LOCKDOWN_LSM_EARLY \
|
||||
--set-str CONFIG_LSM yama,integrity,apparmor \
|
||||
-e CONFIG_PAGE_TABLE_ISOLATION
|
||||
|
||||
debian/control: $(wildcard debian/*.in)
|
||||
sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/pve-kernel.prerm.in > debian/${PVE_KERNEL_PKG}.prerm
|
||||
sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/pve-kernel.postrm.in > debian/${PVE_KERNEL_PKG}.postrm
|
||||
sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/pve-kernel.postinst.in > debian/${PVE_KERNEL_PKG}.postinst
|
||||
sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/pve-headers.postinst.in > debian/${PVE_HEADER_PKG}.postinst
|
||||
chmod +x debian/${PVE_KERNEL_PKG}.prerm
|
||||
chmod +x debian/${PVE_KERNEL_PKG}.postrm
|
||||
chmod +x debian/${PVE_KERNEL_PKG}.postinst
|
||||
chmod +x debian/${PVE_HEADER_PKG}.postinst
|
||||
sed -e 's/@KVNAME@/${KVNAME}/g' -e 's/@KVMAJMIN@/${KERNEL_MAJMIN}/g' < debian/control.in > debian/control
|
||||
|
||||
build: .compile_mark .tools_compile_mark .modules_compile_mark
|
||||
|
||||
install: .install_mark .tools_install_mark .headers_install_mark .usr_headers_install_mark
|
||||
dh_installdocs -A debian/copyright debian/SOURCE
|
||||
dh_installchangelogs
|
||||
dh_installman
|
||||
dh_strip_nondeterminism
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
|
||||
binary: install
|
||||
debian/rules fwcheck abicheck
|
||||
dh_strip -N${PVE_HEADER_PKG} -N${PVE_USR_HEADER_PKG}
|
||||
dh_makeshlibs
|
||||
dh_shlibdeps
|
||||
dh_installdeb
|
||||
dh_gencontrol
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
|
||||
.config_mark:
|
||||
cd ${KERNEL_SRC}; scripts/config ${PVE_CONFIG_OPTS}
|
||||
${MAKE} -C ${KERNEL_SRC} oldconfig
|
||||
# copy to allow building in parallel to kernel/module compilation without interference
|
||||
rm -rf ${KERNEL_SRC_COPY}
|
||||
cp -ar ${KERNEL_SRC} ${KERNEL_SRC_COPY}
|
||||
touch $@
|
||||
|
||||
.compile_mark: .config_mark
|
||||
${MAKE} -C ${KERNEL_SRC} KBUILD_BUILD_VERSION_TIMESTAMP="PVE ${DEB_VERSION} (${CHANGELOG_DATE})"
|
||||
touch $@
|
||||
|
||||
.install_mark: .compile_mark .modules_compile_mark
|
||||
rm -rf debian/${PVE_KERNEL_PKG}
|
||||
mkdir -p debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}
|
||||
mkdir debian/${PVE_KERNEL_PKG}/boot
|
||||
install -m 644 ${KERNEL_SRC}/.config debian/${PVE_KERNEL_PKG}/boot/config-${KVNAME}
|
||||
install -m 644 ${KERNEL_SRC}/System.map debian/${PVE_KERNEL_PKG}/boot/System.map-${KVNAME}
|
||||
install -m 644 ${KERNEL_SRC}/${KERNEL_IMAGE_PATH} debian/${PVE_KERNEL_PKG}/boot/${KERNEL_INSTALL_FILE}-${KVNAME}
|
||||
${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install
|
||||
# install zfs drivers
|
||||
install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
|
||||
install -m 644 $(addprefix ${MODULES}/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
|
||||
# remove firmware
|
||||
rm -rf debian/${PVE_KERNEL_PKG}/lib/firmware
|
||||
|
||||
ifeq ($(filter pkg.pve-kernel.debug,$(DEB_BUILD_PROFILES)),)
|
||||
echo "'pkg.pve-kernel.debug' build profile disabled, skipping -dbgsym creation"
|
||||
else
|
||||
echo "'pkg.pve-kernel.debug' build profile enabled, creating -dbgsym contents"
|
||||
mkdir -p debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/${KVNAME}
|
||||
mkdir debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/boot
|
||||
install -m 644 ${KERNEL_SRC}/vmlinux debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/boot/vmlinux-${KVNAME}
|
||||
cp -r debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME} debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/
|
||||
rm -f debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/${KVNAME}/source
|
||||
rm -f debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/${KVNAME}/build
|
||||
rm -f debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/${KVNAME}/modules.*
|
||||
endif
|
||||
|
||||
# strip debug info
|
||||
find debian/${PVE_KERNEL_PKG}/lib/modules -name \*.ko -print | while read f ; do strip --strip-debug "$$f"; done
|
||||
# finalize
|
||||
/sbin/depmod -b debian/${PVE_KERNEL_PKG}/ ${KVNAME}
|
||||
# Autogenerate blacklist for watchdog devices (see README)
|
||||
install -m 0755 -d debian/${PVE_KERNEL_PKG}/lib/modprobe.d
|
||||
ls debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/watchdog/ > watchdog-blacklist.tmp
|
||||
echo ipmi_watchdog.ko >> watchdog-blacklist.tmp
|
||||
cat watchdog-blacklist.tmp|sed -e 's/^/blacklist /' -e 's/.ko$$//'|sort -u > debian/${PVE_KERNEL_PKG}/lib/modprobe.d/blacklist_${PVE_KERNEL_PKG}.conf
|
||||
rm -f debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/source
|
||||
rm -f debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/build
|
||||
touch $@
|
||||
|
||||
.tools_compile_mark: .compile_mark
|
||||
${MAKE} -C ${KERNEL_SRC}/tools/perf prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python3
|
||||
echo "checking GPL-2 only perf binary for library linkage with incompatible licenses.."
|
||||
! ldd ${KERNEL_SRC}/tools/perf/perf | grep -q -E '\blibbfd'
|
||||
! ldd ${KERNEL_SRC}/tools/perf/perf | grep -q -E '\blibcrypto'
|
||||
${MAKE} -C ${KERNEL_SRC}/tools/perf man
|
||||
touch $@
|
||||
|
||||
.tools_install_mark: .tools_compile_mark
|
||||
rm -rf debian/${LINUX_TOOLS_PKG}
|
||||
mkdir -p debian/${LINUX_TOOLS_PKG}/usr/bin
|
||||
mkdir -p debian/${LINUX_TOOLS_PKG}/usr/share/man/man1
|
||||
install -m 755 ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/perf debian/${LINUX_TOOLS_PKG}/usr/bin/perf_$(KERNEL_MAJMIN)
|
||||
for i in ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/Documentation/*.1; do \
|
||||
fname="$${i##*/}"; manname="$${fname%.1}"; \
|
||||
install -m644 "$$i" "debian/${LINUX_TOOLS_PKG}/usr/share/man/man1/$${manname}_$(KERNEL_MAJMIN).1"; \
|
||||
done
|
||||
touch $@
|
||||
|
||||
.headers_prepare_mark: .config_mark
|
||||
rm -rf debian/${PVE_HEADER_PKG}
|
||||
mkdir -p debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
||||
install -m 0644 ${KERNEL_SRC}/.config debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
||||
make -C ${KERNEL_SRC_COPY} mrproper
|
||||
cd ${KERNEL_SRC_COPY}; find . -path './debian/*' -prune \
|
||||
-o -path './include/*' -prune \
|
||||
-o -path './Documentation' -prune \
|
||||
-o -path './scripts' -prune \
|
||||
-o -type f \
|
||||
\( \
|
||||
-name 'Makefile*' \
|
||||
-o -name 'Kconfig*' \
|
||||
-o -name 'Kbuild*' \
|
||||
-o -name '*.sh' \
|
||||
-o -name '*.pl' \
|
||||
\) \
|
||||
-print | cpio -pd --preserve-modification-time ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
||||
cd ${KERNEL_SRC_COPY}; \
|
||||
( \
|
||||
find arch/${KERNEL_HEADER_ARCH} -name include -type d -print | \
|
||||
xargs -n1 -i: find : -type f \
|
||||
) | \
|
||||
cpio -pd --preserve-modification-time ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
||||
touch $@
|
||||
|
||||
.headers_compile_mark: .headers_prepare_mark
|
||||
# set output to subdir of source to reduce number of hardcoded paths in output files
|
||||
rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
|
||||
mkdir -p ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
|
||||
cp ${KERNEL_SRC}/.config ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/.config
|
||||
${MAKE} -C ${KERNEL_SRC_COPY} O=${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -j1 syncconfig modules_prepare prepare scripts
|
||||
cd ${KERNEL_SRC_COPY}; cp -a include scripts ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
||||
find ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -name \*.o.ur-\* -o -name '*.cmd' | xargs rm -f
|
||||
rsync --ignore-existing -r -v -a $(addprefix ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/,arch include kernel scripts tools) ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/
|
||||
rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}
|
||||
touch $@
|
||||
|
||||
.headers_install_mark: .compile_mark .modules_compile_mark .headers_compile_mark
|
||||
cp ${KERNEL_SRC}/include/generated/compile.h debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/include/generated/compile.h
|
||||
install -m 0644 ${KERNEL_SRC}/Module.symvers debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
||||
mkdir -p debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}
|
||||
ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
|
||||
touch $@
|
||||
|
||||
.usr_headers_install_mark: PKG_DIR = debian/${PVE_USR_HEADER_PKG}
|
||||
.usr_headers_install_mark: OUT_DIR = ${PKG_DIR}/usr
|
||||
.usr_headers_install_mark: .config_mark
|
||||
rm -rf '${PKG_DIR}'
|
||||
mkdir -p '${PKG_DIR}'
|
||||
$(MAKE) -C ${KERNEL_SRC} headers_check ARCH=$(KERNEL_HEADER_ARCH)
|
||||
$(MAKE) -C ${KERNEL_SRC} headers_install ARCH=$(KERNEL_HEADER_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
|
||||
rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
|
||||
find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
|
||||
|
||||
# Move include/asm to arch-specific directory
|
||||
mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
|
||||
mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
|
||||
test ! -d $(OUT_DIR)/include/arch || \
|
||||
mv $(OUT_DIR)/include/arch $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
|
||||
touch $@
|
||||
|
||||
.modules_compile_mark: ${MODULES}/zfs.ko
|
||||
touch $@
|
||||
|
||||
${MODULES}/zfs.ko: .compile_mark
|
||||
cd ${MODULES}/${ZFSDIR}; ./autogen.sh
|
||||
cd ${MODULES}/${ZFSDIR}; ./configure --with-config=kernel --with-linux=${BUILD_DIR}/${KERNEL_SRC} --with-linux-obj=${BUILD_DIR}/${KERNEL_SRC}
|
||||
${MAKE} -C ${MODULES}/${ZFSDIR}
|
||||
cp ${MODULES}/${ZFSDIR}/module/avl/zavl.ko ${MODULES}/
|
||||
cp ${MODULES}/${ZFSDIR}/module/nvpair/znvpair.ko ${MODULES}/
|
||||
cp ${MODULES}/${ZFSDIR}/module/unicode/zunicode.ko ${MODULES}/
|
||||
cp ${MODULES}/${ZFSDIR}/module/zcommon/zcommon.ko ${MODULES}/
|
||||
cp ${MODULES}/${ZFSDIR}/module/icp/icp.ko ${MODULES}/
|
||||
cp ${MODULES}/${ZFSDIR}/module/zfs/zfs.ko ${MODULES}/
|
||||
cp ${MODULES}/${ZFSDIR}/module/lua/zlua.ko ${MODULES}/
|
||||
cp ${MODULES}/${ZFSDIR}/module/spl/spl.ko ${MODULES}/
|
||||
cp ${MODULES}/${ZFSDIR}/module/zstd/zzstd.ko ${MODULES}/
|
||||
|
||||
fwlist-${KVNAME}: .compile_mark .modules_compile_mark
|
||||
debian/scripts/find-firmware.pl debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME} >fwlist.tmp
|
||||
mv fwlist.tmp $@
|
||||
|
||||
.PHONY: fwcheck
|
||||
fwcheck: fwlist-${KVNAME} fwlist-previous
|
||||
@echo "checking fwlist for changes since last built firmware package.."
|
||||
@echo "if this check fails, add fwlist-${KVNAME} to the pve-firmware repository and upload a new firmware package together with the ${KVNAME} kernel"
|
||||
sort fwlist-previous | uniq > fwlist-previous.sorted
|
||||
sort fwlist-${KVNAME} | uniq > fwlist-${KVNAME}.sorted
|
||||
diff -up -N fwlist-previous.sorted fwlist-${KVNAME}.sorted > fwlist.diff
|
||||
rm fwlist.diff fwlist-previous.sorted fwlist-${KVNAME}.sorted
|
||||
@echo "done, no need to rebuild pve-firmware"
|
||||
|
||||
|
||||
abi-${KVNAME}: .compile_mark
|
||||
debian/scripts/abi-generate debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/Module.symvers abi-${KVNAME} ${KVNAME}
|
||||
|
||||
.PHONY: abicheck
|
||||
abicheck: debian/scripts/abi-check abi-${KVNAME} abi-prev-* abi-blacklist
|
||||
debian/scripts/abi-check abi-${KVNAME} abi-prev-* ${SKIPABI}
|
||||
|
||||
.PHONY: clean
|
||||
Vendored
-5
@@ -1,5 +0,0 @@
|
||||
KERNEL_BUILD_ARCH = x86
|
||||
KERNEL_HEADER_ARCH = $(KERNEL_BUILD_ARCH)
|
||||
KERNEL_BUILD_IMAGE = bzImage
|
||||
KERNEL_IMAGE_PATH = arch/$(KERNEL_BUILD_ARCH)/boot/${KERNEL_BUILD_IMAGE}
|
||||
KERNEL_INSTALL_FILE = vmlinuz
|
||||
Vendored
-42
@@ -1,42 +0,0 @@
|
||||
#!/usr/bin/perl -w
|
||||
|
||||
use PVE::Tools;
|
||||
|
||||
use IO::File;
|
||||
|
||||
sub usage {
|
||||
die "USAGE: $0 INFILE OUTFILE [ABI INFILE-IS-DEB]\n";
|
||||
}
|
||||
|
||||
my $input_file = shift // usage();
|
||||
my $output_file = shift // usage();
|
||||
my $abi = shift;
|
||||
my $extract_deb = shift;
|
||||
|
||||
die "input file '$input_file' does not exist\n" if ! -e $input_file;
|
||||
|
||||
my $modules_symver_fh;
|
||||
|
||||
if ($extract_deb) {
|
||||
usage() if !defined($abi);
|
||||
my $cmd = [];
|
||||
push @$cmd, ['dpkg', '--fsys-tarfile', $input_file];
|
||||
push @$cmd, ['tar', '-xOf', '-', "./usr/src/linux-headers-${abi}/Module.symvers"];
|
||||
$modules_symver_fh = IO::File->new_tmpfile();
|
||||
PVE::Tools::run_command($cmd, output => '>&'.fileno($modules_symver_fh));
|
||||
seek($modules_symver_fh, 0, 0);
|
||||
} else {
|
||||
open($modules_symver_fh, '<', $input_file) or die "can't open '$input_file' - $!\n";
|
||||
}
|
||||
|
||||
my $lines = [];
|
||||
while(my $line = <$modules_symver_fh>) {
|
||||
if ($line =~ /^(.+)\s+(.+)\s+(.+)$/) {
|
||||
push @$lines, "$3 $2 $1";
|
||||
} else {
|
||||
warn "malformed symvers line: '$line'\n";
|
||||
}
|
||||
}
|
||||
close($modules_symver_fh);
|
||||
|
||||
PVE::Tools::file_set_contents($output_file, join("\n", sort @$lines));
|
||||
Vendored
-34
@@ -1,34 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
top=$(pwd)
|
||||
|
||||
if [ "$#" -ne 3 ]; then
|
||||
echo "USAGE: $0 repo patchdir ref"
|
||||
printf "\t exports patches from 'repo' to 'patchdir' based on 'ref'\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# parameters
|
||||
kernel_submodule=$1
|
||||
kernel_patchdir=$2
|
||||
base_ref=$3
|
||||
|
||||
cd "${kernel_submodule}"
|
||||
echo "clearing old exported patchqueue"
|
||||
rm -f "${top}/${kernel_patchdir}"/*.patch
|
||||
echo "exporting patchqueue using 'git format-patch [...] ${base_ref}.."
|
||||
git format-patch \
|
||||
--quiet \
|
||||
--no-numbered \
|
||||
--no-cover-letter \
|
||||
--zero-commit \
|
||||
--no-signature \
|
||||
--diff-algorithm=myers \
|
||||
--output-directory="${top}/${kernel_patchdir}" \
|
||||
"${base_ref}.."
|
||||
|
||||
git checkout "${base_ref}"
|
||||
|
||||
cd "${top}"
|
||||
Vendored
-29
@@ -1,29 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
top=$(pwd)
|
||||
|
||||
if [[ "$#" -lt 2 || "$#" -gt 3 ]]; then
|
||||
echo "USAGE: $0 repo patchdir [branch]"
|
||||
echo "\t imports patches from 'patchdir' into patchqueue branch 'branch' in 'repo'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
# parameters
|
||||
kernel_submodule=$1
|
||||
kernel_patchdir=$2
|
||||
if [[ -z "$3" ]]; then
|
||||
pq_branch='pq'
|
||||
else
|
||||
pq_branch=$3
|
||||
fi
|
||||
|
||||
cd "${kernel_submodule}"
|
||||
echo "creating patchqeueue branch '${pq_branch}'"
|
||||
git checkout -b "${pq_branch}"
|
||||
echo "importing patches from '${kernel_patchdir}'"
|
||||
git am "${top}/${kernel_patchdir}"/*.patch
|
||||
|
||||
cd "${top}"
|
||||
Vendored
-119
@@ -1,119 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
top=$(pwd)
|
||||
|
||||
# parameters
|
||||
kernel_submodule=
|
||||
kernel_patchdir=
|
||||
new_tag=
|
||||
rebase=
|
||||
|
||||
# generated based on new_tag
|
||||
pq_branch=
|
||||
# previously checked out in submodule
|
||||
old_ref=
|
||||
|
||||
function cleanup_pq_branch {
|
||||
if [[ -n $pq_branch ]]; then
|
||||
echo "cleaning up PQ branch '$pq_branch'"
|
||||
cd "${top}/${kernel_submodule}"
|
||||
git checkout --quiet $old_ref
|
||||
git reset --hard
|
||||
git branch -D "$pq_branch"
|
||||
fi
|
||||
}
|
||||
|
||||
function error_exit {
|
||||
echo "$1"
|
||||
set +e
|
||||
|
||||
cleanup_pq_branch
|
||||
|
||||
cd "${top}"
|
||||
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [[ "$#" -lt 3 || "$#" -gt 4 ]]; then
|
||||
echo "USAGE: $0 submodule patchdir tag [rebase]"
|
||||
echo "\t fetches and checks out 'tag' in 'submodule'"
|
||||
echo "\t if 'rebase' is given, imports, rebases and exports patchqueue from 'patchdir' as well"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
kernel_submodule=$1
|
||||
if [ ! -d "${kernel_submodule}" ]; then
|
||||
error_exit "'${kernel_submodule}' must be a directory!"
|
||||
fi
|
||||
|
||||
kernel_patchdir=$2
|
||||
if [ ! -d "${kernel_patchdir}" ]; then
|
||||
error_exit "'${kernel_patchdir}' must be a directory!"
|
||||
fi
|
||||
|
||||
new_tag=$3
|
||||
rebase=$4
|
||||
|
||||
if [[ -n $(git status --untracked-files=no --porcelain) ]]; then
|
||||
error_exit "working directory unclean, aborting"
|
||||
fi
|
||||
|
||||
|
||||
cd "${kernel_submodule}"
|
||||
## check for tag and fetch if needed
|
||||
echo "checking for tag '${new_tag}'"
|
||||
if [[ -z $(git tag -l "${new_tag}") ]]; then
|
||||
echo "tag not found, fetching and retrying"
|
||||
git fetch --tags
|
||||
fi
|
||||
if [[ -z $(git tag -l "${new_tag}") ]]; then
|
||||
error_exit "tag not found, aborting"
|
||||
fi
|
||||
echo "tag found"
|
||||
cd "${top}"
|
||||
|
||||
if [[ -n "$rebase" ]]; then
|
||||
echo ""
|
||||
echo "automatic patchqueue rebase enabled"
|
||||
cd "${kernel_submodule}"
|
||||
## preparing patch queue branch
|
||||
old_ref=$(git rev-parse HEAD)
|
||||
pq_branch="auto_pq/${new_tag}"
|
||||
cd "${top}"
|
||||
|
||||
echo "previous HEAD: ${old_ref}"
|
||||
|
||||
echo ""
|
||||
"${top}/debian/scripts/import-patchqueue" "${kernel_submodule}" "${kernel_patchdir}" "${pq_branch}" || error_exit "failed to import patchqueue"
|
||||
|
||||
cd "${kernel_submodule}"
|
||||
## rebase patches
|
||||
echo ""
|
||||
echo "rebasing patchqueue on top of '${new_tag}'"
|
||||
git rebase "${new_tag}"
|
||||
cd "${top}"
|
||||
|
||||
## regenerate exported patch queue
|
||||
echo ""
|
||||
"${top}/debian/scripts/export-patchqueue" "${kernel_submodule}" "${kernel_patchdir}" "${new_tag}" || error_exit "failed to export patchqueue"
|
||||
|
||||
cleanup_pq_branch
|
||||
cd "${top}"
|
||||
pq_branch=
|
||||
fi
|
||||
|
||||
cd "${kernel_submodule}"
|
||||
echo ""
|
||||
echo "checking out '${new_tag}' in submodule"
|
||||
git checkout --quiet "${new_tag}"
|
||||
cd "${top}"
|
||||
|
||||
echo ""
|
||||
echo "committing results"
|
||||
git commit --verbose -s -m "update sources to ${new_tag}" -m "(generated with debian/scripts/import-upstream-tag)" "${kernel_submodule}"
|
||||
if [[ -n "$rebase" ]]; then
|
||||
git add "${kernel_patchdir}"
|
||||
git commit --verbose -s -m "rebase patches on top of ${new_tag}" -m "(generated with debian/scripts/import-upstream-tag)" "${kernel_patchdir}"
|
||||
fi
|
||||
Binary file not shown.
@@ -0,0 +1,81 @@
|
||||
src/{netdev.c.orig => netdev.c} | 18 +++++++++---------
|
||||
src/{ptp.c.orig => ptp.c} | 4 ++--
|
||||
2 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/netdev.c.orig b/src/netdev.c
|
||||
index 73b0f9a..480265b 100644
|
||||
--- a/src/netdev.c.orig
|
||||
+++ b/src/netdev.c
|
||||
@@ -4833,24 +4833,24 @@ void e1000e_reinit_locked(struct e1000_adapter *adapter)
|
||||
/**
|
||||
* e1000e_sanitize_systim - sanitize raw cycle counter reads
|
||||
* @hw: pointer to the HW structure
|
||||
- * @systim: cycle_t value read, sanitized and returned
|
||||
+ * @systim: u64 value read, sanitized and returned
|
||||
*
|
||||
* Errata for 82574/82583 possible bad bits read from SYSTIMH/L:
|
||||
* check to see that the time is incrementing at a reasonable
|
||||
* rate and is a multiple of incvalue.
|
||||
**/
|
||||
-static cycle_t e1000e_sanitize_systim(struct e1000_hw *hw, cycle_t systim)
|
||||
+static u64 e1000e_sanitize_systim(struct e1000_hw *hw, u64 systim)
|
||||
{
|
||||
u64 time_delta, rem, temp;
|
||||
- cycle_t systim_next;
|
||||
+ u64 systim_next;
|
||||
u32 incvalue;
|
||||
int i;
|
||||
|
||||
incvalue = er32(TIMINCA) & E1000_TIMINCA_INCVALUE_MASK;
|
||||
for (i = 0; i < E1000_MAX_82574_SYSTIM_REREADS; i++) {
|
||||
/* latch SYSTIMH on read of SYSTIML */
|
||||
- systim_next = (cycle_t)er32(SYSTIML);
|
||||
- systim_next |= (cycle_t)er32(SYSTIMH) << 32;
|
||||
+ systim_next = (u64)er32(SYSTIML);
|
||||
+ systim_next |= (u64)er32(SYSTIMH) << 32;
|
||||
|
||||
time_delta = systim_next - systim;
|
||||
temp = time_delta;
|
||||
@@ -4872,13 +4872,13 @@ static cycle_t e1000e_sanitize_systim(struct e1000_hw *hw, cycle_t systim)
|
||||
* e1000e_cyclecounter_read - read raw cycle counter (used by time counter)
|
||||
* @cc: cyclecounter structure
|
||||
**/
|
||||
-static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc)
|
||||
+static u64 e1000e_cyclecounter_read(const struct cyclecounter *cc)
|
||||
{
|
||||
struct e1000_adapter *adapter = container_of(cc, struct e1000_adapter,
|
||||
cc);
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
u32 systimel, systimeh;
|
||||
- cycle_t systim;
|
||||
+ u64 systim;
|
||||
/* SYSTIMH latching upon SYSTIML read does not work well.
|
||||
* This means that if SYSTIML overflows after we read it but before
|
||||
* we read SYSTIMH, the value of SYSTIMH has been incremented and we
|
||||
@@ -4899,8 +4899,8 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc)
|
||||
systimel = systimel_2;
|
||||
}
|
||||
}
|
||||
- systim = (cycle_t)systimel;
|
||||
- systim |= (cycle_t)systimeh << 32;
|
||||
+ systim = (u64)systimel;
|
||||
+ systim |= (u64)systimeh << 32;
|
||||
|
||||
if (adapter->flags2 & FLAG2_CHECK_SYSTIM_OVERFLOW)
|
||||
systim = e1000e_sanitize_systim(hw, systim);
|
||||
|
||||
diff --git a/src/ptp.c.orig b/src/ptp.c
|
||||
index 00c419f..228adce 100644
|
||||
--- a/src/ptp.c.orig
|
||||
+++ b/src/ptp.c
|
||||
@@ -136,8 +136,8 @@ static int e1000e_phc_get_syncdevicetime(ktime_t * device,
|
||||
unsigned long flags;
|
||||
int i;
|
||||
u32 tsync_ctrl;
|
||||
- cycle_t dev_cycles;
|
||||
- cycle_t sys_cycles;
|
||||
+ u64 dev_cycles;
|
||||
+ u64 sys_cycles;
|
||||
|
||||
tsync_ctrl = er32(TSYNCTXCTL);
|
||||
tsync_ctrl |= E1000_TSYNCTXCTL_START_SYNC |
|
||||
@@ -0,0 +1,37 @@
|
||||
diff --git a/src/netdev.c b/src/netdev.c
|
||||
index 73b0f9a..aef1bc2 100644
|
||||
--- a/src/netdev.c
|
||||
+++ b/src/netdev.c
|
||||
@@ -6724,19 +6724,12 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
|
||||
int max_frame = new_mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
|
||||
|
||||
/* Jumbo frame support */
|
||||
- if ((max_frame > (VLAN_ETH_FRAME_LEN + ETH_FCS_LEN)) &&
|
||||
+ if ((new_mtu > ETH_DATA_LEN) &&
|
||||
!(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
|
||||
e_err("Jumbo Frames not supported.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- /* Supported frame sizes */
|
||||
- if ((new_mtu < (VLAN_ETH_ZLEN + ETH_FCS_LEN)) ||
|
||||
- (max_frame > adapter->max_hw_frame_size)) {
|
||||
- e_err("Unsupported MTU setting\n");
|
||||
- return -EINVAL;
|
||||
- }
|
||||
-
|
||||
/* Jumbo frame workaround on 82579 and newer requires CRC be stripped */
|
||||
if ((adapter->hw.mac.type >= e1000_pch2lan) &&
|
||||
!(adapter->flags2 & FLAG2_CRC_STRIPPING) &&
|
||||
@@ -8262,6 +8255,11 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
#endif /* HAVE_NETDEV_VLAN_FEATURES */
|
||||
}
|
||||
|
||||
+ /* MTU range: 68 - max_hw_frame_size */
|
||||
+ netdev->min_mtu = ETH_MIN_MTU;
|
||||
+ netdev->max_mtu = adapter->max_hw_frame_size -
|
||||
+ (VLAN_ETH_HLEN + ETH_FCS_LEN);
|
||||
+
|
||||
if (e1000e_enable_mng_pass_thru(&adapter->hw))
|
||||
adapter->flags |= FLAG_MNG_PT_ENABLED;
|
||||
|
||||
@@ -8,7 +8,7 @@ die "no directory to scan" if !$dir;
|
||||
|
||||
die "no such directory" if ! -d $dir;
|
||||
|
||||
die "strange directory name: $dir" if $dir !~ m|^(.*/)?(\d+.\d+.\d+\-\d+\-pve)(/+)?$|;
|
||||
die "strange directory name" if $dir !~ m|^(.*/)?(4.10.\d+\-\d+\-pve)(/+)?$|;
|
||||
|
||||
my $apiver = $2;
|
||||
|
||||
+1173
-1837
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,10 @@
|
||||
Package: pve-headers-@KVNAME@
|
||||
Version: @KERNEL_VER@-@PKGREL@
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Architecture: @ARCH@
|
||||
Provides: linux-headers, linux-headers-2.6
|
||||
Depends: coreutils | fileutils (>= 4.0)
|
||||
Maintainer: Proxmox Support Team <support@proxmox.com>
|
||||
Description: The Proxmox PVE Kernel Headers
|
||||
This package contains the linux kernel headers
|
||||
Binary file not shown.
@@ -0,0 +1,25 @@
|
||||
src/{igb_ptp.c.orig => igb_ptp.c} | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/igb_ptp.c.orig b/src/igb_ptp.c
|
||||
index 744fa65..f334ac7 100644
|
||||
--- a/src/igb_ptp.c.orig
|
||||
+++ b/src/igb_ptp.c
|
||||
@@ -93,7 +93,7 @@
|
||||
* SYSTIM read access for the 82576
|
||||
*/
|
||||
|
||||
-static cycle_t igb_ptp_read_82576(const struct cyclecounter *cc)
|
||||
+static u64 igb_ptp_read_82576(const struct cyclecounter *cc)
|
||||
{
|
||||
struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
|
||||
struct e1000_hw *hw = &igb->hw;
|
||||
@@ -113,7 +113,7 @@ static cycle_t igb_ptp_read_82576(const struct cyclecounter *cc)
|
||||
* SYSTIM read access for the 82580
|
||||
*/
|
||||
|
||||
-static cycle_t igb_ptp_read_82580(const struct cyclecounter *cc)
|
||||
+static u64 igb_ptp_read_82580(const struct cyclecounter *cc)
|
||||
{
|
||||
struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
|
||||
struct e1000_hw *hw = &igb->hw;
|
||||
@@ -0,0 +1,47 @@
|
||||
diff --git a/src/e1000_defines.h b/src/e1000_defines.h
|
||||
index 6de3988..d58e12f 100644
|
||||
--- a/src/e1000_defines.h
|
||||
+++ b/src/e1000_defines.h
|
||||
@@ -423,7 +423,8 @@
|
||||
#define ETHERNET_IEEE_VLAN_TYPE 0x8100 /* 802.3ac packet */
|
||||
|
||||
#define ETHERNET_FCS_SIZE 4
|
||||
-#define MAX_JUMBO_FRAME_SIZE 0x3F00
|
||||
+#define MAX_JUMBO_FRAME_SIZE 0x2600
|
||||
+#define MAX_STD_JUMBO_FRAME_SIZE 9216
|
||||
/* The datasheet maximum supported RX size is 9.5KB (9728 bytes) */
|
||||
#define MAX_RX_JUMBO_FRAME_SIZE 0x2600
|
||||
#define E1000_TX_PTR_GAP 0x1F
|
||||
diff --git a/src/igb_main.c b/src/igb_main.c
|
||||
index 2dff0f4..bbfe87e 100644
|
||||
--- a/src/igb_main.c
|
||||
+++ b/src/igb_main.c
|
||||
@@ -2852,6 +2852,10 @@ static int igb_probe(struct pci_dev *pdev,
|
||||
if (pci_using_dac)
|
||||
netdev->features |= NETIF_F_HIGHDMA;
|
||||
|
||||
+ /* MTU range: 68 - 9216 */
|
||||
+ netdev->min_mtu = ETH_MIN_MTU;
|
||||
+ netdev->max_mtu = MAX_STD_JUMBO_FRAME_SIZE;
|
||||
+
|
||||
adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw);
|
||||
#ifdef DEBUG
|
||||
if (adapter->dmac != IGB_DMAC_DISABLE)
|
||||
@@ -5832,17 +5836,6 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu)
|
||||
struct pci_dev *pdev = adapter->pdev;
|
||||
int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
|
||||
|
||||
- if ((new_mtu < 68) || (max_frame > MAX_JUMBO_FRAME_SIZE)) {
|
||||
- dev_err(pci_dev_to_dev(pdev), "Invalid MTU setting\n");
|
||||
- return -EINVAL;
|
||||
- }
|
||||
-
|
||||
-#define MAX_STD_JUMBO_FRAME_SIZE 9238
|
||||
- if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {
|
||||
- dev_err(pci_dev_to_dev(pdev), "MTU > 9216 not supported.\n");
|
||||
- return -EINVAL;
|
||||
- }
|
||||
-
|
||||
/* adjust max frame to be at least the size of a standard frame */
|
||||
if (max_frame < (ETH_FRAME_LEN + ETH_FCS_LEN))
|
||||
max_frame = ETH_FRAME_LEN + ETH_FCS_LEN;
|
||||
@@ -0,0 +1,95 @@
|
||||
From 6445198f802d993c73f4b246353b2ceb2dfafc32 Mon Sep 17 00:00:00 2001
|
||||
From: Ferruh Yigit <ferruh.yigit@intel.com>
|
||||
Date: Mon, 17 Oct 2016 11:23:14 +0100
|
||||
Subject: kni: fix build with kernel 4.9
|
||||
|
||||
compile error:
|
||||
CC [M] .../lib/librte_eal/linuxapp/kni/igb_main.o
|
||||
.../lib/librte_eal/linuxapp/kni/igb_main.c:2317:21:
|
||||
error: initialization from incompatible pointer type
|
||||
[-Werror=incompatible-pointer-types]
|
||||
.ndo_set_vf_vlan = igb_ndo_set_vf_vlan,
|
||||
^~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Linux kernel 4.9 updates API for ndo_set_vf_vlan:
|
||||
Linux: 79aab093a0b5 ("net: Update API for VF vlan protocol 802.1ad support")
|
||||
|
||||
Use new API for Linux kernels >= 4.9
|
||||
|
||||
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
|
||||
Tested-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
|
||||
---
|
||||
src/igb_main.c | 19 +++++++++++++++++++
|
||||
src/kcompat.h | 4 ++++
|
||||
2 files changed, 23 insertions(+)
|
||||
|
||||
diff --git a/src/igb_main.c b/src/igb_main.c
|
||||
index 23e2d64..f4dca5a 100644
|
||||
--- a/src/igb_main.c
|
||||
+++ b/src/igb_main.c
|
||||
@@ -195,7 +195,11 @@ static void igb_process_mdd_event(struct igb_adapter *);
|
||||
#ifdef IFLA_VF_MAX
|
||||
static int igb_ndo_set_vf_mac( struct net_device *netdev, int vf, u8 *mac);
|
||||
static int igb_ndo_set_vf_vlan(struct net_device *netdev,
|
||||
+#ifdef HAVE_VF_VLAN_PROTO
|
||||
+ int vf, u16 vlan, u8 qos, __be16 vlan_proto);
|
||||
+#else
|
||||
int vf, u16 vlan, u8 qos);
|
||||
+#endif
|
||||
#ifdef HAVE_VF_SPOOFCHK_CONFIGURE
|
||||
static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
|
||||
bool setting);
|
||||
@@ -6412,7 +6416,11 @@ static void igb_set_vmvir(struct igb_adapter *adapter, u32 vid, u32 vf)
|
||||
}
|
||||
|
||||
static int igb_ndo_set_vf_vlan(struct net_device *netdev,
|
||||
+#ifdef HAVE_VF_VLAN_PROTO
|
||||
+ int vf, u16 vlan, u8 qos, __be16 vlan_proto)
|
||||
+#else
|
||||
int vf, u16 vlan, u8 qos)
|
||||
+#endif
|
||||
{
|
||||
int err = 0;
|
||||
struct igb_adapter *adapter = netdev_priv(netdev);
|
||||
@@ -6420,6 +6428,12 @@ static int igb_ndo_set_vf_vlan(struct net_device *netdev,
|
||||
/* VLAN IDs accepted range 0-4094 */
|
||||
if ((vf >= adapter->vfs_allocated_count) || (vlan > VLAN_VID_MASK-1) || (qos > 7))
|
||||
return -EINVAL;
|
||||
+
|
||||
+#ifdef HAVE_VF_VLAN_PROTO
|
||||
+ if (vlan_proto != htons(ETH_P_8021Q))
|
||||
+ return -EPROTONOSUPPORT;
|
||||
+#endif
|
||||
+
|
||||
if (vlan || qos) {
|
||||
err = igb_vlvf_set(adapter, vlan, !!vlan, vf);
|
||||
if (err)
|
||||
@@ -6580,7 +6594,12 @@ static inline void igb_vf_reset(struct igb_adapter *adapter, u32 vf)
|
||||
if (adapter->vf_data[vf].pf_vlan)
|
||||
igb_ndo_set_vf_vlan(adapter->netdev, vf,
|
||||
adapter->vf_data[vf].pf_vlan,
|
||||
+#ifdef HAVE_VF_VLAN_PROTO
|
||||
+ adapter->vf_data[vf].pf_qos,
|
||||
+ htons(ETH_P_8021Q));
|
||||
+#else
|
||||
adapter->vf_data[vf].pf_qos);
|
||||
+#endif
|
||||
else
|
||||
igb_clear_vf_vfta(adapter, vf);
|
||||
#endif
|
||||
diff --git a/src/kcompat.h b/src/kcompat.h
|
||||
index 69e0e7a..84826b2 100644
|
||||
--- a/src/kcompat.h
|
||||
+++ b/src/kcompat.h
|
||||
@@ -3929,4 +3929,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
|
||||
#define vlan_tx_tag_present skb_vlan_tag_present
|
||||
#endif
|
||||
|
||||
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) )
|
||||
+#define HAVE_VF_VLAN_PROTO
|
||||
+#endif /* >= 4.9.0 */
|
||||
+
|
||||
#endif /* _KCOMPAT_H_ */
|
||||
--
|
||||
cgit v1.0
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
diff --git a/src/Makefile.orig b/src/Makefile
|
||||
index 8e962f7..50bcdcc 100644
|
||||
--- a/src/Makefile.orig
|
||||
+++ b/src/Makefile
|
||||
@@ -123,6 +123,13 @@ ifeq (,$(CC))
|
||||
$(error Compiler not found)
|
||||
endif
|
||||
|
||||
+# workaround for GCC6's default PIE
|
||||
+ifeq ($(CC),gcc)
|
||||
+ PIE_TEST = [ -z "`$(CC) -fno-PIE -no-pie -x c -c /dev/null -o /dev/null 2>&1`" ]
|
||||
+ PIE_FLAGS := $(shell $(PIE_TEST) && echo '-fno-PIE -no-pie')
|
||||
+ EXTRA_CFLAGS += $(PIE_FLAGS)
|
||||
+endif
|
||||
+
|
||||
# we need to know what platform the driver is being built on
|
||||
# some additional features are only built on Intel platforms
|
||||
ARCH := $(shell uname -m | sed 's/i.86/i386/')
|
||||
Binary file not shown.
@@ -0,0 +1,25 @@
|
||||
src/{ixgbe_ptp.c.orig => ixgbe_ptp.c} | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/ixgbe_ptp.c.orig b/src/ixgbe_ptp.c
|
||||
index fb832f0..b868c68 100644
|
||||
--- a/src/ixgbe_ptp.c.orig
|
||||
+++ b/src/ixgbe_ptp.c
|
||||
@@ -244,7 +244,7 @@ static void ixgbe_ptp_setup_sdp_X540(struct ixgbe_adapter *adapter)
|
||||
* result of SYSTIME is 32bits of "billions of cycles" and 32 bits of
|
||||
* "cycles", rather than seconds and nanoseconds.
|
||||
*/
|
||||
-static cycle_t ixgbe_ptp_read_X550(const struct cyclecounter *hw_cc) {
|
||||
+static u64 ixgbe_ptp_read_X550(const struct cyclecounter *hw_cc) {
|
||||
struct ixgbe_adapter *adapter =
|
||||
container_of(hw_cc, struct ixgbe_adapter, hw_cc);
|
||||
struct ixgbe_hw *hw = &adapter->hw;
|
||||
@@ -280,7 +280,7 @@ static cycle_t ixgbe_ptp_read_X550(const struct cyclecounter *hw_cc) {
|
||||
* cyclecounter structure used to construct a ns counter from the
|
||||
* arbitrary fixed point registers
|
||||
*/
|
||||
-static cycle_t ixgbe_ptp_read_82599(const struct cyclecounter *hw_cc)
|
||||
+static u64 ixgbe_ptp_read_82599(const struct cyclecounter *hw_cc)
|
||||
{
|
||||
struct ixgbe_adapter *adapter =
|
||||
container_of(hw_cc, struct ixgbe_adapter, hw_cc);
|
||||
@@ -0,0 +1,37 @@
|
||||
diff --git a/src/ixgbe_main.c b/src/ixgbe_main.c
|
||||
index 83c6250..fe226cd 100644
|
||||
--- a/src/ixgbe_main.c
|
||||
+++ b/src/ixgbe_main.c
|
||||
@@ -6379,11 +6379,6 @@ static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter)
|
||||
static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
|
||||
{
|
||||
struct ixgbe_adapter *adapter = netdev_priv(netdev);
|
||||
- int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
|
||||
-
|
||||
- /* MTU < 68 is an error and causes problems on some kernels */
|
||||
- if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
|
||||
- return -EINVAL;
|
||||
|
||||
/*
|
||||
* For 82599EB we cannot allow legacy VFs to enable their receive
|
||||
@@ -6392,7 +6387,7 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
|
||||
*/
|
||||
if ((adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) &&
|
||||
(adapter->hw.mac.type == ixgbe_mac_82599EB) &&
|
||||
- (max_frame > (ETH_FRAME_LEN + ETH_FCS_LEN)))
|
||||
+ (new_mtu > ETH_DATA_LEN))
|
||||
e_warn(probe, "Setting MTU > 1500 will disable legacy VFs\n");
|
||||
|
||||
e_info(probe, "changing MTU from %d to %d\n", netdev->mtu, new_mtu);
|
||||
@@ -10134,6 +10129,11 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
|
||||
#ifdef IFF_SUPP_NOFCS
|
||||
netdev->priv_flags |= IFF_SUPP_NOFCS;
|
||||
#endif
|
||||
+
|
||||
+ /* MTU range: 68 - 9710 */
|
||||
+ netdev->min_mtu = ETH_MIN_MTU;
|
||||
+ netdev->max_mtu = IXGBE_MAX_JUMBO_FRAME_SIZE - (ETH_HLEN + ETH_FCS_LEN);
|
||||
+
|
||||
#if IS_ENABLED(CONFIG_DCB)
|
||||
if (adapter->flags & IXGBE_FLAG_DCB_CAPABLE)
|
||||
netdev->dcbnl_ops = &dcbnl_ops;
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
||||
--- a/virt/kvm/kvm_main.c 2016-05-12 10:39:37.540387127 +0200
|
||||
+++ b/virt/kvm/kvm_main.c 2016-05-04 10:43:38.063996221 +0200
|
||||
@@ -75,7 +75,7 @@ static unsigned int halt_poll_ns = KVM_H
|
||||
EXPORT_SYMBOL_GPL(halt_poll_ns);
|
||||
|
||||
/* Default doubles per-vcpu halt_poll_ns. */
|
||||
-unsigned int halt_poll_ns_grow = 2;
|
||||
+unsigned int halt_poll_ns_grow = 0;
|
||||
module_param(halt_poll_ns_grow, uint, S_IRUGO | S_IWUSR);
|
||||
EXPORT_SYMBOL_GPL(halt_poll_ns_grow);
|
||||
|
||||
+44
-45
@@ -1,15 +1,13 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From 866f4c5de45ae13aa590de0d40819a0c38f3f682 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Weiman <mark.weiman@markzz.com>
|
||||
Date: Wed, 7 Feb 2018 16:04:03 -0500
|
||||
Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.15)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Date: Sun, 23 Oct 2016 12:57:37 -0400
|
||||
Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.8+)
|
||||
|
||||
This an updated version of Alex Williamson's patch from:
|
||||
https://lkml.org/lkml/2013/5/30/513
|
||||
|
||||
Original commit message follows:
|
||||
---
|
||||
PCIe ACS (Access Control Services) is the PCIe 2.0+ feature that
|
||||
allows us to control whether transactions are allowed to be redirected
|
||||
in various subnodes of a PCIe topology. For instance, if two
|
||||
@@ -47,39 +45,38 @@ specific devices which enforce isolation but not provide an ACS
|
||||
capability. Please contact me to have your devices added and save
|
||||
your customers the hassle of this boot option.
|
||||
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
|
||||
---
|
||||
.../admin-guide/kernel-parameters.txt | 9 ++
|
||||
drivers/pci/quirks.c | 102 ++++++++++++++++++
|
||||
2 files changed, 111 insertions(+)
|
||||
Documentation/admin-guide/kernel-parameters.txt | 9 ++++
|
||||
drivers/pci/quirks.c | 101 ++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 110 insertions(+)
|
||||
|
||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
||||
index 550f341daf99..478530b48cf1 100644
|
||||
index a4f4d69..d68cfab 100644
|
||||
--- a/Documentation/admin-guide/kernel-parameters.txt
|
||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
||||
@@ -3814,6 +3814,15 @@
|
||||
Also, it enforces the PCI Local Bus spec
|
||||
rule that those bits should be 0 in system reset
|
||||
events (useful for kexec/kdump cases).
|
||||
@@ -2928,6 +2928,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
||||
nomsi [MSI] If the PCI_MSI kernel config parameter is
|
||||
enabled, this kernel boot option can be used to
|
||||
disable the use of MSI interrupts system-wide.
|
||||
+ pci_acs_override =
|
||||
+ [PCIE] Override missing PCIe ACS support for:
|
||||
+ [PCIE] Override missing PCIe ACS support for:
|
||||
+ downstream
|
||||
+ All downstream ports - full ACS capabilities
|
||||
+ multifunction
|
||||
+ Add multifunction devices - multifunction ACS subset
|
||||
+ multfunction
|
||||
+ All multifunction devices - multifunction ACS subset
|
||||
+ id:nnnn:nnnn
|
||||
+ Specific device - full ACS capabilities
|
||||
+ Specfic device - full ACS capabilities
|
||||
+ Specified as vid:did (vendor/device ID) in hex
|
||||
noioapicquirk [APIC] Disable all boot interrupt quirks.
|
||||
Safety option to keep boot IRQs enabled. This
|
||||
should never be necessary.
|
||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||
index 444ba11f3e79..5843ba2cad8e 100644
|
||||
index 44e0ff3..32016cb 100644
|
||||
--- a/drivers/pci/quirks.c
|
||||
+++ b/drivers/pci/quirks.c
|
||||
@@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void)
|
||||
}
|
||||
@@ -3487,6 +3487,106 @@ static int __init pci_apply_final_quirks(void)
|
||||
|
||||
fs_initcall_sync(pci_apply_final_quirks);
|
||||
|
||||
+static bool acs_on_downstream;
|
||||
@@ -122,6 +119,7 @@ index 444ba11f3e79..5843ba2cad8e 100644
|
||||
+ goto next;
|
||||
+ }
|
||||
+ acs_on_ids[max_acs_id].vendor = val;
|
||||
+
|
||||
+ p += strcspn(p, ":");
|
||||
+ if (*p != ':') {
|
||||
+ pr_warn("PCIe ACS invalid ID\n");
|
||||
@@ -166,31 +164,32 @@ index 444ba11f3e79..5843ba2cad8e 100644
|
||||
+ return 1;
|
||||
+
|
||||
+ switch (pci_pcie_type(dev)) {
|
||||
+ case PCI_EXP_TYPE_DOWNSTREAM:
|
||||
+ case PCI_EXP_TYPE_ROOT_PORT:
|
||||
+ if (acs_on_downstream)
|
||||
+ return 1;
|
||||
+ break;
|
||||
+ case PCI_EXP_TYPE_ENDPOINT:
|
||||
+ case PCI_EXP_TYPE_UPSTREAM:
|
||||
+ case PCI_EXP_TYPE_LEG_END:
|
||||
+ case PCI_EXP_TYPE_RC_END:
|
||||
+ if (acs_on_multifunction && dev->multifunction)
|
||||
+ return 1;
|
||||
+ case PCI_EXP_TYPE_DOWNSTREAM:
|
||||
+ case PCI_EXP_TYPE_ROOT_PORT:
|
||||
+ if (acs_on_downstream)
|
||||
+ return 1;
|
||||
+ break;
|
||||
+ case PCI_EXP_TYPE_ENDPOINT:
|
||||
+ case PCI_EXP_TYPE_UPSTREAM:
|
||||
+ case PCI_EXP_TYPE_LEG_END:
|
||||
+ case PCI_EXP_TYPE_RC_END:
|
||||
+ if (acs_on_multifunction && dev->multifunction)
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ return -ENOTTY;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* Decoding should be disabled for a PCI device during BAR sizing to avoid
|
||||
* conflict. But doing so may cause problems on host bridge and perhaps other
|
||||
@@ -4876,6 +4976,8 @@ static const struct pci_dev_acs_enabled {
|
||||
{ PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },
|
||||
/* APM X-Gene */
|
||||
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
|
||||
+ /* Enable overrides for missing ACS capabilities */
|
||||
* Followings are device-specific reset methods which can be used to
|
||||
* reset a single function if other methods (e.g. FLR, PM D0->D3) are
|
||||
@@ -4160,6 +4260,7 @@ static const struct pci_dev_acs_enabled {
|
||||
{ 0x10df, 0x720, pci_quirk_mf_endpoint_acs }, /* Emulex Skyhawk-R */
|
||||
/* Cavium ThunderX */
|
||||
{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
|
||||
+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
|
||||
/* Ampere Computing */
|
||||
{ PCI_VENDOR_ID_AMPERE, 0xE005, pci_quirk_xgene_acs },
|
||||
{ PCI_VENDOR_ID_AMPERE, 0xE006, pci_quirk_xgene_acs },
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
--
|
||||
2.10.1
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Thu, 14 Sep 2017 11:02:18 +0200
|
||||
Subject: [PATCH] bridge: keep MAC of first assigned port
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
original commit message:
|
||||
|
||||
Default bridge changes MAC dynamically using smallest MAC of all
|
||||
connected ports (for no real reason). To avoid problems with ARP
|
||||
we simply use the MAC of the first connected port.
|
||||
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
net/bridge/br_stp_if.c | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
|
||||
index ba55851fe132..82675e1ecfb8 100644
|
||||
--- a/net/bridge/br_stp_if.c
|
||||
+++ b/net/bridge/br_stp_if.c
|
||||
@@ -265,10 +265,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
|
||||
return false;
|
||||
|
||||
list_for_each_entry(p, &br->port_list, list) {
|
||||
- if (addr == br_mac_zero ||
|
||||
- memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
|
||||
- addr = p->dev->dev_addr;
|
||||
-
|
||||
+ addr = p->dev->dev_addr;
|
||||
}
|
||||
|
||||
if (ether_addr_equal(br->bridge_id.addr, addr))
|
||||
@@ -1,27 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Thu, 14 Sep 2017 11:09:58 +0200
|
||||
Subject: [PATCH] kvm: disable default dynamic halt polling growth
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
virt/kvm/kvm_main.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
||||
index b86d4bce9793..946643fa1aa1 100644
|
||||
--- a/virt/kvm/kvm_main.c
|
||||
+++ b/virt/kvm/kvm_main.c
|
||||
@@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644);
|
||||
EXPORT_SYMBOL_GPL(halt_poll_ns);
|
||||
|
||||
/* Default doubles per-vcpu halt_poll_ns. */
|
||||
-unsigned int halt_poll_ns_grow = 2;
|
||||
+unsigned int halt_poll_ns_grow = 0;
|
||||
module_param(halt_poll_ns_grow, uint, 0644);
|
||||
EXPORT_SYMBOL_GPL(halt_poll_ns_grow);
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
Date: Wed, 7 Oct 2020 17:18:28 +0200
|
||||
Subject: [PATCH] net: core: downgrade unregister_netdevice refcount leak from
|
||||
emergency to error
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
net/core/dev.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/net/core/dev.c b/net/core/dev.c
|
||||
index 7bac7947d8b8..4196ce468b10 100644
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -10533,7 +10533,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
|
||||
if (refcnt != 1 &&
|
||||
time_after(jiffies, warning_time +
|
||||
netdev_unregister_timeout_secs * HZ)) {
|
||||
- pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
|
||||
+ pr_err("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
|
||||
dev->name, refcnt);
|
||||
warning_time = jiffies;
|
||||
}
|
||||
@@ -1,105 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
Date: Mon, 27 Sep 2021 11:28:39 +0200
|
||||
Subject: [PATCH] Revert "PCI: Coalesce host bridge contiguous apertures"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit ab20e43b20b60f5cc8e2ea3763ffa388158469ac.
|
||||
|
||||
was reverted upstream because of reports similar to
|
||||
|
||||
Link: https://bugzilla.proxmox.com/show_bug.cgi?id=3552
|
||||
Link: https://lore.kernel.org/r/20210709231529.GA3270116@roeck-us.net
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
drivers/pci/probe.c | 52 +++++----------------------------------------
|
||||
1 file changed, 5 insertions(+), 47 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
|
||||
index 59ef93f1d953..b38a345c5df6 100644
|
||||
--- a/drivers/pci/probe.c
|
||||
+++ b/drivers/pci/probe.c
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <linux/hypervisor.h>
|
||||
#include <linux/irqdomain.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
-#include <linux/list_sort.h>
|
||||
#include "pci.h"
|
||||
|
||||
#define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */
|
||||
@@ -875,31 +874,14 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus)
|
||||
dev_set_msi_domain(&bus->dev, d);
|
||||
}
|
||||
|
||||
-static int res_cmp(void *priv, const struct list_head *a,
|
||||
- const struct list_head *b)
|
||||
-{
|
||||
- struct resource_entry *entry1, *entry2;
|
||||
-
|
||||
- entry1 = container_of(a, struct resource_entry, node);
|
||||
- entry2 = container_of(b, struct resource_entry, node);
|
||||
-
|
||||
- if (entry1->res->flags != entry2->res->flags)
|
||||
- return entry1->res->flags > entry2->res->flags;
|
||||
-
|
||||
- if (entry1->offset != entry2->offset)
|
||||
- return entry1->offset > entry2->offset;
|
||||
-
|
||||
- return entry1->res->start > entry2->res->start;
|
||||
-}
|
||||
-
|
||||
static int pci_register_host_bridge(struct pci_host_bridge *bridge)
|
||||
{
|
||||
struct device *parent = bridge->dev.parent;
|
||||
- struct resource_entry *window, *next, *n;
|
||||
+ struct resource_entry *window, *n;
|
||||
struct pci_bus *bus, *b;
|
||||
- resource_size_t offset, next_offset;
|
||||
+ resource_size_t offset;
|
||||
LIST_HEAD(resources);
|
||||
- struct resource *res, *next_res;
|
||||
+ struct resource *res;
|
||||
char addr[64], *fmt;
|
||||
const char *name;
|
||||
int err;
|
||||
@@ -979,35 +961,11 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
|
||||
if (nr_node_ids > 1 && pcibus_to_node(bus) == NUMA_NO_NODE)
|
||||
dev_warn(&bus->dev, "Unknown NUMA node; performance will be reduced\n");
|
||||
|
||||
- /* Sort and coalesce contiguous windows */
|
||||
- list_sort(NULL, &resources, res_cmp);
|
||||
- resource_list_for_each_entry_safe(window, n, &resources) {
|
||||
- if (list_is_last(&window->node, &resources))
|
||||
- break;
|
||||
-
|
||||
- next = list_next_entry(window, node);
|
||||
- offset = window->offset;
|
||||
- res = window->res;
|
||||
- next_offset = next->offset;
|
||||
- next_res = next->res;
|
||||
-
|
||||
- if (res->flags != next_res->flags || offset != next_offset)
|
||||
- continue;
|
||||
-
|
||||
- if (res->end + 1 == next_res->start) {
|
||||
- next_res->start = res->start;
|
||||
- res->flags = res->start = res->end = 0;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
/* Add initial resources to the bus */
|
||||
resource_list_for_each_entry_safe(window, n, &resources) {
|
||||
- offset = window->offset;
|
||||
- res = window->res;
|
||||
- if (!res->end)
|
||||
- continue;
|
||||
-
|
||||
list_move_tail(&window->node, &bridge->windows);
|
||||
+ offset = window->offset;
|
||||
+ res = window->res;
|
||||
|
||||
if (res->flags & IORESOURCE_BUS)
|
||||
pci_bus_insert_busn_res(bus, bus->number, res->end);
|
||||
@@ -1,113 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
|
||||
Date: Tue, 13 Jul 2021 20:50:07 +0800
|
||||
Subject: [PATCH] PCI: Reinstate "PCI: Coalesce host bridge contiguous
|
||||
apertures"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Built-in graphics on HP EliteDesk 805 G6 doesn't work because graphics
|
||||
can't get the BAR it needs:
|
||||
pci_bus 0000:00: root bus resource [mem 0x10020200000-0x100303fffff window]
|
||||
pci_bus 0000:00: root bus resource [mem 0x10030400000-0x100401fffff window]
|
||||
|
||||
pci 0000:00:08.1: bridge window [mem 0xd2000000-0xd23fffff]
|
||||
pci 0000:00:08.1: bridge window [mem 0x10030000000-0x100401fffff 64bit pref]
|
||||
pci 0000:00:08.1: can't claim BAR 15 [mem 0x10030000000-0x100401fffff 64bit pref]: no compatible bridge window
|
||||
pci 0000:00:08.1: [mem 0x10030000000-0x100401fffff 64bit pref] clipped to [mem 0x10030000000-0x100303fffff 64bit pref]
|
||||
pci 0000:00:08.1: bridge window [mem 0x10030000000-0x100303fffff 64bit pref]
|
||||
pci 0000:07:00.0: can't claim BAR 0 [mem 0x10030000000-0x1003fffffff 64bit pref]: no compatible bridge window
|
||||
pci 0000:07:00.0: can't claim BAR 2 [mem 0x10040000000-0x100401fffff 64bit pref]: no compatible bridge window
|
||||
|
||||
However, the root bus has two contiguous apertures that can contain the
|
||||
child resource requested.
|
||||
|
||||
Coalesce contiguous apertures so we can allocate from the entire contiguous
|
||||
region.
|
||||
|
||||
This is the second take of commit 65db04053efe ("PCI: Coalesce host
|
||||
bridge contiguous apertures"). The original approach sorts the apertures
|
||||
by address, but that makes NVMe stop working on QEMU ppc:sam460ex:
|
||||
PCI host bridge to bus 0002:00
|
||||
pci_bus 0002:00: root bus resource [io 0x0000-0xffff]
|
||||
pci_bus 0002:00: root bus resource [mem 0xd80000000-0xdffffffff] (bus address [0x80000000-0xffffffff])
|
||||
pci_bus 0002:00: root bus resource [mem 0xc0ee00000-0xc0eefffff] (bus address [0x00000000-0x000fffff])
|
||||
|
||||
After the offending commit:
|
||||
PCI host bridge to bus 0002:00
|
||||
pci_bus 0002:00: root bus resource [io 0x0000-0xffff]
|
||||
pci_bus 0002:00: root bus resource [mem 0xc0ee00000-0xc0eefffff] (bus address [0x00000000-0x000fffff])
|
||||
pci_bus 0002:00: root bus resource [mem 0xd80000000-0xdffffffff] (bus address [0x80000000-0xffffffff])
|
||||
|
||||
Since the apertures on HP EliteDesk 805 G6 are already in ascending
|
||||
order, doing a precautious sorting is not necessary.
|
||||
|
||||
Remove the sorting part to avoid the regression on ppc:sam460ex.
|
||||
|
||||
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212013
|
||||
Cc: Guenter Roeck <linux@roeck-us.net>
|
||||
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
|
||||
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
drivers/pci/probe.c | 33 ++++++++++++++++++++++++++++-----
|
||||
1 file changed, 28 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
|
||||
index b38a345c5df6..485167ca62a1 100644
|
||||
--- a/drivers/pci/probe.c
|
||||
+++ b/drivers/pci/probe.c
|
||||
@@ -877,11 +877,11 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus)
|
||||
static int pci_register_host_bridge(struct pci_host_bridge *bridge)
|
||||
{
|
||||
struct device *parent = bridge->dev.parent;
|
||||
- struct resource_entry *window, *n;
|
||||
+ struct resource_entry *window, *next, *n;
|
||||
struct pci_bus *bus, *b;
|
||||
- resource_size_t offset;
|
||||
+ resource_size_t offset, next_offset;
|
||||
LIST_HEAD(resources);
|
||||
- struct resource *res;
|
||||
+ struct resource *res, *next_res;
|
||||
char addr[64], *fmt;
|
||||
const char *name;
|
||||
int err;
|
||||
@@ -961,11 +961,34 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
|
||||
if (nr_node_ids > 1 && pcibus_to_node(bus) == NUMA_NO_NODE)
|
||||
dev_warn(&bus->dev, "Unknown NUMA node; performance will be reduced\n");
|
||||
|
||||
+ /* Coalesce contiguous windows */
|
||||
+ resource_list_for_each_entry_safe(window, n, &resources) {
|
||||
+ if (list_is_last(&window->node, &resources))
|
||||
+ break;
|
||||
+
|
||||
+ next = list_next_entry(window, node);
|
||||
+ offset = window->offset;
|
||||
+ res = window->res;
|
||||
+ next_offset = next->offset;
|
||||
+ next_res = next->res;
|
||||
+
|
||||
+ if (res->flags != next_res->flags || offset != next_offset)
|
||||
+ continue;
|
||||
+
|
||||
+ if (res->end + 1 == next_res->start) {
|
||||
+ next_res->start = res->start;
|
||||
+ res->flags = res->start = res->end = 0;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/* Add initial resources to the bus */
|
||||
resource_list_for_each_entry_safe(window, n, &resources) {
|
||||
+ offset = window->offset;
|
||||
+ res = window->res;
|
||||
+ if (!res->end)
|
||||
+ continue;
|
||||
+
|
||||
list_move_tail(&window->node, &bridge->windows);
|
||||
- offset = window->offset;
|
||||
- res = window->res;
|
||||
|
||||
if (res->flags & IORESOURCE_BUS)
|
||||
pci_bus_insert_busn_res(bus, bus->number, res->end);
|
||||
@@ -1,418 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jens Axboe <axboe@kernel.dk>
|
||||
Date: Tue, 31 Aug 2021 13:57:32 -0600
|
||||
Subject: [PATCH] io-wq: split bounded and unbounded work into separate lists
|
||||
|
||||
We've got a few issues that all boil down to the fact that we have one
|
||||
list of pending work items, yet two different types of workers to
|
||||
serve them. This causes some oddities around workers switching type and
|
||||
even hashed work vs regular work on the same bounded list.
|
||||
|
||||
Just separate them out cleanly, similarly to how we already do
|
||||
accounting of what is running. That provides a clean separation and
|
||||
removes some corner cases that can cause stalls when handling IO
|
||||
that is punted to io-wq.
|
||||
|
||||
Fixes: ecc53c48c13d ("io-wq: check max_worker limits if a worker transitions bound state")
|
||||
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
||||
[backport]
|
||||
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
fs/io-wq.c | 160 +++++++++++++++++++++++------------------------------
|
||||
1 file changed, 70 insertions(+), 90 deletions(-)
|
||||
|
||||
diff --git a/fs/io-wq.c b/fs/io-wq.c
|
||||
index ba7aaf2b95d0..6710da3d4445 100644
|
||||
--- a/fs/io-wq.c
|
||||
+++ b/fs/io-wq.c
|
||||
@@ -34,7 +34,7 @@ enum {
|
||||
};
|
||||
|
||||
enum {
|
||||
- IO_WQE_FLAG_STALLED = 1, /* stalled on hash */
|
||||
+ IO_ACCT_STALLED_BIT = 0, /* stalled on hash */
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -73,26 +73,25 @@ struct io_wqe_acct {
|
||||
unsigned max_workers;
|
||||
int index;
|
||||
atomic_t nr_running;
|
||||
+ struct io_wq_work_list work_list;
|
||||
+ unsigned long flags;
|
||||
};
|
||||
|
||||
enum {
|
||||
IO_WQ_ACCT_BOUND,
|
||||
IO_WQ_ACCT_UNBOUND,
|
||||
+ IO_WQ_ACCT_NR,
|
||||
};
|
||||
|
||||
/*
|
||||
* Per-node worker thread pool
|
||||
*/
|
||||
struct io_wqe {
|
||||
- struct {
|
||||
- raw_spinlock_t lock;
|
||||
- struct io_wq_work_list work_list;
|
||||
- unsigned flags;
|
||||
- } ____cacheline_aligned_in_smp;
|
||||
-
|
||||
- int node;
|
||||
+ raw_spinlock_t lock;
|
||||
struct io_wqe_acct acct[2];
|
||||
|
||||
+ int node;
|
||||
+
|
||||
struct hlist_nulls_head free_list;
|
||||
struct list_head all_list;
|
||||
|
||||
@@ -196,11 +195,10 @@ static void io_worker_exit(struct io_worker *worker)
|
||||
do_exit(0);
|
||||
}
|
||||
|
||||
-static inline bool io_wqe_run_queue(struct io_wqe *wqe)
|
||||
- __must_hold(wqe->lock)
|
||||
+static inline bool io_acct_run_queue(struct io_wqe_acct *acct)
|
||||
{
|
||||
- if (!wq_list_empty(&wqe->work_list) &&
|
||||
- !(wqe->flags & IO_WQE_FLAG_STALLED))
|
||||
+ if (!wq_list_empty(&acct->work_list) &&
|
||||
+ !test_bit(IO_ACCT_STALLED_BIT, &acct->flags))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
@@ -209,7 +207,8 @@ static inline bool io_wqe_run_queue(struct io_wqe *wqe)
|
||||
* Check head of free list for an available worker. If one isn't available,
|
||||
* caller must create one.
|
||||
*/
|
||||
-static bool io_wqe_activate_free_worker(struct io_wqe *wqe)
|
||||
+static bool io_wqe_activate_free_worker(struct io_wqe *wqe,
|
||||
+ struct io_wqe_acct *acct)
|
||||
__must_hold(RCU)
|
||||
{
|
||||
struct hlist_nulls_node *n;
|
||||
@@ -223,6 +222,10 @@ static bool io_wqe_activate_free_worker(struct io_wqe *wqe)
|
||||
hlist_nulls_for_each_entry_rcu(worker, n, &wqe->free_list, nulls_node) {
|
||||
if (!io_worker_get(worker))
|
||||
continue;
|
||||
+ if (io_wqe_get_acct(worker) != acct) {
|
||||
+ io_worker_release(worker);
|
||||
+ continue;
|
||||
+ }
|
||||
if (wake_up_process(worker->task)) {
|
||||
io_worker_release(worker);
|
||||
return true;
|
||||
@@ -341,7 +344,7 @@ static void io_wqe_dec_running(struct io_worker *worker)
|
||||
if (!(worker->flags & IO_WORKER_F_UP))
|
||||
return;
|
||||
|
||||
- if (atomic_dec_and_test(&acct->nr_running) && io_wqe_run_queue(wqe)) {
|
||||
+ if (atomic_dec_and_test(&acct->nr_running) && io_acct_run_queue(acct)) {
|
||||
atomic_inc(&acct->nr_running);
|
||||
atomic_inc(&wqe->wq->worker_refs);
|
||||
io_queue_worker_create(wqe, worker, acct);
|
||||
@@ -356,29 +359,10 @@ static void __io_worker_busy(struct io_wqe *wqe, struct io_worker *worker,
|
||||
struct io_wq_work *work)
|
||||
__must_hold(wqe->lock)
|
||||
{
|
||||
- bool worker_bound, work_bound;
|
||||
-
|
||||
- BUILD_BUG_ON((IO_WQ_ACCT_UNBOUND ^ IO_WQ_ACCT_BOUND) != 1);
|
||||
-
|
||||
if (worker->flags & IO_WORKER_F_FREE) {
|
||||
worker->flags &= ~IO_WORKER_F_FREE;
|
||||
hlist_nulls_del_init_rcu(&worker->nulls_node);
|
||||
}
|
||||
-
|
||||
- /*
|
||||
- * If worker is moving from bound to unbound (or vice versa), then
|
||||
- * ensure we update the running accounting.
|
||||
- */
|
||||
- worker_bound = (worker->flags & IO_WORKER_F_BOUND) != 0;
|
||||
- work_bound = (work->flags & IO_WQ_WORK_UNBOUND) == 0;
|
||||
- if (worker_bound != work_bound) {
|
||||
- int index = work_bound ? IO_WQ_ACCT_UNBOUND : IO_WQ_ACCT_BOUND;
|
||||
- io_wqe_dec_running(worker);
|
||||
- worker->flags ^= IO_WORKER_F_BOUND;
|
||||
- wqe->acct[index].nr_workers--;
|
||||
- wqe->acct[index ^ 1].nr_workers++;
|
||||
- io_wqe_inc_running(worker);
|
||||
- }
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -420,44 +404,23 @@ static bool io_wait_on_hash(struct io_wqe *wqe, unsigned int hash)
|
||||
return ret;
|
||||
}
|
||||
|
||||
-/*
|
||||
- * We can always run the work if the worker is currently the same type as
|
||||
- * the work (eg both are bound, or both are unbound). If they are not the
|
||||
- * same, only allow it if incrementing the worker count would be allowed.
|
||||
- */
|
||||
-static bool io_worker_can_run_work(struct io_worker *worker,
|
||||
- struct io_wq_work *work)
|
||||
-{
|
||||
- struct io_wqe_acct *acct;
|
||||
-
|
||||
- if (!(worker->flags & IO_WORKER_F_BOUND) !=
|
||||
- !(work->flags & IO_WQ_WORK_UNBOUND))
|
||||
- return true;
|
||||
-
|
||||
- /* not the same type, check if we'd go over the limit */
|
||||
- acct = io_work_get_acct(worker->wqe, work);
|
||||
- return acct->nr_workers < acct->max_workers;
|
||||
-}
|
||||
-
|
||||
-static struct io_wq_work *io_get_next_work(struct io_wqe *wqe,
|
||||
+static struct io_wq_work *io_get_next_work(struct io_wqe_acct *acct,
|
||||
struct io_worker *worker)
|
||||
__must_hold(wqe->lock)
|
||||
{
|
||||
struct io_wq_work_node *node, *prev;
|
||||
struct io_wq_work *work, *tail;
|
||||
unsigned int stall_hash = -1U;
|
||||
+ struct io_wqe *wqe = worker->wqe;
|
||||
|
||||
- wq_list_for_each(node, prev, &wqe->work_list) {
|
||||
+ wq_list_for_each(node, prev, &acct->work_list) {
|
||||
unsigned int hash;
|
||||
|
||||
work = container_of(node, struct io_wq_work, list);
|
||||
|
||||
- if (!io_worker_can_run_work(worker, work))
|
||||
- break;
|
||||
-
|
||||
/* not hashed, can run anytime */
|
||||
if (!io_wq_is_hashed(work)) {
|
||||
- wq_list_del(&wqe->work_list, node, prev);
|
||||
+ wq_list_del(&acct->work_list, node, prev);
|
||||
return work;
|
||||
}
|
||||
|
||||
@@ -468,7 +431,7 @@ static struct io_wq_work *io_get_next_work(struct io_wqe *wqe,
|
||||
/* hashed, can run if not already running */
|
||||
if (!test_and_set_bit(hash, &wqe->wq->hash->map)) {
|
||||
wqe->hash_tail[hash] = NULL;
|
||||
- wq_list_cut(&wqe->work_list, &tail->list, prev);
|
||||
+ wq_list_cut(&acct->work_list, &tail->list, prev);
|
||||
return work;
|
||||
}
|
||||
if (stall_hash == -1U)
|
||||
@@ -484,12 +447,12 @@ static struct io_wq_work *io_get_next_work(struct io_wqe *wqe,
|
||||
* Set this before dropping the lock to avoid racing with new
|
||||
* work being added and clearing the stalled bit.
|
||||
*/
|
||||
- wqe->flags |= IO_WQE_FLAG_STALLED;
|
||||
+ set_bit(IO_ACCT_STALLED_BIT, &acct->flags);
|
||||
raw_spin_unlock(&wqe->lock);
|
||||
unstalled = io_wait_on_hash(wqe, stall_hash);
|
||||
raw_spin_lock(&wqe->lock);
|
||||
if (unstalled) {
|
||||
- wqe->flags &= ~IO_WQE_FLAG_STALLED;
|
||||
+ clear_bit(IO_ACCT_STALLED_BIT, &acct->flags);
|
||||
if (wq_has_sleeper(&wqe->wq->hash->wait))
|
||||
wake_up(&wqe->wq->hash->wait);
|
||||
}
|
||||
@@ -526,6 +489,7 @@ static void io_wqe_enqueue(struct io_wqe *wqe, struct io_wq_work *work);
|
||||
static void io_worker_handle_work(struct io_worker *worker)
|
||||
__releases(wqe->lock)
|
||||
{
|
||||
+ struct io_wqe_acct *acct = io_wqe_get_acct(worker);
|
||||
struct io_wqe *wqe = worker->wqe;
|
||||
struct io_wq *wq = wqe->wq;
|
||||
bool do_kill = test_bit(IO_WQ_BIT_EXIT, &wq->state);
|
||||
@@ -540,7 +504,7 @@ static void io_worker_handle_work(struct io_worker *worker)
|
||||
* can't make progress, any work completion or insertion will
|
||||
* clear the stalled flag.
|
||||
*/
|
||||
- work = io_get_next_work(wqe, worker);
|
||||
+ work = io_get_next_work(acct, worker);
|
||||
if (work)
|
||||
__io_worker_busy(wqe, worker, work);
|
||||
|
||||
@@ -576,7 +540,7 @@ static void io_worker_handle_work(struct io_worker *worker)
|
||||
/* serialize hash clear with wake_up() */
|
||||
spin_lock_irq(&wq->hash->wait.lock);
|
||||
clear_bit(hash, &wq->hash->map);
|
||||
- wqe->flags &= ~IO_WQE_FLAG_STALLED;
|
||||
+ clear_bit(IO_ACCT_STALLED_BIT, &acct->flags);
|
||||
spin_unlock_irq(&wq->hash->wait.lock);
|
||||
if (wq_has_sleeper(&wq->hash->wait))
|
||||
wake_up(&wq->hash->wait);
|
||||
@@ -595,6 +559,7 @@ static void io_worker_handle_work(struct io_worker *worker)
|
||||
static int io_wqe_worker(void *data)
|
||||
{
|
||||
struct io_worker *worker = data;
|
||||
+ struct io_wqe_acct *acct = io_wqe_get_acct(worker);
|
||||
struct io_wqe *wqe = worker->wqe;
|
||||
struct io_wq *wq = wqe->wq;
|
||||
char buf[TASK_COMM_LEN];
|
||||
@@ -610,7 +575,7 @@ static int io_wqe_worker(void *data)
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
loop:
|
||||
raw_spin_lock_irq(&wqe->lock);
|
||||
- if (io_wqe_run_queue(wqe)) {
|
||||
+ if (io_acct_run_queue(acct)) {
|
||||
io_worker_handle_work(worker);
|
||||
goto loop;
|
||||
}
|
||||
@@ -636,7 +601,7 @@ static int io_wqe_worker(void *data)
|
||||
|
||||
if (test_bit(IO_WQ_BIT_EXIT, &wq->state)) {
|
||||
raw_spin_lock_irq(&wqe->lock);
|
||||
- if (!wq_list_empty(&wqe->work_list))
|
||||
+ if (!wq_list_empty(&acct->work_list))
|
||||
io_worker_handle_work(worker);
|
||||
else
|
||||
raw_spin_unlock_irq(&wqe->lock);
|
||||
@@ -782,12 +747,13 @@ static void io_run_cancel(struct io_wq_work *work, struct io_wqe *wqe)
|
||||
|
||||
static void io_wqe_insert_work(struct io_wqe *wqe, struct io_wq_work *work)
|
||||
{
|
||||
+ struct io_wqe_acct *acct = io_work_get_acct(wqe, work);
|
||||
unsigned int hash;
|
||||
struct io_wq_work *tail;
|
||||
|
||||
if (!io_wq_is_hashed(work)) {
|
||||
append:
|
||||
- wq_list_add_tail(&work->list, &wqe->work_list);
|
||||
+ wq_list_add_tail(&work->list, &acct->work_list);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -797,7 +763,7 @@ static void io_wqe_insert_work(struct io_wqe *wqe, struct io_wq_work *work)
|
||||
if (!tail)
|
||||
goto append;
|
||||
|
||||
- wq_list_add_after(&work->list, &tail->list, &wqe->work_list);
|
||||
+ wq_list_add_after(&work->list, &tail->list, &acct->work_list);
|
||||
}
|
||||
|
||||
static void io_wqe_enqueue(struct io_wqe *wqe, struct io_wq_work *work)
|
||||
@@ -819,10 +785,10 @@ static void io_wqe_enqueue(struct io_wqe *wqe, struct io_wq_work *work)
|
||||
|
||||
raw_spin_lock_irqsave(&wqe->lock, flags);
|
||||
io_wqe_insert_work(wqe, work);
|
||||
- wqe->flags &= ~IO_WQE_FLAG_STALLED;
|
||||
+ clear_bit(IO_ACCT_STALLED_BIT, &acct->flags);
|
||||
|
||||
rcu_read_lock();
|
||||
- do_create = !io_wqe_activate_free_worker(wqe);
|
||||
+ do_create = !io_wqe_activate_free_worker(wqe, acct);
|
||||
rcu_read_unlock();
|
||||
|
||||
raw_spin_unlock_irqrestore(&wqe->lock, flags);
|
||||
@@ -875,6 +841,7 @@ static inline void io_wqe_remove_pending(struct io_wqe *wqe,
|
||||
struct io_wq_work *work,
|
||||
struct io_wq_work_node *prev)
|
||||
{
|
||||
+ struct io_wqe_acct *acct = io_work_get_acct(wqe, work);
|
||||
unsigned int hash = io_get_work_hash(work);
|
||||
struct io_wq_work *prev_work = NULL;
|
||||
|
||||
@@ -886,7 +853,7 @@ static inline void io_wqe_remove_pending(struct io_wqe *wqe,
|
||||
else
|
||||
wqe->hash_tail[hash] = NULL;
|
||||
}
|
||||
- wq_list_del(&wqe->work_list, &work->list, prev);
|
||||
+ wq_list_del(&acct->work_list, &work->list, prev);
|
||||
}
|
||||
|
||||
static void io_wqe_cancel_pending_work(struct io_wqe *wqe,
|
||||
@@ -895,22 +862,27 @@ static void io_wqe_cancel_pending_work(struct io_wqe *wqe,
|
||||
struct io_wq_work_node *node, *prev;
|
||||
struct io_wq_work *work;
|
||||
unsigned long flags;
|
||||
+ int i;
|
||||
|
||||
retry:
|
||||
raw_spin_lock_irqsave(&wqe->lock, flags);
|
||||
- wq_list_for_each(node, prev, &wqe->work_list) {
|
||||
- work = container_of(node, struct io_wq_work, list);
|
||||
- if (!match->fn(work, match->data))
|
||||
- continue;
|
||||
- io_wqe_remove_pending(wqe, work, prev);
|
||||
- raw_spin_unlock_irqrestore(&wqe->lock, flags);
|
||||
- io_run_cancel(work, wqe);
|
||||
- match->nr_pending++;
|
||||
- if (!match->cancel_all)
|
||||
- return;
|
||||
+ for (i = 0; i < IO_WQ_ACCT_NR; i++) {
|
||||
+ struct io_wqe_acct *acct = io_get_acct(wqe, i == 0);
|
||||
|
||||
- /* not safe to continue after unlock */
|
||||
- goto retry;
|
||||
+ wq_list_for_each(node, prev, &acct->work_list) {
|
||||
+ work = container_of(node, struct io_wq_work, list);
|
||||
+ if (!match->fn(work, match->data))
|
||||
+ continue;
|
||||
+ io_wqe_remove_pending(wqe, work, prev);
|
||||
+ raw_spin_unlock_irqrestore(&wqe->lock, flags);
|
||||
+ io_run_cancel(work, wqe);
|
||||
+ match->nr_pending++;
|
||||
+ if (!match->cancel_all)
|
||||
+ return;
|
||||
+
|
||||
+ /* not safe to continue after unlock */
|
||||
+ goto retry;
|
||||
+ }
|
||||
}
|
||||
raw_spin_unlock_irqrestore(&wqe->lock, flags);
|
||||
}
|
||||
@@ -971,18 +943,24 @@ static int io_wqe_hash_wake(struct wait_queue_entry *wait, unsigned mode,
|
||||
int sync, void *key)
|
||||
{
|
||||
struct io_wqe *wqe = container_of(wait, struct io_wqe, wait);
|
||||
+ int i;
|
||||
|
||||
list_del_init(&wait->entry);
|
||||
|
||||
rcu_read_lock();
|
||||
- io_wqe_activate_free_worker(wqe);
|
||||
+ for (i = 0; i < IO_WQ_ACCT_NR; i++) {
|
||||
+ struct io_wqe_acct *acct = &wqe->acct[i];
|
||||
+
|
||||
+ if (test_and_clear_bit(IO_ACCT_STALLED_BIT, &acct->flags))
|
||||
+ io_wqe_activate_free_worker(wqe, acct);
|
||||
+ }
|
||||
rcu_read_unlock();
|
||||
return 1;
|
||||
}
|
||||
|
||||
struct io_wq *io_wq_create(unsigned bounded, struct io_wq_data *data)
|
||||
{
|
||||
- int ret = -ENOMEM, node;
|
||||
+ int ret, node, i;
|
||||
struct io_wq *wq;
|
||||
|
||||
if (WARN_ON_ONCE(!data->free_work || !data->do_work))
|
||||
@@ -1019,18 +997,20 @@ struct io_wq *io_wq_create(unsigned bounded, struct io_wq_data *data)
|
||||
goto err;
|
||||
wq->wqes[node] = wqe;
|
||||
wqe->node = alloc_node;
|
||||
- wqe->acct[IO_WQ_ACCT_BOUND].index = IO_WQ_ACCT_BOUND;
|
||||
- wqe->acct[IO_WQ_ACCT_UNBOUND].index = IO_WQ_ACCT_UNBOUND;
|
||||
wqe->acct[IO_WQ_ACCT_BOUND].max_workers = bounded;
|
||||
- atomic_set(&wqe->acct[IO_WQ_ACCT_BOUND].nr_running, 0);
|
||||
wqe->acct[IO_WQ_ACCT_UNBOUND].max_workers =
|
||||
task_rlimit(current, RLIMIT_NPROC);
|
||||
- atomic_set(&wqe->acct[IO_WQ_ACCT_UNBOUND].nr_running, 0);
|
||||
- wqe->wait.func = io_wqe_hash_wake;
|
||||
INIT_LIST_HEAD(&wqe->wait.entry);
|
||||
+ wqe->wait.func = io_wqe_hash_wake;
|
||||
+ for (i = 0; i < IO_WQ_ACCT_NR; i++) {
|
||||
+ struct io_wqe_acct *acct = &wqe->acct[i];
|
||||
+
|
||||
+ acct->index = i;
|
||||
+ atomic_set(&acct->nr_running, 0);
|
||||
+ INIT_WQ_LIST(&acct->work_list);
|
||||
+ }
|
||||
wqe->wq = wq;
|
||||
raw_spin_lock_init(&wqe->lock);
|
||||
- INIT_WQ_LIST(&wqe->work_list);
|
||||
INIT_HLIST_NULLS_HEAD(&wqe->free_list, 0);
|
||||
INIT_LIST_HEAD(&wqe->all_list);
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Thu, 14 Sep 2017 11:09:58 +0200
|
||||
Subject: [PATCH] do not generate split BTF type info per default
|
||||
|
||||
This reverts commit a8ed1a0607cfa5478ff6009539f44790c4d0956d.
|
||||
|
||||
It breaks ZFS sometimes:
|
||||
https://github.com/openzfs/zfs/issues/12301#issuecomment-873303739
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
lib/Kconfig.debug | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
|
||||
index 25dc20175bba..7ff51a3f65e6 100644
|
||||
--- a/lib/Kconfig.debug
|
||||
+++ b/lib/Kconfig.debug
|
||||
@@ -314,7 +314,7 @@ config PAHOLE_HAS_SPLIT_BTF
|
||||
def_bool $(success, test `$(PAHOLE) --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'` -ge "119")
|
||||
|
||||
config DEBUG_INFO_BTF_MODULES
|
||||
- def_bool y
|
||||
+ def_bool n
|
||||
depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
|
||||
help
|
||||
Generate compact split BTF type information for kernel modules.
|
||||
@@ -1,90 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Mon, 22 Nov 2021 19:43:09 -0500
|
||||
Subject: [PATCH] KVM: VMX: prepare sync_pir_to_irr for running with APICv
|
||||
disabled
|
||||
|
||||
If APICv is disabled for this vCPU, assigned devices may still attempt to
|
||||
post interrupts. In that case, we need to cancel the vmentry and deliver
|
||||
the interrupt with KVM_REQ_EVENT. Extend the existing code that handles
|
||||
injection of L1 interrupts into L2 to cover this case as well.
|
||||
|
||||
vmx_hwapic_irr_update is only called when APICv is active so it would be
|
||||
confusing to add a check for vcpu->arch.apicv_active in there. Instead,
|
||||
just use vmx_set_rvi directly in vmx_sync_pir_to_irr.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||
Reviewed-by: David Matlack <dmatlack@google.com>
|
||||
Reviewed-by: Sean Christopherson <seanjc@google.com>
|
||||
Message-Id: <20211123004311.2954158-3-pbonzini@redhat.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
(cherry picked from commit 7e1901f6c86c896acff6609e0176f93f756d8b2a)
|
||||
[ T: reused WARN instead of newer KVM_BUG_ON for minimal change ]
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
arch/x86/kvm/vmx/vmx.c | 39 +++++++++++++++++++++++++--------------
|
||||
1 file changed, 25 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
||||
index fc6fbaba1cb5..2f6db087e243 100644
|
||||
--- a/arch/x86/kvm/vmx/vmx.c
|
||||
+++ b/arch/x86/kvm/vmx/vmx.c
|
||||
@@ -6331,9 +6331,9 @@ static int vmx_sync_pir_to_irr(struct kvm_vcpu *vcpu)
|
||||
{
|
||||
struct vcpu_vmx *vmx = to_vmx(vcpu);
|
||||
int max_irr;
|
||||
- bool max_irr_updated;
|
||||
+ bool got_posted_interrupt;
|
||||
|
||||
- WARN_ON(!vcpu->arch.apicv_active);
|
||||
+ WARN_ON(!enable_apicv);
|
||||
if (pi_test_on(&vmx->pi_desc)) {
|
||||
pi_clear_on(&vmx->pi_desc);
|
||||
/*
|
||||
@@ -6341,22 +6341,33 @@ static int vmx_sync_pir_to_irr(struct kvm_vcpu *vcpu)
|
||||
* But on x86 this is just a compiler barrier anyway.
|
||||
*/
|
||||
smp_mb__after_atomic();
|
||||
- max_irr_updated =
|
||||
+ got_posted_interrupt =
|
||||
kvm_apic_update_irr(vcpu, vmx->pi_desc.pir, &max_irr);
|
||||
-
|
||||
- /*
|
||||
- * If we are running L2 and L1 has a new pending interrupt
|
||||
- * which can be injected, this may cause a vmexit or it may
|
||||
- * be injected into L2. Either way, this interrupt will be
|
||||
- * processed via KVM_REQ_EVENT, not RVI, because we do not use
|
||||
- * virtual interrupt delivery to inject L1 interrupts into L2.
|
||||
- */
|
||||
- if (is_guest_mode(vcpu) && max_irr_updated)
|
||||
- kvm_make_request(KVM_REQ_EVENT, vcpu);
|
||||
} else {
|
||||
max_irr = kvm_lapic_find_highest_irr(vcpu);
|
||||
+ got_posted_interrupt = false;
|
||||
}
|
||||
- vmx_hwapic_irr_update(vcpu, max_irr);
|
||||
+
|
||||
+ /*
|
||||
+ * Newly recognized interrupts are injected via either virtual interrupt
|
||||
+ * delivery (RVI) or KVM_REQ_EVENT. Virtual interrupt delivery is
|
||||
+ * disabled in two cases:
|
||||
+ *
|
||||
+ * 1) If L2 is running and the vCPU has a new pending interrupt. If L1
|
||||
+ * wants to exit on interrupts, KVM_REQ_EVENT is needed to synthesize a
|
||||
+ * VM-Exit to L1. If L1 doesn't want to exit, the interrupt is injected
|
||||
+ * into L2, but KVM doesn't use virtual interrupt delivery to inject
|
||||
+ * interrupts into L2, and so KVM_REQ_EVENT is again needed.
|
||||
+ *
|
||||
+ * 2) If APICv is disabled for this vCPU, assigned devices may still
|
||||
+ * attempt to post interrupts. The posted interrupt vector will cause
|
||||
+ * a VM-Exit and the subsequent entry will call sync_pir_to_irr.
|
||||
+ */
|
||||
+ if (!is_guest_mode(vcpu) && kvm_vcpu_apicv_active(vcpu))
|
||||
+ vmx_set_rvi(max_irr);
|
||||
+ else if (got_posted_interrupt)
|
||||
+ kvm_make_request(KVM_REQ_EVENT, vcpu);
|
||||
+
|
||||
return max_irr;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,200 @@
|
||||
proxmox-ve (5.0-24) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.17-4-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 10 Oct 2017 14:39:55 +0200
|
||||
|
||||
proxmox-ve (5.0-21) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.17-3-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 31 Aug 2017 14:57:17 +0200
|
||||
|
||||
proxmox-ve (5.0-16) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.17-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 11 Jul 2017 11:11:35 +0200
|
||||
|
||||
proxmox-ve (5.0-10) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.15-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 7 Jun 2017 10:36:33 +0200
|
||||
|
||||
proxmox-ve (5.0-8) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.11-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 18 May 2017 09:14:18 +0200
|
||||
|
||||
proxmox-ve (5.0-6) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.8-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 13 Apr 2017 11:24:12 +0200
|
||||
|
||||
proxmox-ve (5.0-5) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.5-1-pve kernel
|
||||
|
||||
* remove old 4.x release key
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 28 Mar 2017 10:14:00 +0200
|
||||
|
||||
proxmox-ve (5.0-3) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.3-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 24 Mar 2017 13:44:18 +0100
|
||||
|
||||
proxmox-ve (5.0-2) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.1-2-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 10 Mar 2017 10:20:14 +0100
|
||||
|
||||
proxmox-ve (5.0-1) unstable; urgency=medium
|
||||
|
||||
* Proxmox VE package for Debian Stretch
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 3 Mar 2017 15:56:11 +0100
|
||||
|
||||
proxmox-ve (4.4-83) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.44-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 1 Mar 2017 09:22:26 +0100
|
||||
|
||||
proxmox-ve (4.4-82) unstable; urgency=medium
|
||||
|
||||
* install PVE release keys in a Debian Stretch compatible way
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 23 Feb 2017 15:14:06 +0100
|
||||
|
||||
proxmox-ve (4.4-80) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.40-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 8 Feb 2017 13:10:57 +0100
|
||||
|
||||
proxmox-ve (4.4-76) unstable; urgency=medium
|
||||
|
||||
* update version for 4.4 release
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 8 Feb 2017 10:38:33 +0100
|
||||
|
||||
proxmox-ve (4.3-74) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.35-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 5 Dec 2016 10:20:03 +0100
|
||||
|
||||
proxmox-ve (4.3-73) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.30-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 30 Nov 2016 09:43:29 +0100
|
||||
|
||||
proxmox-ve (4.3-72) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.24-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 14 Nov 2016 12:17:16 +0100
|
||||
|
||||
proxmox-ve (4.3-67) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.21-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 10 Oct 2016 13:58:20 +0200
|
||||
|
||||
proxmox-ve (4.3-66) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.19-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 14 Sep 2016 13:23:43 +0200
|
||||
|
||||
proxmox-ve (4.2-63) unstable; urgency=medium
|
||||
|
||||
* use /etc/apt/trusted.gpg.d/ mechanism to install trusted apt keys
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 29 Aug 2016 12:08:43 +0200
|
||||
|
||||
proxmox-ve (4.2-61) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.16-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 24 Aug 2016 15:11:08 +0200
|
||||
|
||||
proxmox-ve (4.2-58) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.13-2-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 15 Jul 2016 06:03:16 +0200
|
||||
|
||||
proxmox-ve (4.2-55) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.13-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Sat, 25 Jun 2016 11:52:14 +0200
|
||||
|
||||
proxmox-ve (4.2-54) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.10-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 10 Jun 2016 20:56:08 +0200
|
||||
|
||||
proxmox-ve (4.0-49) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.8-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 09 May 2016 10:29:57 +0200
|
||||
|
||||
proxmox-ve (4.0-43) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.4.6-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 11 Apr 2016 09:35:06 +0200
|
||||
|
||||
proxmox-ve (4.0-32) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.2.8-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 03 Feb 2016 16:15:41 +0100
|
||||
|
||||
proxmox-ve (4.0-31) unstable; urgency=medium
|
||||
|
||||
* setup kernel links for installation CD (rescue boot)
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Sun, 10 Jan 2016 10:10:37 +0100
|
||||
|
||||
proxmox-ve (4.0-29) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.2.6-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 31 Dec 2015 12:46:00 +0100
|
||||
|
||||
proxmox-ve (4.0-8) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.2.3-2-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 03 Nov 2015 10:40:01 +0100
|
||||
|
||||
proxmox-ve (4.0-7) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.2.3-1-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Sun, 18 Oct 2015 10:58:21 +0200
|
||||
|
||||
proxmox-ve (4.0-6) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.1.3 kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 30 Jul 2015 09:17:30 +0200
|
||||
|
||||
proxmox-ve (4.0-1) unstable; urgency=medium
|
||||
|
||||
* Proxmox VE package for Debian Jessie
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Sat, 28 Feb 2015 17:25:14 +0100
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
Package: proxmox-ve
|
||||
Version: @RELEASE@-@PKGREL@
|
||||
Architecture: all
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Provides: proxmox-virtual-environment
|
||||
Conflicts: pve-kernel, proxmox-virtual-environment, proxmox-ve-3.10.0
|
||||
Replaces: pve-kernel, proxmox-virtual-environment, proxmox-ve-3.10.0
|
||||
Depends: libc6 (>= 2.7-18), pve-kernel-@KVNAME@, pve-firmware, pve-manager, qemu-server, pve-qemu-kvm, openssh-client, openssh-server, apt, vncterm, spiceterm
|
||||
Maintainer: Proxmox Support Team <support@proxmox.com>
|
||||
Description: The Proxmox Virtual Environment
|
||||
The Proxmox Virtual Environment is an easy to use Open Source
|
||||
virtualization platform for running Virtual Appliances and Virtual
|
||||
Machines. This is a meta package which will install everything
|
||||
needed. This package also depends on the latest available Proxmox
|
||||
kernel from the @KERNEL_VER@ series.
|
||||
@@ -0,0 +1,21 @@
|
||||
Copyright (C) 2016 Proxmox Server Solutions GmbH
|
||||
|
||||
This software is written by Proxmox Server Solutions GmbH <support@proxmox.com>
|
||||
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; version 2 dated June, 1991.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
MA 02110-1301 USA
|
||||
|
||||
The complete text of the GNU General
|
||||
Public License can be found in `/usr/share/common-licenses/GPL-2'.
|
||||
Executable
+81
@@ -0,0 +1,81 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Abort if any command returns an error value
|
||||
set -e
|
||||
|
||||
# This script is called as the last step of the installation of the
|
||||
# package. All the package's files are in place, dpkg has already
|
||||
# done its automatic conffile handling, and all the packages we depend
|
||||
# of are already fully installed and configured.
|
||||
|
||||
# The following idempotent stuff doesn't generally need protecting
|
||||
# against being run in the abort-* cases.
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
# Configure this package. If the package must prompt the user for
|
||||
# information, do it here.
|
||||
|
||||
# cleanup - remove Proxmox Release Key key from /etc/apt/trusted.gpg
|
||||
/usr/bin/apt-key --keyring /etc/apt/trusted.gpg del 9887F95A >/dev/null 2>&1 || /bin/true
|
||||
|
||||
# cleanup - remove old stretch-incompatible variant of installing release key
|
||||
rm -f /etc/apt/trusted.gpg.d/proxmox-ve.gpg /etc/apt/trusted.gpg.d/proxmox-ve.gpg~
|
||||
|
||||
# setup kernel links for installation CD (rescue boot)
|
||||
mkdir -p /boot/pve
|
||||
ln -sf /boot/vmlinuz-@KVNAME@ /boot/pve/vmlinuz
|
||||
ln -sf /boot/initrd.img-@KVNAME@ /boot/pve/initrd.img
|
||||
|
||||
# There are three sub-cases:
|
||||
if test "${2+set}" != set; then
|
||||
# We're being installed by an ancient dpkg which doesn't remember
|
||||
# which version was most recently configured, or even whether
|
||||
# there is a most recently configured version.
|
||||
:
|
||||
|
||||
elif test -z "$2" -o "$2" = "<unknown>"; then
|
||||
# The package has not ever been configured on this system, or was
|
||||
# purged since it was last configured.
|
||||
:
|
||||
|
||||
else
|
||||
# Version $2 is the most recently configured version of this
|
||||
# package.
|
||||
:
|
||||
|
||||
fi ;;
|
||||
abort-upgrade)
|
||||
# Back out of an attempt to upgrade this package FROM THIS VERSION
|
||||
# to version $2. Undo the effects of "prerm upgrade $2".
|
||||
:
|
||||
|
||||
;;
|
||||
abort-remove)
|
||||
if test "$2" != in-favour; then
|
||||
echo "$0: undocumented call to \`postinst $*'" 1>&2
|
||||
exit 0
|
||||
fi
|
||||
# Back out of an attempt to remove this package, which was due to
|
||||
# a conflict with package $3 (version $4). Undo the effects of
|
||||
# "prerm remove in-favour $3 $4".
|
||||
:
|
||||
|
||||
;;
|
||||
abort-deconfigure)
|
||||
if test "$2" != in-favour -o "$5" != removing; then
|
||||
echo "$0: undocumented call to \`postinst $*'" 1>&2
|
||||
exit 0
|
||||
fi
|
||||
# Back out of an attempt to deconfigure this package, which was
|
||||
# due to package $6 (version $7) which we depend on being removed
|
||||
# to make way for package $3 (version $4). Undo the effects of
|
||||
# "prerm deconfigure in-favour $3 $4 removing $6 $7".
|
||||
:
|
||||
|
||||
;;
|
||||
*) echo "$0: didn't understand being called with \`$1'" 1>&2
|
||||
exit 0;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
Executable
+19
@@ -0,0 +1,19 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Abort if any command returns an error value
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
# remove kernel symlinks
|
||||
rm -f /boot/pve/vmlinuz
|
||||
rm -f /boot/pve/initrd.img
|
||||
rmdir --ignore-fail-on-non-empty /boot/pve/ || true
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,11 @@
|
||||
Package: pve-headers
|
||||
Version: @RELEASE@-@PKGREL@
|
||||
Architecture: all
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Depends: pve-headers-@KVNAME@
|
||||
Maintainer: Proxmox Support Team <support@proxmox.com>
|
||||
Description: Latest Proxmox VE Kernel Headers
|
||||
This is a virtual package which will install the kernel headers
|
||||
for the latest available proxmox kernel from the @KERNEL_VER@
|
||||
series.
|
||||
Submodule
+1
Submodule submodules/spl-module added at 785f8eda81
Submodule submodules/ubuntu-impish deleted from 168d1231d9
Submodule
+1
Submodule submodules/ubuntu-zesty added at cc8f26e2f0
Submodule
+1
Submodule submodules/zfs-module added at ab6f41b56c
Submodule submodules/zfsonlinux deleted from 531eac3304
+3
-14
@@ -1,10 +1,7 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Subject: Make mkcompile_h accept an alternate timestamp string
|
||||
Date: Tue, 12 May 2015 19:29:22 +0100
|
||||
Subject: [PATCH] Make mkcompile_h accept an alternate timestamp string
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Forwarded: not-needed
|
||||
|
||||
We want to include the Debian version in the utsname::version string
|
||||
instead of a full timestamp string. However, we still need to provide
|
||||
@@ -14,17 +11,9 @@ kernel image reproducible.
|
||||
Make mkcompile_h use $KBUILD_BUILD_VERSION_TIMESTAMP in preference to
|
||||
$KBUILD_BUILD_TIMESTAMP.
|
||||
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
scripts/mkcompile_h | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
|
||||
index a72b154de7b0..4dd111086466 100755
|
||||
--- a/scripts/mkcompile_h
|
||||
+++ b/scripts/mkcompile_h
|
||||
@@ -24,10 +24,14 @@ else
|
||||
@@ -37,10 +37,14 @@ else
|
||||
VERSION=$KBUILD_BUILD_VERSION
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user