From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D893314A6F for ; Sun, 10 May 2026 21:41:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778449298; cv=none; b=G5T4CfWIbiM/qX80t+A/2OSo16/td3a9eI/2wCr7IaNMf2OMqtsZ9dLH3qdHrxaXExakUv2fytyQmwCFoXUiJhkIwfVjy9b6LQFDuVl53ZnjjoyAymshs1S124mrE0hPFLklbcLf0inwY+bMxbXDwZGDe4Aw5azn3cP1YHY1SYw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778449298; c=relaxed/simple; bh=xpy9AyhUst/uLBO9xlxIdK2zcPLCL9yNJiiQAZ3hkrM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=QQr+6rbF3fbqSJ/hYV4jZFN+g9BvcOt3apn0kEuPWjWgKv13Xv/ouWXqp0mt4kg8VNNU2br2K5PG5RWHAAV35EOai8T4eJmc+QjqsvHqDY5J85cKjofNHWYbx1AmT8OJY46ON+9cTjatPY78IPhaiVzgbkBsD+FTn9T+rZBicCg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=sv0rEXQ9; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sv0rEXQ9" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2ba6485d219so22856315ad.3 for ; Sun, 10 May 2026 14:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778449297; x=1779054097; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IqrHxbDBE+DHYuDSqc/T5P005krzaOCUo3AtLPcUMkM=; b=sv0rEXQ9choFpQXhHS8jI3nqoEFuH0/EOvseq503RqWbeyTJ5YWAUD6/BwAzLJZwEK iBcedQHrqON6AfSxFAFAUdZIwXZr5Zou0hlTfQ/hn0f25I/WGQ9rnAQKbQSMabJifMGT HX6XwSQyQi0C8pfk2rMaIQA1QPICpoUCG8uBDuAxN21gzarn5GJItpT0BYgrcNezCKrs DvuE9Q5kmXbpDah7Q8PuD/SNUjCxEYk1apv5U11/ylmYrPkbH442LKV0k85awQjxKJBX 3SiwbTbWtlDmrvlbzdPhBVRM3oIEKbKhPCfFfMWHMT7sBaj/4G/Oi3DGA71OacdQl/rH 3LdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778449297; x=1779054097; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IqrHxbDBE+DHYuDSqc/T5P005krzaOCUo3AtLPcUMkM=; b=H1l7CssUcEZ/GgmEXzJIpUlNBcvwGUK/Kc6fvmT+gda0Bu8o0WQVGqfgkDdC+5arK9 xi7+WS5q+iIkZbnzWV9OQM3kqo9OXMEuBONwfXSMDUpuFOAZECQbrhaC5TwrTQ5B2mZI IgNe/dnPX3z/1U1JowPYc6Az9WQdTKN5LWgiRTrv1p8JWYXAU5OfHjaZoAZVsVSG/n59 JL8u3Ki8eDlBWHed/bUxQRRKxf8obuQPTkCVHYt3fnOo7qMQ2kVx177tUkDJx/MHLaVg igFfTt7IiaIiovctp7fDfgFLYEE05/LHizaCdbLPaOhwluJrSBi5Xi84FTKPPKuvFp02 xZhg== X-Forwarded-Encrypted: i=1; AFNElJ8BbHDaNbI+OPk9Yg9gwMoUUsEMG0j/tTxMehDdnw7rGhln58z2HAJ8LaM1QmMvd3N1+kEWXiQYyS23XOE=@vger.kernel.org X-Gm-Message-State: AOJu0YzgvkhdQD+r9bdhYZfWqt2zE7bmIfZ7abs4bkkOBV8miaZTTDWu suFJiYSNBq2GK2DmPM41iugzzDUAn2V9WA9+HO9MzTUK0gb6wYd6qDva X-Gm-Gg: Acq92OFgKgPTItQ/HxdO2gFrsmO26UR89tc4uuzMd5ugCqbeoN4ZY8AIyKoSSeCc77q gezgenc64thdktpzl/MYzsGFjZWZWu44/edLdwdgI0JMQEAdTmRKPzrhsBamokQoChF1HSC5jZq RnQjGNuCsigb9EHGxZBHRS9ARf0aInsAzdQ3vZOUYdJcaVbDPpFA/ZLm1q1+zfRvFBa7huJ7VbG TsLu81ZZf/7gTC4oDALqVh+ZO6Q3CaGUhoF8TpB00vkF4QjPGkYQzJSTpD+Fa9x28B1XVpjXObU MqiUbPXla1NUbi8Ex7JCBzyZ46B0bEr/xjjtqRFsJNjtLHjVwjcJEW/GsWhl/ZnSjU1Nu/mtyGe vCFniTAp9mxwGLma2a9wmp8Cz0B55g0AO0uxcUrlNWVHVB2gRhlfmqH2QVqmj4d9FM5bLyFqNq3 sZ8+C56VfHEL6aqjZO8pMZiOS37DJIHEvVDJnhyu/U4gEByacOf5ZsVo6BBfdwAtUFjsEGgleJQ JPtlb3wpSNcDZWBbeeQeUemgOAOmutAaMGpHUM5CfLFlQ== X-Received: by 2002:a17:902:ea0e:b0:2b2:481b:de68 with SMTP id d9443c01a7336-2ba79c14a7cmr248908885ad.35.1778449296667; Sun, 10 May 2026 14:41:36 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1e99be6sm78597955ad.68.2026.05.10.14.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2026 14:41:36 -0700 (PDT) From: Rosen Penev To: linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Oleg Nesterov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , linux-kernel@vger.kernel.org (open list:UPROBES), linux-perf-users@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM) Subject: [PATCH] uprobes: Use flexible array for xol_area bitmap Date: Sun, 10 May 2026 14:41:18 -0700 Message-ID: <20260510214118.41926-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The XOL slot bitmap has the same lifetime as struct xol_area, but it is currently allocated separately. That adds another allocation failure path and a matching cleanup branch without buying any extra flexibility. Store the bitmap as a flexible array member and allocate it together with the xol_area using kzalloc_flex(). The bitmap remains zero-initialized, while the allocation and error handling become simpler. Assisted-by: Codex:GPT-5.5 Signed-off-by: Rosen Penev --- kernel/events/uprobes.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 4084e926e284..9ef74c2ad390 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -108,7 +108,6 @@ static LIST_HEAD(delayed_uprobe_list); */ struct xol_area { wait_queue_head_t wq; /* if all slots are busy */ - unsigned long *bitmap; /* 0 = free slot */ struct page *page; /* @@ -117,6 +116,7 @@ struct xol_area { * the vma go away, and we must handle that reasonably gracefully. */ unsigned long vaddr; /* Page(s) of instruction slots */ + unsigned long bitmap[]; /* 0 = free slot */ }; static void uprobe_warn(struct task_struct *t, const char *msg) @@ -1755,18 +1755,13 @@ static struct xol_area *__create_xol_area(unsigned long vaddr) struct xol_area *area; void *insns; - area = kzalloc_obj(*area); + area = kzalloc_flex(*area, bitmap, BITS_TO_LONGS(UINSNS_PER_PAGE)); if (unlikely(!area)) goto out; - area->bitmap = kcalloc(BITS_TO_LONGS(UINSNS_PER_PAGE), sizeof(long), - GFP_KERNEL); - if (!area->bitmap) - goto free_area; - area->page = alloc_page(GFP_HIGHUSER | __GFP_ZERO); if (!area->page) - goto free_bitmap; + goto free_area; area->vaddr = vaddr; init_waitqueue_head(&area->wq); @@ -1779,8 +1774,6 @@ static struct xol_area *__create_xol_area(unsigned long vaddr) return area; __free_page(area->page); - free_bitmap: - kfree(area->bitmap); free_area: kfree(area); out: -- 2.54.0