* [pve-devel] [PATCH container] fix #5907: ignore conflicting mount options for read-only mounts
@ 2024-11-25 13:09 Filip Schauer
2024-11-28 13:42 ` Fiona Ebner
2024-11-28 14:56 ` Daniel Kral
0 siblings, 2 replies; 3+ messages in thread
From: Filip Schauer @ 2024-11-25 13:09 UTC (permalink / raw)
To: pve-devel
When mounting volumes as read-only, certain mount options like
"discard", "lazytime", and "noatime" are either ignored or can cause the
mount to fail. For example, attempting to mount with "-t zfs" and
"-o ro,discard" leads to an error: filesystem cannot be mounted due to
invalid option 'discard'.
This commit ensures that only valid mount options, such as "nodev",
"noexec", and "nosuid", are applied to read-only mounts, avoiding
potential mount failures.
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
src/PVE/LXC.pm | 8 ++++++--
src/PVE/LXC/Config.pm | 6 ++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index e78e365..d01fafc 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -1865,11 +1865,16 @@ sub __mountpoint_mount {
die "unknown snapshot path for '$volid'" if !$storage && defined($snapname);
+ my $readonly = $mountpoint->{ro};
my $optlist = [];
if (my $mountopts = $mountpoint->{mountoptions}) {
my @opts = split(/;/, $mountpoint->{mountoptions});
- push @$optlist, grep { PVE::LXC::Config::is_valid_mount_option($_) } @opts;
+ if ($readonly || defined($snapname)) {
+ push @$optlist, grep { PVE::LXC::Config::is_valid_ro_mount_option($_) } @opts;
+ } else {
+ push @$optlist, grep { PVE::LXC::Config::is_valid_mount_option($_) } @opts;
+ }
}
my $acl = $mountpoint->{acl};
@@ -1880,7 +1885,6 @@ sub __mountpoint_mount {
}
my $optstring = join(',', @$optlist);
- my $readonly = $mountpoint->{ro};
my @extra_opts;
@extra_opts = ('-o', $optstring) if $optstring;
diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index 5cc37f7..0740e8c 100644
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -312,12 +312,18 @@ cfs_register_file('/lxc/', \&parse_pct_config, \&write_pct_config);
my $valid_mount_option_re = qr/(discard|lazytime|noatime|nodev|noexec|nosuid)/;
+my $valid_ro_mount_option_re = qr/(nodev|noexec|nosuid)/;
sub is_valid_mount_option {
my ($option) = @_;
return $option =~ $valid_mount_option_re;
}
+sub is_valid_ro_mount_option {
+ my ($option) = @_;
+ return $option =~ $valid_ro_mount_option_re;
+}
+
my $rootfs_desc = {
volume => {
type => 'string',
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [pve-devel] [PATCH container] fix #5907: ignore conflicting mount options for read-only mounts
2024-11-25 13:09 [pve-devel] [PATCH container] fix #5907: ignore conflicting mount options for read-only mounts Filip Schauer
@ 2024-11-28 13:42 ` Fiona Ebner
2024-11-28 14:56 ` Daniel Kral
1 sibling, 0 replies; 3+ messages in thread
From: Fiona Ebner @ 2024-11-28 13:42 UTC (permalink / raw)
To: Proxmox VE development discussion, Filip Schauer
Am 25.11.24 um 14:09 schrieb Filip Schauer:
> When mounting volumes as read-only, certain mount options like
> "discard", "lazytime", and "noatime" are either ignored or can cause the
> mount to fail. For example, attempting to mount with "-t zfs" and
> "-o ro,discard" leads to an error: filesystem cannot be mounted due to
> invalid option 'discard'.
>
Things I didn't want to know (but luckily doesn't apply for mountpoints
here ;)):
https://utcc.utoronto.ca/~cks/space/blog/linux/NFSReadonlyAtime
> This commit ensures that only valid mount options, such as "nodev",
> "noexec", and "nosuid", are applied to read-only mounts, avoiding
> potential mount failures.
>
> Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
> ---
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [pve-devel] [PATCH container] fix #5907: ignore conflicting mount options for read-only mounts
2024-11-25 13:09 [pve-devel] [PATCH container] fix #5907: ignore conflicting mount options for read-only mounts Filip Schauer
2024-11-28 13:42 ` Fiona Ebner
@ 2024-11-28 14:56 ` Daniel Kral
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Kral @ 2024-11-28 14:56 UTC (permalink / raw)
To: Proxmox VE development discussion, Filip Schauer
On 11/25/24 14:09, Filip Schauer wrote:
> When mounting volumes as read-only, certain mount options like
> "discard", "lazytime", and "noatime" are either ignored or can cause the
> mount to fail. For example, attempting to mount with "-t zfs" and
> "-o ro,discard" leads to an error: filesystem cannot be mounted due to
> invalid option 'discard'.
>
> This commit ensures that only valid mount options, such as "nodev",
> "noexec", and "nosuid", are applied to read-only mounts, avoiding
> potential mount failures.
>
> Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
I could reproduce the issue when backing up a container with at least
one root disk or mountpoint, which has at least the mount option
"discard" applied, and backing it up to a PBS instance (to stay close to
the bug report I used v3.2.10-1 for this), while all images were stored
on a ZFS pool.
After applying the patch, the container could be backed up to the same
PBS instance without any trouble.
Reviewed-by: Daniel Kral <d.kral@proxmox.com>
Tested-by: Daniel Kral <d.kral@proxmox.com>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-28 14:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-25 13:09 [pve-devel] [PATCH container] fix #5907: ignore conflicting mount options for read-only mounts Filip Schauer
2024-11-28 13:42 ` Fiona Ebner
2024-11-28 14:56 ` Daniel Kral
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox