From patchwork Thu Jul 7 17:09:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Devaev X-Patchwork-Id: 588872 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 199D0C433EF for ; Thu, 7 Jul 2022 17:09:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235477AbiGGRJu (ORCPT ); Thu, 7 Jul 2022 13:09:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233524AbiGGRJt (ORCPT ); Thu, 7 Jul 2022 13:09:49 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CC2B57239; Thu, 7 Jul 2022 10:09:48 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id r21so4748796eju.0; Thu, 07 Jul 2022 10:09:48 -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=4PiuAHK5hc6wiViAsafcwzKOl/+28axpWnQuV+W6bSY=; b=R+U+LgvlC2DPdXrWyDrC27k1E0zZGp1DoEsW58PaWvbGO8tkjhY1/j6LROY8gNy8zt a9LdbxMRCMFwTyUqp2HvoXhiQO4MUiE7PMeXquHiHeWVbbcOrdoXuU8f+KPBP93lV2w5 xdgD5kSrciVxQ6kD+/FNOfHjcSve9pWYeuQb8LJzogmN7f58nBs6DgyR1g6fyDR+JrOT ftLwa/K1ZYVxdQqmMO1WTlNrcHlQREW4DMuNF96FXl6sIwMJknMuumm0SqqEnao0qr9R LjdeZnmOj59AB1+PsdB2swcO7FbA0Ccj9FPUCIn5P9g86GX8ztjyLAQOXY1Aw5oKF/b2 gHRg== 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=4PiuAHK5hc6wiViAsafcwzKOl/+28axpWnQuV+W6bSY=; b=DzVd1kBX8TnzwC4BKOmLOdmSIakOdSy4BD8QxQGP4zxOZy1mOxQhyWAV6p2ZlRNCIP e35XDOFbl4sMt16E319OHfn6PmI/oqSr/VsncvnYJheb+EJtuYRfmEYG2m9sccdXk/Ky 1ihRHLE4ekVIqqtr8a0NZ/8XOP205jHbcFDuxy8omJpWC5kwauhJ6L3OiUS1uCfYc/pm dNfC0HqB+EMbW9Ka6gRJNfMz3hVjnQLaFtLXFJnPsMQBu+dpjKFNe9UGdK3oGSEtRKCq Ioon6iJG3fG2xC8lN0wodP6MWdpfwxPeXb8DuaH+XzI0R8mp6laYMD0+z9rbz0gj/OfJ wJrA== X-Gm-Message-State: AJIora9jE2Ilg68La0XpOjCouYm5XmmDqvDRgFiMWuamaEW0fxGsf45B Cn0XaK+DeyzLkOWIPvZCpp+pXnKKdZO3gSBh X-Google-Smtp-Source: AGRyM1uffv2SHgBY4GuYp500zohvhDYKBCosyRTS5qFmh4mqUTgs1H2tSXf2qTohD+LEd9O+4LD3+g== X-Received: by 2002:a17:906:5055:b0:6ff:1dfb:1e2c with SMTP id e21-20020a170906505500b006ff1dfb1e2cmr30464247ejk.200.1657213786390; Thu, 07 Jul 2022 10:09:46 -0700 (PDT) Received: from localhost.localdomain (87-168-253.netrunf.cytanet.com.cy. [87.228.168.253]) by smtp.gmail.com with ESMTPSA id 3-20020a170906310300b0072a430d2abdsm11735055ejx.91.2022.07.07.10.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 10:09:45 -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 v3] usb: gadget: f_mass_storage: forced_eject attribute Date: Thu, 7 Jul 2022 20:09:13 +0300 Message-Id: <20220707170912.70505-1-mdevaev@gmail.com> X-Mailer: git-send-email 2.37.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@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..d899adb57e81 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 file is useful only when + the function is active. It causes the backing + file to be forcibly detached 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..15624c4fe633 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 file is useful only when + the function is active. It causes the backing + file to be forcibly detached 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..f399ec631599 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 causes the backing file to be forcibly + detached from the LUN, regardless of whether the host has allowed + it. The content doesn't matter, any non-zero number of bytes + written will result in ejection. + + 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 */