From patchwork Tue Oct 27 23:55:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1389055 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=AOuZcfG4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CLTCd73jRz9sV1 for ; Wed, 28 Oct 2020 10:57:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3E2D48250A; Wed, 28 Oct 2020 00:56:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AOuZcfG4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7EB6F81260; Wed, 28 Oct 2020 00:56:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8640B81260 for ; Wed, 28 Oct 2020 00:56:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qv1-xf41.google.com with SMTP id 63so1586832qva.7 for ; Tue, 27 Oct 2020 16:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pm6Xxna0F2Rugn08fTq9hI/cQxFWY+FAMPqnSe+YH5s=; b=AOuZcfG4Iiz1cG4CvFHQmTbHHfcOzk5dXgFd5DycT6/SHDqbYap2/6/TyVbBnrYZpU s8ShD15jE4FOPN+mBsaJtDSWMGXUkivaA7lUoRDvusarRZUWL0CAOvmY6wd8PNY+lGGM 6FjXbmFleYU6zwnPeiq83ZDt/Enyrk7Ni1VMNoQVj1C7GlqbsZzQulfhKVPqi0qg/tX+ bpLnGj1TXsuAw0YXVUpoy3aWIaAFvdyOU4sMBrjWEHPyu0+wZjJOuR95MpSwvbKj3F11 +ex46ya3zzK8dSdnQBM+sTykoBtY7adzQzXsEQo9NGrPVV84Tep7DrDZ6LuQm6HYEaxw /ePQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pm6Xxna0F2Rugn08fTq9hI/cQxFWY+FAMPqnSe+YH5s=; b=rsT7ctIqB56g7KwyOzyRfni+LeskZks0v+/51Nd/E+tWL5JB1y8ZvvmKF+AtBVuYVU sQlK4zOgowjIFH/lwkKNwOqQUk6A+hb5icdipLgs/1IfXdtyGga3wbZk1zEIwdmfBPOp keV845PpX+OSFofuWdU1Jy3H8/PMLZJvuJXw3hVhRvKQUbdfzqGroqBeDCJfdLjZ1Eot g6LDS4bpsknFIp57AzMd9Re7pqWnu86jphcl8hUwLtVVzL/2knd3WPNsnFDuk7GumrtG HhuS6h21AC5ly0daaI0klDOiCf8T7YlHuqs/6hpROh7vXv2UP5+91yecFyHD0ttgbZi0 l0kA== X-Gm-Message-State: AOAM531ujVV5MZDZlT53W3/zCCec/eUkAikTfyFZUMfrW3x/TK5p7nPZ bCDsRWh+3Sx2N0EcFW21wuxJIAyKfo3FwQ== X-Google-Smtp-Source: ABdhPJz42ThkH/cEXtS7gLnSw0K32bxktQvqzWHFmNbPis9j/2xvzP5PUEKX2hZK8AqOZsSgxbLJLQ== X-Received: by 2002:a05:6214:104d:: with SMTP id l13mr5346364qvr.38.1603842963311; Tue, 27 Oct 2020 16:56:03 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id 69sm1907543qko.48.2020.10.27.16.56.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 16:56:02 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Tom Rini , Heinrich Schuchardt , Simon Glass , Sean Anderson Subject: [PATCH v4 07/22] log: Add filter flag to deny on match Date: Tue, 27 Oct 2020 19:55:26 -0400 Message-Id: <20201027235541.706077-8-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201027235541.706077-1-seanga2@gmail.com> References: <20201027235541.706077-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Without this flag, log filters can only explicitly accept messages. Allowing denial makes it easier to filter certain subsystems. Unlike allow-ing filters, deny-ing filters are added to the beginning of the filter list. This should do the Right Thing most of the time, but it's less-universal than allowing filters to be inserted anywhere. If this becomes a problem, then perhaps log_filter_add* should take a filter number to insert before/after. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) common/log.c | 12 ++++++++++-- include/log.h | 11 ++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/common/log.c b/common/log.c index a14b227231..6299c8b2d4 100644 --- a/common/log.c +++ b/common/log.c @@ -164,7 +164,11 @@ static bool log_passes_filters(struct log_device *ldev, struct log_rec *rec) if (filt->file_list && !log_has_file(filt->file_list, rec->file)) continue; - return true; + + if (filt->flags & LOGFF_DENY) + return false; + else + return true; } return false; @@ -268,7 +272,11 @@ int log_add_filter_flags(const char *drv_name, enum log_category_t cat_list[], } } filt->filter_num = ldev->next_filter_num++; - list_add_tail(&filt->sibling_node, &ldev->filter_head); + /* Add deny filters to the beginning of the list */ + if (flags & LOGFF_DENY) + list_add(&filt->sibling_node, &ldev->filter_head); + else + list_add_tail(&filt->sibling_node, &ldev->filter_head); return filt->filter_num; diff --git a/include/log.h b/include/log.h index 4e59a2cf74..018180e788 100644 --- a/include/log.h +++ b/include/log.h @@ -359,13 +359,22 @@ enum { LOGF_MAX_CATEGORIES = 5, /* maximum categories per filter */ }; +/** + * enum log_filter_flags - Flags which modify a filter + */ enum log_filter_flags { - LOGFF_HAS_CAT = 1 << 0, /* Filter has a category list */ + /** @LOGFF_HAS_CAT: Filter has a category list */ + LOGFF_HAS_CAT = 1 << 0, + /** @LOGFF_DENY: Filter denies matching messages */ + LOGFF_DENY = 1 << 1, }; /** * struct log_filter - criterial to filter out log messages * + * If a message matches all criteria, then it is allowed. If LOGFF_DENY is set, + * then it is denied instead. + * * @filter_num: Sequence number of this filter. This is returned when adding a * new filter, and must be provided when removing a previously added * filter.