From patchwork Wed Aug 23 03:50:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 136639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp311060vqm; Wed, 23 Aug 2023 01:14:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF3rhL8oaKhNJ2i+/IiBgpt/ZcV8EoTvKLUpaxYCYVrOh9ICcHVja6v3ezt2pmaxMywzLF9 X-Received: by 2002:a17:906:76d2:b0:9a1:7919:d3d5 with SMTP id q18-20020a17090676d200b009a17919d3d5mr9219174ejn.43.1692778496873; Wed, 23 Aug 2023 01:14:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692778496; cv=none; d=google.com; s=arc-20160816; b=j8uehTqLq2qQWFP2x056lPN0galq8dvpYpNDkyT5tziRyN4zb+3OA3KDiO3oMGAuxh yfcNv6UliCGlUKI3yFhHTV8E8IH0wEhcbciHgwEqANAac/j/X9y068+sm10gQ3TTyvXg wPkMX9LKt2LGyjXZnxuAvRXnrO0xpw/g8K/rScgqouf4b6EZ9/Z9T5w/5C1NN28jE7F7 cUyu9Z64t/F/x3FnSS95YzvUxl3ekr071pT1oTP5oaDqghaOoeiT8ym1Kljd9lDLVRpP yCmVcGrGo+wJr5BkQAS8T0z+5F8l5FHMvVBkChjlNHl4zxxrFXjmqHJHtLZw/CC0QdDd VurA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=8ni3FOorY1wcIobbNR4684LVgK89hlVg1JP/0uEEaWg=; fh=8juKlDjB6jlrpYOud2KQawp/WDsAx/bzbWNUiSmVwZw=; b=sCkCBSLdi9qJ/PGwv9K1NjZ3KZeGRSsTK63AqiwDE/oyZvvE3Xv6Zre2haxs7aELJ4 TA+Rn0FpVbB2OIA8i3X7YXrZypMRCrMsKG8+zTVyWzWeH96+RqaXxKWR64UDN/fKmpsd w9OGz/8iMa7NAPNZ99Zpv+G5jJ2pqIoaSVg303Jo8CBBBALXfeizVFy2VETEjeTG2Vqh vqIHgG/T42EHPmz+mP1OnCeYnHrGOxvBfi8hK6Ix419lg/xn3fKSwmob8vwM6oXlCQtM eICdyCTtxDhQyBkhyYERoS77f9I3Hd8YhOhjb9pe5Bc6B0FppV9jR6tpxLgsN/XfV5rk gb9w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gg22-20020a170906e29600b009a1b857e3b1si2321823ejb.304.2023.08.23.01.14.29; Wed, 23 Aug 2023 01:14:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232490AbjHWDum (ORCPT + 99 others); Tue, 22 Aug 2023 23:50:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230243AbjHWDul (ORCPT ); Tue, 22 Aug 2023 23:50:41 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D864B184 for ; Tue, 22 Aug 2023 20:50:38 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RVsbT6tbCzNn3m; Wed, 23 Aug 2023 11:47:01 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 23 Aug 2023 11:50:36 +0800 From: Jinjie Ruan To: , Arnd Bergmann , Greg Kroah-Hartman , Pavan Savoy CC: Subject: [PATCH -next] misc: st_core: Do not call kfree_skb() under spin_lock_irqsave() Date: Wed, 23 Aug 2023 11:50:20 +0800 Message-ID: <20230823035020.1281892-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775006905108089403 X-GMAIL-MSGID: 1775006905108089403 It is not allowed to call kfree_skb() from hardware interrupt context or with hardware interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under spin_lock_irqsave(). Compile tested only. Fixes: 53618cc1e51e ("Staging: sources for ST core") Signed-off-by: Jinjie Ruan --- drivers/misc/ti-st/st_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c index c1a134bd8ba7..b878431553ab 100644 --- a/drivers/misc/ti-st/st_core.c +++ b/drivers/misc/ti-st/st_core.c @@ -15,6 +15,7 @@ #include #include +#include /* * function pointer pointing to either, @@ -429,7 +430,7 @@ static void st_int_enqueue(struct st_data_s *st_gdata, struct sk_buff *skb) case ST_LL_AWAKE_TO_ASLEEP: pr_err("ST LL is illegal state(%ld)," "purging received skb.", st_ll_getstate(st_gdata)); - kfree_skb(skb); + dev_kfree_skb_irq(skb); break; case ST_LL_ASLEEP: skb_queue_tail(&st_gdata->tx_waitq, skb); @@ -438,7 +439,7 @@ static void st_int_enqueue(struct st_data_s *st_gdata, struct sk_buff *skb) default: pr_err("ST LL is illegal state(%ld)," "purging received skb.", st_ll_getstate(st_gdata)); - kfree_skb(skb); + dev_kfree_skb_irq(skb); break; } @@ -492,7 +493,7 @@ void st_tx_wakeup(struct st_data_s *st_data) spin_unlock_irqrestore(&st_data->lock, flags); break; } - kfree_skb(skb); + dev_kfree_skb_irq(skb); spin_unlock_irqrestore(&st_data->lock, flags); } /* if wake-up is set in another context- restart sending */