Received: by 2002:ab2:7a55:0:b0:1f4:4a7d:290d with SMTP id u21csp95864lqp; Thu, 4 Apr 2024 08:00:48 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXjuE/jZcp3XZbrLw7hZwZb0ysuQt/7ZAYKMB9+GMJfQmEF/A/i4B0IhrLmO2d9Sw2ykUyNHqFNiwqm+x+5aN2uaV32tc+L6KtyUVhAjg== X-Google-Smtp-Source: AGHT+IH48eZwytdAYXyu5uuKf+iuUxWGuB4MadZABgCdu+NQ0UeszRpvOMHAT2joalZSRIjTjS/q X-Received: by 2002:a67:e219:0:b0:476:d846:d00c with SMTP id g25-20020a67e219000000b00476d846d00cmr2734430vsa.15.1712242848432; Thu, 04 Apr 2024 08:00:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712242848; cv=pass; d=google.com; s=arc-20160816; b=J2LjvXthmUxoFO3Ju+l6vbX+CaxLm24LjZDwRsZgOUKN7zH4xnigbSUlomcAMXEw9y XrkmGCVPih6b2aZGLcFOS39X5xRWrKtZxOMBGEj3cKgsCxFYSu42M9IZpfuZ8URGr4Tx Ncetiz7azc9ed4ro07NoGH7wqryr3pX63r2yZoK63oUoXaZdRpsjgTtgk79QZW6nRbQ0 pAQwFNsNPZUBzIEnF6+1p5SOR6X3+VwqGcViBthsGEGi5HKDI0RrFT0ITdz3QAJ9y7D+ siuM6m/2WKEU/EDJeS4XDQORpBJzw+XbUhGpEgy+hiJKBlByT6I0qqRwVdHyvbsHT73d 5VTA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=G8m6X0YutT7uWn1TO1PGQ+ufRs6DUh470J81GT16/S0=; fh=wIplP5x7oqtI4nDToCp2EHTukefLh8vyfgB6HAgFO1k=; b=VMKW6J/YDQHMxEz5Xv+AmiRVYUfKty38N3ll42zeAeU/dSgUA/XjKdrb0NnoNUztRT BeNaivVnysNJ+EMAKTGxYBr6j52t5a25DZd+qdBDmAxUV50rzkUaBNOVmfcY+r1oqLR/ 5Js3LI/uUy7IktBjCnGQIuBhwVKQQpUBAbYOzw1jkPJTjG3g16ZXuuMQ00P7Y7saXnp2 EV7brbaEC5RxTcgyOIEaDyXInyQ1YrNIBSvdvAVuBLZOYTX/jPh1uip3eU+6++EKdfEZ 82TpMZPzB4BbK8pE7nf2qBy1tCfP6BT7Ey/wSaqraHmCK+k4Rf03QgM1wdtbH+x4jdLS 5lfQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-131662-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-131662-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id i9-20020ab02489000000b007e3add68d36si825919uan.86.2024.04.04.08.00.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 08:00:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-131662-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-131662-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-131662-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2759B1C278F3 for ; Thu, 4 Apr 2024 15:00:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B924412A159; Thu, 4 Apr 2024 15:00:21 +0000 (UTC) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E6B684FC8; Thu, 4 Apr 2024 15:00:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712242821; cv=none; b=KOtc4m0F8zT++UxjFkJ9IJlrz4ACDiWCZ98CGpMyN6ntfUqEuzi2rfafICO+xgwqOdD6oYhTsty90znt7ibKH87vW3CsHB9EYGPJxsjE/xGiBSy38YgyR9YEkrirKMpnESJbc2RmhlgvkLalWWmKOIdWoc1oF+42wqkt6cOwdNY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712242821; c=relaxed/simple; bh=Ymi8vcGeV5U25n5hHY6p/NSyc58XMyU2LXdmqZKED6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RLawcU2A8v6b1Hv4vaW32Q4sbwBihdxWxmfCR2CBi3jF4TAVeTA1hwe6b9VRfmqU81Al1KMeVEiWIfWE/nJ1cR0YKwnV1TurPwSjglMTz+duMmZSxzZM3wiMKRKwQ/tGHVfzIqjfa15Xbn2II8Udga5ekZY4RP3FR0SA+3zCMHQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-56dc9955091so1217977a12.1; Thu, 04 Apr 2024 08:00:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712242818; x=1712847618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G8m6X0YutT7uWn1TO1PGQ+ufRs6DUh470J81GT16/S0=; b=wtDzYLEQYJH/LQEbm0HXSvz8SBAecrk6qp13NZoWLfLBLJxNHOZNA5uFVg7ug7WDMm ZKiZWjzuNN8Sz4gg11qD/H8tzR5z8+WzP/BsOHgyY3pRvP6x6DU/xLJrong8/7fYD2Cf lu6ky1CqbM5CjkEMPaWaKPUA0OB/t78t9siQtIU7qF8y8PaPmK28OdfkSocbAbR0lUpN 1GbM34FS/ZWm5bfTqIgDI+QFuoZkhg8BIljsY1Je0VTwb9+c1LWLpIcZpg7xrcR+EhC/ ddDlvBXS/3XYUHNF/t+T54ZChVGUpZqbwYf7JdZQZ1ne9Tg+/KHvhgr+rLa3oNQ1Gi6k IQLg== X-Forwarded-Encrypted: i=1; AJvYcCUT4l2FY+6oQTKjxfcqublV+8f4CDKqDEWy9skxMxkXxQSu5hGOY+AIG+nUjzk5js3l79yaqGI6XAycfUaqVDFJ9QqdvYPK X-Gm-Message-State: AOJu0YzSDOAK7jLz1SzvodKThnJ9n+KJTEAuAJfC9soqLJ8P6aTT/InU bIzjdOsS5APwVmdJ37nKSoLDpBHaay9ch6TYaDE4OkJavuoeVPiQ X-Received: by 2002:a50:d6da:0:b0:56c:4e2:5a4e with SMTP id l26-20020a50d6da000000b0056c04e25a4emr2050522edj.1.1712242817595; Thu, 04 Apr 2024 08:00:17 -0700 (PDT) Received: from localhost (fwdproxy-lla-001.fbsv.net. [2a03:2880:30ff:1::face:b00c]) by smtp.gmail.com with ESMTPSA id p12-20020a50c94c000000b005689bfe2688sm9311362edh.39.2024.04.04.08.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 08:00:17 -0700 (PDT) From: Breno Leitao To: kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next 1/3] net: dql: Avoid calling BUG() when WARN() is enough Date: Thu, 4 Apr 2024 07:59:30 -0700 Message-ID: <20240404145939.3601097-2-leitao@debian.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240404145939.3601097-1-leitao@debian.org> References: <20240404145939.3601097-1-leitao@debian.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit If the dql_queued() function receives an invalid argument, WARN about it and continue, instead of crashing the kernel. This was raised by checkpatch, when I am refactoring this code (see following patch/commit) WARNING: Do not crash the kernel unless it is absolutely unavoidable--use WARN_ON_ONCE() plus recovery code (if feasible) instead of BUG() or variants Signed-off-by: Breno Leitao --- include/linux/dynamic_queue_limits.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/dynamic_queue_limits.h b/include/linux/dynamic_queue_limits.h index 5693a4be0d9a..ff9c65841ae8 100644 --- a/include/linux/dynamic_queue_limits.h +++ b/include/linux/dynamic_queue_limits.h @@ -91,7 +91,8 @@ static inline void dql_queued(struct dql *dql, unsigned int count) { unsigned long map, now, now_hi, i; - BUG_ON(count > DQL_MAX_OBJECT); + if (WARN_ON_ONCE(count > DQL_MAX_OBJECT)) + return; dql->last_obj_cnt = count; -- 2.43.0