Return-path: Received: from mail-ve0-f178.google.com ([209.85.128.178]:47052 "EHLO mail-ve0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932105Ab3LIH1S (ORCPT ); Mon, 9 Dec 2013 02:27:18 -0500 MIME-Version: 1.0 In-Reply-To: <878uvw1t49.fsf@mina86.com> References: <1385744870-10164-1-git-send-email-mpn@google.com> <20131201004715.11125.qmail@stuge.se> <878uvw1t49.fsf@mina86.com> Date: Mon, 9 Dec 2013 07:27:17 +0000 Message-ID: (sfid-20131209_082730_813705_F22C2E34) Subject: Re: [PATCH] net: wirelesse: wcn36xx: pull allocation outside of critical section From: Eugene Krasnikov To: Michal Nazarewicz Cc: Peter Stuge , "John W. Linville" , ath9k-devel , linux-wireless , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: hal_ind_mutex suppose to protect msg_ind but with this patch allocation will be done outside the critical section. On Sat, Dec 7, 2013 at 5:13 PM, Michal Nazarewicz wrote: > > This also simplifies flow-controll as there is now only one if > condition with a single branch. > --- > drivers/net/wireless/ath/wcn36xx/smd.c | 28 +++++++++++++++------------- > 1 file changed, 15 insertions(+), 13 deletions(-) > > On Thu, Dec 05 2013, Eugene Krasnikov wrote: >> I think code will look neater if error case will be handled in "else" >> statement something like: [...] > > How about the following: > > diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c > index 823631c..ebab2db 100644 > --- a/drivers/net/wireless/ath/wcn36xx/smd.c > +++ b/drivers/net/wireless/ath/wcn36xx/smd.c > @@ -2056,22 +2056,24 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len) > case WCN36XX_HAL_OTA_TX_COMPL_IND: > case WCN36XX_HAL_MISSED_BEACON_IND: > case WCN36XX_HAL_DELETE_STA_CONTEXT_IND: > - mutex_lock(&wcn->hal_ind_mutex); > msg_ind = kmalloc(sizeof(*msg_ind), GFP_KERNEL); > - if (msg_ind) { > - msg_ind->msg_len = len; > - msg_ind->msg = kmalloc(len, GFP_KERNEL); > - memcpy(msg_ind->msg, buf, len); > - list_add_tail(&msg_ind->list, &wcn->hal_ind_queue); > - queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work); > - wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n"); > + if (!msg_ind) { > + /* > + * FIXME: Do something smarter then just > + * printing an error. > + */ > + wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n", > + msg_header->msg_type); > + break; > } > + mutex_lock(&wcn->hal_ind_mutex); > + msg_ind->msg_len = len; > + msg_ind->msg = kmalloc(len, GFP_KERNEL); > + memcpy(msg_ind->msg, buf, len); > + list_add_tail(&msg_ind->list, &wcn->hal_ind_queue); > + queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work); > + wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n"); > mutex_unlock(&wcn->hal_ind_mutex); > - if (msg_ind) > - break; > - /* FIXME: Do something smarter then just printing an error. */ > - wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n", > - msg_header->msg_type); > break; > default: > wcn36xx_err("SMD_EVENT (%d) not supported\n", > -- > 1.8.4 > -- Best regards, Eugene