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;
From:   Eiichi Tsukata <eiichi.tsukata@nutanix.com>
To:     paul@paul-moore.com, eparis@redhat.com,
        linux-kernel@vger.kernel.org, audit@vger.kernel.org
Cc:     Eiichi Tsukata <eiichi.tsukata@nutanix.com>
Subject: [PATCH v2 1/5] audit: refactor queue full checks
Date:   Thu, 11 May 2023 05:21:12 +0000
Message-Id: <20230511052116.19452-2-eiichi.tsukata@nutanix.com>
In-Reply-To: <20230511052116.19452-1-eiichi.tsukata@nutanix.com>
References: <20230511052116.19452-1-eiichi.tsukata@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LQ8++nP6GG0cDygodwjIlJM/VM1cxWGViAo/A7J4pUxbGGIcGsXJ0WnUAO8I?=
 =?us-ascii?Q?4fN38pGaPDrlApZhtlxCgPpCG6Comp+Fvj8IdZSWZS/aAD0TfMYJuw1jijEi?=
 =?us-ascii?Q?7PVyirb980OwZujQO0j70yhHQolalF1uWBJzutBkbk01HwkH0EvMYXsHAQY1?=
 =?us-ascii?Q?WQ7dKgG40FRqZbJD7A9UuzLaFYwGfxsVDEm8Iz8ZaPjRPEfSJ8qKJrtshy8b?=
 =?us-ascii?Q?gWo7XVAerWFHDxSGXaW+AkJleW3WE4TeojBsJEgVoYY9+r7HAXIfUEm1Ld7y?=
 =?us-ascii?Q?F79zOrgcnKox5HOFW4LGsQvtNU5Xmy94FoEVVeQBozq2W3uNZJDUBJ8eWX3D?=
 =?us-ascii?Q?DENn2OGAm4yiT7BZ+NTNYTQOKA9c/t3hmaJLvpY5nqFrxCuJnteA80NNw747?=
 =?us-ascii?Q?6Fr74rDWcNapy60RrS/Mi2gbi+uoMi7Kdq2MlXsEgV3MiL/ANeaO4BY06rDi?=
 =?us-ascii?Q?daeYekp0e81jH2paqLDn63w8I0RvS1KEhxDhEG0NtIKX7rcnSSReO3rSx43m?=
 =?us-ascii?Q?9HBoi90Yef+cpx5aXLpt+lAKfmCS9KFmJDCjLW/jWG4+HyWxjcjwDvjntWRI?=
 =?us-ascii?Q?LJP3TzUR6Q2S0D9cYvXjVRFhrFNY0yDtq0ICsE8ajv6u0eIIAyjQaQ5NpxUp?=
 =?us-ascii?Q?9lonX2Ie1My+ysGOmXXS1rb7vSrAJsl7pLGMjyqnmkL2TLBJ+fCwbgQGe9G9?=
 =?us-ascii?Q?h3pyXyYvA54Rx86pOiw5lsQEyhJrxDXlUFqYMS0ApmWVQpJvbusbbyILbCBd?=
 =?us-ascii?Q?Q/jqFFBj+pwCQ2sYeCVNdW0tNgQdnzFsdiQ0S1NeLw9qeb5xFvK3dDwzPBgq?=
 =?us-ascii?Q?LQWhRRDr3medtCysitr4s4286PJWMw1G4VmNWI0wx/Daw7lcqLwQg3jIQPId?=
 =?us-ascii?Q?cXKqoeZ9GfQWfOjfyHVm/mjxjo+z6oT+DtYzOaJOm9EIIjJ5XWx4V6vkJKLJ?=
 =?us-ascii?Q?up6CHL6GQp83wjbTQAIvwzny1u+0K2UMdbVm2JeB1MTr1cZ9MQc27YX1HMn/?=
 =?us-ascii?Q?DBmwb3Gj4Vo2/KhguMmBeTirrfF5uo4BnRuIDfoLBoZ2DzdmhtUQD9hgVnh+?=
 =?us-ascii?Q?RoIAKejcKo52fiR+rzpDNF6qxP1Tkkpk0THcZT6PeD5PndiFGlkw7rdvosXM?=
 =?us-ascii?Q?cacElxF7YyA7ZNOR0Lt40oaGoeZjyrohH//5v3S/p+SIbJtHIAMhZy/j0CC/?=
 =?us-ascii?Q?yrGYBHkY13NANnfQYFvGheDlVSh3ylfehTCLdBSzefJis8w3pUE2yaj0GjdZ?=
 =?us-ascii?Q?pOsCW6RooPZ50Eu1IsK23VECxVZMfl6Wsonq1HtSgfC2KbmqGZ1UM1cLlFRs?=
 =?us-ascii?Q?UjgL2sR3PBqGTzESbLtcWV4DDXxz28X3k+2VCJ6vVOAUfKLjoxIWVjhPwhkA?=
 =?us-ascii?Q?HXP8IDKM8umZWeB8qMvQQx7A8drdbniCzRiwe/Ps7Vjq7S1hag1z7DHpQdPR?=
 =?us-ascii?Q?0IEvYAqpFU+jgeKp+wpkfd/oE4iuuzYfRFweryNLQBbPcFgY08tVjS09Q8d7?=
 =?us-ascii?Q?15D85F3BW8vq1v051+u/yDkNpfTbf2YI92JO18M/5pedhVrQEnwTO2GXEqDL?=
 =?us-ascii?Q?pAN/5c9hy3g9AnK3c8AzX3JKuW6cW9Q5vinoRjEIoWkcMLK9HZLoEIGbnSFt?=
 =?us-ascii?Q?6Q=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2c1d83c9-5c6f-4339-00b6-08db51df93c3
X-MS-Exchange-CrossTenant-AuthSource: CH0PR02MB8041.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 05:21:30.3836
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: pCLPAiblMbSN2uaYjKuynnIwHJydmx0CjDyUazIEC1qXYZb+2WZ+mU7SjOdUB2LdPq1v3+Q+pxh6mMP6q31ZQOH8nUDqSwaorWRsUNw/FxE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR02MB10006
X-Proofpoint-GUID: EDwqLvLmAYaW5GcQKTFa7kROzcwcwh_e
X-Proofpoint-ORIG-GUID: EDwqLvLmAYaW5GcQKTFa7kROzcwcwh_e
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-10_04,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Currently audit queue full checks are done in multiple places.
Consolidate them into one audit_queue_full().

Signed-off-by: Eiichi Tsukata <eiichi.tsukata@nutanix.com>
---
 kernel/audit.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 9bc0b0301198..c15694e1a76b 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -341,6 +341,12 @@ static inline int audit_rate_check(void)
 	return retval;
 }
 
+static inline int audit_queue_full(const struct sk_buff_head *queue)
+{
+	return audit_backlog_limit &&
+	       (skb_queue_len(queue) > audit_backlog_limit);
+}
+
 /**
  * audit_log_lost - conditionally log lost audit message event
  * @message: the message stating reason for lost audit message
@@ -579,8 +585,7 @@ static void kauditd_hold_skb(struct sk_buff *skb, int error)
 	 * record on the retry queue unless it's full, in which case drop it
 	 */
 	if (error == -EAGAIN) {
-		if (!audit_backlog_limit ||
-		    skb_queue_len(&audit_retry_queue) < audit_backlog_limit) {
+		if (!audit_queue_full(&audit_retry_queue)) {
 			skb_queue_tail(&audit_retry_queue, skb);
 			return;
 		}
@@ -589,8 +594,7 @@ static void kauditd_hold_skb(struct sk_buff *skb, int error)
 	}
 
 	/* if we have room in the hold queue, queue the message */
-	if (!audit_backlog_limit ||
-	    skb_queue_len(&audit_hold_queue) < audit_backlog_limit) {
+	if (!audit_queue_full(&audit_hold_queue)) {
 		skb_queue_tail(&audit_hold_queue, skb);
 		return;
 	}
@@ -613,8 +617,7 @@ static void kauditd_hold_skb(struct sk_buff *skb, int error)
  */
 static void kauditd_retry_skb(struct sk_buff *skb, __always_unused int error)
 {
-	if (!audit_backlog_limit ||
-	    skb_queue_len(&audit_retry_queue) < audit_backlog_limit) {
+	if (!audit_queue_full(&audit_retry_queue)) {
 		skb_queue_tail(&audit_retry_queue, skb);
 		return;
 	}
@@ -1564,8 +1567,7 @@ static void audit_receive(struct sk_buff  *skb)
 	audit_ctl_unlock();
 
 	/* can't block with the ctrl lock, so penalize the sender now */
-	if (audit_backlog_limit &&
-	    (skb_queue_len(&audit_queue) > audit_backlog_limit)) {
+	if (audit_queue_full(&audit_queue)) {
 		DECLARE_WAITQUEUE(wait, current);
 
 		/* wake kauditd to try and flush the queue */
@@ -1866,8 +1868,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
 	if (!(auditd_test_task(current) || audit_ctl_owner_current())) {
 		long stime = audit_backlog_wait_time;
 
-		while (audit_backlog_limit &&
-		       (skb_queue_len(&audit_queue) > audit_backlog_limit)) {
+		while (audit_queue_full(&audit_queue)) {
 			/* wake kauditd to try and flush the queue */
 			wake_up_interruptible(&kauditd_wait);
 
-- 
2.40.0