From patchwork Sat Nov 26 08:27:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 26196 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4529688wrr; Sat, 26 Nov 2022 01:00:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4o5UeC0LlmMKX8JvInc2LwUCX6doE1DchRf67iDR5mbLHg3nSDLopsvJKFBZhUu7E6BAHS X-Received: by 2002:a17:90a:b382:b0:213:1fcb:3ce1 with SMTP id e2-20020a17090ab38200b002131fcb3ce1mr44005167pjr.58.1669453239702; Sat, 26 Nov 2022 01:00:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669453239; cv=none; d=google.com; s=arc-20160816; b=d0NOu8qEpeAhUEJAsM7nUmvD4RPx0sS4UGTxPE6Usn7NyjzSbIcxXk7bf1Ky9B1xWO u1mRPs+AyKu60hH/r7VGkUKOEoPjFXAHcybeCKR4viJzUmqHzQepOZRUFERoiiiBGgHj G+ZvIw2Fbs7ZBZGafz5w1RaWo5EpBX3P78zOIO6Td+4pS1ojoOAUX+EM3R7655KYVvrm sImmnanwgTbv2kU3Wf4Fxn8qCVGFgASZ0eZj6S+B9qYKCoV+qDrQjwYgqNQ01J7/wA9U /dxIvjlyDbG8cE+YUek/KTY4FlhGp6XRuIkG1iECg9vvvHaQQOaC9086loqSUwHEudzx ChEQ== 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:to:from; bh=2JtBDGa4Oobp0TDt9cYECRlgMeCoj9wLCXPnDc/Rr8Y=; b=IW0JiOvIeyO1agfVbsqPraFGdC9DfBS6UxqbnfVrbCV9WnXL1e36BqY1GE5JZCK2zf 7adRlStemEngLNNNwJWWX95Uxz+EWmYTUUAjV2KcxNVlIEkaIsBjIfwp355WDgxt63ev u6u4yFkOBzd+xeEdcfqvTJ0S0f1c3RLmYHm9H1qlv7M1veodV6RG8d3CDS8qDXpikJaB K8cXs61EWdnZmrbP8ApZvcrOPrzr/7efZ+wSwCUbTH7YEX11rXMIzpjwsfskPC+Fao/H 4RY/bxkZnQX49is2AIz02sIIvVqGJ8AGe3Nw47IlOF5viE1RhTC01kainu5LmZjr/+M7 5MMA== 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 n3-20020a638f03000000b004771126e2f7si6857703pgd.142.2022.11.26.01.00.11; Sat, 26 Nov 2022 01:00:39 -0800 (PST) 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 S229581AbiKZI3O (ORCPT + 99 others); Sat, 26 Nov 2022 03:29:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbiKZI3N (ORCPT ); Sat, 26 Nov 2022 03:29:13 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66A2C2A251 for ; Sat, 26 Nov 2022 00:29:12 -0800 (PST) Received: from dggpemm500024.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NK4d016XLz15MtS for ; Sat, 26 Nov 2022 16:28:36 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500024.china.huawei.com (7.185.36.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 26 Nov 2022 16:29:10 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 26 Nov 2022 16:29:10 +0800 From: Yang Yingliang To: , , Subject: [PATCH] genirq/irqdesc: fix WARNING in irq_sysfs_del() Date: Sat, 26 Nov 2022 16:27:16 +0800 Message-ID: <20221126082716.438271-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750548599947671551?= X-GMAIL-MSGID: =?utf-8?q?1750548599947671551?= I got the lots of WARNING report when doing fault injection test: kernfs: can not remove 'chip_name', no directory WARNING: CPU: 0 PID: 253 at fs/kernfs/dir.c:1616 kernfs_remove_by_name_ns+0xce/0xe0 RIP: 0010:kernfs_remove_by_name_ns+0xce/0xe0 Call Trace: remove_files.isra.1+0x3f/0xb0 sysfs_remove_group+0x68/0xe0 sysfs_remove_groups+0x41/0x70 __kobject_del+0x45/0xc0 kobject_del+0x29/0x40 free_desc+0x42/0x70 irq_free_descs+0x5e/0x90 kernfs: can not remove 'hwirq', no directory WARNING: CPU: 0 PID: 253 at fs/kernfs/dir.c:1616 kernfs_remove_by_name_ns+0xce/0xe0 RIP: 0010:kernfs_remove_by_name_ns+0xce/0xe0 Call Trace: remove_files.isra.1+0x3f/0xb0 sysfs_remove_group+0x68/0xe0 sysfs_remove_groups+0x41/0x70 __kobject_del+0x45/0xc0 kobject_del+0x29/0x40 free_desc+0x42/0x70 irq_free_descs+0x5e/0x90 If irq_sysfs_add() fails in alloc_descs(), the directory of interrupt informations is not added to sysfs, it causes the WARNINGs when removing the information files. Fix this by adding check kobj.state_in_sysfs in irq_sysfs_del(). Fixes: ecb3f394c5db ("genirq: Expose interrupt information through sysfs") Signed-off-by: Yang Yingliang --- kernel/irq/irqdesc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index a91f9001103c..e391f4195b87 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -303,7 +303,7 @@ static void irq_sysfs_del(struct irq_desc *desc) * kobject_del() complains about a object with no parent, so make * it conditional. */ - if (irq_kobj_base) + if (irq_kobj_base && desc->kobj.state_in_sysfs) kobject_del(&desc->kobj); }