From patchwork Mon Mar 27 13:24:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 13189346 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 030ECC76195 for ; Mon, 27 Mar 2023 13:27:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232442AbjC0N1Y (ORCPT ); Mon, 27 Mar 2023 09:27:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232491AbjC0N1D (ORCPT ); Mon, 27 Mar 2023 09:27:03 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80A3059FD for ; Mon, 27 Mar 2023 06:25:50 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B7FFE21F4A; Mon, 27 Mar 2023 13:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1679923514; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jlwV1NAdVqUf/jBBkwg4iHp6LFT18ZbI02dmD/e4ee8=; b=BC76h1YO/Lx9UotSSagrwY/zkLT05ELFW3DFjF6NUFUsQmkd7Ixtgw0qK9v79sz0xdN03f CvgFcq0/uZxWjZ57ql96Xvec+M0d8IB/G0iSTs8crZjVJhKtRJb2nKeR0zzVjshXiLxXGz HMRX5cBM6cpQ7uOnnNzCuh5De8FdjYs= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6869513329; Mon, 27 Mar 2023 13:25:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CNDYFzqZIWTobgAAMHmgww (envelope-from ); Mon, 27 Mar 2023 13:25:14 +0000 From: mwilck@suse.com To: Douglas Gilbert , Hannes Reinecke Cc: "Martin K. Petersen" , James Bottomley , Franck Bui , dm-devel@redhat.com, linux-scsi@vger.kernel.org, Benjamin Marzinski , Martin Wilck Subject: [PATCH 3/3] udev: add 00-scsi-sg3_config.rules for user configuration Date: Mon, 27 Mar 2023 15:24:59 +0200 Message-Id: <20230327132459.29531-4-mwilck@suse.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230327132459.29531-1-mwilck@suse.com> References: <20230327132459.29531-1-mwilck@suse.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Martin Wilck Add a dedicated early rules file to simplify configuring the behavior of the SCSI udev rules shipped with sg3_utils. Signed-off-by: Martin Wilck --- Makefile.am | 1 + scripts/00-scsi-sg3_config.rules | 23 +++++++++++++++++++++++ scripts/55-scsi-sg3_id.rules | 6 ++---- scripts/58-scsi-sg3_symlink.rules | 6 +----- 4 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 scripts/00-scsi-sg3_config.rules diff --git a/Makefile.am b/Makefile.am index 240acbe..ce7ee71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,6 +123,7 @@ EXTRA_DIST += \ inhex/z_act_query.hex EXTRA_DIST += \ + scripts/00-scsi-sg3_config.rules \ scripts/40-usb-blacklist.rules \ scripts/54-before-scsi-sg3_id.rules \ scripts/55-scsi-sg3_id.rules \ diff --git a/scripts/00-scsi-sg3_config.rules b/scripts/00-scsi-sg3_config.rules new file mode 100644 index 0000000..43d6f16 --- /dev/null +++ b/scripts/00-scsi-sg3_config.rules @@ -0,0 +1,23 @@ +# Configuration for SCSI device identification + +# To apply changes, copy this file to /etc/udev/rules.d and edit to suit your needs. +# DO NOT EDIT THIS FILE IN PLACE! + +ACTION!="add|change", GOTO="scsi_identify_end" +SUBSYSTEMS=="scsi", GOTO="scsi_identify" +GOTO="scsi_identify_end" +LABEL="scsi_identify" + +# Set ID_SCSI_INQUIRY to 0 to force running "sg_inq" for obtaining device IDs +# from SCSI VPDs, rather than looking them up in sysfs (not recommended). +ENV{ID_SCSI_INQUIRY}="" + +# Set enabled unreliable sources for setting the ID_SERIAL property. +# See 55-scsi-sg3_id.rules for detailed documentation. +ENV{.SCSI_ID_SERIAL_SRC}="T" + +# Set enabled unreliable sources for creating additional /dev/disk/by-id/scsi* symlinks. +# See 58-scsi-sg3_symlink.rules for detailed documentation. +ENV{.SCSI_SYMLINK_SRC}="" + +LABEL="scsi_identify_end" diff --git a/scripts/55-scsi-sg3_id.rules b/scripts/55-scsi-sg3_id.rules index 33b2ad3..5e9732d 100644 --- a/scripts/55-scsi-sg3_id.rules +++ b/scripts/55-scsi-sg3_id.rules @@ -36,7 +36,7 @@ KERNEL!="sd*[!0-9]|sr*", GOTO="sg3_utils_id_end" # have scanned for VPD pages, so if the vpd page attribute is not # present it is not supported (or deemed unsafe to access). # Hence we can skip the call to sg_inq and avoid I/O altogether. -# Set 'ID_SCSI_INQUIRY=0' in an earlier udev rule if the kernel +# Set ENV{ID_SCSI_INQUIRY}="0" in 00-scsi-sg3_config.rules if the kernel # fails to scan VPD pages correctly; the rules will then fall # back to calling sg_vpd directly. LABEL="scsi_inquiry" @@ -119,9 +119,7 @@ ENV{ID_SCSI_SERIAL}!="?*", ENV{SCSI_IDENT_SERIAL}=="?*", ENV{ID_SCSI_SERIAL}="$e # Be aware that multipath actually needs unique identifiers, though. # Using ambiguous identifiers for ID_SERIAL can cause data corruption with multipath. # -# To configure this, add an early rule (e.g. /etc/udev/rules.d/00-scsi-serial.rules) e.g. like this: -# ACTION!="remove", KERNEL=="sd*|sr*|st*|nst*|cciss*", ENV{.SCSI_ID_SERIAL_SRC}="TLVS" -# +# To configure the behavior, set ENV{.SCSI_ID_SERIAL_SRC} in 00-scsi-sg3_config.rules. # By default, only T10 vendor ID is allowed. ENV{.SCSI_ID_SERIAL_SRC}!="?*", ENV{.SCSI_ID_SERIAL_SRC}="T" diff --git a/scripts/58-scsi-sg3_symlink.rules b/scripts/58-scsi-sg3_symlink.rules index 99fdc23..dfe8f77 100644 --- a/scripts/58-scsi-sg3_symlink.rules +++ b/scripts/58-scsi-sg3_symlink.rules @@ -23,12 +23,8 @@ ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="sg3_utils_symlink_en # This only needs to be changed if some subsystem, like dm-crypt or LVM, depends on the # additional symlinks being present for device identification. # -# To configure the behavior, add an early rule (e.g. /etc/udev/rules.d/00-scsi-serial.rules) -# like this: -# ACTION!="remove", KERNEL=="sd*|sr*|st*|nst*|cciss*", ENV{.SCSI_SYMLINK_SRC}="TS" -# +# To configure the behavior, set ENV{.SCSI_SYMLINK_SRC} in 00-scsi-sg3_config.rules. # By default, no possibly ambiguous additional symlinks will be created. -ENV{.SCSI_SYMLINK_SRC}!="?*", ENV{.SCSI_SYMLINK_SRC}="" # 0: vpd page 0x80 identifier ENV{.SCSI_SYMLINK_SRC}=="*S*", ENV{SCSI_IDENT_SERIAL}=="?*", ENV{DEVTYPE}=="disk", \