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 2/4] audit: account backlog waiting time in audit_receive()
Date:   Mon,  8 May 2023 07:58:10 +0000
Message-Id: <20230508075812.76077-3-eiichi.tsukata@nutanix.com>
In-Reply-To: <20230508075812.76077-1-eiichi.tsukata@nutanix.com>
References: <20230508075812.76077-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?6sIB/pZ9+bdeclGLmt6HpGG0jJ7KI0Q1EOtmLYAe5UtMh//9SCEBEkBjcwLI?=
 =?us-ascii?Q?xeJCr6LHZJs+zypIOjxp/Nh7FfeSFQ5h6fMH2YeznwwcXTbfHFGHBGjtJ+6G?=
 =?us-ascii?Q?IMsDvpiHS7gZE5xiZ2YGDXbBQ8ZOn3OZ09NDP76cZLs9lCWTMexZFRCA18jE?=
 =?us-ascii?Q?PjFnIBRcgyxCOxJ81F3eiSqYYjbXfCjG+slRShAme7ovHOAf85c8nHfmr5oK?=
 =?us-ascii?Q?seECKtmO+oEkcSzHxi5CVTmmqCZnHXobkZExpPhipWkrm/kO/83oWalb0AGn?=
 =?us-ascii?Q?jvfqnkb78GvKb/I86hHZH/SZ+24O+Rmk2SNOJdGPsOS7cFphaJCG8OARrj/R?=
 =?us-ascii?Q?IjqjUt106+0oNZ7BovnG980oFchcH7C4SdkjgarKlm9ppcH8J+gtbn3DIge0?=
 =?us-ascii?Q?QXWP3ATpM68yRs1g/v0trhW8StHizkpDqb3EdeY7OGmLrpW5h4kHWk6mGUpG?=
 =?us-ascii?Q?gG+gJBSGse2oNmzuhKLCFgZnrBMw8xGFgwrgWpshNSk9+2NaZ31fLHTA90tB?=
 =?us-ascii?Q?LUCdqusuDnaZZQpPRsyg7+R7LwXedh3dOp4xMH0aWdPYrwsJckp1KOfVlhtN?=
 =?us-ascii?Q?Xm7NOZQTNe6AnnApH6FGycv1k4vRYW0z1UW4FupkCLyPnuHlW/couVZKynd0?=
 =?us-ascii?Q?nvmZMyv5NMyKdAXOKsigMeFXoLNHrpHgUrvisItpp3+gD2qtkERbxJ6+v8i8?=
 =?us-ascii?Q?1tRixzrjh05f8dgTF21T1uWVTqq4r1/X4DGv3du3OVQEUKBe+G5FnnWjUDPh?=
 =?us-ascii?Q?1A6iECEil+s+MMxvvb5Kby8gCzaY/4dS5VD8dKz61kI/5Xt6SXy8DrasEBJM?=
 =?us-ascii?Q?cIPavfxJ3lRsVS3ffS3KczLvKfyA0s8OJvs9t6jc6QTNbqGrlakoc3i5Yi+J?=
 =?us-ascii?Q?uu0eyGNoeL+cCXTRLjEjEYoeX3yiecDeZXK/yqnax6UAMq22UBvka6HcNfX7?=
 =?us-ascii?Q?LxQRU4XF3s8ROP8L8aiAB+rtTGViPrWij0gRokEpRA3/5INRPk+iw1dI0ahk?=
 =?us-ascii?Q?qtyuSxF6i5vouyEJ5pPIK2YlBGlCiVS4is6+PLKFcdAW/sfxofB/j6ukslL4?=
 =?us-ascii?Q?u4AliIUHzWj7aLC3Rw7MFLWUhCXJXBbTLfwNy1l7dCIIV/nF0l/FA7H9zt5W?=
 =?us-ascii?Q?cZVmESHEQJq9JqNeCEc5vWyvKbL7N7ABLmDX/11l62uEb0a+whBjlFN/xnLH?=
 =?us-ascii?Q?GXWGV57M61JCHsLPmeeK25XQksDy0NeuCxaMJJkRAevQ4LR9UZCdUPBUJdZw?=
 =?us-ascii?Q?L76Rccjwbs9PbytbiQeTIr8ICn8IEDC7JcRsmKJeAmd0wZT+uIC+08nv/Hln?=
 =?us-ascii?Q?Q1mR0V8/5GvcUr/hwSMmw8M+G5OnArzRnmtIi55LPmRCnITAOJ2VOmpQnVF6?=
 =?us-ascii?Q?N0xB8GsCD30biz7BeDu2gOIvpOoV4luDkREBXEKSD1Kl4RshUbQY6xZjJn3t?=
 =?us-ascii?Q?NfRxc1rWkfiMDS0MZarQvHmRwP2+glY7HQNdNBMwlYbOVrOCappcbmODst3w?=
 =?us-ascii?Q?q+nE/6CrUoOstL00jiadoHUfAbUkn5jTjQTHQfzY04ePZKlOCQ3oHFjhF/Pr?=
 =?us-ascii?Q?zUomvoI+KdafhwGTgrLXZr9GL/4nocPaq+17zJTordjtMDUdXiCqoYBD51gA?=
 =?us-ascii?Q?oQ=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c9159176-2009-43cf-8a1f-08db4f9a0d7f
X-MS-Exchange-CrossTenant-AuthSource: CH0PR02MB8041.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2023 07:58:47.4164
 (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: BDiYPWApfeGUMbM2FkJN2k+vMd1e74wZLLnMVDXm2FKcoRG2j9FHvVgYM4jGiKFrGRaM6WITfsWF98R1UHhrKhx8zFj9izg6SbUeJacCkNE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR0201MB8821
X-Proofpoint-GUID: WmPAuRydJWMT_9fIfcAmCOsX7g-5ZJNA
X-Proofpoint-ORIG-GUID: WmPAuRydJWMT_9fIfcAmCOsX7g-5ZJNA
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-08_05,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