Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp7466328ybp; Wed, 16 Oct 2019 09:04:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqwOw3/xOsJ+Q6ZsuButlwWjn9/ZfOapKZhCUIpAbFrzudGZsAZtv6PNKq5z2T0XDYktvANf X-Received: by 2002:a17:906:70c7:: with SMTP id g7mr41913786ejk.9.1571241875186; Wed, 16 Oct 2019 09:04:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571241875; cv=none; d=google.com; s=arc-20160816; b=0Utl0Jeb8uZdon0B1bVt+TC8afUpUOrIqdIOawyAZWApnL/jrQsZfgyGVcmV93xs0Q TqHtf4Vpbdb/Um8E58Fw2tP/Xc6UTNQu1j2MWlaNd1ejmt++ClJZ+KEqhXyk8fmioU+N PAYfng1PH072ptfMb8QFMmkvnALJ+phLYsmPxtNnOaxX3wQYdXtR/BEhT4MMjbuXbCfi OAhM3dwCjLhNCe3dSYqabHxndJp0LqbscFZGfHFFiBZBCoj/USPeEWwpeHc569rhN4AD M5dSzp5yNvsmI0CACjHAycQeXsd5MA8iNB2TfRskM2Q1+1ilvnKfVP1x2NH8EDpF0SHU i4DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:references:cc:to:from:subject; bh=fH1W1Mtypb5f+oLEF+vjzNl2bNrB87dLkwAe1c4iEFI=; b=kLmLvPa5IjJDemdqynY/ZYY9hS3IBt7YPWyRypOu/umgTBvSw/oNmSdpq3k1yFkIV1 uxzWJpRJfWalP4/CfWkhGihwHbSdnWVhcMlTWrYTYLEWR7ZxWQvzT3l/Y5Gf7a6EQL45 hB12X11T3AHPVrfRQWtvrgmBL8Gorp8NKp7/9P7IxR0YtSAq6lZu1RIhar20OR8mxiWi v6m/RslEqAXCK8CgJOY946nRnUVtazKruA+zgP6K8B0Mdu2qd2ODbmL2cc6c6ed//SKs 2How7lLassSdU4qqzqo8U75SVfdOWP7dA+fzZAXG3jLwiEsWWj2JboJ1jZzNEq9BOuvp dnCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k6si17977236edb.235.2019.10.16.09.04.12; Wed, 16 Oct 2019 09:04:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393531AbfJPNNO (ORCPT + 99 others); Wed, 16 Oct 2019 09:13:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45958 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390087AbfJPNNM (ORCPT ); Wed, 16 Oct 2019 09:13:12 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D51EEA3CD92; Wed, 16 Oct 2019 13:13:11 +0000 (UTC) Received: from [10.3.116.74] (ovpn-116-74.phx2.redhat.com [10.3.116.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3647560127; Wed, 16 Oct 2019 13:13:11 +0000 (UTC) Subject: Re: [PATCH] ipmi: Don't allow device module unload when in use From: tony camuso To: minyard@acm.org Cc: openipmi-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org, Corey Minyard References: <20191014134141.GA25427@t560> <20191014154632.11103-1-minyard@acm.org> <40e26052-3ccb-684a-540f-61ff47077690@redhat.com> Message-ID: <321ed6cb-929c-462f-2459-9caf67be224e@redhat.com> Date: Wed, 16 Oct 2019 09:13:10 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <40e26052-3ccb-684a-540f-61ff47077690@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Wed, 16 Oct 2019 13:13:11 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/16/19 8:18 AM, tony camuso wrote: > On 10/14/19 11:46 AM, minyard@acm.org wrote: >> From: Corey Minyard >> >> If something has the IPMI driver open, don't allow the device >> module to be unloaded.  Before it would unload and the user would >> get errors on use. >> >> This change is made on user request, and it makes it consistent >> with the I2C driver, which has the same behavior. >> >> It does change things a little bit with respect to kernel users. >> If the ACPI or IPMI watchdog (or any other kernel user) has >> created a user, then the device module cannot be unloaded.  Before >> it could be unloaded, >> >> This does not affect hot-plug.  If the device goes away (it's on >> something removable that is removed or is hot-removed via sysfs) >> then it still behaves as it did before. >> >> Reported-by: tony camuso >> Signed-off-by: Corey Minyard >> --- >> Tony, here is a suggested change for this.  Can you look it over and >> see if it looks ok? >> >> Thanks, >> >> -corey >> >>   drivers/char/ipmi/ipmi_msghandler.c | 23 ++++++++++++++++------- >>   include/linux/ipmi_smi.h            | 12 ++++++++---- >>   2 files changed, 24 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c >> index 2aab80e19ae0..15680de18625 100644 >> --- a/drivers/char/ipmi/ipmi_msghandler.c >> +++ b/drivers/char/ipmi/ipmi_msghandler.c >> @@ -448,6 +448,8 @@ enum ipmi_stat_indexes { >>   #define IPMI_IPMB_NUM_SEQ    64 >>   struct ipmi_smi { >> +    struct module *owner; >> + >>       /* What interface number are we? */ >>       int intf_num; >> @@ -1220,6 +1222,11 @@ int ipmi_create_user(unsigned int          if_num, >>       if (rv) >>           goto out_kfree; >> +    if (!try_module_get(intf->owner)) { >> +        rv = -ENODEV; >> +        goto out_kfree; >> +    } >> + >>       /* Note that each existing user holds a refcount to the interface. */ >>       kref_get(&intf->refcount); >> @@ -1349,6 +1356,7 @@ static void _ipmi_destroy_user(struct ipmi_user *user) >>       } >>       kref_put(&intf->refcount, intf_free); >> +    module_put(intf->owner); >>   } >>   int ipmi_destroy_user(struct ipmi_user *user) >> @@ -2459,7 +2467,7 @@ static int __get_device_id(struct ipmi_smi *intf, struct bmc_device *bmc) >>    * been recently fetched, this will just use the cached data.  Otherwise >>    * it will run a new fetch. >>    * >> - * Except for the first time this is called (in ipmi_register_smi()), >> + * Except for the first time this is called (in ipmi_add_smi()), >>    * this will always return good data; >>    */ >>   static int __bmc_get_device_id(struct ipmi_smi *intf, struct bmc_device *bmc, >> @@ -3377,10 +3385,11 @@ static void redo_bmc_reg(struct work_struct *work) >>       kref_put(&intf->refcount, intf_free); >>   } >> -int ipmi_register_smi(const struct ipmi_smi_handlers *handlers, >> -              void               *send_info, >> -              struct device            *si_dev, >> -              unsigned char            slave_addr) >> +int ipmi_add_smi(struct module         *owner, >> +         const struct ipmi_smi_handlers *handlers, >> +         void               *send_info, >> +         struct device         *si_dev, >> +         unsigned char         slave_addr) >>   { >>       int              i, j; >>       int              rv; >> @@ -3406,7 +3415,7 @@ int ipmi_register_smi(const struct ipmi_smi_handlers *handlers, >>           return rv; >>       } >> - >> +    intf->owner = owner; >>       intf->bmc = &intf->tmp_bmc; >>       INIT_LIST_HEAD(&intf->bmc->intfs); >>       mutex_init(&intf->bmc->dyn_mutex); >> @@ -3514,7 +3523,7 @@ int ipmi_register_smi(const struct ipmi_smi_handlers *handlers, >>       return rv; >>   } >> -EXPORT_SYMBOL(ipmi_register_smi); >> +EXPORT_SYMBOL(ipmi_add_smi); >>   static void deliver_smi_err_response(struct ipmi_smi *intf, >>                        struct ipmi_smi_msg *msg, >> diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h >> index 4dc66157d872..deec18b8944a 100644 >> --- a/include/linux/ipmi_smi.h >> +++ b/include/linux/ipmi_smi.h >> @@ -224,10 +224,14 @@ static inline int ipmi_demangle_device_id(uint8_t netfn, uint8_t cmd, >>    * is called, and the lower layer must get the interface from that >>    * call. >>    */ >> -int ipmi_register_smi(const struct ipmi_smi_handlers *handlers, >> -              void                     *send_info, >> -              struct device            *dev, >> -              unsigned char            slave_addr); >> +int ipmi_add_smi(struct module            *owner, >> +         const struct ipmi_smi_handlers *handlers, >> +         void                     *send_info, >> +         struct device            *dev, >> +         unsigned char            slave_addr); >> + >> +#define ipmi_register_smi(handlers, send_info, dev, slave_addr) \ >> +    ipmi_add_smi(THIS_MODULE, handlers, send_info, dev, slave_addr) >>   /* >>    * Remove a low-level interface from the IPMI driver.  This will >> > > Thanks, Corey. > > Regards, > Tony > And I meant to add that I will be testing this over the next couple days.