From patchwork Mon Jan 15 10:07:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13519439 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 8381FC3DA79 for ; Mon, 15 Jan 2024 10:07:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19ADB6B00A0; Mon, 15 Jan 2024 05:07:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 14A096B00A1; Mon, 15 Jan 2024 05:07:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 038F86B00A2; Mon, 15 Jan 2024 05:07:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id E912F6B00A0 for ; Mon, 15 Jan 2024 05:07:42 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BD7071604E7 for ; Mon, 15 Jan 2024 10:07:42 +0000 (UTC) X-FDA: 81681118764.22.FDEE735 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 25154C0013 for ; Mon, 15 Jan 2024 10:07:40 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZqcBnNJh; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705313260; 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:references:dkim-signature; bh=5T4EASqZP4WNXzIQNT1K4h8oNNu89D6KQhpLw+uTpdE=; b=Ju94ptkp7KOewwn7ISZuumSci00eUnsO8hO6lA9KXZaUOOIPym+TtMQzXoUYQZ3zHLPBdb pdgQ/uPOdRorcxWB+ya1jXwUlJUJfNwxrxNcEndnqVxI/H13NUygrwJM80f7RT/YhnJOae TwMSU7CDLJMHLnZNQsacmtCj5P/hMPQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZqcBnNJh; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705313260; a=rsa-sha256; cv=none; b=LiqjuADJQas5sJpurM7S4Y1qp8kf4JGchvLFyJ0a7TT98hyDZjh1fSakCWxKMjLZlpjk66 g6EycXmb6+sUmLHK2ljq2wwi2vXtgJKvmzw8qwm4+B7HnO6OlFsWOalSOcXFOE2wRXGlWL 7viMEf3olmldO02OLt31hQ9X3YBaaeM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705313259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5T4EASqZP4WNXzIQNT1K4h8oNNu89D6KQhpLw+uTpdE=; b=ZqcBnNJht5eFzDmD2z2/eZX5yOpI555m+JUhiZSX5BvUGPzNyPR5XphsTUpVW/VtEHPhor KNYxI5qCJwDwxnjZoB/OkWhp6dOzj+CwXZlArvBpam/USXTI5bdbL/dN16ZeMnpB+ud45b KhAPylqCbRgEEpHktgjOZnHvKDyiIco= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-563-7P3tQoYOPIKCU7iP2YPC5w-1; Mon, 15 Jan 2024 05:07:37 -0500 X-MC-Unique: 7P3tQoYOPIKCU7iP2YPC5w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 653CF38425A0; Mon, 15 Jan 2024 10:07:36 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.194.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFBA040C6E2C; Mon, 15 Jan 2024 10:07:32 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-perf-users@vger.kernel.org, David Hildenbrand , Jiri Olsa , Ryan Roberts , Andrew Morton , Oleg Nesterov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Namhyung Kim , Ian Rogers , Adrian Hunter Subject: [PATCH v1] uprobes: use pagesize-aligned virtual address when replacing pages Date: Mon, 15 Jan 2024 11:07:31 +0100 Message-ID: <20240115100731.91007-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 25154C0013 X-Stat-Signature: fg3eh8jmnae77eeukn347k4z55rgjcus X-Rspam-User: X-HE-Tag: 1705313260-927960 X-HE-Meta: U2FsdGVkX18JSd4BykosJhAa2Ks8N14loRAAsY6dY9sYobxxxRl/BS/ds/gtax9dkay/GyStdVTR3+nME1J9sRyz+NM+yMic5dqtV93hXRGjmV8P2jUxiprV1MHJfLi6B2N+3zUzPAMkrMXTYSG7hT4Q1UZqJ5VmdXq5bUr4P4t/jBCcOD5TxYlgkGN8brfka8hvnTnKLRW/blmhN0GN97jFviZbq91tgUgmGZG7RccvJ9f02h+I+Tu+AVGZ+cCCHW64W2m6IAp8vpNbAZfwZXD9h31mjNy5eutnIgiuWkjU/9baiXKKuF0L6UJa46rTJ8vQRZuq6pHGzJcrJD4rtQSx49TqKiCPs8Qz3TPGnpF0aPL+Oml4O7ARDMbewqm0sGLsIj5Jabrv4x2Q2rAuFvgDBVFQDSlRhFk/yQ8WTZktlRNlOtpajJvthTBfGw/lw3mY4z9V5uJ5lgOOAV2imbTbb+cgSRYETXmapz22HMQy7SLAD7AG0bjTDoIQ/o8i8DC87QNNaZroYzdOERQ/WnBac3F0l0/8rWQOkZi8QL+AL6t0a23LVO6OGfBqCdmGHPwvfVhtN0g4pD+iRr4Kfrycexc3fXD53RzGKGuadBuBBQD2DFJPWkhXyCyZD7XBbwLbqKt1Q6aARiLAXdieZneOAAqVNDk9+wtdszIP1EKfaNrWK5DWdDp6DhuHeMY8XfcrrmFjARZvgNAs7RB2tjRde3M+Aht3ODpOtV8ccM88hUqtcEf2swQKpXgLmI/EqN8nJq7Lpc90CPulCG64vq90MNLNU0nEEP4VNGQu6tCPHx8Gjzr6aGYlAweDmMvKPSBofcxA9vyV08krC+MBpUuVRUU4/hU1l1kd6/UR9lttOJBkZW8VPhZmrwEBqSVUy71lX6LjpcwfQLB1C6ZvHVhPEG29nOK7/j01A2vuC5iR0AMTjEEHGj9RB6TJ+AE59zb3vFpv8zdcCgCFpKt igmBrLv4 miNWbcqgnU7atA4E4ZqrgIro/jwe5rh9Q9yy+jW8FLb2eLvyYrdkszcKtR5HlylhHy7kZgEebTg5BsLrnvzM3MW1BMrAJV2Mo/krgcw4iF1m8Os9ZK3q5Ozll4Dm9IX6zpGEFz3rC4WKpzBOeY0/ykDZY0vDZCces41tTX9Xezd/8L2OS9OnHxdJZt6Q4AaqwQXdc7zSnjkFD2JlmnGGDNgB9gx6yOE1qEnQkDoDmBeW71TyirJYZh6kDqDGHWuC3tjY3d89HU6hGxxpAZdK/o/z+RbPNcjvPaARJHEzcBFGv1ShLLSO2iVI0yNVbgzfEEDDZfpbZnceXyfIgWgPCbNRIHX2h+7+1e5ITPUqxp2bZ5MiGesnAKuM0mkQJdsIIYWvUnKIleyvNTY4H8qvrl+4dAu3icRRIq1Rin7lZrwLlREv9hhNbr3Bw0GSCWMN94yCIlWLiz5KfU6A= 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: List-Subscribe: List-Unsubscribe: uprobes passes an unaligned page mapping address to folio_add_new_anon_rmap(), which ends up triggering a VM_BUG_ON() we recently extended in commit 372cbd4d5a066 ("mm: non-pmd-mappable, large folios for folio_add_new_anon_rmap()"). Arguably, this is uprobes code doing something wrong; however, for the time being it would have likely worked in rmap code because __folio_set_anon() would set folio->index to the same value. Looking at __replace_page(), we'd also pass slightly wrong values to mmu_notifier_range_init(), page_vma_mapped_walk(), flush_cache_page(), ptep_clear_flush() and set_pte_at_notify(). I suspect most of them are fine, but let's just mark the introducing commit as the one needed fixing. I don't think CC stable is warranted. We'll add more sanity checks in rmap code separately, to make sure that we always get properly aligned addresses. Reported-by: Jiri Olsa Closes: https://lkml.kernel.org/r/ZaMR2EWN-HvlCfUl@krava Fixes: c517ee744b96 ("uprobes: __replace_page() should not use page_address_in_vma()") Tested-by: Jiri Olsa Reviewed-by: Ryan Roberts Cc: Andrew Morton Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Mark Rutland Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Cc: Ian Rogers Cc: Adrian Hunter Signed-off-by: David Hildenbrand Acked-by: Oleg Nesterov --- kernel/events/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 485bb0389b488..929e98c629652 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -537,7 +537,7 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, } } - ret = __replace_page(vma, vaddr, old_page, new_page); + ret = __replace_page(vma, vaddr & PAGE_MASK, old_page, new_page); if (new_page) put_page(new_page); put_old: