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 6428775544 for ; Mon, 12 Jul 2021 12:22:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5742913F3A for ; Mon, 12 Jul 2021 12:22:11 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9BBC313F1E for ; Mon, 12 Jul 2021 12:22:10 +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 6D71D40F96 for ; Mon, 12 Jul 2021 12:22:10 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 12 Jul 2021 12:22:09 +0200 Message-Id: <20210712102209.3061802-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712102209.3061802-1-d.csapak@proxmox.com> References: <20210712102209.3061802-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.621 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 Subject: [pbs-devel] [PATCH proxmox-backup 2/2] tape: changer: sg_pt: correctly loop over MODE SENSE (B8h) 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: Mon, 12 Jul 2021 10:22:11 -0000 and limit to 1000 elements per request. (Because some changers limit that request with the options we set) instead of checking if the data len was equal to the allocation_len for getting more data, we count the returned elements and compare that with the number we requested Signed-off-by: Dominik Csapak --- src/tape/changer/sg_pt_changer.rs | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/tape/changer/sg_pt_changer.rs b/src/tape/changer/sg_pt_changer.rs index 29b04ad6..da114074 100644 --- a/src/tape/changer/sg_pt_changer.rs +++ b/src/tape/changer/sg_pt_changer.rs @@ -279,6 +279,7 @@ pub fn transfer_medium( fn scsi_read_element_status_cdb( start_element_address: u16, + number_of_elements: u16, allocation_len: u32, ) -> Vec { @@ -287,7 +288,6 @@ fn scsi_read_element_status_cdb( cmd.push(1u8<<4); // report all types and volume tags cmd.extend(&start_element_address.to_be_bytes()); - let number_of_elements: u16 = 0xffff; cmd.extend(&number_of_elements.to_be_bytes()); cmd.push(0b001); // Mixed=0,CurData=0,DVCID=1 cmd.extend(&allocation_len.to_be_bytes()[1..4]); @@ -315,6 +315,7 @@ pub fn read_element_status(file: &mut F) -> Result sg_raw.set_timeout(SCSI_CHANGER_DEFAULT_TIMEOUT); let mut start_element_address = 0; + let number_of_elements: u16 = 1000; // some changers limit the query let mut drives = Vec::new(); let mut storage_slots = Vec::new(); @@ -324,12 +325,17 @@ pub fn read_element_status(file: &mut F) -> Result let mut retry = true; loop { - let cmd = scsi_read_element_status_cdb(start_element_address, allocation_len); + let cmd = scsi_read_element_status_cdb(start_element_address, number_of_elements, allocation_len); let data = execute_scsi_command(&mut sg_raw, &cmd, "read element status (B8h)", retry)?; let page = decode_element_status_page(&inquiry, &data, start_element_address)?; + let returned_number_of_elements = page.transports.len() + + page.drives.len() + + page.storage_slots.len() + + page.import_export_slots.len(); + retry = false; // only retry the first command transports.extend(page.transports); @@ -337,19 +343,16 @@ pub fn read_element_status(file: &mut F) -> Result storage_slots.extend(page.storage_slots); import_export_slots.extend(page.import_export_slots); - if data.len() < (allocation_len as usize) { - break; - } - if let Some(last_element_address) = page.last_element_address { - if last_element_address >= start_element_address { - start_element_address = last_element_address + 1; - } else { + if last_element_address < start_element_address { bail!("got strange element address"); } - } else { - break; + if returned_number_of_elements >= (number_of_elements as usize) { + start_element_address = last_element_address + 1; + continue; // we possibly have to read additional elements + } } + break; } if (setup.transport_element_count as usize) != transports.len() { -- 2.30.2