Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1979568pxb; Fri, 5 Mar 2021 04:40:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJ7oVNpCHgBa5YG9M3OAmZ+E3AxhVQDfJzcHVAEuJ+Yok3rsBflBnY8f8Lxs7pL2CgIhh+ X-Received: by 2002:a50:e0c3:: with SMTP id j3mr9204748edl.32.1614948003449; Fri, 05 Mar 2021 04:40:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614948003; cv=none; d=google.com; s=arc-20160816; b=y8pRL7vsfNkBibrCjHpEilfEsTdRXXIz2SXGqOULSNdIA1T/FcDK7DDFwLYr+IIwcB mlpMmgqAQhfzongednpBThm8vKyQLaDEhC9uDPFoOa5YP198A1gjV1LzlFcX6M0neXpa VD8LwYUs4hAOq6BqDsfbBvGJ/lOctXSHDA5iDRoNE8wqleqG86M2QMr9Xi/suJyxayNK YiUR8cgP96naIblqcyoyMDu2Pd8TYgqUj5H55tjswuBd2FybGNwIActNaKC1iRfI7o1c FOUMu7a+vHSkLx/WcG8sMwczJ8Vmmui0RWeS+VnIaprLSfA9M8yYdTAbpkgyqBK0VLCJ 7LIQ== 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=k7e/oYz/Ina5SCrB6BV81xJh1I85zkEhk5SOiEQF51w=; b=WzOQoYRc2ny43NFmYq1/RK60RwPv2RC/Lg6KhbU9cM/6JH/J1oaslDXN8X3hKCVLry K2ysrYgvS0DhhagwRuYwvb0ftBJMJbBc2dFAM4Vb9fkv11fvt+HogxKPLhCvC/HuzEz/ yPWXACo/4MSNbolO84fQQOba04kQtONHtlI4Pk9PabIiJRvlKA+Da8ezVxSl4qLKBS4t E2PuiwPB2wAnca4o7Of8PangWvyHzzwCFrDNLs4+OaPQEemY6ObBuTHyoL6G34ukQNe9 cZMLD/MLDc/jswAkLOlHBAeeFmZy+Rj7XTb72KhaYc8VnWMICPZwRcsCwPilN27tm9mP mYww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=f2GRwSsg; 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 e22si1511273edu.9.2021.03.05.04.39.40; Fri, 05 Mar 2021 04:40:03 -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=f2GRwSsg; 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 S231694AbhCEMiL (ORCPT + 99 others); Fri, 5 Mar 2021 07:38:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:50236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233065AbhCEMhJ (ORCPT ); Fri, 5 Mar 2021 07:37:09 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2DA3364FF0; Fri, 5 Mar 2021 12:37:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614947829; bh=UGpFb8kWs+NSp8ayi/sYFOJll/SqJS7XtVu4U2mrEoE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f2GRwSsgvFRUywfBELaGXOYyU0kzzF0WAySZYaJHa3ci8EX56IVBA1MdvFDUjtWr2 Cu2ipeUoTI0EojYQED7raHEhnazbUS37BI1g1up4d/4+DloZ1RtADJLag9c7FakKF6 2ItBXov+EC1T9ilTUjWrQh/hg/p0bNVPSex0UtiQ= 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 4.19 26/52] pktgen: fix misuse of BUG_ON() in pktgen_thread_worker() Date: Fri, 5 Mar 2021 13:21:57 +0100 Message-Id: <20210305120854.958842563@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305120853.659441428@linuxfoundation.org> References: <20210305120853.659441428@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 092fa3d75b32..3714cd9e3111 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -3471,7 +3471,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