Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1974850pxb; Fri, 5 Mar 2021 04:33:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWtyuhJ+pKwteHRciKYy8xN/iXRCJbVYy2XHsb3+w4De6NJH3xq/ihPvnkbaP99cuITmaj X-Received: by 2002:a50:9d8a:: with SMTP id w10mr8815601ede.39.1614947587908; Fri, 05 Mar 2021 04:33:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614947587; cv=none; d=google.com; s=arc-20160816; b=bOllek4FxgJSAlqHRMI2/+Vpe36VmWUiUus/mgOJVcpLm8xFOJAihVYWZ7iYs5JDos G9ukCHGLZErTEc4PkqhMrK8FiV68zaXz1u09zSfwEVFv7F+uCDg5eZ9g/zI3yrweuFrD EDl18J/vXdWS8q9GHBqK1Xwft+BUDQKA5rh9r99rbCV+H/CqhpR8gq3mI4Kuir3E2293 injrCLVv4ZGYzq/imQeYfnqTRD6My1SUzL8lcVcZ13cNKDifeWuwfPR+6PsrJJUVtYQX Xpa5Im3+GW7db9YSfSUc+HmNjVDsXg98KGCchBCrDLmTzLpxHltIUeBZEzDut89HnD22 wO7Q== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VQBSSlz2VxkyGLAFXOxMYmvmwd0Qn85NtKuOoVdPJzg=; b=vJ6SnsXzz6Ezr9+Z4gqnzeim58eT3Uo2gBGginpMOt40/b3iBpjUlxHlO5s27Mqf3z wJBCjLfS/emRdMI9NrxchYBRmo/WW9LO2kTN/7/TPa1SzfrA77p734d8aaMyUkjs1gUy z/tcnbgA5DIfWR92Ze5zfWuSFZigG9kGRUVN23tlDmPp3f7hPFuyBpd3RP8/xTXq/R74 EVveo0mV+W1/FoWElydSKTNjR3cDSfRgBOGoRiAKU2cFl9FpjaXkHlj69/fJnR0zybXt tw/DApOmFrZx5CbQQ8ark0qmImIGRovQNJgvAzkdfcErtK1dMI8TnTdf5gu1yhjmcgHH Ij9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=l91PGBHk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t18si1174530ejy.531.2021.03.05.04.32.45; Fri, 05 Mar 2021 04:33:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=l91PGBHk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232449AbhCEMby (ORCPT + 99 others); Fri, 5 Mar 2021 07:31:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:41564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231489AbhCEMbO (ORCPT ); Fri, 5 Mar 2021 07:31:14 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D2ECB6501A; Fri, 5 Mar 2021 12:31:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614947474; bh=jtmvNCMSLiFnha0mvyrxJiLQ8NGGtkXO/CgxslNA8RA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l91PGBHkTm24oZHT7AvhFM3VDV5+FIl08sgyKYvZuHILrwhnJnskzWRPLrehbZliJ Xzg0R6JVeQ79Tsi2FhMo1VAOWwA1keU9YgouYA/8RxX07I+d4WtKXOxekuAaxrQ7cK qRs8720qYfVhRJtqj9kUOzfxBpOGOO/U3n+GY40E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Di Zhu , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 048/102] pktgen: fix misuse of BUG_ON() in pktgen_thread_worker() Date: Fri, 5 Mar 2021 13:21:07 +0100 Message-Id: <20210305120905.658146241@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305120903.276489876@linuxfoundation.org> References: <20210305120903.276489876@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Di Zhu [ Upstream commit 275b1e88cabb34dbcbe99756b67e9939d34a99b6 ] pktgen create threads for all online cpus and bond these threads to relevant cpu repecivtily. when this thread firstly be woken up, it will compare cpu currently running with the cpu specified at the time of creation and if the two cpus are not equal, BUG_ON() will take effect causing panic on the system. Notice that these threads could be migrated to other cpus before start running because of the cpu hotplug after these threads have created. so the BUG_ON() used here seems unreasonable and we can replace it with WARN_ON() to just printf a warning other than panic the system. Signed-off-by: Di Zhu Link: https://lore.kernel.org/r/20210125124229.19334-1-zhudi21@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/pktgen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 105978604ffd..3fba429f1f57 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -3464,7 +3464,7 @@ static int pktgen_thread_worker(void *arg) struct pktgen_dev *pkt_dev = NULL; int cpu = t->cpu; - BUG_ON(smp_processor_id() != cpu); + WARN_ON(smp_processor_id() != cpu); init_waitqueue_head(&t->queue); complete(&t->start_done); -- 2.30.1