From patchwork Tue Apr 23 23:27:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 13640882 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 16042405F7 for ; Tue, 23 Apr 2024 23:27:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713914866; cv=none; b=L454hYZOnEBB9OmRqx202Ccv+o/1qRT4TAiN+58Xg127k3mZooNGhCvC2vUHj4Wq8Bl2aswQu5f79viGG+VLb10fyx4aoKp5yCC2UgrtjX1GoUw2xMgpjhMVNcKOe8RMHNbf2v68SLR4ZSLErZ6TIz2aviaOZbaYROtvtojzjgs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713914866; c=relaxed/simple; bh=l6oDZivJcyQTCOy+gknzagGu6pD9fjWdRZ/T8AH6uxk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Xz9Mxi19PHmKMvAXO5PUMHu2CL5AR37HLaAA/Oou+YjGmgCJGWP6epI8C+DlPfP9tteiRKN0aeY9BEgwJlZX0WJaHt195fNaoww+SCuHjyaWRFnWKHaAfdEZ6fSqRvNtcoCh9BRcn1hSZdC6YEg3ix3nHANMNLWSvNV3Wl6Fm6A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KBYjzMWN; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KBYjzMWN" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-417bf71efb4so1442165e9.0 for ; Tue, 23 Apr 2024 16:27:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713914862; x=1714519662; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=RPOnWL9RPpAUuW6zSj0DHbUYz85VJ46LckD0gpweWUA=; b=KBYjzMWN/Vb1FaJMmcGldTfjlsH1Uz11TC8lW6+1dmV/Zl9R7qbUL3ZFAuCOFbjgKY V5yJI94I4T5guHJUx8Tv7V/1RGqD0wi66Fz6MJqeEbO6zIIHMRJPMMrcByoB/LQUMxtl IAVcn2z3P59gwGPqAeDjFfGjkF5nYjuKnUfxivurUdS2O3uLfZ4t5e6/V7ISTw0N1sJH tzbbnyORVz4c2vKMOd8slpkel1RwNtTkPYbomtfOV/tf5ur+Dnl26dEemQxlwDOerQPk TCloioMR20kwRcf3hIiEPADWoBtnoYdM4QkkG2DZA7wBAfQvbGrOBj9kYMl/73owkJ2N g83w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713914862; x=1714519662; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RPOnWL9RPpAUuW6zSj0DHbUYz85VJ46LckD0gpweWUA=; b=fSznHmxA8yvi+/YG7YySaXONJ+IxirZgfNetcKlrhucBct2F8wWqWmkAJ+nMhQymkZ V2YCeG1SqpXGUogGaiA9H6e4xlbEjV/MZVOn9Y56hSoKYzEfwuRn05z4XYhbKDXh0Woe 7mFIywsATJaI2edjdWLK3LAVYYZCo7/jHXisUquDDFo2ai+wqDm2k86cLB+qE3iSTLTU mbk8hai0jEn7pVu4bClYXGc9TgKEvHUHLOEDp7EHTfXH8OtwtjiRvA7Rg2jm06mmZ0nS tPZRM19yGQtbfFs+sXnr9MJIcHcDnLmWCjy5V91OEx+nrgOyGrjNjpilGByCameJR9JW 37Kg== X-Forwarded-Encrypted: i=1; AJvYcCXt+o7pVo0X5kNgUL6UAMaUEBYdvg7b3A2I90ScpcTGzeZ2TAzTd8p+74bZdS+axyS37s2Q65NSBgl5z/7ffUS5Qu7fYZmh0CyiawgcrJt2mdWw X-Gm-Message-State: AOJu0YxOaVzHjgRdKpujY1FNxdQJJdAVl4n1uiBFCa2mQH2uyTby2vf/ HvJxpfVKMZ4HXdEcPqZWxd7Ilb+xTg39DF6uUxp8uc2hvmWGj4cmE2oV0Fyj8rRqZ7eDV0sRqPV 1r/mLFvibK4p+TOGSvg== X-Google-Smtp-Source: AGHT+IGcdysYgUX4limEoSe99eX1kVHNgFXvvBzAevVZIP8Mf4AJfQvspS4UgnqLHo17qIW313pU+cLeRpPTxzU0 X-Received: from vdonnefort.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:2eea]) (user=vdonnefort job=sendgmr) by 2002:a7b:cc16:0:b0:419:e61c:f388 with SMTP id f22-20020a7bcc16000000b00419e61cf388mr17264wmh.4.1713914862375; Tue, 23 Apr 2024 16:27:42 -0700 (PDT) Date: Wed, 24 Apr 2024 00:27:24 +0100 In-Reply-To: <20240423232728.1492340-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240423232728.1492340-1-vdonnefort@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240423232728.1492340-2-vdonnefort@google.com> Subject: [PATCH v21 1/5] ring-buffer: Allocate sub-buffers with __GFP_COMP From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: mathieu.desnoyers@efficios.com, kernel-team@android.com, rdunlap@infradead.org, rppt@kernel.org, david@redhat.com, Vincent Donnefort In preparation for the ring-buffer memory mapping, allocate compound pages for the ring-buffer sub-buffers to enable us to map them to user-space with vm_insert_pages(). Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 25476ead681b..cc9ebe593571 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1524,7 +1524,7 @@ static int __rb_allocate_pages(struct ring_buffer_per_cpu *cpu_buffer, list_add(&bpage->list, pages); page = alloc_pages_node(cpu_to_node(cpu_buffer->cpu), - mflags | __GFP_ZERO, + mflags | __GFP_COMP | __GFP_ZERO, cpu_buffer->buffer->subbuf_order); if (!page) goto free_pages; @@ -1609,7 +1609,7 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu) cpu_buffer->reader_page = bpage; - page = alloc_pages_node(cpu_to_node(cpu), GFP_KERNEL | __GFP_ZERO, + page = alloc_pages_node(cpu_to_node(cpu), GFP_KERNEL | __GFP_COMP | __GFP_ZERO, cpu_buffer->buffer->subbuf_order); if (!page) goto fail_free_reader; @@ -5579,7 +5579,7 @@ ring_buffer_alloc_read_page(struct trace_buffer *buffer, int cpu) goto out; page = alloc_pages_node(cpu_to_node(cpu), - GFP_KERNEL | __GFP_NORETRY | __GFP_ZERO, + GFP_KERNEL | __GFP_NORETRY | __GFP_COMP | __GFP_ZERO, cpu_buffer->buffer->subbuf_order); if (!page) { kfree(bpage);