Re: [pve-devel] [PATCH manager] gui: qemu: fix min/max memory checks
On 8/21/19 10:39 AM, Thomas Lamprecht wrote:
On 8/20/19 2:50 PM, Dominik Csapak wrote:
we need to set the minvalue for the memoryfield when setting the
'mininum memory', otherwise it is possible in the wizard to set
a higher minimum than maximum value
Signed-off-by: Dominik Csapak
---
www/manager6/qemu/MemoryEdit.js | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js
index 4c4d1815..ab578bef 100644
--- a/www/manager6/qemu/MemoryEdit.js
+++ b/www/manager6/qemu/MemoryEdit.js
@@ -67,9 +67,11 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
allowBlank: false,
listeners: {
change: function(f, value) {
- var memory = me.down('field[name=memory]').getValue();
+ var memory = me.down('field[name=memory]');
var shares = me.down('field[name=shares]');
- shares.setDisabled(value === memory);
+ shares.setDisabled(value === memory.getValue());
+ memory.setMinValue(value);
+ memory.validate();
}
}
},
With this I cannot use the spin-down trigger/button in the memory field
if it's the same (or less) as the minimum value, that worked before -
with correct behavior (both, memory and minimum got decreased).
I'd like to keep this behavior, IMO it's nicer UX, as it's really strange
and seems like a bug if the "advanced" mode is off and thus the minimum
field isn't even visible.
SO, the correct fix would IMO be:
8<
diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js
index 4c4d1815..d1284716 100644
--- a/www/manager6/qemu/MemoryEdit.js
+++ b/www/manager6/qemu/MemoryEdit.js
@@ -60,6 +60,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
xtype: 'pveMemoryField',
name: 'balloon',
minValue: 1,
+ maxValue: 512,
step: 32,
fieldLabel: gettext('Minimum memory') + ' (MiB)',
hotplug: me.hotplug,
--
This ensures the default maxValue is initially correct, after that
the memory change handler does the rest. What do you think?
yeah much nicer and better, thanks for seeing that :)
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] [RFC PATCH common] cli: prettify tables even more
Are your sure common terminals support those characters?
They did not when I tested ...
> On 21 August 2019 14:33 Wolfgang Bumiller wrote:
>
>
> Separate the header with a double line.
>
> Signed-off-by: Wolfgang Bumiller
> ---
> src/PVE/CLIFormatter.pm | 18 +-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/src/PVE/CLIFormatter.pm b/src/PVE/CLIFormatter.pm
> index 84dbed1..0e9cbe6 100644
> --- a/src/PVE/CLIFormatter.pm
> +++ b/src/PVE/CLIFormatter.pm
> @@ -186,6 +186,7 @@ sub print_text_table {
> my $borderstring_m = '';
> my $borderstring_b = '';
> my $borderstring_t = '';
> +my $borderstring_h = '';
> my $formatstring = '';
>
> my $column_count = scalar(@$props_to_print);
> @@ -255,41 +256,49 @@ sub print_text_table {
> if ($utf8) {
> $formatstring .= "│ %$alignstr${cutoff}s │";
> $borderstring_t .= "┌─" . ('─' x $cutoff) . "─┐";
> + $borderstring_h .= "╞═" . ('═' x $cutoff) . '═╡';
> $borderstring_m .= "├─" . ('─' x $cutoff) . "─┤";
> $borderstring_b .= "└─" . ('─' x $cutoff) . "─┘";
> } else {
> $formatstring .= "| %$alignstr${cutoff}s |";
> $borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
> + $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
> }
> } elsif ($i == 0) {
> if ($utf8) {
> $formatstring .= "│ %$alignstr${cutoff}s ";
> $borderstring_t .= "┌─" . ('─' x $cutoff) . '─';
> + $borderstring_h .= "╞═" . ('═' x $cutoff) . '═';
> $borderstring_m .= "├─" . ('─' x $cutoff) . '─';
> $borderstring_b .= "└─" . ('─' x $cutoff) . '─';
> } else {
> $formatstring .= "| %$alignstr${cutoff}s ";
> $borderstring_m .= "+-" . ('-' x $cutoff) . '-';
> + $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
> }
> } elsif ($i == ($column_count - 1)) {
> if ($utf8) {
> $formatstring .= "│ %$alignstr${cutoff}s │";
> $borderstring_t .= "┬─" . ('─' x $cutoff) . "─┐";
> + $borderstring_h .= "╪═" . ('═' x $cutoff) . '═╡';
> $borderstring_m .= "┼─" . ('─' x $cutoff) . "─┤";
> $borderstring_b .= "┴─" . ('─' x $cutoff) . "─┘";
> } else {
> $formatstring .= "| %$alignstr${cutoff}s |";
> $borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
> + $borderstring_h .= "+=" . ('=' x $cutoff) . "=+";
> }
> } else {
> if ($utf8) {
> $formatstring .= "│ %$alignstr${cutoff}s ";
> $borderstring_t .= "┬─" . ('─' x $cutoff) . '─';
> + $borderstring_h .= "╪═" . ('═' x $cutoff) . '═';
> $borderstring_m .= "┼─" . ('─' x $cutoff) . '─';
> $borderstring_b .= "┴─" . ('─' x $cutoff) . '─';
> } else {
> $formatstring .= "| %$alignstr${cutoff}s ";
> $borderstring_m .= "+-" . ('-' x $cutoff) . '-';
> + $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
> }
> }
> } else {
> @@ -313,15 +322,22 @@ sub print_text_table {
>
> $writeln->($borderstring_t) if $border;
>
> +my $borderstring_sep;
> if ($header) {
> my $text = sprintf $formatstring, map { $colopts->{$_}->{title} }
> @$props_to_print;
> $writeln->($text);
> + $borderstring_sep = $borderstring_h;
> +} else {
> + $borderstring_sep = $borderstring_m;
> }
>
> for (my $i = 0; $i < scalar(@$tabledata); $i++) {
> my $coldata = $tabledata->[$i];
>
> - $writeln->($borderstring_m) if $border && ($i != 0 || $header);
> + if ($border && ($i != 0 || $header)) {
> + $writeln->($borderstring_sep);
> + $borderstring_sep = $borderstring_m;
> + }
>
> for (my $i = 0; $i < $coldata->{height}; $i++) {
>
> --
> 2.20.1
>
>
> ___
> pve-devel mailing list
> pve-devel@pve.proxmox.com
> https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] applied: [PATCH kronosnet 0/8] refactor to submodule and update to 1.11
On 8/21/19 5:25 PM, Thomas Lamprecht wrote: > Refactor buildsystem to submodule and update to upstream 1.11 release. > > Thomas Lamprecht (8): > extract debian and track that > move changelog patch content to d/changelog > move build-deps fix patch to d/control > move adding symbols for 1.10 to d/libknet1.symbols directly > switch to submodule build > buildsys: fix upload target > update sources to v1.11; drop upstream patches > update libknet1 symbols for 1.11 all for kronosnet, forgot that tag, sorry. ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] applied: [PATCH 3/8] move build-deps fix patch to d/control
Signed-off-by: Thomas Lamprecht --- debian/control| 1 + ...004-add-libzstd-dev-to-build-depends.patch | 25 --- patches/series| 1 - 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 patches/0004-add-libzstd-dev-to-build-depends.patch diff --git a/debian/control b/debian/control index 807977c..a472c95 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ Build-Depends: liblz4-dev, liblzma-dev, liblzo2-dev, + libzstd-dev, zlib1g-dev, # Crypto plugins: libnss3-dev, diff --git a/patches/0004-add-libzstd-dev-to-build-depends.patch b/patches/0004-add-libzstd-dev-to-build-depends.patch deleted file mode 100644 index 3f17cb3..000 --- a/patches/0004-add-libzstd-dev-to-build-depends.patch +++ /dev/null @@ -1,25 +0,0 @@ -From Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= -Date: Wed, 19 Jun 2019 10:21:59 +0200 -Subject: [PATCH kronosnet] add libzstd-dev to build-depends -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabian Grünbichler - debian/control | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/debian/control b/debian/control -index 807977c..de690e2 100644 a/debian/control -+++ b/debian/control -@@ -17,6 +17,7 @@ Build-Depends: - liblzma-dev, - liblzo2-dev, - zlib1g-dev, -+ libzstd-dev, - # Crypto plugins: - libnss3-dev, - libnspr4-dev, diff --git a/patches/series b/patches/series index 05a0b30..4280e18 100644 --- a/patches/series +++ b/patches/series @@ -1,5 +1,4 @@ 0002-cherry-pick-1.9-as-patches.patch 0003-cherry-pick-1.10-as-patches.patch -0004-add-libzstd-dev-to-build-depends.patch 0005-add-new-symbols-for-libknet-1.10.patch 0006-cherry-pick-pmtud-fixes.patch -- 2.20.1 ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] applied: [PATCH 1/8] extract debian and track that
Signed-off-by: Thomas Lamprecht
---
Makefile | 5 +-
debian/changelog | 152 ++
debian/compat | 1 +
debian/control| 115 +
debian/copyright | 72 +
debian/gbp.conf | 15 ++
debian/libknet-dev.install| 3 +
debian/libknet-doc.install| 1 +
debian/libknet1.install | 2 +
debian/libknet1.symbols | 62 +++
debian/libnozzle-dev.install | 3 +
debian/libnozzle1.install | 1 +
debian/libnozzle1.symbols | 20 +++
...TP-test-if-SCTP-is-not-supported-by-.patch | 28
debian/patches/series | 1 +
debian/rules | 39 +
debian/source/format | 1 +
debian/tests/control | 7 +
debian/tests/unit | 12 ++
debian/upstream/signing-key.asc | 51 ++
debian/watch | 4 +
...kronosnet_1.10-0+really1.8-2.debian.tar.xz | Bin 8912 -> 0 bytes
22 files changed, 592 insertions(+), 3 deletions(-)
create mode 100644 debian/changelog
create mode 100644 debian/compat
create mode 100644 debian/control
create mode 100644 debian/copyright
create mode 100644 debian/gbp.conf
create mode 100644 debian/libknet-dev.install
create mode 100644 debian/libknet-doc.install
create mode 100644 debian/libknet1.install
create mode 100644 debian/libknet1.symbols
create mode 100644 debian/libnozzle-dev.install
create mode 100644 debian/libnozzle1.install
create mode 100644 debian/libnozzle1.symbols
create mode 100644
debian/patches/send-test-skip-the-SCTP-test-if-SCTP-is-not-supported-by-.patch
create mode 100644 debian/patches/series
create mode 100755 debian/rules
create mode 100644 debian/source/format
create mode 100644 debian/tests/control
create mode 100755 debian/tests/unit
create mode 100644 debian/upstream/signing-key.asc
create mode 100644 debian/watch
delete mode 100644 upstream/kronosnet_1.10-0+really1.8-2.debian.tar.xz
diff --git a/Makefile b/Makefile
index 7d4b0f2..ceae235 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ PVERELEASE=pve2
BUILDDIR=kronosnet-${VERSION}
SRCARCHIVE=kronosnet_${VERSION}.orig.tar.xz
-DEBARCHIVE=kronosnet_${VERSION}-${DEBRELEASE}.debian.tar.xz
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
@@ -23,12 +22,12 @@ DSC=kronosnet-${VERSION}-${PVERELEASE}.dsc
all:
ls -1 ${DEBS}
-${BUILDDIR}: upstream/${SRCARCHIVE} upstream/${DEBARCHIVE} patches/*
+${BUILDDIR}: upstream/${SRCARCHIVE} patches/*
rm -rf ${BUILDDIR}
mkdir ${BUILDDIR}
ln -sf upstream/${SRCARCHIVE} ${SRCARCHIVE}
tar -x -C ${BUILDDIR} --strip-components=1 -f upstream/${SRCARCHIVE}
- tar -C ${BUILDDIR} -xf upstream/${DEBARCHIVE}
+ cp -a debian/ ${BUILDDIR}
cd ${BUILDDIR}; ln -s ../patches patches
cd ${BUILDDIR}; quilt push -a
cd ${BUILDDIR}; rm -rf .pc ./patches
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..63d5a6d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,152 @@
+kronosnet (1.8-2) unstable; urgency=medium
+
+ * [b6a2cdc] New patch: send test: skip the SCTP test if SCTP is not supported
+by the kernel
+
+ -- Ferenc Wágner Wed, 03 Apr 2019 10:33:30 +0200
+
+kronosnet (1.8-1) unstable; urgency=medium
+
+ * [ff7beff] New upstream release (1.8)
+ * [21d7565] Update copyright years
+
+ -- Ferenc Wágner Mon, 01 Apr 2019 23:59:14 +0200
+
+kronosnet (1.7-1) unstable; urgency=medium
+
+ * [4e5fcde] New upstream release (1.7)
+ * [f23dac4] Delete our patches, they went upstream
+
+ -- Ferenc Wágner Thu, 31 Jan 2019 19:06:49 +0100
+
+kronosnet (1.6-4) unstable; urgency=medium
+
+ * [50a96b8] Fix ugly assignment bug in my patch
+
+ -- Ferenc Wágner Fri, 28 Dec 2018 10:21:26 +0100
+
+kronosnet (1.6-3) unstable; urgency=medium
+
+ * [c2eec28] New patch: Fix nozzle man dates to SOURCE_EPOCH, just like the
+libknet ones are
+
+ -- Ferenc Wágner Wed, 26 Dec 2018 11:00:26 +0100
+
+kronosnet (1.6-2) unstable; urgency=medium
+
+ * [121d257] New patch: Skip SCTP event initialization if the protocol is not
+supported
+ * [7112630] Run libknet unit tests as autopkgtests, too.
+Buildds lack SCTP support, so this is more comprehensive.
+ * [62e62e6] Update Standards-Version to 4.3.0 (no changes required)
+ * [45b1073] Add libnozzle autopkgtests.
+The libnozzle tests are all skipped during the build because they need
+root privileges.
+
+ -- Ferenc Wágner Mon, 24 Dec 2018 02:12:39 +0100
+
+kronosnet (1.6-1) unstable; urgency=medium
+
+ * [640f767] New upstream release (1.6)
+ * [c9f9431] Revert "New p
[pve-devel] applied: [PATCH 0/8] refactor to submodule and update to 1.11
Refactor buildsystem to submodule and update to upstream 1.11 release. Thomas Lamprecht (8): extract debian and track that move changelog patch content to d/changelog move build-deps fix patch to d/control move adding symbols for 1.10 to d/libknet1.symbols directly switch to submodule build buildsys: fix upload target update sources to v1.11; drop upstream patches update libknet1 symbols for 1.11 .gitmodules | 3 + Makefile |25 +- debian/changelog | 172 + debian/compat | 1 + debian/control| 116 + debian/copyright |72 + debian/gbp.conf |15 + debian/libknet-dev.install| 3 + debian/libknet-doc.install| 1 + debian/libknet1.install | 2 + debian/libknet1.symbols |68 + debian/libnozzle-dev.install | 3 + debian/libnozzle1.install | 1 + debian/libnozzle1.symbols |20 + ...TP-test-if-SCTP-is-not-supported-by-.patch |28 + debian/patches/series | 1 + debian/rules |39 + debian/source/format | 1 + debian/tests/control | 7 + debian/tests/unit |12 + debian/upstream/signing-key.asc |51 + debian/watch | 4 + patches/0001-update-changelog.patch |41 - patches/0002-cherry-pick-1.9-as-patches.patch | 776 - .../0003-cherry-pick-1.10-as-patches.patch| 14716 ...004-add-libzstd-dev-to-build-depends.patch |25 - ...005-add-new-symbols-for-libknet-1.10.patch |43 - patches/0006-cherry-pick-pmtud-fixes.patch| 256 - patches/series| 6 - upstream | 1 + ...kronosnet_1.10-0+really1.8-2.debian.tar.xz | Bin 8912 -> 0 bytes upstream/kronosnet_1.10.orig.tar.xz | Bin 462580 -> 0 bytes 32 files changed, 630 insertions(+), 15879 deletions(-) create mode 100644 .gitmodules create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100644 debian/libknet-dev.install create mode 100644 debian/libknet-doc.install create mode 100644 debian/libknet1.install create mode 100644 debian/libknet1.symbols create mode 100644 debian/libnozzle-dev.install create mode 100644 debian/libnozzle1.install create mode 100644 debian/libnozzle1.symbols create mode 100644 debian/patches/send-test-skip-the-SCTP-test-if-SCTP-is-not-supported-by-.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/tests/control create mode 100755 debian/tests/unit create mode 100644 debian/upstream/signing-key.asc create mode 100644 debian/watch delete mode 100644 patches/0001-update-changelog.patch delete mode 100644 patches/0002-cherry-pick-1.9-as-patches.patch delete mode 100644 patches/0003-cherry-pick-1.10-as-patches.patch delete mode 100644 patches/0004-add-libzstd-dev-to-build-depends.patch delete mode 100644 patches/0005-add-new-symbols-for-libknet-1.10.patch delete mode 100644 patches/0006-cherry-pick-pmtud-fixes.patch delete mode 100644 patches/series create mode 16 upstream delete mode 100644 upstream/kronosnet_1.10-0+really1.8-2.debian.tar.xz delete mode 100644 upstream/kronosnet_1.10.orig.tar.xz -- 2.20.1 ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] applied: [PATCH 7/8] update sources to v1.11; drop upstream patches
Signed-off-by: Thomas Lamprecht
---
Makefile | 5 +-
patches/0006-cherry-pick-pmtud-fixes.patch | 254 -
patches/series | 1 -
upstream | 2 +-
4 files changed, 2 insertions(+), 260 deletions(-)
delete mode 100644 patches/0006-cherry-pick-pmtud-fixes.patch
delete mode 100644 patches/series
diff --git a/Makefile b/Makefile
index c8efe46..e84fd9e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,13 +22,10 @@ DSC=kronosnet-${VERSION}-${PVERELEASE}.dsc
all:
ls -1 ${DEBS}
-${BUILDDIR}: upstream/README patches/*
+${BUILDDIR}: upstream/README
rm -rf ${BUILDDIR}
cp -a upstream ${BUILDDIR}
cp -a debian/ ${BUILDDIR}
- cd ${BUILDDIR}; ln -s ../patches patches
- cd ${BUILDDIR}; quilt push -a
- cd ${BUILDDIR}; rm -rf .pc ./patches
deb: ${DEBS}
${OTHER_DEBS}: ${MAIN_DEB}
diff --git a/patches/0006-cherry-pick-pmtud-fixes.patch
b/patches/0006-cherry-pick-pmtud-fixes.patch
deleted file mode 100644
index 92c28a0..000
--- a/patches/0006-cherry-pick-pmtud-fixes.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?=
-Date: Fri, 2 Aug 2019 10:52:32 +0200
-Subject: [PATCH kronosnet] cherry-pick pmtud fixes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-from upstream PR#242.
-
-Signed-off-by: Fabian Grünbichler
- ...ation-when-using-crypto-and-add-docs.patch | 100 ++
- .../patches/crypto-fix-log-information.patch | 32 ++
- .../patches/docs-add-knet-packet-layout.patch | 43
- ...nformation-about-detected-kernel-MTU.patch | 22
- debian/patches/series | 4 +
- 5 files changed, 201 insertions(+)
- create mode 100644
debian/patches/PMTUd-fix-MTU-calculation-when-using-crypto-and-add-docs.patch
- create mode 100644 debian/patches/crypto-fix-log-information.patch
- create mode 100644 debian/patches/docs-add-knet-packet-layout.patch
- create mode 100644
debian/patches/udp-log-information-about-detected-kernel-MTU.patch
-
-diff --git
a/debian/patches/PMTUd-fix-MTU-calculation-when-using-crypto-and-add-docs.patch
b/debian/patches/PMTUd-fix-MTU-calculation-when-using-crypto-and-add-docs.patch
-new file mode 100644
-index 000..2e55471
/dev/null
-+++
b/debian/patches/PMTUd-fix-MTU-calculation-when-using-crypto-and-add-docs.patch
-@@ -0,0 +1,100 @@
-+From: "Fabio M. Di Nitto"
-+Date: Fri, 2 Aug 2019 10:44:23 +0200
-+Subject: [PMTUd] fix MTU calculation when using crypto and add docs
-+
-+Signed-off-by: Fabio M. Di Nitto
-+(cherry picked from commit 06709869d55061d9e402928f63b8ea062dd19dfd)
-+---
-+ libknet/threads_pmtud.c | 55
+++--
-+ 1 file changed, 49 insertions(+), 6 deletions(-)
-+
-+diff --git a/libknet/threads_pmtud.c b/libknet/threads_pmtud.c
-+index 2cd48f9..1a19806 100644
-+--- a/libknet/threads_pmtud.c
- b/libknet/threads_pmtud.c
-+@@ -113,29 +113,68 @@ restart:
-+ * knet_h->sec_hash_size is >= 0 if signing is enabled
-+ */
-+
-++ /*
-++ * common to all packets
-++ */
-+ data_len = onwire_len - overhead_len;
-+
-+ if (knet_h->crypto_instance) {
-+
-++realign:
-+ if (knet_h->sec_block_size) {
-++
-++ /*
-++ * drop both salt and hash, that leaves only the crypto
data and padding
-++ * we need to calculate the padding based on the real
encrypted data.
-++ */
-++ data_len = data_len - (knet_h->sec_salt_size +
knet_h->sec_hash_size);
-++
-++ /*
-++ * if the crypto mechanism requires padding, calculate
the padding
-++ * and add it back to data_len because that's what the
crypto layer
-++ * would do.
-++ */
-+ pad_len = knet_h->sec_block_size - (data_len %
knet_h->sec_block_size);
-++
-++ /*
-++ * if are at the boundary, reset padding
-++ */
-+ if (pad_len == knet_h->sec_block_size) {
-+ pad_len = 0;
-+ }
-+ data_len = data_len + pad_len;
-+- }
-+
-+- data_len = data_len + (knet_h->sec_hash_size +
knet_h->sec_salt_size + knet_h->sec_block_size);
-+-
-+- if (knet_h->sec_block_size) {
-++ /*
-++ * if our current data_len is higher than max_mtu_len
-++ * then we need to reduce by padding size (that is our
-++ * increment / decrement value)
-++ *
-++ * this generally happens only on the first P
[pve-devel] applied: [PATCH 8/8] update libknet1 symbols for 1.11
Signed-off-by: Thomas Lamprecht --- debian/libknet1.symbols | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libknet1.symbols b/debian/libknet1.symbols index eb0baa3..c4330cd 100644 --- a/debian/libknet1.symbols +++ b/debian/libknet1.symbols @@ -24,6 +24,7 @@ libknet.so.1 libknet1 #MINVER# knet_handle_new_ex@LIBKNET 1.1 knet_handle_pmtud_get@LIBKNET 0.9 knet_handle_pmtud_getfreq@LIBKNET 0.9 + knet_handle_pmtud_set@LIBKNET 1.11 knet_handle_pmtud_setfreq@LIBKNET 0.9 knet_handle_remove_datafd@LIBKNET 0.9 knet_handle_set_transport_reconnect_interval@LIBKNET 0.9 -- 2.20.1 ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] applied: [PATCH 2/8] move changelog patch content to d/changelog
Signed-off-by: Thomas Lamprecht --- debian/changelog| 20 ++ patches/0001-update-changelog.patch | 41 - patches/series | 1 - 3 files changed, 20 insertions(+), 42 deletions(-) delete mode 100644 patches/0001-update-changelog.patch diff --git a/debian/changelog b/debian/changelog index 63d5a6d..4872847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +kronosnet (1.10-pve2) pve; urgency=medium + + * cherry-pick pmtud fixes + + -- Proxmox Support Team Fri, 2 Aug 2019 10:53:46 +0200 + +kronosnet (1.10-pve1) pve; urgency=medium + + * update to 1.10 + + -- Proxmox Support Team Wed, 19 Jun 2019 09:32:21 +0200 + +kronosnet (1.8-pve1) pve; urgency=medium + + * introduce kronosnet for PVE 6.x + + * cherry-pick crypto patches for Corosync 2.x keyfile compat + + -- Proxmox Support Team Wed, 22 May 2019 14:08:15 +0200 + kronosnet (1.8-2) unstable; urgency=medium * [b6a2cdc] New patch: send test: skip the SCTP test if SCTP is not supported diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch deleted file mode 100644 index e99e5c9..000 --- a/patches/0001-update-changelog.patch +++ /dev/null @@ -1,41 +0,0 @@ -From Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= -Date: Wed, 22 May 2019 14:08:37 +0200 -Subject: [PATCH kronosnet] update changelog -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabian Grünbichler - debian/changelog | 20 - 1 file changed, 20 insertions(+) - -diff --git a/debian/changelog b/debian/changelog -index 63d5a6d..4872847 100644 a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,23 @@ -+kronosnet (1.10-pve2) pve; urgency=medium -+ -+ * cherry-pick pmtud fixes -+ -+ -- Proxmox Support Team Fri, 2 Aug 2019 10:53:46 +0200 -+ -+kronosnet (1.10-pve1) pve; urgency=medium -+ -+ * update to 1.10 -+ -+ -- Proxmox Support Team Wed, 19 Jun 2019 09:32:21 +0200 -+ -+kronosnet (1.8-pve1) pve; urgency=medium -+ -+ * introduce kronosnet for PVE 6.x -+ -+ * cherry-pick crypto patches for Corosync 2.x keyfile compat -+ -+ -- Proxmox Support Team Wed, 22 May 2019 14:08:15 +0200 -+ - kronosnet (1.8-2) unstable; urgency=medium - - * [b6a2cdc] New patch: send test: skip the SCTP test if SCTP is not supported diff --git a/patches/series b/patches/series index 3f64ee5..05a0b30 100644 --- a/patches/series +++ b/patches/series @@ -1,4 +1,3 @@ -0001-update-changelog.patch 0002-cherry-pick-1.9-as-patches.patch 0003-cherry-pick-1.10-as-patches.patch 0004-add-libzstd-dev-to-build-depends.patch -- 2.20.1 ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] applied: [PATCH 4/8] move adding symbols for 1.10 to d/libknet1.symbols directly
Signed-off-by: Thomas Lamprecht --- debian/libknet1.symbols | 5 +++ ...005-add-new-symbols-for-libknet-1.10.patch | 43 --- patches/series| 1 - 3 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 patches/0005-add-new-symbols-for-libknet-1.10.patch diff --git a/debian/libknet1.symbols b/debian/libknet1.symbols index 0fa1fd5..eb0baa3 100644 --- a/debian/libknet1.symbols +++ b/debian/libknet1.symbols @@ -11,6 +11,7 @@ libknet.so.1 libknet1 #MINVER# knet_handle_clear_stats@LIBKNET 0.9 knet_handle_compress@LIBKNET 0.9 knet_handle_crypto@LIBKNET 0.9 + knet_handle_enable_access_lists@LIBKNET 1.10 knet_handle_enable_filter@LIBKNET 0.9 knet_handle_enable_pmtud_notify@LIBKNET 0.9 knet_handle_enable_sock_notify@LIBKNET 0.9 @@ -37,6 +38,8 @@ libknet.so.1 libknet1 #MINVER# knet_host_remove@LIBKNET 0.9 knet_host_set_name@LIBKNET 0.9 knet_host_set_policy@LIBKNET 0.9 + knet_link_add_acl@LIBKNET 1.10 + knet_link_clear_acl@LIBKNET 1.10 knet_link_clear_config@LIBKNET 0.9 knet_link_get_config@LIBKNET 0.9 knet_link_get_enable@LIBKNET 0.9 @@ -45,6 +48,8 @@ libknet.so.1 libknet1 #MINVER# knet_link_get_pong_count@LIBKNET 0.9 knet_link_get_priority@LIBKNET 0.9 knet_link_get_status@LIBKNET 0.9 + knet_link_insert_acl@LIBKNET 1.10 + knet_link_rm_acl@LIBKNET 1.10 knet_link_set_config@LIBKNET 0.9 knet_link_set_enable@LIBKNET 0.9 knet_link_set_ping_timers@LIBKNET 0.9 diff --git a/patches/0005-add-new-symbols-for-libknet-1.10.patch b/patches/0005-add-new-symbols-for-libknet-1.10.patch deleted file mode 100644 index 46ef699..000 --- a/patches/0005-add-new-symbols-for-libknet-1.10.patch +++ /dev/null @@ -1,43 +0,0 @@ -From Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= -Date: Wed, 19 Jun 2019 10:41:22 +0200 -Subject: [PATCH kronosnet] add new symbols for libknet 1.10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabian Grünbichler - debian/libknet1.symbols | 5 + - 1 file changed, 5 insertions(+) - -diff --git a/debian/libknet1.symbols b/debian/libknet1.symbols -index 0fa1fd5..eb0baa3 100644 a/debian/libknet1.symbols -+++ b/debian/libknet1.symbols -@@ -11,6 +11,7 @@ libknet.so.1 libknet1 #MINVER# - knet_handle_clear_stats@LIBKNET 0.9 - knet_handle_compress@LIBKNET 0.9 - knet_handle_crypto@LIBKNET 0.9 -+ knet_handle_enable_access_lists@LIBKNET 1.10 - knet_handle_enable_filter@LIBKNET 0.9 - knet_handle_enable_pmtud_notify@LIBKNET 0.9 - knet_handle_enable_sock_notify@LIBKNET 0.9 -@@ -37,6 +38,8 @@ libknet.so.1 libknet1 #MINVER# - knet_host_remove@LIBKNET 0.9 - knet_host_set_name@LIBKNET 0.9 - knet_host_set_policy@LIBKNET 0.9 -+ knet_link_add_acl@LIBKNET 1.10 -+ knet_link_clear_acl@LIBKNET 1.10 - knet_link_clear_config@LIBKNET 0.9 - knet_link_get_config@LIBKNET 0.9 - knet_link_get_enable@LIBKNET 0.9 -@@ -45,6 +48,8 @@ libknet.so.1 libknet1 #MINVER# - knet_link_get_pong_count@LIBKNET 0.9 - knet_link_get_priority@LIBKNET 0.9 - knet_link_get_status@LIBKNET 0.9 -+ knet_link_insert_acl@LIBKNET 1.10 -+ knet_link_rm_acl@LIBKNET 1.10 - knet_link_set_config@LIBKNET 0.9 - knet_link_set_enable@LIBKNET 0.9 - knet_link_set_ping_timers@LIBKNET 0.9 diff --git a/patches/series b/patches/series index 4280e18..ede59da 100644 --- a/patches/series +++ b/patches/series @@ -1,4 +1,3 @@ 0002-cherry-pick-1.9-as-patches.patch 0003-cherry-pick-1.10-as-patches.patch -0005-add-new-symbols-for-libknet-1.10.patch 0006-cherry-pick-pmtud-fixes.patch -- 2.20.1 ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] applied: [PATCH 6/8] buildsys: fix upload target
Signed-off-by: Thomas Lamprecht
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 953f4b3..c8efe46 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ submodule:
.PHONY: upload
upload: ${DEBS}
- tar cf - ${DEBS} | ssh repo...@repo.proxmox.com upload
+ tar cf - ${DEBS} | ssh repo...@repo.proxmox.com upload --product pve
--dist buster
.PHONY: clean
clean:
--
2.20.1
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [RFC PATCH common] cli: prettify tables even more
Separate the header with a double line.
Signed-off-by: Wolfgang Bumiller
---
src/PVE/CLIFormatter.pm | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/PVE/CLIFormatter.pm b/src/PVE/CLIFormatter.pm
index 84dbed1..0e9cbe6 100644
--- a/src/PVE/CLIFormatter.pm
+++ b/src/PVE/CLIFormatter.pm
@@ -186,6 +186,7 @@ sub print_text_table {
my $borderstring_m = '';
my $borderstring_b = '';
my $borderstring_t = '';
+my $borderstring_h = '';
my $formatstring = '';
my $column_count = scalar(@$props_to_print);
@@ -255,41 +256,49 @@ sub print_text_table {
if ($utf8) {
$formatstring .= "│ %$alignstr${cutoff}s │";
$borderstring_t .= "┌─" . ('─' x $cutoff) . "─┐";
+ $borderstring_h .= "╞═" . ('═' x $cutoff) . '═╡';
$borderstring_m .= "├─" . ('─' x $cutoff) . "─┤";
$borderstring_b .= "└─" . ('─' x $cutoff) . "─┘";
} else {
$formatstring .= "| %$alignstr${cutoff}s |";
$borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
+ $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
}
} elsif ($i == 0) {
if ($utf8) {
$formatstring .= "│ %$alignstr${cutoff}s ";
$borderstring_t .= "┌─" . ('─' x $cutoff) . '─';
+ $borderstring_h .= "╞═" . ('═' x $cutoff) . '═';
$borderstring_m .= "├─" . ('─' x $cutoff) . '─';
$borderstring_b .= "└─" . ('─' x $cutoff) . '─';
} else {
$formatstring .= "| %$alignstr${cutoff}s ";
$borderstring_m .= "+-" . ('-' x $cutoff) . '-';
+ $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
}
} elsif ($i == ($column_count - 1)) {
if ($utf8) {
$formatstring .= "│ %$alignstr${cutoff}s │";
$borderstring_t .= "┬─" . ('─' x $cutoff) . "─┐";
+ $borderstring_h .= "╪═" . ('═' x $cutoff) . '═╡';
$borderstring_m .= "┼─" . ('─' x $cutoff) . "─┤";
$borderstring_b .= "┴─" . ('─' x $cutoff) . "─┘";
} else {
$formatstring .= "| %$alignstr${cutoff}s |";
$borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
+ $borderstring_h .= "+=" . ('=' x $cutoff) . "=+";
}
} else {
if ($utf8) {
$formatstring .= "│ %$alignstr${cutoff}s ";
$borderstring_t .= "┬─" . ('─' x $cutoff) . '─';
+ $borderstring_h .= "╪═" . ('═' x $cutoff) . '═';
$borderstring_m .= "┼─" . ('─' x $cutoff) . '─';
$borderstring_b .= "┴─" . ('─' x $cutoff) . '─';
} else {
$formatstring .= "| %$alignstr${cutoff}s ";
$borderstring_m .= "+-" . ('-' x $cutoff) . '-';
+ $borderstring_h .= "+=" . ('=' x $cutoff) . '=';
}
}
} else {
@@ -313,15 +322,22 @@ sub print_text_table {
$writeln->($borderstring_t) if $border;
+my $borderstring_sep;
if ($header) {
my $text = sprintf $formatstring, map { $colopts->{$_}->{title} }
@$props_to_print;
$writeln->($text);
+ $borderstring_sep = $borderstring_h;
+} else {
+ $borderstring_sep = $borderstring_m;
}
for (my $i = 0; $i < scalar(@$tabledata); $i++) {
my $coldata = $tabledata->[$i];
- $writeln->($borderstring_m) if $border && ($i != 0 || $header);
+ if ($border && ($i != 0 || $header)) {
+ $writeln->($borderstring_sep);
+ $borderstring_sep = $borderstring_m;
+ }
for (my $i = 0; $i < $coldata->{height}; $i++) {
--
2.20.1
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] kronosnet : PMTUd fixes merged today
Hi, On 8/21/19 11:38 AM, Alexandre DERUMIER wrote: > kronosnet team have just merged the big pull request with pmtud fixes. > > https://github.com/kronosnet/kronosnet/pull/245 > > > Hope I'll solve proxmox users problem. > (I personnality don't have any issue since months) Yes, it's also included in the 1.11 release, tagged just a few hours ago. I'm in process of updating to it, our kronosnet build is just a bit of a mess, in terms of easy "updateabillity", so I'll change it to submodule first, as I really do not want to deal with tar source balls anymore... ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] kronosnet : PMTUd fixes merged today
Hi, kronosnet team have just merged the big pull request with pmtud fixes. https://github.com/kronosnet/kronosnet/pull/245 Hope I'll solve proxmox users problem. (I personnality don't have any issue since months) ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] [PATCH manager] gui: qemu: fix min/max memory checks
On 8/20/19 2:50 PM, Dominik Csapak wrote:
> we need to set the minvalue for the memoryfield when setting the
> 'mininum memory', otherwise it is possible in the wizard to set
> a higher minimum than maximum value
>
> Signed-off-by: Dominik Csapak
> ---
> www/manager6/qemu/MemoryEdit.js | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js
> index 4c4d1815..ab578bef 100644
> --- a/www/manager6/qemu/MemoryEdit.js
> +++ b/www/manager6/qemu/MemoryEdit.js
> @@ -67,9 +67,11 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
> allowBlank: false,
> listeners: {
> change: function(f, value) {
> - var memory = me.down('field[name=memory]').getValue();
> + var memory = me.down('field[name=memory]');
> var shares = me.down('field[name=shares]');
> - shares.setDisabled(value === memory);
> + shares.setDisabled(value === memory.getValue());
> + memory.setMinValue(value);
> + memory.validate();
> }
> }
> },
>
With this I cannot use the spin-down trigger/button in the memory field
if it's the same (or less) as the minimum value, that worked before -
with correct behavior (both, memory and minimum got decreased).
I'd like to keep this behavior, IMO it's nicer UX, as it's really strange
and seems like a bug if the "advanced" mode is off and thus the minimum
field isn't even visible.
SO, the correct fix would IMO be:
8<
diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js
index 4c4d1815..d1284716 100644
--- a/www/manager6/qemu/MemoryEdit.js
+++ b/www/manager6/qemu/MemoryEdit.js
@@ -60,6 +60,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
xtype: 'pveMemoryField',
name: 'balloon',
minValue: 1,
+ maxValue: 512,
step: 32,
fieldLabel: gettext('Minimum memory') + ' (MiB)',
hotplug: me.hotplug,
--
This ensures the default maxValue is initially correct, after that
the memory change handler does the rest. What do you think?
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] proxmox6 : vhost_net experimental_zcopytx=1 bug?
>>I do not really see the connection, though... O.o >>Could also be an issue with our systemd related code, or with systemd's >>scope handling (yet again).. for the user having this stack trace, Aug 17 11:45:26 server kernel: Call Trace: Aug 17 11:45:26 server kernel: __schedule+0x2d4/0x870 Aug 17 11:45:26 server kernel: ? wait_for_completion+0xc2/0x140 Aug 17 11:45:26 server kernel: ? wake_up_q+0x80/0x80 Aug 17 11:45:26 server kernel: schedule+0x2c/0x70 Aug 17 11:45:26 server kernel: vhost_net_ubuf_put_and_wait+0x60/0x90 [vhost_net] Aug 17 11:45:26 server kernel: ? wait_woken+0x80/0x80 Aug 17 11:45:26 server kernel: vhost_net_ioctl+0x5fe/0xa50 [vhost_net] Aug 17 11:45:26 server kernel: ? send_signal+0x3e/0x80 Aug 17 11:45:26 server kernel: do_vfs_ioctl+0xa9/0x640 Aug 17 11:45:26 server kernel: ksys_ioctl+0x67/0x90 Aug 17 11:45:26 server kernel: __x64_sys_ioctl+0x1a/0x20 Aug 17 11:45:26 server kernel: do_syscall_64+0x5a/0x110 Aug 17 11:45:26 server kernel: entry_SYSCALL_64_after_hwframe+0x44/0xa9 Aug 17 11:45:26 server kernel: RIP: 0033:0x7f03ce3bc427 Aug 17 11:45:26 server kernel: Code: Bad RIP value. they was a similar bug in kernel 4.14 (with same stack trace host_net_ubuf_put_and_wait) https://bugzilla.redhat.com/show_bug.cgi?id=1494974 (mainly at vm shutdown, but I think the user have problem when he's trying to shutdown, then start again) At this time it was because of a kernel patch "Date: Thu Aug 3 16:29:38 2017 -0400 sock: skb_copy_ubufs support for compound pages Refine skb_copy_ubufs to support compound pages. With upcoming TCP zerocopy sendmsg, such fragments may appear. The existing code replaces each page one for one. Splitting each compound page into an independent number of regular pages can result in exceeding limit MAX_SKB_FRAGS if data is not exactly page aligned. Instead, fill all destination pages but the last to PAGE_SIZE. Split the existing alloc + copy loop into separate stages: 1. compute bytelength and minimum number of pages to store this. 2. allocate 3. copy, filling each page except the last to PAGE_SIZE bytes 4. update skb frag array" This was fixed, but maybe they are a new regression in recent kernel ? - Mail original - De: "Wolfgang Bumiller" À: "aderumier" Cc: "pve-devel" Envoyé: Mercredi 21 Août 2019 09:31:04 Objet: Re: [pve-devel] proxmox6 : vhost_net experimental_zcopytx=1 bug? On Tue, Aug 20, 2019 at 11:32:57AM +0200, Alexandre DERUMIER wrote: > Hi, > > Some users have reported vm start timeout on proxmox6 > > https://forum.proxmox.com/threads/vm-doesnt-start-proxmox-6-timeout-waiting-on-systemd.56218/ > > > and for at least 2 of them, > > the vhost_net module option experimental_zcopytx=0 have fixed it. I do not really see the connection, though... O.o Could also be an issue with our systemd related code, or with systemd's scope handling (yet again)... > It was enable by default since 2012, so maybe regression somewhere. (also > redhat disable it by default) > > > It seem than in kernel 5.1, the value has been rollback to 0 > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.2.9&id=9d28094f3cf3b315e784f04ba617de8c8d8978fa > > > Not sure if this patch could be backported in proxmox 5.0 kernel ? Makes sense IMO. After all it's an upstream decision made due to known issues. ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] proxmox6 : vhost_net experimental_zcopytx=1 bug?
Hi, On 8/21/19 9:31 AM, Wolfgang Bumiller wrote: > On Tue, Aug 20, 2019 at 11:32:57AM +0200, Alexandre DERUMIER wrote: >> Hi, >> >> Some users have reported vm start timeout on proxmox6 >> >> https://forum.proxmox.com/threads/vm-doesnt-start-proxmox-6-timeout-waiting-on-systemd.56218/ >> >> and for at least 2 of them, >> >> the vhost_net module option experimental_zcopytx=0 have fixed it. > > I do not really see the connection, though... O.o > Could also be an issue with our systemd related code, or with systemd's > scope handling (yet again)... let's really hope that that's not the case, the error seems definitively like some other sort of issue. > >> It was enable by default since 2012, so maybe regression somewhere. (also >> redhat disable it by default) >> >> >> It seem than in kernel 5.1, the value has been rollback to 0 >> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.2.9&id=9d28094f3cf3b315e784f04ba617de8c8d8978fa >> >> >> Not sure if this patch could be backported in proxmox 5.0 kernel ? > > Makes sense IMO. After all it's an upstream decision made due to known issues. > made sense to me to, so done, will only be released in the kernel after the next one, bumped just yesterday and this went under my radar.. :/ ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] applied: [PATCH kernel] backport vhost_net: disable zerocopy by default
It seems to make general problems[0], and upstream changed the default back to 0 again[1] (was enabled long ago, ca. 2012). [0]: https://pve.proxmox.com/pipermail/pve-devel/2019-August/038571.html [1]: https://git.kernel.org/torvalds/c/098eadce3c622c07b328d0a43dda379b38cf7c5e Signed-off-by: Thomas Lamprecht --- ...host_net-disable-zerocopy-by-default.patch | 40 +++ 1 file changed, 40 insertions(+) create mode 100644 patches/kernel/0007-vhost_net-disable-zerocopy-by-default.patch diff --git a/patches/kernel/0007-vhost_net-disable-zerocopy-by-default.patch b/patches/kernel/0007-vhost_net-disable-zerocopy-by-default.patch new file mode 100644 index 000..e384d6a --- /dev/null +++ b/patches/kernel/0007-vhost_net-disable-zerocopy-by-default.patch @@ -0,0 +1,40 @@ +From Mon Sep 17 00:00:00 2001 +From: Jason Wang +Date: Mon, 17 Jun 2019 05:20:54 -0400 +Subject: [PATCH] vhost_net: disable zerocopy by default + +[ Upstream commit 098eadce3c622c07b328d0a43dda379b38cf7c5e ] + +Vhost_net was known to suffer from HOL[1] issues which is not easy to +fix. Several downstream disable the feature by default. What's more, +the datapath was split and datacopy path got the support of batching +and XDP support recently which makes it faster than zerocopy part for +small packets transmission. + +It looks to me that disable zerocopy by default is more +appropriate. It cold be enabled by default again in the future if we +fix the above issues. + +[1] https://patchwork.kernel.org/patch/3787671/ + +Signed-off-by: Jason Wang +Acked-by: Michael S. Tsirkin +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/vhost/net.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c +index 2d9df786a9d3..21e0805e5e60 100644 +--- a/drivers/vhost/net.c b/drivers/vhost/net.c +@@ -36,7 +36,7 @@ + + #include "vhost.h" + +-static int experimental_zcopytx = 1; ++static int experimental_zcopytx = 0; + module_param(experimental_zcopytx, int, 0444); + MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;" + " 1 -Enable; 0 - Disable"); -- 2.20.1 ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] proxmox6 : vhost_net experimental_zcopytx=1 bug?
On Tue, Aug 20, 2019 at 11:32:57AM +0200, Alexandre DERUMIER wrote: > Hi, > > Some users have reported vm start timeout on proxmox6 > > https://forum.proxmox.com/threads/vm-doesnt-start-proxmox-6-timeout-waiting-on-systemd.56218/ > > and for at least 2 of them, > > the vhost_net module option experimental_zcopytx=0 have fixed it. I do not really see the connection, though... O.o Could also be an issue with our systemd related code, or with systemd's scope handling (yet again)... > It was enable by default since 2012, so maybe regression somewhere. (also > redhat disable it by default) > > > It seem than in kernel 5.1, the value has been rollback to 0 > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.2.9&id=9d28094f3cf3b315e784f04ba617de8c8d8978fa > > > Not sure if this patch could be backported in proxmox 5.0 kernel ? Makes sense IMO. After all it's an upstream decision made due to known issues. ___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
