From mboxrd@z Thu Jan 1 00:00:00 1970 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 433CFCCA473 for ; Wed, 6 Jul 2022 19:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234251AbiGFTAY (ORCPT ); Wed, 6 Jul 2022 15:00:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233419AbiGFTAV (ORCPT ); Wed, 6 Jul 2022 15:00:21 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 265451EAD7; Wed, 6 Jul 2022 12:00:20 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id fd6so20422735edb.5; Wed, 06 Jul 2022 12:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3RfVCr1wdSbFKycunLeMa8Y0qn5/ZBGG09gYaTJHdUo=; b=ECRHYRwEMx+7ksygXlOsm0PdRH2A1Vxdrajxe+R3gPhDIKgy69LhPi3Md26Vromf86 o5f8uWcC/V2Yv1qY4fXs6K+2sipe8SDdi19SJ0wYubx39Ehiy3jc6/UBBVA48lbLJtSS 48VxRIehzxEjJba0a3WN9HmZbU7QycVYHLfNAoJjuYzataU/Ux5E468kb1IMaTL4IJJa qmhyjkCwteF8n8cXjkzPkjdOfH5saP8jBK+esgc7Kb7/G57vgo0nKcoGEKZN340xZ5FL jJCTQV67O8UuYdXNqEmpeDxS2MCaV/zOLM38Ph9o9P7Y8ZZjJuijj0tY6kpKI653RBDG 9nrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3RfVCr1wdSbFKycunLeMa8Y0qn5/ZBGG09gYaTJHdUo=; b=6R1t6EXG//YyigHX2Cy6YALFeBlOEQYJ/C0Q0YeSH3mt5PNvruwB8kZ8GtVr76+yCd Qui7HmlPrHH7G4T45cjA7MchFAABMqXSExQIiQZhse0FzvymHivVooB55ijRdiNwi34V NXTZ2MNW+Rn7efMqk6m0Y0ZZaOknliSPlk9RDcfJAorRCYbzaZidMESlQnU5WWMz8Yac 6vMKsd+Cb9hKqWUsg96uteuzN5Je8aEP2D02qujhV879N+9QA5ij7UibOohDbsL2OsZE wcWEaxs3BhWZJQ54+PtODW2Q7VHrxp1vO49cVSFPFbMKrZnS0E5bpWEgwAInMQC5W6Zn LtpQ== X-Gm-Message-State: AJIora+jKm0AK8o/4xsuAjwCJSrUQzbDqTl5hJUTyFh0j1ssP0rs+sIW yrX+cH4wgGM6QAs/WlOdl/vZU7CF5d5oFihu X-Google-Smtp-Source: AGRyM1udtywZFL4f9QmrjH+QPS4+UQMRWUY2sLmoXtUk5XwDzIkNlerdLHrvhXpIp4ezHmcHOARHQA== X-Received: by 2002:a05:6402:104a:b0:435:c7cd:11dc with SMTP id e10-20020a056402104a00b00435c7cd11dcmr56691431edu.335.1657134018349; Wed, 06 Jul 2022 12:00:18 -0700 (PDT) Received: from localhost.localdomain (87-168-253.netrunf.cytanet.com.cy. [87.228.168.253]) by smtp.gmail.com with ESMTPSA id g17-20020aa7c591000000b0043a4a5813d8sm8188879edq.2.2022.07.06.12.00.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 12:00:17 -0700 (PDT) From: Maxim Devaev To: linux-usb@vger.kernel.org Cc: stern@rowland.harvard.edu, balbi@kernel.org, gregkh@linuxfoundation.org, caihuoqing@baidu.com, mdevaev@gmail.com, linux-kernel@vger.kernel.org Subject: [PATCH v2] usb: gadget: f_mass_storage: forced_eject attribute Date: Wed, 6 Jul 2022 21:59:37 +0300 Message-Id: <20220706185936.24692-1-mdevaev@gmail.com> X-Mailer: git-send-email 2.37.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It allows to reset prevent_medium_removal flag and "eject" the image. The patch is a completely alternative implementation of the previously proposed [1], the idea of which was born after the mentioned discussion. Signed-off-by: Maxim Devaev Link: https://lore.kernel.org/lkml/20220406092445.215288-1-mdevaev@gmail.com [1] --- .../testing/configfs-usb-gadget-mass-storage | 6 +++++ Documentation/usb/gadget-testing.rst | 6 +++++ Documentation/usb/mass-storage.rst | 9 +++++++ drivers/usb/gadget/function/f_mass_storage.c | 25 +++++++++++++++++++ drivers/usb/gadget/function/storage_common.c | 11 ++++++++ drivers/usb/gadget/function/storage_common.h | 2 ++ 6 files changed, 59 insertions(+) diff --git a/Documentation/ABI/testing/configfs-usb-gadget-mass-storage b/Documentation/ABI/testing/configfs-usb-gadget-mass-storage index c86b63a7bb43..87859ef40579 100644 --- a/Documentation/ABI/testing/configfs-usb-gadget-mass-storage +++ b/Documentation/ABI/testing/configfs-usb-gadget-mass-storage @@ -32,4 +32,10 @@ Description: being a CD-ROM. nofua Flag specifying that FUA flag in SCSI WRITE(10,12) + forced_eject This write-only flag only makes sence when + the function is active. It causes a forced + detaching of the backing file from the LUN, + regardless of whether the host has allowed it. + Any non-zero number of bytes written will + result in ejection. =========== ============================================== diff --git a/Documentation/usb/gadget-testing.rst b/Documentation/usb/gadget-testing.rst index c18113077889..1481173d8719 100644 --- a/Documentation/usb/gadget-testing.rst +++ b/Documentation/usb/gadget-testing.rst @@ -333,6 +333,12 @@ In each lun directory there are the following attribute files: being a CD-ROM. nofua Flag specifying that FUA flag in SCSI WRITE(10,12) + forced_eject This write-only flag only makes sence when + the function is active. It causes a forced + detaching of the backing file from the LUN, + regardless of whether the host has allowed it. + Any non-zero number of bytes written will + result in ejection. =============== ============================================== Testing the MASS STORAGE function diff --git a/Documentation/usb/mass-storage.rst b/Documentation/usb/mass-storage.rst index d181b47c3cb6..f72e59237bce 100644 --- a/Documentation/usb/mass-storage.rst +++ b/Documentation/usb/mass-storage.rst @@ -181,6 +181,15 @@ sysfs entries Reflects the state of nofua flag for given logical unit. It can be read and written. + - forced_eject + + When written into, it allows to detach the backing file for given + logical unit, regardless of whether the host has allowed it. + The content doesn't matter, any non-zero number of bytes will + lead the forced eject. + + Can not be read. + Other then those, as usual, the values of module parameters can be read from /sys/module/g_mass_storage/parameters/* files. diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c index 6ad669dde41c..00cac2a38178 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -2520,10 +2520,21 @@ static ssize_t file_store(struct device *dev, struct device_attribute *attr, return fsg_store_file(curlun, filesem, buf, count); } +static ssize_t forced_eject_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct fsg_lun *curlun = fsg_lun_from_dev(dev); + struct rw_semaphore *filesem = dev_get_drvdata(dev); + + return fsg_store_forced_eject(curlun, filesem, buf, count); +} + static DEVICE_ATTR_RW(nofua); /* mode wil be set in fsg_lun_attr_is_visible() */ static DEVICE_ATTR(ro, 0, ro_show, ro_store); static DEVICE_ATTR(file, 0, file_show, file_store); +static DEVICE_ATTR_WO(forced_eject); /****************************** FSG COMMON ******************************/ @@ -2677,6 +2688,7 @@ static struct attribute *fsg_lun_dev_attrs[] = { &dev_attr_ro.attr, &dev_attr_file.attr, &dev_attr_nofua.attr, + &dev_attr_forced_eject.attr, NULL }; @@ -3090,6 +3102,18 @@ static ssize_t fsg_lun_opts_inquiry_string_store(struct config_item *item, CONFIGFS_ATTR(fsg_lun_opts_, inquiry_string); +static ssize_t fsg_lun_opts_forced_eject_store(struct config_item *item, + const char *page, size_t len) +{ + struct fsg_lun_opts *opts = to_fsg_lun_opts(item); + struct fsg_opts *fsg_opts = to_fsg_opts(opts->group.cg_item.ci_parent); + + return fsg_store_forced_eject(opts->lun, &fsg_opts->common->filesem, + page, len); +} + +CONFIGFS_ATTR_WO(fsg_lun_opts_, forced_eject); + static struct configfs_attribute *fsg_lun_attrs[] = { &fsg_lun_opts_attr_file, &fsg_lun_opts_attr_ro, @@ -3097,6 +3121,7 @@ static struct configfs_attribute *fsg_lun_attrs[] = { &fsg_lun_opts_attr_cdrom, &fsg_lun_opts_attr_nofua, &fsg_lun_opts_attr_inquiry_string, + &fsg_lun_opts_attr_forced_eject, NULL, }; diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c index b859a158a414..8cd95bf7831f 100644 --- a/drivers/usb/gadget/function/storage_common.c +++ b/drivers/usb/gadget/function/storage_common.c @@ -519,4 +519,15 @@ ssize_t fsg_store_inquiry_string(struct fsg_lun *curlun, const char *buf, } EXPORT_SYMBOL_GPL(fsg_store_inquiry_string); +ssize_t fsg_store_forced_eject(struct fsg_lun *curlun, struct rw_semaphore *filesem, + const char *buf, size_t count) +{ + int ret; + + curlun->prevent_medium_removal = 0; + ret = fsg_store_file(curlun, filesem, "", 0); + return ret < 0 ? ret : count; +} +EXPORT_SYMBOL_GPL(fsg_store_forced_eject); + MODULE_LICENSE("GPL"); diff --git a/drivers/usb/gadget/function/storage_common.h b/drivers/usb/gadget/function/storage_common.h index bdeb1e233fc9..0a544a82cbf8 100644 --- a/drivers/usb/gadget/function/storage_common.h +++ b/drivers/usb/gadget/function/storage_common.h @@ -219,5 +219,7 @@ ssize_t fsg_store_removable(struct fsg_lun *curlun, const char *buf, size_t count); ssize_t fsg_store_inquiry_string(struct fsg_lun *curlun, const char *buf, size_t count); +ssize_t fsg_store_forced_eject(struct fsg_lun *curlun, struct rw_semaphore *filesem, + const char *buf, size_t count); #endif /* USB_STORAGE_COMMON_H */ -- 2.37.0