From patchwork Thu Mar 23 19:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 13186003 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 4710CC6FD1C for ; Thu, 23 Mar 2023 19:06:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B6F3C6B007D; Thu, 23 Mar 2023 15:06:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AF8B76B007E; Thu, 23 Mar 2023 15:06:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8AD556B0080; Thu, 23 Mar 2023 15:06:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 703786B007D for ; Thu, 23 Mar 2023 15:06:20 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 49DC4A07D8 for ; Thu, 23 Mar 2023 19:06:20 +0000 (UTC) X-FDA: 80601093720.12.FCB45BD Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf11.hostedemail.com (Postfix) with ESMTP id 90BBF40014 for ; Thu, 23 Mar 2023 19:06:18 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=ZAy6bwU6; spf=pass (imf11.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=1679598378; 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=hPint7oilCioEigkIIslQUbcyG4C0cJ57YmYs/t8wm4=; b=w5DEZknAgPYr8gQbw067CPOBlm1Zhar3Oi4YJYyRucspqp8fbK1V2Iuh8B+DbhTCqHpkFP RSNdeBj6czKx52WqnO5hg0d9LyxeyMEPLC59wfEp83wN4zwGWPk9qQAx6hdR/R85crdlhc AWC8sLEe+hQYEpG+R6BKGkMnwYMI5Ss= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=ZAy6bwU6; spf=pass (imf11.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=1679598378; a=rsa-sha256; cv=none; b=v29lF1EWMWlvO3cfJJF8cYz7GFcXR1gGcvaiOWsJgz8fILNyOaZFirnOH6w2QK+Ab4rIW5 XmsC0zJVv9W20fuj7i4EAT5R2djCtA3A7GYGxhHSltaPVnC+JMfvpXTL8S3GWsnMl/wDhk B31gw9rF+OBeAxZOL3R4LwgizpjPETA= Received: from W11-BEAU-MD.localdomain (unknown [76.135.27.212]) by linux.microsoft.com (Postfix) with ESMTPSA id 5CC6820FC0FE; Thu, 23 Mar 2023 12:06:16 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5CC6820FC0FE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679598376; bh=hPint7oilCioEigkIIslQUbcyG4C0cJ57YmYs/t8wm4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZAy6bwU6z8ND9vjLrj7wihLErKBo+N3lmm9I+oh30UiG1ICDQxbVHncDqLEhdC5x/ FBQYs5o6nX1VlqK93g7ROM1FOLKcZK6wUg0xSta4wcdBoab/RA2Iks6qhCXSn3DWFy cDQIp3OMVvEFp3PlEcf4vRxkwlL1JwewPT2obYvI= 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: [RESEND PATCH v8 05/11] tracing/user_events: Add ioctl for disabling addresses Date: Thu, 23 Mar 2023 12:06:04 -0700 Message-Id: <20230323190610.251-6-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230323190610.251-1-beaub@linux.microsoft.com> References: <20230323190610.251-1-beaub@linux.microsoft.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 90BBF40014 X-Stat-Signature: otihiw3pyuok693h1strs3xrzr8kn7z5 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1679598378-867993 X-HE-Meta: U2FsdGVkX1/kPR47GtZfI4t1FzYuUa5Xa5lkARE5VeuVWfsSoqKEhE/1aL+M+vHuKh0dsjU/FN76GRfHD0I1oTRqQ3jJequMnWD+AbJucLNJWznRZn7jrOunm/3baX2totHx3G2Iusl/q8QvWDhacxzHk+4m/c3EvW1rN4Nt9W9L33jtQBC9yE1503ziM+FN1FT4tAxfgpfliFryVv+Pq70L+QmK0+FAMvvngv2HD68YJcmxHZwnc9WhplodG/PHgpffufD1laVzjbOAN2JLhDFNu4BK3fZFzfrackqYqRgVGiEcmsRoMiJ1n0E27EtBpF0tgik+tYNbCKZ+/5BjgpVqh9oD/n71xHIMuZOLtcKCjhQGAgaFsd/OoMHjZRGi5EKNOAFcBOMDh3yWF2kzEi/1qrWnIRaaWiOQm0ORgTlT1Hy6J4P3KBihLesM339tJrA7cI2Sgz0hUyfM2+GZ3vQdKCdyw95ktL9NOwhfcZQhp2Csr7PuDEWYuMAUvQdKAfNIzVe0D/B+o/Eajn0ojaxnOxOLaBeGlC+DxVUDlABEa45HnNdjcfz474wzkicAoNZ/MVTp3IT281BfclGRZcOGgG764beO3aH8zLEEVngBtoD6vnZV6udCc4WmSwBuDSpS/o3MY94EZjqN9ojR0uWLv45uZ7iCS3+cOejmTnNxY2B7u/iXjM+ijSoYt+Tlsm2liADTi9Gt5DCi64lVW3tuwnoA7mISd+6EE5ST6asX5GceXsaiSa2hfGdpWI5ITRJheD+U3uxA3LN8LOu2PHEVwGCKdPcql3z+Bjioxq12u0Q6YoWBPWLWFj6s8giG8E23aUChx70ZQZRVCAE9hukWqcw1PAoKyHE5H22xjj9LL4HqNMxXG9muou6T78t2TpCVl+Rc0Cgsz8sD+y2mitVfHmR9szoW5+Moy1zsuGedaKj2Urwbm28B/idFCLuH1kkiKJHvbjaVmPx21EW PslFefoU apti4e/OM8+z1vKcQRSR57XuRyFbHUODnGsNtEI1kRkZEZ2TU5vR5dtLQG215sKvuwqmvc9xxPONxMUBgjZmYBZJsMEFJVDcmMd4DynIDUeLznjJjbLFPYiUEDnvGbN+yVHStOiGPY3Q9CWxZtnqPUVzsfxzhgAewJR3sX8RqLf1biGoM/yNZlNcL9XpltgaQ+toHEOMQS6AP5wfAXzWVF366CHeZrE8TkZD80bffJc/W4MHATz9r4/RGBV5O1uyvO4si/5KNcaHTwoZT9JihKfTzRRbXTgbRXqH73Pgd4bsnp1k= 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: Enablements are now tracked by the lifetime of the task/mm. User processes need to be able to disable their addresses if tracing is requested to be turned off. Before unmapping the page would suffice. However, we now need a stronger contract. Add an ioctl to enable this. A new flag bit is added, freeing, to user_event_enabler to ensure that if the event is attempted to be removed while a fault is being handled that the remove is delayed until after the fault is reattempted. Signed-off-by: Beau Belgrave --- include/uapi/linux/user_events.h | 24 +++++++++ kernel/trace/trace_events_user.c | 93 +++++++++++++++++++++++++++++++- 2 files changed, 115 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/user_events.h b/include/uapi/linux/user_events.h index 22521bc622db..3e7275e3234a 100644 --- a/include/uapi/linux/user_events.h +++ b/include/uapi/linux/user_events.h @@ -46,6 +46,27 @@ struct user_reg { __u32 write_index; } __attribute__((__packed__)); +/* + * Describes an event unregister, callers must set the size, address and bit. + * This structure is passed to the DIAG_IOCSUNREG ioctl to disable bit updates. + */ +struct user_unreg { + /* Input: Size of the user_unreg structure being used */ + __u32 size; + + /* Input: Bit to unregister */ + __u8 disable_bit; + + /* Input: Reserved, set to 0 */ + __u8 __reserved; + + /* Input: Reserved, set to 0 */ + __u16 __reserved2; + + /* Input: Address to unregister */ + __u64 disable_addr; +} __attribute__((__packed__)); + #define DIAG_IOC_MAGIC '*' /* Request to register a user_event */ @@ -54,4 +75,7 @@ struct user_reg { /* Request to delete a user_event */ #define DIAG_IOCSDEL _IOW(DIAG_IOC_MAGIC, 1, char *) +/* Requests to unregister a user_event */ +#define DIAG_IOCSUNREG _IOW(DIAG_IOC_MAGIC, 2, struct user_unreg*) + #endif /* _UAPI_LINUX_USER_EVENTS_H */ diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 86bda1660536..e4ee25d16f3b 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -102,6 +102,9 @@ struct user_event_enabler { /* Bit 6 is for faulting status of enablement */ #define ENABLE_VAL_FAULTING_BIT 6 +/* Bit 7 is for freeing status of enablement */ +#define ENABLE_VAL_FREEING_BIT 7 + /* Only duplicate the bit value */ #define ENABLE_VAL_DUP_MASK ENABLE_VAL_BIT_MASK @@ -301,6 +304,12 @@ static void user_event_enabler_fault_fixup(struct work_struct *work) /* Prevent state changes from racing */ mutex_lock(&event_mutex); + /* User asked for enabler to be removed during fault */ + if (test_bit(ENABLE_VAL_FREEING_BIT, ENABLE_BITOPS(enabler))) { + user_event_enabler_destroy(enabler); + goto out; + } + /* * 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 @@ -315,7 +324,7 @@ static void user_event_enabler_fault_fixup(struct work_struct *work) user_event_enabler_write(mm, enabler, true); mmap_read_unlock(mm->mm); } - +out: mutex_unlock(&event_mutex); /* In all cases we no longer need the mm or fault */ @@ -370,7 +379,8 @@ 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)))) + if (unlikely(test_bit(ENABLE_VAL_FAULTING_BIT, ENABLE_BITOPS(enabler)) || + test_bit(ENABLE_VAL_FREEING_BIT, ENABLE_BITOPS(enabler)))) return -EBUSY; ret = pin_user_pages_remote(mm->mm, uaddr, 1, FOLL_WRITE | FOLL_NOFAULT, @@ -428,6 +438,10 @@ static bool user_event_enabler_dup(struct user_event_enabler *orig, { struct user_event_enabler *enabler; + /* Skip pending frees */ + if (unlikely(test_bit(ENABLE_VAL_FREEING_BIT, ENABLE_BITOPS(orig)))) + return true; + enabler = kzalloc(sizeof(*enabler), GFP_NOWAIT); if (!enabler) @@ -2086,6 +2100,75 @@ static long user_events_ioctl_del(struct user_event_file_info *info, return ret; } +static long user_unreg_get(struct user_unreg __user *ureg, + struct user_unreg *kreg) +{ + u32 size; + long ret; + + ret = get_user(size, &ureg->size); + + if (ret) + return ret; + + if (size > PAGE_SIZE) + return -E2BIG; + + if (size < offsetofend(struct user_unreg, disable_addr)) + return -EINVAL; + + ret = copy_struct_from_user(kreg, sizeof(*kreg), ureg, size); + + return ret; +} + +/* + * Unregisters an enablement address/bit within a task/user mm. + */ +static long user_events_ioctl_unreg(unsigned long uarg) +{ + struct user_unreg __user *ureg = (struct user_unreg __user *)uarg; + struct user_event_mm *mm = current->user_event_mm; + struct user_event_enabler *enabler, *next; + struct user_unreg reg; + long ret; + + ret = user_unreg_get(ureg, ®); + + if (ret) + return ret; + + if (!mm) + return -ENOENT; + + ret = -ENOENT; + + /* + * Flags freeing and faulting are used to indicate if the enabler is in + * use at all. When faulting is set a page-fault is occurring asyncly. + * During async fault if freeing is set, the enabler will be destroyed. + * If no async fault is happening, we can destroy it now since we hold + * the event_mutex during these checks. + */ + mutex_lock(&event_mutex); + + list_for_each_entry_safe(enabler, next, &mm->enablers, link) + if (enabler->addr == reg.disable_addr && + (enabler->values & ENABLE_VAL_BIT_MASK) == reg.disable_bit) { + set_bit(ENABLE_VAL_FREEING_BIT, ENABLE_BITOPS(enabler)); + + if (!test_bit(ENABLE_VAL_FAULTING_BIT, ENABLE_BITOPS(enabler))) + user_event_enabler_destroy(enabler); + + /* Removed at least one */ + ret = 0; + } + + mutex_unlock(&event_mutex); + + return ret; +} + /* * Handles the ioctl from user mode to register or alter operations. */ @@ -2108,6 +2191,12 @@ static long user_events_ioctl(struct file *file, unsigned int cmd, ret = user_events_ioctl_del(info, uarg); mutex_unlock(&group->reg_mutex); break; + + case DIAG_IOCSUNREG: + mutex_lock(&group->reg_mutex); + ret = user_events_ioctl_unreg(uarg); + mutex_unlock(&group->reg_mutex); + break; } return ret;