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 2/5] audit: account backlog waiting time in audit_receive()
Date:   Thu, 11 May 2023 05:21:13 +0000
Message-Id: <20230511052116.19452-3-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?f9zUtMU7TvoeP2MDqVUlhFUxFFuYOaHgpIBFNot4p5mWIj3W7rBff5gh+6RB?=
 =?us-ascii?Q?a3YbrY5JdR+2gO5TX9uAQKohhiu0Nn/+vSKBKwkF0w/HsDZHuTqSdBNOjT9R?=
 =?us-ascii?Q?4G5T7IaDf56wh9KVxM+8Hp/FwKtuncGs2aUctJwwwOwFix1wI8s6nCp//WPn?=
 =?us-ascii?Q?reoAYTPU15K9tGy0Etu61kluJGGosaXt+OSeFEEWYappqq2nV8x8Q8M7JhBf?=
 =?us-ascii?Q?oYEqnDvbyIsNe11c5imZT+lJ9ygOxthhfL7mmEKXUNslxxdIkTgc9Dk+8oqt?=
 =?us-ascii?Q?rWtwd9kYmWgN9bZf4ngnwr5hTNC8grvk/Ot7NQ4ASs8UVo4iYpYyoqlEFFdi?=
 =?us-ascii?Q?EhPviM6nIIKarDIRccoQaF2s61dfMSm3B60l6EkGFXQNcQzyee+LwzKP0ZFS?=
 =?us-ascii?Q?M+kvQjUPFJ/S/XDZDAGrAmUsPyi2io6dcGo5F3Fxkz7uIIYrZxaKAhIkd2pm?=
 =?us-ascii?Q?rolNr1yZV6DiAQDgmqnB7/SvV6o7U6npzSpF1T/Zu2y2Zni1LvJn1LGBuczO?=
 =?us-ascii?Q?2zIZwWfv21oQ/ALlszMn+On8wwemsHSi+4IaR9qieeULjAj+h2mlBqpeClxP?=
 =?us-ascii?Q?hgKVP4TZr85VbCpDC/hjXlzP3rgt4eyUOK+8lohhGvzmk1ORsqgBtnHViPmH?=
 =?us-ascii?Q?Oq9VqZSD/HC61H2T+cJtu9IMD2DULxF4uWk5BF4WlnJheicfDV1mdNTzfwUo?=
 =?us-ascii?Q?KoPtxabu78hJ0pNdO21Vf+3gn9KcECLAcn2tSUMAE+OQQVsYwA1IOfNlnmC7?=
 =?us-ascii?Q?66SjKizMcIQhcJqMrR9nOdq44x1srfeVogb8Xnd3hDeGFW0L0c+zNFj3VMXa?=
 =?us-ascii?Q?8ihmlmIsSNHAz2auy0RKKQLXy4gfShoq4vPm2FXAEtouQcS/pQw9KNkROwbG?=
 =?us-ascii?Q?8ccnisDWo5R65ZpEpKkGLCdyBYaf6c2oTzXw0r3agXn82bl1ujYq+pl6z47t?=
 =?us-ascii?Q?tKBiD0PXImO6ukzT/G726cYKeKJykrU0HM82F+T1d5lHTjURWqTgQw44ME6a?=
 =?us-ascii?Q?ylf95+Aal8SUZZsncSy8mlA068lQtf2dNr7BomvHbnY4j1A7wdOly587ZY8k?=
 =?us-ascii?Q?AzVEiqMAUTBkd8CjtPh68taLNQAgbe4Vxw0Ls92rICE77jk9DeMCEEFojME8?=
 =?us-ascii?Q?TZNYOZjSLJRCc8I2ruCQoMm5RV/9t9NXuFo4wJUaK/PxHlXitvIep4+czZwG?=
 =?us-ascii?Q?tKoNFGzjcIQcIU/D3TgqaScpjjSbc8Avr54xothgZ8fgARONdKpHvvFIrUE/?=
 =?us-ascii?Q?GqUjUFrhA7WuFNj9TuZabqgDkFyDg8sc6yO23pMBEEXdM/iYIpvThovp8mfc?=
 =?us-ascii?Q?Gf3OZYmUtNr5gEkjpOvi3VSXGuATaXLvuakIttUJuLddbRN+N47s4A2JEl3R?=
 =?us-ascii?Q?p86S23W3L5Dp/mOkduXojbDrS0nqslMi+C8m383J4fvw9tcW7QmWp7caAo+J?=
 =?us-ascii?Q?eGYwqsvOzaLdagFm+0Lf6b5zYcbnLw068UAettcLwwUL+bkMKahkApIH/cL7?=
 =?us-ascii?Q?kTfTi2RJAGPmCfmEcJrrx5dgdykTrjFdyfVdgxzJyLOLGf8alQ4H8GV2kW2N?=
 =?us-ascii?Q?LBIlo7d+hTMltkcm9WNNfTPyGBf812orw806AdqMQrf5Uk+x/T0Oi3jkdYZH?=
 =?us-ascii?Q?SQ=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b0fb040b-e18f-4f5e-b9f7-08db51df9443
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:31.1900
 (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: 3VpHfzq4k/v3VDCRyg2CsB2lGm6tsYsLOpDPAevlW2KbbFOvxHrJWLLUDpvJfiAfuMWqCJLIpBUSaDUJqDwueAZX7l9uQ/iTnqfDcb3JNac=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR02MB10006
X-Proofpoint-GUID: Xiv-k6Pkee_nLSfCgqpf7U8Cq47IRaiv
X-Proofpoint-ORIG-GUID: Xiv-k6Pkee_nLSfCgqpf7U8Cq47IRaiv
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 backlog waiting time in audit_receive() is not accounted as
audit_backlog_wait_time_actual. Accounts it as well.

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

diff --git a/kernel/audit.c b/kernel/audit.c
index c15694e1a76b..89e119ccda76 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -628,6 +628,29 @@ static void kauditd_retry_skb(struct sk_buff *skb, __always_unused int error)
 	kfree_skb(skb);
 }
 
+/**
+ * wait_for_kauditd - Wait for kauditd to drain the queue
+ * @stime: time to sleep
+ *
+ * Description:
+ * Waits for kauditd to drain the queue then adds duration of sleep time to
+ * audit_backlog_wait_time_actual as cumulative sum.
+ * Returns remaining time to sleep.
+ */
+static long wait_for_kauditd(long stime)
+{
+	long rtime;
+	DECLARE_WAITQUEUE(wait, current);
+
+	add_wait_queue_exclusive(&audit_backlog_wait, &wait);
+	set_current_state(TASK_UNINTERRUPTIBLE);
+	rtime = schedule_timeout(stime);
+	atomic_add(stime - rtime, &audit_backlog_wait_time_actual);
+	remove_wait_queue(&audit_backlog_wait, &wait);
+
+	return rtime;
+}
+
 /**
  * auditd_reset - Disconnect the auditd connection
  * @ac: auditd connection state
@@ -1568,15 +1591,9 @@ static void audit_receive(struct sk_buff  *skb)
 
 	/* can't block with the ctrl lock, so penalize the sender now */
 	if (audit_queue_full(&audit_queue)) {
-		DECLARE_WAITQUEUE(wait, current);
-
 		/* wake kauditd to try and flush the queue */
 		wake_up_interruptible(&kauditd_wait);
-
-		add_wait_queue_exclusive(&audit_backlog_wait, &wait);
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(audit_backlog_wait_time);
-		remove_wait_queue(&audit_backlog_wait, &wait);
+		wait_for_kauditd(audit_backlog_wait_time);
 	}
 }
 
@@ -1874,17 +1891,8 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
 
 			/* sleep if we are allowed and we haven't exhausted our
 			 * backlog wait limit */
-			if (gfpflags_allow_blocking(gfp_mask) && (stime > 0)) {
-				long rtime = stime;
-
-				DECLARE_WAITQUEUE(wait, current);
-
-				add_wait_queue_exclusive(&audit_backlog_wait,
-							 &wait);
-				set_current_state(TASK_UNINTERRUPTIBLE);
-				stime = schedule_timeout(rtime);
-				atomic_add(rtime - stime, &audit_backlog_wait_time_actual);
-				remove_wait_queue(&audit_backlog_wait, &wait);
+			if (gfpflags_allow_blocking(gfp_mask) && stime > 0) {
+				stime = wait_for_kauditd(stime);
 			} else {
 				if (audit_rate_check() && printk_ratelimit())
 					pr_warn("audit_backlog=%d > audit_backlog_limit=%d\n",
-- 
2.40.0