aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD20
-rwxr-xr-xbuildandcopy.sh4
-rw-r--r--mpss-modules-page-cache.patch63
-rw-r--r--mpss-modules-rcu-lockup.patch45
5 files changed, 58 insertions, 94 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8c81ddb8dd0a..e2bc1c29c9aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mpss
pkgdesc = Intel® Manycore Platform Software Stack
- pkgver = 3.7.1
- pkgrel = 9
+ pkgver = 3.8.1
+ pkgrel = 1
url = https://software.intel.com/en-us/articles/intel-manycore-platform-software-stack-mpss
arch = x86_64
license = LGPL2.1
@@ -12,9 +12,9 @@ pkgbase = mpss
depends = nfs-utils
depends = netctl
depends = ifplugd
- source = http://registrationcenter-download.intel.com/akdlm/irc_nas/9226/mpss-3.7.1-linux.tar
- source = http://registrationcenter-download.intel.com/akdlm/irc_nas/9226/mpss-3.7.1-k1om.tar
- source = http://registrationcenter-download.intel.com/akdlm/irc_nas/9226/mpss-src-3.7.1.tar
+ source = http://registrationcenter-download.intel.com/akdlm/irc_nas/11194/mpss-3.8.1-linux.tar
+ source = http://registrationcenter-download.intel.com/akdlm/irc_nas/11194/mpss-3.8.1-k1om.tar
+ source = http://registrationcenter-download.intel.com/akdlm/irc_nas/11194/mpss-src-3.8.1.tar
source = dkms.conf
source = blacklist-mpss.conf
source = mpss-daemon.service
@@ -23,7 +23,6 @@ pkgbase = mpss
source = mpss-daemon-minimize-modules.patch
source = mpss-modules-explicit-coprocessor-build.patch
source = mpss-modules-init-indent.patch
- source = mpss-modules-rcu-lockup.patch
source = mpss-modules-page-cache.patch
source = mpss-modules-Makefile.patch
source = mpss-gen-symver-map-python3-compat.patch
@@ -32,9 +31,9 @@ pkgbase = mpss
source = mpss-micmgmt-remove-inline1.patch
source = mpss-micmgmt-whitespace.patch
source = mpss-coi-gcc6-compilation.patch
- sha256sums = 3a8d070d7b82d41afa67766db8e3305621643ced1b3f8e2845bf333cdf39b83b
- sha256sums = d73abe69df8f36e6214194fc010877b2ee5ea47e2227acf823d88896804899aa
- sha256sums = 4458257ded25dc7b69fa6de49e7ec066d0053ef6be54267bb283dbb4e6eb38c8
+ sha256sums = 812e8a965e83c9e278410f603f21d7427922bd20d6142903aaeb01a14b3403e1
+ sha256sums = 7373fdef5bdafa3347abac75c0d9c4ae1154e78771a71e14e487c0d8b34d8705
+ sha256sums = f23293c73d03baabc066e26b4a0b1701d54c5dab5a63e9b51a437739cca83b1b
sha256sums = a76162c169073060ee3a966e95342f29b3e342c956d29169c10a6dd97e342fa5
sha256sums = 42dda3527ed2496b851c0fad6a841f660a0c086ecf742bb4f132308b9e38d913
sha256sums = 8fe2d3b0f1374cf74ea9ef1c5ade0a6cdf891cbcd0438420c19da27feef144c7
@@ -43,8 +42,7 @@ pkgbase = mpss
sha256sums = b135e8af616fa2404777ae8c689ea97b9ffb73d18036039fd545108b9b9310fc
sha256sums = 2169df02b5623c43feb272f2d142472d2d42a089a370a6f33f470aa3dea50603
sha256sums = b1264678b77a3ae64716e507e225fce5cfd1c77ae77d0119071c28cab74d0a97
- sha256sums = 3690295e9e24e6a8b42323ca5b2b76f56a3a8f4bdee75b3dfc5a3f01e3f3d1bc
- sha256sums = ace053c75b096c2e120c73076c9a86fcbf1528518761766b9e41e975dc44ae43
+ sha256sums = a326ecc6c048a580a393908fa3350427288ec19d8b3fe6fe43ad331e153ec888
sha256sums = 565d86b880c0dbdd6c0a37383264175f0e3f74db45efa7dac166191ac129e44c
sha256sums = 17791147eef797e4fe161bb08e989685303dbff866d01f2e37335c09e6367688
sha256sums = 64d26ff84029d246868f995cf9fd49b20851a671208c3fa474e0fef5216708cd
diff --git a/PKGBUILD b/PKGBUILD
index ff9551e96aff..03ac31e77eff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,17 +10,17 @@ pkgname=(
mpss-boot-files mpss-flash-files
)
pkgdesc="Intel® Manycore Platform Software Stack"
-pkgver=3.7.1
-pkgrel=9
+pkgver=3.8.1
+pkgrel=1
arch=('x86_64')
url="https://software.intel.com/en-us/articles/intel-manycore-platform-software-stack-mpss"
license=('LGPL2.1')
depends=(dkms python nfs-utils netctl ifplugd)
makedepends=(asciidoc libarchive)
source=(
- http://registrationcenter-download.intel.com/akdlm/irc_nas/9226/mpss-${pkgver}-linux.tar
- http://registrationcenter-download.intel.com/akdlm/irc_nas/9226/mpss-${pkgver}-k1om.tar
- http://registrationcenter-download.intel.com/akdlm/irc_nas/9226/mpss-src-${pkgver}.tar
+ http://registrationcenter-download.intel.com/akdlm/irc_nas/11194/mpss-${pkgver}-linux.tar
+ http://registrationcenter-download.intel.com/akdlm/irc_nas/11194/mpss-${pkgver}-k1om.tar
+ http://registrationcenter-download.intel.com/akdlm/irc_nas/11194/mpss-src-${pkgver}.tar
dkms.conf
blacklist-mpss.conf
mpss-daemon.service
@@ -29,7 +29,6 @@ source=(
mpss-daemon-minimize-modules.patch
mpss-modules-explicit-coprocessor-build.patch
mpss-modules-init-indent.patch
- mpss-modules-rcu-lockup.patch
mpss-modules-page-cache.patch
mpss-modules-Makefile.patch
mpss-gen-symver-map-python3-compat.patch
@@ -39,9 +38,9 @@ source=(
mpss-micmgmt-whitespace.patch
mpss-coi-gcc6-compilation.patch
)
-sha256sums=('3a8d070d7b82d41afa67766db8e3305621643ced1b3f8e2845bf333cdf39b83b'
- 'd73abe69df8f36e6214194fc010877b2ee5ea47e2227acf823d88896804899aa'
- '4458257ded25dc7b69fa6de49e7ec066d0053ef6be54267bb283dbb4e6eb38c8'
+sha256sums=('812e8a965e83c9e278410f603f21d7427922bd20d6142903aaeb01a14b3403e1'
+ '7373fdef5bdafa3347abac75c0d9c4ae1154e78771a71e14e487c0d8b34d8705'
+ 'f23293c73d03baabc066e26b4a0b1701d54c5dab5a63e9b51a437739cca83b1b'
'a76162c169073060ee3a966e95342f29b3e342c956d29169c10a6dd97e342fa5'
'42dda3527ed2496b851c0fad6a841f660a0c086ecf742bb4f132308b9e38d913'
'8fe2d3b0f1374cf74ea9ef1c5ade0a6cdf891cbcd0438420c19da27feef144c7'
@@ -50,8 +49,7 @@ sha256sums=('3a8d070d7b82d41afa67766db8e3305621643ced1b3f8e2845bf333cdf39b83b'
'b135e8af616fa2404777ae8c689ea97b9ffb73d18036039fd545108b9b9310fc'
'2169df02b5623c43feb272f2d142472d2d42a089a370a6f33f470aa3dea50603'
'b1264678b77a3ae64716e507e225fce5cfd1c77ae77d0119071c28cab74d0a97'
- '3690295e9e24e6a8b42323ca5b2b76f56a3a8f4bdee75b3dfc5a3f01e3f3d1bc'
- 'ace053c75b096c2e120c73076c9a86fcbf1528518761766b9e41e975dc44ae43'
+ 'a326ecc6c048a580a393908fa3350427288ec19d8b3fe6fe43ad331e153ec888'
'565d86b880c0dbdd6c0a37383264175f0e3f74db45efa7dac166191ac129e44c'
'17791147eef797e4fe161bb08e989685303dbff866d01f2e37335c09e6367688'
'64d26ff84029d246868f995cf9fd49b20851a671208c3fa474e0fef5216708cd'
diff --git a/buildandcopy.sh b/buildandcopy.sh
index 1b098d5323d2..f7619edea667 100755
--- a/buildandcopy.sh
+++ b/buildandcopy.sh
@@ -5,9 +5,9 @@ repodir=/home/own-repo
thingsToDo=(
'for n in $thedirs; do ( cd $n && updpkgsums); done'
- 'for n in $thedirs; do ( cd $n && makepkg --force --nodeps --nobuild --cleanbuild; makepkg --printsrcinfo > .SRCINFO ); done'
+ 'for n in $thedirs; do ( cd $n && makepkg --force --nodeps --nobuild; makepkg --printsrcinfo > .SRCINFO ); done'
'git diff --quiet --no-ext-diff --exit-code && echo clean || ( git diff -b -w && git add -p && git commit ) || true'
- 'for n in $thedirs; do ( cd $n && makepkg --force --nodeps --noextract --skipchecksums); done'
+ 'for n in $thedirs; do ( cd $n && makepkg --force --nodeps --noextract --cleanbuild --skipchecksums); done'
'test -n "$repodir" -a -d "$repodir" && for n in $thedirs; do for pkgdir in $(find $n -name "*.tar.xz" -printf "%h\n" | sort | uniq); do cpfn=$(ls -tc1 $pkgdir/*.tar.xz | head -1); echo "move [$cpfn]? (y*|n)"; read v; if [ ! "$v" = "n" -a ! "$v" = "N" ]; then sh -c "mv --interactive --update $cpfn $repodir && ( repo-add --new --quiet ${repodir}/ownrepo.db.tar.gz $repodir/$(basename $cpfn); )"; fi; done; done'
'git push origin'
'for n in $thedirs; do ( cd $n && makepkg --nodeps --noextract --force --nobuild --noarchive --nocheck --noprepare --skipinteg --clean ); done'
diff --git a/mpss-modules-page-cache.patch b/mpss-modules-page-cache.patch
index e2f67ff4421c..d036c98ed2b1 100644
--- a/mpss-modules-page-cache.patch
+++ b/mpss-modules-page-cache.patch
@@ -1,17 +1,17 @@
-From 4eaa693c59dfad494e1e560cd1bd6d6ef1e2b9e5 Mon Sep 17 00:00:00 2001
-From: Marcel Huber <marcelhuberfoo@gmail.com>
-Date: Thu, 4 Aug 2016 13:34:10 +0200
-Subject: use newer functions for pages
+From 784943a81e3fe80af4a393ea6112a4f178489ce2 Mon Sep 17 00:00:00 2001
+From: Marcel Huber <marcel.huber@hsr.ch>
+Date: Fri, 10 Feb 2017 09:52:56 +0100
+Subject: use newer functions for get_user_pages
---
- host/tools_support.c | 9 +++++++++
- host/vhost/mic_blk.c | 8 ++++++++
- micscif/micscif_api.c | 8 ++++++++
- micscif/micscif_rma.c | 4 ++++
- 4 files changed, 29 insertions(+)
+ host/tools_support.c | 12 ++++++++++++
+ host/vhost/mic_blk.c | 8 ++++++++
+ micscif/micscif_api.c | 12 ++++++++++++
+ micscif/micscif_rma.c | 4 ++++
+ 4 files changed, 36 insertions(+)
-diff --git host/tools_support.c host/tools_support.c
-index d9b213d..832caf6 100644
+diff --git mpss-modules/host/tools_support.c mpss-modules/host/tools_support.c
+index 93922f8..ff8efcb 100644
--- mpss-modules/host/tools_support.c
+++ mpss-modules/host/tools_support.c
@@ -64,7 +64,11 @@ mic_unpin_user_pages(struct page **pages, uint32_t nf_pages)
@@ -26,11 +26,14 @@ index d9b213d..832caf6 100644
}
}
kfree(pages);
-@@ -89,8 +93,13 @@ mic_pin_user_pages (void *data, struct page **pages, uint32_t len, int32_t *nf_p
-
+@@ -89,8 +93,16 @@ mic_pin_user_pages (void *data, struct page **pages, uint32_t len, int32_t *nf_p
+
// pin the user pages; use semaphores on linux for doing the same
down_read(&current->mm->mmap_sem);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)
++ *nf_pages = (int32_t)get_user_pages_remote(current, current->mm,
++ (uint64_t)data, nr_pages, FOLL_WRITE|FOLL_FORCE, pages, NULL);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
+ *nf_pages = (int32_t)get_user_pages_remote(current, current->mm,
+ (uint64_t)data, nr_pages, PROT_WRITE, 1, pages, NULL);
+#else
@@ -38,9 +41,9 @@ index d9b213d..832caf6 100644
nr_pages, PROT_WRITE, 1, pages, NULL);
+#endif
up_read(&current->mm->mmap_sem);
-
+
// compare if the no of final pages is equal to no of requested pages
-diff --git host/vhost/mic_blk.c host/vhost/mic_blk.c
+diff --git mpss-modules/host/vhost/mic_blk.c mpss-modules/host/vhost/mic_blk.c
index 12bc880..47a0924 100644
--- mpss-modules/host/vhost/mic_blk.c
+++ mpss-modules/host/vhost/mic_blk.c
@@ -65,14 +68,14 @@ index 12bc880..47a0924 100644
}
status = (ret < 0) ? VIRTIO_BLK_S_IOERR : VIRTIO_BLK_S_OK;
if (vbio->head != -1) {
-diff --git micscif/micscif_api.c micscif/micscif_api.c
-index 03d6d92..a61454c 100644
+diff --git mpss-modules/micscif/micscif_api.c mpss-modules/micscif/micscif_api.c
+index e13e59d..1c06105 100644
--- mpss-modules/micscif/micscif_api.c
+++ mpss-modules/micscif/micscif_api.c
-@@ -1981,7 +1981,11 @@ retry:
+@@ -1981,13 +1981,21 @@ retry:
}
}
-
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
+ pinned_pages->nr_pages = get_user_pages_remote(
+#else
@@ -81,7 +84,17 @@ index 03d6d92..a61454c 100644
current,
mm,
(uint64_t)addr,
-@@ -2007,7 +2011,11 @@ retry:
+ nr_pages,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)
++ FOLL_WRITE,
++#else
+ !!(prot & SCIF_PROT_WRITE),
+ 0,
++#endif
+ pinned_pages->pages,
+ pinned_pages->vma);
+ up_write(&mm->mmap_sem);
+@@ -2007,7 +2015,11 @@ retry:
/* Roll back any pinned pages */
for (i = 0; i < pinned_pages->nr_pages; i++) {
if (pinned_pages->pages[i])
@@ -93,8 +106,8 @@ index 03d6d92..a61454c 100644
}
prot &= ~SCIF_PROT_WRITE;
try_upgrade = false;
-diff --git micscif/micscif_rma.c micscif/micscif_rma.c
-index 520d7bb..3e41407 100644
+diff --git mpss-modules/micscif/micscif_rma.c mpss-modules/micscif/micscif_rma.c
+index 9c6de2e..f0bf6c7 100644
--- mpss-modules/micscif/micscif_rma.c
+++ mpss-modules/micscif/micscif_rma.c
@@ -413,7 +413,11 @@ int micscif_destroy_pinned_pages(struct scif_pinned_pages *pinned_pages)
@@ -109,6 +122,6 @@ index 520d7bb..3e41407 100644
}
}
}
---
-2.9.2
+--
+2.11.1
diff --git a/mpss-modules-rcu-lockup.patch b/mpss-modules-rcu-lockup.patch
deleted file mode 100644
index 61a9975fd8d9..000000000000
--- a/mpss-modules-rcu-lockup.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ab23490f38613aa80cfa811b384f29094b5f3672 Mon Sep 17 00:00:00 2001
-From: Marcel Huber <marcelhuberfoo@gmail.com>
-Date: Thu, 4 Aug 2016 13:33:05 +0200
-Subject: remove rcu_lockup
- https://github.com/bradyjoh/mpss-modules/commit/70560c893e8acc8d834f04dd2eee0d9e1780c840
-
----
- host/vhost/vhost.h | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git host/vhost/vhost.h host/vhost/vhost.h
-index ad61802..0d9abf9 100644
---- mpss-modules/host/vhost/vhost.h
-+++ mpss-modules/host/vhost/vhost.h
-@@ -205,18 +205,6 @@ int vhost_zerocopy_signal_used(struct vhost_virtqueue *vq);
- eventfd_signal((vq)->error_ctx, 1);\
- } while (0)
-
--#ifndef __rcu_dereference_index_check
--#define __rcu_dereference_index_check(p, c) \
-- ({ \
-- typeof(p) _________p1 = ACCESS_ONCE(p); \
-- rcu_lockdep_assert(c, \
-- "suspicious rcu_dereference_index_check()" \
-- " usage"); \
-- smp_read_barrier_depends(); \
-- (_________p1); \
-- })
--#endif
--
- enum {
- VHOST_FEATURES = (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) |
- (1ULL << VIRTIO_RING_F_INDIRECT_DESC) |
-@@ -238,7 +226,7 @@ static inline int vhost_has_feature(struct vhost_dev *dev, int bit)
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0))
- unsigned acked_features = rcu_dereference_index_check(dev->acked_features, rcu_read_lock_held());
- #else
-- unsigned acked_features = __rcu_dereference_index_check(dev->acked_features, rcu_read_lock_held());
-+ unsigned acked_features = smp_load_acquire(&(dev->acked_features));
- #endif
- #endif
- return acked_features & (1 << bit);
---
-2.9.2
-