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 0615476471 for ; Thu, 15 Jul 2021 13:07:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C9FAB22647 for ; Thu, 15 Jul 2021 13:07:22 +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 BEB822263D for ; Thu, 15 Jul 2021 13:07:21 +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 896EE41A37 for ; Thu, 15 Jul 2021 13:07:21 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 15 Jul 2021 13:07:20 +0200 Message-Id: <20210715110720.3036773-1-d.csapak@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.594 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] tape: changer: sg_pt: make extra scsi request for dvcid 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: Thu, 15 Jul 2021 11:07:53 -0000 some libraries cannot handle a request with volume tags and DVCID set at the same time. So we make 2 separate requests and merge them, since we want to keep the vendor/model/serial data. to not overcomplicate the code, add another special type to ElementType Signed-off-by: Dominik Csapak --- src/tape/changer/sg_pt_changer.rs | 54 ++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/src/tape/changer/sg_pt_changer.rs b/src/tape/changer/sg_pt_changer.rs index 66da140d..f4154ced 100644 --- a/src/tape/changer/sg_pt_changer.rs +++ b/src/tape/changer/sg_pt_changer.rs @@ -265,13 +265,34 @@ pub fn transfer_medium( Ok(()) } -#[repr(u8)] #[derive(Clone, Copy)] enum ElementType { - MediumTransport = 1, - Storage = 2, - ImportExport = 3, - DataTransfer = 4, + MediumTransport, + Storage, + ImportExport, + DataTransfer, + DataTransferWithDVCID, +} + +impl ElementType { + fn byte1(&self) -> u8 { + let volume_tag_bit = 1u8 << 4; + match *self { + ElementType::MediumTransport => volume_tag_bit | 1, + ElementType::Storage => volume_tag_bit | 2, + ElementType::ImportExport => volume_tag_bit | 3, + ElementType::DataTransfer => volume_tag_bit | 4, + // some changers cannot get voltag + dvcid at the same time + ElementType::DataTransferWithDVCID => 4, + } + } + + fn byte6(&self) -> u8 { + match *self { + ElementType::DataTransferWithDVCID => 0b001, // Mixed=0,CurData=0,DVCID=1 + _ => 0b000, // Mixed=0,CurData=0,DVCID=0 + } + } } fn scsi_read_element_status_cdb( @@ -283,15 +304,11 @@ fn scsi_read_element_status_cdb( let mut cmd = Vec::new(); cmd.push(0xB8); // READ ELEMENT STATUS (B8h) - cmd.push(1u8<<4 | (element_type as u8)); // volume tags and given type + cmd.push(element_type.byte1()); cmd.extend(&start_element_address.to_be_bytes()); cmd.extend(&number_of_elements.to_be_bytes()); - let byte6 = match element_type { - ElementType::DataTransfer => 0b001, // Mixed=0,CurData=0,DVCID=1 - _ => 0b000, // Mixed=0,CurData=0,DVCID=0 - }; - cmd.push(byte6); + cmd.push(element_type.byte6()); cmd.extend(&allocation_len.to_be_bytes()[1..4]); cmd.push(0); cmd.push(0); @@ -385,6 +402,21 @@ pub fn read_element_status(file: &mut F) -> Result let page = get_element(&inquiry, &mut sg_raw, ElementType::DataTransfer, allocation_len, false)?; drives.extend(page.drives); + // get the serial + vendor + model, + // some changer require this to be an extra scsi command + let page = get_element(&inquiry, &mut sg_raw, ElementType::DataTransferWithDVCID, allocation_len, false)?; + // should be in same order and same count, but be on the safe side. + // there should not be too many drives normally + for drive in drives.iter_mut() { + for drive2 in &page.drives { + if drive2.element_address == drive.element_address { + drive.vendor = drive2.vendor.clone(); + drive.model = drive2.model.clone(); + drive.drive_serial_number = drive2.drive_serial_number.clone(); + } + } + } + let page = get_element(&inquiry, &mut sg_raw, ElementType::MediumTransport, allocation_len, false)?; transports.extend(page.transports); -- 2.30.2