From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 12C7EB39D for ; Wed, 6 Apr 2022 14:51:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 10D8A2B3B8 for ; Wed, 6 Apr 2022 14:51:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 161082B3AF for ; Wed, 6 Apr 2022 14:51:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E2E7041DFB; Wed, 6 Apr 2022 14:51:22 +0200 (CEST) From: Wolfgang Bumiller To: pbs-devel@lists.proxmox.com Date: Wed, 6 Apr 2022 14:51:12 +0200 Message-Id: <20220406125112.37327-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.344 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH backup] use BufReader/Writer for Files passed to serde_json::from_reader/writer X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Apr 2022 12:51:24 -0000 As serde_json will otherwise read files 1 byte at a time. Writing is a bit better, but syntacitcal elements (quotes, braces, commas) still often show up as single write syscalls, so use BufWriter there as well. Note that while we do store the file in the resulting objects, we do not need to keep the buffered read/writers as we always `seek` to the beginning on further file operations. Reported-by: Mark Schouten Link: https://lists.proxmox.com/pipermail/pbs-devel/2022-April/004909.html Signed-off-by: Wolfgang Bumiller --- @Mark: Hope the Reported-by tag is fine with you. proxmox-file-restore/src/block_driver_qemu.rs | 8 ++++---- src/config/tfa.rs | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/proxmox-file-restore/src/block_driver_qemu.rs b/proxmox-file-restore/src/block_driver_qemu.rs index 0176f7f1..ac61f917 100644 --- a/proxmox-file-restore/src/block_driver_qemu.rs +++ b/proxmox-file-restore/src/block_driver_qemu.rs @@ -1,7 +1,7 @@ //! Block file access via a small QEMU restore VM using the PBS block driver in QEMU use std::collections::HashMap; use std::fs::{File, OpenOptions}; -use std::io::{prelude::*, SeekFrom}; +use std::io::{prelude::*, BufReader, BufWriter, SeekFrom}; use anyhow::{bail, Error}; use futures::FutureExt; @@ -51,7 +51,7 @@ impl VMStateMap { fn load() -> Result { let mut file = Self::open_file_raw(true)?; lock_file(&mut file, true, Some(std::time::Duration::from_secs(120)))?; - let map = serde_json::from_reader(&file).unwrap_or_default(); + let map = serde_json::from_reader(BufReader::new(&mut file)).unwrap_or_default(); Ok(Self { map, file }) } @@ -59,14 +59,14 @@ impl VMStateMap { /// shell auto-completion, for anything requiring consistency use load() ! fn load_read_only() -> Result, Error> { let file = Self::open_file_raw(false)?; - Ok(serde_json::from_reader(&file).unwrap_or_default()) + Ok(serde_json::from_reader(BufReader::new(file)).unwrap_or_default()) } /// Write back a potentially modified state map, consuming the held lock fn write(mut self) -> Result<(), Error> { self.file.seek(SeekFrom::Start(0))?; self.file.set_len(0)?; - serde_json::to_writer(self.file, &self.map)?; + serde_json::to_writer(BufWriter::new(&mut self.file), &self.map)?; // drop ourselves including file lock Ok(()) diff --git a/src/config/tfa.rs b/src/config/tfa.rs index 790e0960..7120553c 100644 --- a/src/config/tfa.rs +++ b/src/config/tfa.rs @@ -40,7 +40,7 @@ pub fn read() -> Result { Err(err) => return Err(err.into()), }; - Ok(serde_json::from_reader(file)?) + Ok(serde_json::from_reader(io::BufReader::new(file))?) } pub(crate) fn webauthn_config_digest(config: &WebauthnConfig) -> Result<[u8; 32], Error> { @@ -116,7 +116,7 @@ impl TfaUserChallengeData { fn save(mut self) -> Result<(), Error> { self.rewind()?; - serde_json::to_writer(&mut &self.lock, &self.inner).map_err(|err| { + serde_json::to_writer(io::BufWriter::new(&mut &self.lock), &self.inner).map_err(|err| { format_err!("failed to update challenge file {:?}: {}", self.path, err) })?; @@ -293,7 +293,7 @@ impl proxmox_tfa::api::OpenUserChallengeData for UserAccess { proxmox_sys::fs::lock_file(&mut file, true, None)?; - let inner = serde_json::from_reader(&mut file).map_err(|err| { + let inner = serde_json::from_reader(io::BufReader::new(&mut file)).map_err(|err| { format_err!("failed to read challenge data for user {}: {}", userid, err) })?; -- 2.30.2