From patchwork Fri Feb 17 17:25:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Bauer X-Patchwork-Id: 9580439 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 198C06043A for ; Fri, 17 Feb 2017 17:35:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A2C928755 for ; Fri, 17 Feb 2017 17:35:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF69628760; Fri, 17 Feb 2017 17:35:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 497C828758 for ; Fri, 17 Feb 2017 17:35:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934113AbdBQRfb (ORCPT ); Fri, 17 Feb 2017 12:35:31 -0500 Received: from mga07.intel.com ([134.134.136.100]:61954 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934096AbdBQRfb (ORCPT ); Fri, 17 Feb 2017 12:35:31 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP; 17 Feb 2017 09:35:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,172,1484035200"; d="scan'208";a="48322732" Received: from sbauer-z170x-ud5.lm.intel.com ([10.232.112.157]) by orsmga002.jf.intel.com with ESMTP; 17 Feb 2017 09:35:30 -0800 From: Scott Bauer To: linux-block@vger.kernel.org Cc: axboe@fb.com, keith.busch@intel.com, jonathan.derrick@intel.com, hch@lst.de, Scott Bauer Subject: [PATCH] block/sed-opal: Introduce free_opal_dev to free the structure and clean up state Date: Fri, 17 Feb 2017 10:25:13 -0700 Message-Id: <1487352313-3539-1-git-send-email-scott.bauer@intel.com> X-Mailer: git-send-email 2.7.4 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Before we free the opal structure we need to clean up any saved locking ranges that the user had told us to unlock from a suspend. Also fixup a list_for_each to list_for_each_safe in the save path. Signed-off-by: Scott Bauer Reviewed-by: Christoph Hellwig --- block/sed-opal.c | 33 +++++++++++++++++++++++++++++++-- include/linux/sed-opal.h | 5 +++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/block/sed-opal.c b/block/sed-opal.c index d1c52ba..1be5c72 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -988,9 +988,9 @@ static int start_opal_session_cont(struct opal_dev *dev) static void add_suspend_info(struct opal_dev *dev, struct opal_suspend_data *sus) { - struct opal_suspend_data *iter; + struct opal_suspend_data *iter, *next; - list_for_each_entry(iter, &dev->unlk_lst, node) { + list_for_each_entry_safe(iter, next, &dev->unlk_lst, node) { if (iter->lr == sus->lr) { list_del(&iter->node); kfree(iter); @@ -2014,6 +2014,28 @@ static int check_opal_support(struct opal_dev *dev) return ret; } +static void clean_opal_dev(struct opal_dev *dev) +{ + + struct opal_suspend_data *suspend, *next; + + mutex_lock(&dev->dev_lock); + list_for_each_entry_safe(suspend, next, &dev->unlk_lst, node) { + list_del(&suspend->node); + kfree(suspend); + } + mutex_unlock(&dev->dev_lock); +} + +void free_opal_dev(struct opal_dev *dev) +{ + if (!dev) + return; + clean_opal_dev(dev); + kfree(dev); +} +EXPORT_SYMBOL(free_opal_dev); + struct opal_dev *init_opal_dev(void *data, sec_send_recv *send_recv) { struct opal_dev *dev; @@ -2193,6 +2215,13 @@ static int opal_reverttper(struct opal_dev *dev, struct opal_key *opal) dev->func_data[1] = opal; ret = next(dev); mutex_unlock(&dev->dev_lock); + + /* If we succesfully reverted lets clean + * any saved locking ranges. + */ + if (!ret) + clean_opal_dev(dev); + return ret; } diff --git a/include/linux/sed-opal.h b/include/linux/sed-opal.h index deee23d..04b124f 100644 --- a/include/linux/sed-opal.h +++ b/include/linux/sed-opal.h @@ -27,6 +27,7 @@ typedef int (sec_send_recv)(void *data, u16 spsp, u8 secp, void *buffer, size_t len, bool send); #ifdef CONFIG_BLK_SED_OPAL +void free_opal_dev(struct opal_dev *dev); bool opal_unlock_from_suspend(struct opal_dev *dev); struct opal_dev *init_opal_dev(void *data, sec_send_recv *send_recv); int sed_ioctl(struct opal_dev *dev, unsigned int cmd, void __user *ioctl_ptr); @@ -51,6 +52,10 @@ static inline bool is_sed_ioctl(unsigned int cmd) return false; } #else +static inline void free_opal_dev(struct opal_dev *dev) +{ +} + static inline bool is_sed_ioctl(unsigned int cmd) { return false;