From patchwork Fri Mar 24 22:30:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 13187428 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87EB6C76195 for ; Fri, 24 Mar 2023 22:30:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A1C666B0078; Fri, 24 Mar 2023 18:30:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97C8E6B007B; Fri, 24 Mar 2023 18:30:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 78959900003; Fri, 24 Mar 2023 18:30:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4FFA46B007B for ; Fri, 24 Mar 2023 18:30:42 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0E828ABAE7 for ; Fri, 24 Mar 2023 22:30:42 +0000 (UTC) X-FDA: 80605237524.14.0998539 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf26.hostedemail.com (Postfix) with ESMTP id 4AE1E14000B for ; Fri, 24 Mar 2023 22:30:40 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=oKE14Q0T; spf=pass (imf26.hostedemail.com: domain of beaub@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=beaub@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679697040; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LAT6es1zlcxHgyXQ+ccAd1DGKcAvO/9IswEU0C+E8Yk=; b=ATwIzIpuNti0HZ6XQGidg8VI4BaqCWqjol8kAv0FhoClBBsekLx6dYb2fFJWqudL1e7Dr1 I4NO+0f+OXDB85FTjAu4Yel24/h6QbUAhGWNvej/Mx4qxgDWhLXn0hOeOjq+1BzBxuzBaU nxEPWNWrIbTWepIVDwLgaIC9cvMUrZY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=oKE14Q0T; spf=pass (imf26.hostedemail.com: domain of beaub@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=beaub@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679697040; a=rsa-sha256; cv=none; b=PBJOzrEd4buImyJmLg127QyT/rgoyO4+rWl92jCQmg+xkhvAiVFMDEYf2fDCn6GeB1wFUG 0zDg6lw/NfxsYYvR33QVnUJBDmfo8Dk0VrXI9euyNZ25aVfP+zmxh6hED21WTjy2SEzaZT czsN0+rsvYaBs22dr8dvlFix3HKZdQ0= Received: from W11-BEAU-MD.localdomain (unknown [76.135.27.212]) by linux.microsoft.com (Postfix) with ESMTPSA id EAA8820FC4D8; Fri, 24 Mar 2023 15:30:38 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com EAA8820FC4D8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679697039; bh=LAT6es1zlcxHgyXQ+ccAd1DGKcAvO/9IswEU0C+E8Yk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oKE14Q0TJsMW8crS4IdUxVfjibtp1Adb+m5vPIz1w7PWd/gaLD6ByRKpKoZ6hJIAV QSx/BQajYSaVfPowsEjY6WpZNyGtPpkiTD9St5vX9YoeYvRN9mpudZM7KR2JtuzcyX niHh77ZnPhF/Y7dm4J0dw725jyKQ5OmH50Vyk/GQ= From: Beau Belgrave To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, dcook@linux.microsoft.com, alanau@linux.microsoft.com, brauner@kernel.org, akpm@linux-foundation.org, ebiederm@xmission.com, keescook@chromium.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v9 04/11] tracing/user_events: Fixup enable faults asyncly Date: Fri, 24 Mar 2023 15:30:21 -0700 Message-Id: <20230324223028.172-5-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230324223028.172-1-beaub@linux.microsoft.com> References: <20230324223028.172-1-beaub@linux.microsoft.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 5jgysoxpzyoyju7p7mdbaz9u1bj6q3rj X-Rspamd-Queue-Id: 4AE1E14000B X-HE-Tag: 1679697040-577527 X-HE-Meta: U2FsdGVkX1+iqDbyiYDQ8W3ATB9zFj66UtwghFHkdsFQn9ib+exszBbUlKcC8gAj2j37A6fskt+lsaSlDi2t32dk3Co9RMj/PYx76ti7II8xZvdXTHRNv2Y+25fZbHa3usVBmhJRfLjxfI7EOW4scZo2Y13ElbJSMtoHIq55fsyu3yH/AfCz0q+lbA/6gwWOUnQHSucIqCqdIIWysoRQUeZRqZns9M32IEXIoGIRxduL09SpN6HWh0cWQ24SsHEjL0rupZseCodhIzoZXl6svM/bfSwNZ7ZbdgFzzmyXZT/63Kn4V25bRIFXrOS/AAQuaz497aKwLjcTbkna+MhBAiwM8hybJDZCQsOZhtm1XhfTm+JorRRoJjpMpaukBRG8ekLMZXaXdAGqPim8SxByZqV+J7Ee/X+NRPpCj+tcwf332VPFxY9RONNIEQIpHo1U66XQBOEF6JY02+WmuJuc1LmlgYw6IL5F/gqdcayohW/xtpiUCv/eiWzTHT+BaAz3vQaiUMqduO6tqfYqEA7H4FkucJ9+WHOn0iiKeICmcufJyru+2whNq+fOsCeGdb1SJ7aikHPehxn6EeJZA7VfR379xt0edOdvNLty2GUQAZyRzGP//Z8e0dwd08y6iZn3djXnCgP6MS4CaPSfnxeOESXV4OX1MXc8i7iuiNnsYW4JuJg2ahK7mSy9cD+pFEz2qgUiWxIHVCtSgays+h3uD0Q6k5tSB3ulNRnzz5w1u2iJXIBOq1lO/Gqa5ADfnZeW3zeFTNKcVNQm5axMHMordbpP7+6ZylaEeCE21kmYF2veLUXyhPiSwtC18D61VgdOZ9pN+/LSo7JhHEtQd81g4sh9krpis2cRYzKWLLCpO0uJlNCWObyeDn5vXlEnEy/RaTqm036mftS8gRUOeR2YYKFUcm2IDRId3+j1cjfEbykSj0oJsjAIVruNpKhmc/4dkTzl4Xrgv9q493f4EG7 D2+6qNZ6 e0E9duOaxafmx7dPOzpfvjwtHJy6NPpDgt5C9EA7AtWR0vfAhjkzKeePVpH+RfTVaEBq+WvdV9UdC4Qct19hjdhECDa8uZUPiYwMKkhhQBrmLr2rqv1WT1uV0jE+Wx5EJtgFAAEZ3w+37BpAgfxxWT/rrr6e+y65+zkQz4O0Z6huasfvjyqJZc9+EbgRTZAb77TEI7iRcORu9xmz7Wtwk+mLVcIDtKQMLCTFbvPUQD1hNJCGKsbGwvCPtTzNbM5auDQYGV11eWCUX0iSYEAkIxPvyYhXCX4/baYuUA09EoVjztS0= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When events are enabled within the various tracing facilities, such as ftrace/perf, the event_mutex is held. As events are enabled pages are accessed. We do not want page faults to occur under this lock. Instead queue the fault to a workqueue to be handled in a process context safe way without the lock. The enable address is marked faulting while the async fault-in occurs. This ensures that we don't attempt to fault-in more than is necessary. Once the page has been faulted in, an address write is re-attempted. If the page couldn't fault-in, then we wait until the next time the event is enabled to prevent any potential infinite loops. Signed-off-by: Beau Belgrave --- kernel/trace/trace_events_user.c | 120 +++++++++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 6 deletions(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 553a82ee7aeb..86bda1660536 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -99,9 +99,23 @@ struct user_event_enabler { /* Bits 0-5 are for the bit to update upon enable/disable (0-63 allowed) */ #define ENABLE_VAL_BIT_MASK 0x3F +/* Bit 6 is for faulting status of enablement */ +#define ENABLE_VAL_FAULTING_BIT 6 + /* Only duplicate the bit value */ #define ENABLE_VAL_DUP_MASK ENABLE_VAL_BIT_MASK +#define ENABLE_BITOPS(e) ((unsigned long *)&(e)->values) + +/* Used for asynchronous faulting in of pages */ +struct user_event_enabler_fault { + struct work_struct work; + struct user_event_mm *mm; + struct user_event_enabler *enabler; +}; + +static struct kmem_cache *fault_cache; + /* Global list of memory descriptors using user_events */ static LIST_HEAD(user_event_mms); static DEFINE_SPINLOCK(user_event_mms_lock); @@ -263,7 +277,85 @@ static int user_event_mm_fault_in(struct user_event_mm *mm, unsigned long uaddr) } static int user_event_enabler_write(struct user_event_mm *mm, - struct user_event_enabler *enabler) + struct user_event_enabler *enabler, + bool fixup_fault); + +static void user_event_enabler_fault_fixup(struct work_struct *work) +{ + struct user_event_enabler_fault *fault = container_of( + work, struct user_event_enabler_fault, work); + struct user_event_enabler *enabler = fault->enabler; + struct user_event_mm *mm = fault->mm; + unsigned long uaddr = enabler->addr; + int ret; + + ret = user_event_mm_fault_in(mm, uaddr); + + if (ret && ret != -ENOENT) { + struct user_event *user = enabler->event; + + pr_warn("user_events: Fault for mm: 0x%pK @ 0x%llx event: %s\n", + mm->mm, (unsigned long long)uaddr, EVENT_NAME(user)); + } + + /* Prevent state changes from racing */ + mutex_lock(&event_mutex); + + /* + * If we managed to get the page, re-issue the write. We do not + * want to get into a possible infinite loop, which is why we only + * attempt again directly if the page came in. If we couldn't get + * the page here, then we will try again the next time the event is + * enabled/disabled. + */ + clear_bit(ENABLE_VAL_FAULTING_BIT, ENABLE_BITOPS(enabler)); + + if (!ret) { + mmap_read_lock(mm->mm); + user_event_enabler_write(mm, enabler, true); + mmap_read_unlock(mm->mm); + } + + mutex_unlock(&event_mutex); + + /* In all cases we no longer need the mm or fault */ + user_event_mm_put(mm); + kmem_cache_free(fault_cache, fault); +} + +static bool user_event_enabler_queue_fault(struct user_event_mm *mm, + struct user_event_enabler *enabler) +{ + struct user_event_enabler_fault *fault; + + fault = kmem_cache_zalloc(fault_cache, GFP_NOWAIT | __GFP_NOWARN); + + if (!fault) + return false; + + INIT_WORK(&fault->work, user_event_enabler_fault_fixup); + fault->mm = user_event_mm_get(mm); + fault->enabler = enabler; + + /* Don't try to queue in again while we have a pending fault */ + set_bit(ENABLE_VAL_FAULTING_BIT, ENABLE_BITOPS(enabler)); + + if (!schedule_work(&fault->work)) { + /* Allow another attempt later */ + clear_bit(ENABLE_VAL_FAULTING_BIT, ENABLE_BITOPS(enabler)); + + user_event_mm_put(mm); + kmem_cache_free(fault_cache, fault); + + return false; + } + + return true; +} + +static int user_event_enabler_write(struct user_event_mm *mm, + struct user_event_enabler *enabler, + bool fixup_fault) { unsigned long uaddr = enabler->addr; unsigned long *ptr; @@ -278,11 +370,19 @@ static int user_event_enabler_write(struct user_event_mm *mm, if (refcount_read(&mm->tasks) == 0) return -ENOENT; + if (unlikely(test_bit(ENABLE_VAL_FAULTING_BIT, ENABLE_BITOPS(enabler)))) + return -EBUSY; + ret = pin_user_pages_remote(mm->mm, uaddr, 1, FOLL_WRITE | FOLL_NOFAULT, &page, NULL, NULL); - if (ret <= 0) { - pr_warn("user_events: Enable write failed\n"); + if (unlikely(ret <= 0)) { + if (!fixup_fault) + return -EFAULT; + + if (!user_event_enabler_queue_fault(mm, enabler)) + pr_warn("user_events: Unable to queue fault handler\n"); + return -EFAULT; } @@ -314,7 +414,7 @@ static void user_event_enabler_update(struct user_event *user) list_for_each_entry_rcu(enabler, &mm->enablers, link) if (enabler->event == user) - user_event_enabler_write(mm, enabler); + user_event_enabler_write(mm, enabler, true); rcu_read_unlock(); mmap_read_unlock(mm->mm); @@ -562,7 +662,7 @@ static struct user_event_enabler /* Attempt to reflect the current state within the process */ mmap_read_lock(user_mm->mm); - *write_result = user_event_enabler_write(user_mm, enabler); + *write_result = user_event_enabler_write(user_mm, enabler, false); mmap_read_unlock(user_mm->mm); /* @@ -2201,16 +2301,24 @@ static int __init trace_events_user_init(void) { int ret; + fault_cache = KMEM_CACHE(user_event_enabler_fault, 0); + + if (!fault_cache) + return -ENOMEM; + init_group = user_event_group_create(&init_user_ns); - if (!init_group) + if (!init_group) { + kmem_cache_destroy(fault_cache); return -ENOMEM; + } ret = create_user_tracefs(); if (ret) { pr_warn("user_events could not register with tracefs\n"); user_event_group_destroy(init_group); + kmem_cache_destroy(fault_cache); init_group = NULL; return ret; }