From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 953BC3FB075 for ; Mon, 2 Mar 2026 14:13:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460790; cv=none; b=hRIiBq9UXQzsCLY2geXNwfL6MaCF2IzDPbkAuS6PXFNwyjp0IT0RLoX2xMYvT7MSM0m7/nhDiuQto4jT9ejukfyAA7MNcBSHLi9Q+E6lcFQVo/KW9/fzSRXg49y47jHRLDbc4KS8GTFqvhjwzzVlQskpZES5rW9Fg4UdKU4r1hI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460790; c=relaxed/simple; bh=U5t7FfpI8bDIXdRv4UUiGN9veQB5PuFRipOiFyXYXrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=STFFC0wIYbIDM+m+47sOmDOBV8AGiYMpPxn1LV7yeGdojTTnAg0hDwb9YdqdV/XS4HYspiWGRSBwbHtMwXo+3o18a2u0kcdRkNHFl9OzjkCF/0I85uN49p13/lk0SYjBi5b4YOOUYyafQ3gr60YGwE1W3i/De1lQUycRlqI5X4s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=oa5qRlxH; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=rkHs28dS; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=oa5qRlxH; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=rkHs28dS; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="oa5qRlxH"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="rkHs28dS"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="oa5qRlxH"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="rkHs28dS" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6C5785BD76; Mon, 2 Mar 2026 14:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hgO/vBjxEvbCUOOxusElmoEUhXTpiDO+udaq2KN88TI=; b=oa5qRlxHVdI+XFsogszLlCt9iE/0JRwf+IRGRQjnnPx6oQpCHZwpDMR64DUQ6q1b+kQuYo KvdAa/v3qnX8+gafO+4eUKHH4smWUrQRKohQYgAD4W2gKmD4680wI0OYqf9cXLM2TgyqCH x46be/WuJJCQvQBahKeZ8z46Qgc/S8k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hgO/vBjxEvbCUOOxusElmoEUhXTpiDO+udaq2KN88TI=; b=rkHs28dStU/jRLUQp3RdCh0YaU3vDJ49ttgk1Hz5/ltmmCe9J1CArABfAMHg1IcpPi02sA xy8conT13eIBmxAw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=oa5qRlxH; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=rkHs28dS DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hgO/vBjxEvbCUOOxusElmoEUhXTpiDO+udaq2KN88TI=; b=oa5qRlxHVdI+XFsogszLlCt9iE/0JRwf+IRGRQjnnPx6oQpCHZwpDMR64DUQ6q1b+kQuYo KvdAa/v3qnX8+gafO+4eUKHH4smWUrQRKohQYgAD4W2gKmD4680wI0OYqf9cXLM2TgyqCH x46be/WuJJCQvQBahKeZ8z46Qgc/S8k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hgO/vBjxEvbCUOOxusElmoEUhXTpiDO+udaq2KN88TI=; b=rkHs28dStU/jRLUQp3RdCh0YaU3vDJ49ttgk1Hz5/ltmmCe9J1CArABfAMHg1IcpPi02sA xy8conT13eIBmxAw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2FD243EA6C; Mon, 2 Mar 2026 14:13:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id sD8BCuyapWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:00 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 01/13] fbdev: Declare src parameter of fb_pad_ helpers as constant Date: Mon, 2 Mar 2026 15:08:35 +0100 Message-ID: <20260302141255.518657-2-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_SEVEN(0.00)[7]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:dkim,suse.de:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 6C5785BD76 Content-Type: text/plain; charset="utf-8" Fbdev's padding helpers do not modify the source buffer. Declare the parameter as 'const'. Fbcon's font-rendering code calls these helpers with the font data. Declaring src as const will allow for making the font data constant as well. While at it, also remove the extern qualifier from the function declarations in the header file. Signed-off-by: Thomas Zimmermann --- drivers/video/fbdev/core/fbmem.c | 6 +++--- include/linux/fb.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fb= mem.c index cf199038f069..30f2b59c47bf 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -91,14 +91,14 @@ EXPORT_SYMBOL(fb_get_color_depth); /* * Data padding functions. */ -void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32= height) +void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, const u8 *src, u32 s_pitc= h, u32 height) { __fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, height); } EXPORT_SYMBOL(fb_pad_aligned_buffer); =20 -void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx, u32 h= eight, - u32 shift_high, u32 shift_low, u32 mod) +void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, const u8 *src, u32 idx,= u32 height, + u32 shift_high, u32 shift_low, u32 mod) { u8 mask =3D (u8) (0xff << shift_high), tmp; int i, j; diff --git a/include/linux/fb.h b/include/linux/fb.h index 6d4a58084fd5..324b0fd5f617 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -605,9 +605,9 @@ extern int register_framebuffer(struct fb_info *fb_info= ); extern void unregister_framebuffer(struct fb_info *fb_info); extern int devm_register_framebuffer(struct device *dev, struct fb_info *f= b_info); extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *= buf, u32 size); -extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx, - u32 height, u32 shift_high, u32 shift_low, u32 mod); -extern void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pit= ch, u32 height); +void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, const u8 *src, u32 idx,= u32 height, + u32 shift_high, u32 shift_low, u32 mod); +void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, const u8 *src, u32 s_pitc= h, u32 height); extern void fb_set_suspend(struct fb_info *info, int state); extern int fb_get_color_depth(struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix); @@ -633,8 +633,8 @@ static inline struct device *dev_of_fbinfo(const struct= fb_info *info) #endif } =20 -static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, - u8 *src, u32 s_pitch, u32 height) +static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, const u8 = *src, u32 s_pitch, + u32 height) { u32 i, j; =20 --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 2501E3FD130 for ; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460784; cv=none; b=BYCpiBAdIai+5//P+qZ6oByUz0nNLDzcp2rX0KQsaMPxEKsCzEWK6hAO5SMTXL0RWNYW4fWBTjPOeVNMK1gFT3GZF5lJhlU/pGui9LY3NHJJ6boWjLW0bL9CR0mAFTezC2MHoOCE07ec+ar4ZpPKyY8HcwuNYAwle99VYWRgzsg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460784; c=relaxed/simple; bh=X7ZXt/Tvldpttx1rTGbhAfIensbsUVb6ys+73i6I5kg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Np782z82vbzmq5/s5HVYq8fVIOJACiszY0dMZYUR9mN2nvjVKNkKorqucsuST7SleS63lABvQuAJBViH7MisVxMlvd33YcEJneEXoJyGQoA+3CQTLvDzd1e+C8OfdXJi+d5JVoUapUnHaoTKG/aabCZAzc2HUG54Kf2UKViP1yg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=TqKJdKsr; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=CAIj6N61; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=TqKJdKsr; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=CAIj6N61; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="TqKJdKsr"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="CAIj6N61"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="TqKJdKsr"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="CAIj6N61" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 9A3673F7F6; Mon, 2 Mar 2026 14:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDdFaZ33ivCVSgFIvrCH2YTfOSd7wSVCMvjOyrWj3aI=; b=TqKJdKsryS2kvryXltCj3gTsn1zKaSMK+EYuhzjIBxqHxXJFRvkCN8TFeBIld9EFO9pZqM j2tjLSfNNfk0dJRyKqGqSwJKUsFCOQJXwnl3iu/pKXLZf2RLLt8wsdivIR7vJUlztjTbVx SeJTiFtzfwa6OGHSjx8X2FwEciAWhj4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDdFaZ33ivCVSgFIvrCH2YTfOSd7wSVCMvjOyrWj3aI=; b=CAIj6N61HBD01Q10TBuDiZAnFicZGP9g1Kt5V4a5CWYRACTvsW+EHkRI57W8Srkk4oTEM+ /iOB8r/sbP6XE0DA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDdFaZ33ivCVSgFIvrCH2YTfOSd7wSVCMvjOyrWj3aI=; b=TqKJdKsryS2kvryXltCj3gTsn1zKaSMK+EYuhzjIBxqHxXJFRvkCN8TFeBIld9EFO9pZqM j2tjLSfNNfk0dJRyKqGqSwJKUsFCOQJXwnl3iu/pKXLZf2RLLt8wsdivIR7vJUlztjTbVx SeJTiFtzfwa6OGHSjx8X2FwEciAWhj4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDdFaZ33ivCVSgFIvrCH2YTfOSd7wSVCMvjOyrWj3aI=; b=CAIj6N61HBD01Q10TBuDiZAnFicZGP9g1Kt5V4a5CWYRACTvsW+EHkRI57W8Srkk4oTEM+ /iOB8r/sbP6XE0DA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6974F3EA69; Mon, 2 Mar 2026 14:13:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gOxNGOyapWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:00 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 02/13] vt: Remove trailing whitespaces Date: Mon, 2 Mar 2026 15:08:36 +0100 Message-ID: <20260302141255.518657-3-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.994]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Flag: NO Content-Type: text/plain; charset="utf-8" Fix coding style. No functional changes. Signed-off-by: Thomas Zimmermann --- include/linux/console_struct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index 13b35637bd5a..ebdb9750d348 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -120,7 +120,7 @@ struct vc_data { unsigned short vc_complement_mask; /* [#] Xor mask for mouse pointer */ unsigned short vc_s_complement_mask; /* Saved mouse pointer mask */ unsigned long vc_pos; /* Cursor address */ - /* fonts */=09 + /* fonts */ unsigned short vc_hi_font_mask; /* [#] Attribute set for upper 256 chars = of font or 0 if not supported */ struct console_font vc_font; /* Current VC font set */ unsigned short vc_video_erase_char; /* Background erase character */ --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 82DE83FD132 for ; Mon, 2 Mar 2026 14:13:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460796; cv=none; b=FGMzUTjWJdYjl3QPRM3nEghFG0ej16AbITWK/d5bzJqj0CF6Pd7KdnjuoDvuKrhhzXf/cGAY1nOY+H2EGQaVN8t/gAVLdMP2ViIbhH86o0lrLNqADMiSIoRY5tfhLkXMabWOO8QW0aajngXq8FsY8soyvnRpysFyK/ECysioWeY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460796; c=relaxed/simple; bh=tab5Nnx/oEw0IaA4ebfxZbecA//Apnegs5i3ywuC760=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IMApdP4tnU4XijiWzMDwvCgtrVOp5OurjfMz8euFpUFeb0QXfpdXOwUwffPdXQ96ljq6hDPiR2k1ea2UKfCpEVb5FVuEUjTN6gTKNU+P1LZuAFlrpIoy8i8CJS5n+SR+2vGWywlvZy1Rg5Z0LzZvkPS3p+/7hv6gX1FbOHFZoSk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=wnsOxLM/; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=rGYigtCO; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=wnsOxLM/; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=rGYigtCO; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="wnsOxLM/"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="rGYigtCO"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="wnsOxLM/"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="rGYigtCO" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D3F875BD6F; Mon, 2 Mar 2026 14:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GZ1NFRnlAmgYbnBq2kl1lIWQXZsZ3Wq0UDH+fyXEM44=; b=wnsOxLM/ls+gLO2n3v5C/S7PUaGbCo/NefjFMj7bjMl3Nkjx78zWvJiKv1pCuSfVjXOx6Z BXGADFYM8qjYzENKInOQKkb8uII6fv/Ccy87xz1fpLUPs8kJnSmvbsC6mPuF8tidxHAqtO Lindg7cMdDxZVvOoWCQBNlw8svNimIY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GZ1NFRnlAmgYbnBq2kl1lIWQXZsZ3Wq0UDH+fyXEM44=; b=rGYigtCObE/C0YBOm0tkLaRiVs87Uv+/XIDOQKuvBtSHlreVj4Br9prGRDRfrdBDDAMrr+ bBQpyq4v54YvoGCg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GZ1NFRnlAmgYbnBq2kl1lIWQXZsZ3Wq0UDH+fyXEM44=; b=wnsOxLM/ls+gLO2n3v5C/S7PUaGbCo/NefjFMj7bjMl3Nkjx78zWvJiKv1pCuSfVjXOx6Z BXGADFYM8qjYzENKInOQKkb8uII6fv/Ccy87xz1fpLUPs8kJnSmvbsC6mPuF8tidxHAqtO Lindg7cMdDxZVvOoWCQBNlw8svNimIY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460780; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GZ1NFRnlAmgYbnBq2kl1lIWQXZsZ3Wq0UDH+fyXEM44=; b=rGYigtCObE/C0YBOm0tkLaRiVs87Uv+/XIDOQKuvBtSHlreVj4Br9prGRDRfrdBDDAMrr+ bBQpyq4v54YvoGCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A114A3EA6C; Mon, 2 Mar 2026 14:13:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id uC4lJuyapWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:00 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 03/13] vt: Store font in struct vc_font Date: Mon, 2 Mar 2026 15:08:37 +0100 Message-ID: <20260302141255.518657-4-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.994]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Replace struct console_font with struct vc_font for the type of the vc_font field of struct vc_data. Struct console_font is UAPI, which prevents further changes. Hence a new data type is required. Struct console_font has a documented vertical pitch of 32 bytes. This is not the case after the font data has been loaded into the kernel. Changing the type of vc_font addresses this inconsistency. The font data is now declared as constant, as it might come from the kernel's read-only section. There's some fallout throughout the console code where non-const variables refer to it. Fix them. A later update will declare the font data to a dedicated data type. Signed-off-by: Thomas Zimmermann --- drivers/video/fbdev/core/bitblit.c | 11 +++++------ drivers/video/fbdev/core/fbcon.c | 4 ++-- drivers/video/fbdev/core/fbcon.h | 4 ++-- include/linux/console_struct.h | 29 +++++++++++++++++++++++++++-- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/drivers/video/fbdev/core/bitblit.c b/drivers/video/fbdev/core/= bitblit.c index 085ffb44c51a..7478accea8ec 100644 --- a/drivers/video/fbdev/core/bitblit.c +++ b/drivers/video/fbdev/core/bitblit.c @@ -22,8 +22,7 @@ /* * Accelerated handlers. */ -static void update_attr(u8 *dst, u8 *src, int attribute, - struct vc_data *vc) +static void update_attr(u8 *dst, const u8 *src, int attribute, struct vc_d= ata *vc) { int i, offset =3D (vc->vc_font.height < 10) ? 1 : 2; int width =3D DIV_ROUND_UP(vc->vc_font.width, 8); @@ -81,7 +80,7 @@ static inline void bit_putcs_aligned(struct vc_data *vc, = struct fb_info *info, u16 charmask =3D vc->vc_hi_font_mask ? 0x1ff : 0xff; unsigned int charcnt =3D vc->vc_font.charcount; u32 idx =3D vc->vc_font.width >> 3; - u8 *src; + const u8 *src; =20 while (cnt--) { u16 ch =3D scr_readw(s++) & charmask; @@ -120,7 +119,7 @@ static inline void bit_putcs_unaligned(struct vc_data *= vc, u32 shift_low =3D 0, mod =3D vc->vc_font.width % 8; u32 shift_high =3D 8; u32 idx =3D vc->vc_font.width >> 3; - u8 *src; + const u8 *src; =20 while (cnt--) { u16 ch =3D scr_readw(s++) & charmask; @@ -267,7 +266,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_in= fo *info, bool enable, int y =3D real_y(par->p, vc->state.y); int attribute, use_sw =3D vc->vc_cursor_type & CUR_SW; int err =3D 1; - char *src; + const u8 *src; =20 cursor.set =3D 0; =20 @@ -278,7 +277,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_in= fo *info, bool enable, attribute =3D get_attribute(info, c); src =3D vc->vc_font.data + ((c & charmask) * (w * vc->vc_font.height)); =20 - if (par->cursor_state.image.data !=3D src || + if (par->cursor_state.image.data !=3D (const char *)src || par->cursor_reset) { par->cursor_state.image.data =3D src; cursor.set |=3D FB_CUR_SETIMAGE; diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index 666261ae59d8..247bb90c08d3 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2286,7 +2286,7 @@ static bool fbcon_blank(struct vc_data *vc, enum vesa= _blank_mode blank, =20 static int fbcon_get_font(struct vc_data *vc, struct console_font *font, u= nsigned int vpitch) { - u8 *fontdata =3D vc->vc_font.data; + const u8 *fontdata =3D vc->vc_font.data; u8 *data =3D font->data; int i, j; =20 @@ -2417,7 +2417,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int = w, int h, int charcount, struct fbcon_par *par =3D info->fbcon_par; struct fbcon_display *p =3D &fb_display[vc->vc_num]; int resize, ret, old_userfont, old_width, old_height, old_charcount; - u8 *old_data =3D vc->vc_font.data; + const u8 *old_data =3D vc->vc_font.data; =20 resize =3D (w !=3D vc->vc_font.width) || (h !=3D vc->vc_font.height); vc->vc_font.data =3D (void *)(p->fontdata =3D data); diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fb= con.h index fca14e9b729b..3f4386a40237 100644 --- a/drivers/video/fbdev/core/fbcon.h +++ b/drivers/video/fbdev/core/fbcon.h @@ -82,8 +82,8 @@ struct fbcon_par { int rotate; int cur_rotate; char *cursor_data; - u8 *fontbuffer; - u8 *fontdata; + u8 *fontbuffer; + const u8 *fontdata; u8 *cursor_src; u32 cursor_size; u32 fd_size; diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index ebdb9750d348..7fdcae6ed49c 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -13,8 +13,9 @@ #ifndef _LINUX_CONSOLE_STRUCT_H #define _LINUX_CONSOLE_STRUCT_H =20 -#include +#include #include +#include #include =20 struct uni_pagedict; @@ -58,6 +59,30 @@ struct vc_state { bool reverse; }; =20 +/** + * struct vc_font - Describes a font + * @width: The width of a single glyph in bits + * @height: The height of a single glyph in scanlines + * @charcount: The number of glyphs in the font + * @data: The raw font data + * + * Font data is organized as an array of glyphs. Each glyph is a bitmap wi= th + * set bits indicating the foreground color. Unset bits indicate background + * color. The fields @width and @height store a single glyph's number of + * horizontal bits and vertical scanlines. If width is not a multiple of 8, + * there are trailing bits to fill up the byte. These bits should not be d= rawn. + * + * The field @data points to the first glphy's first byte. The value @char= count + * gives the number of glyphs in the font. There are no empty scanlines be= tween + * two adjacent glyphs. + */ +struct vc_font { + unsigned int width; + unsigned int height; + unsigned int charcount; + const unsigned char *data; +}; + /* * Example: vc_data of a console that was scrolled 3 lines down. * @@ -122,7 +147,7 @@ struct vc_data { unsigned long vc_pos; /* Cursor address */ /* fonts */ unsigned short vc_hi_font_mask; /* [#] Attribute set for upper 256 chars = of font or 0 if not supported */ - struct console_font vc_font; /* Current VC font set */ + struct vc_font vc_font; /* Current VC font set */ unsigned short vc_video_erase_char; /* Background erase character */ /* VT terminal data */ unsigned int vc_state; /* Escape sequence parser state */ --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 8C9C1383C6B for ; Mon, 2 Mar 2026 14:13:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460801; cv=none; b=NPV/DdrLCTPM/IQZLCVWC9RzLZ0zRCPm2w49g4UnXcS3MeT/gd9keV24Zp5CGHGZXh++5zV47AoaFa7VLkypsuEcxdDa04WRnX4pZUdB60fjeExxyjcVrRwLWrLWd/Z+My1hodUSiE989ycYoPZNdvyb5gTXxx6KJX6njKTfnIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460801; c=relaxed/simple; bh=sVw20smcmWbgQ7VP8JuoiCynXZAKExO+/r0sXtEveWc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eSC7n8Ni/mPRxxLFBy8Eq+/TpzvsNMrEQsEtWwRnvDZnspR0jkvy9rltv+uBhznQZL/FGtf+Ac2VM+nKvsKvmZ1HKJgCDz0DFscfhtAZDwHAlkFk+gi6wZUNsf+SNPABoIRti21ohOMuKESFaWpw2h/rQ6loYSMg+oOOCYkSY8g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=VtUiwLca; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=51JqJ04N; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=VtUiwLca; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=51JqJ04N; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="VtUiwLca"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="51JqJ04N"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="VtUiwLca"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="51JqJ04N" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 165735BD7A; Mon, 2 Mar 2026 14:13:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XuMyw98BBc1i/ocDzpRA4GQMbQA8MGjbmzxVCApHgSM=; b=VtUiwLcamGe4Q8T4S5xmv4lb63bVtR4FGL1MLwc7wTf9rxs/HARJ4J84bUdc+Ocb8/e1mC 9mnAjJT2xb9eQx2/5sCz9qhAo1Y/gBiWBy7a/uUlWod2Pq6kP3Zg0WeshefIwgxJP1PUEx A97aLghu5X77SOBjmNuNF9Zno8KfKo0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XuMyw98BBc1i/ocDzpRA4GQMbQA8MGjbmzxVCApHgSM=; b=51JqJ04NNwQ+9Lzj4/YDGU1IF7ajptTDdnaSg+hlnqwnP2MzIh3ojtfJZ35FSkCvSclgHk 1FTyreUz7z++EnBQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=VtUiwLca; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=51JqJ04N DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XuMyw98BBc1i/ocDzpRA4GQMbQA8MGjbmzxVCApHgSM=; b=VtUiwLcamGe4Q8T4S5xmv4lb63bVtR4FGL1MLwc7wTf9rxs/HARJ4J84bUdc+Ocb8/e1mC 9mnAjJT2xb9eQx2/5sCz9qhAo1Y/gBiWBy7a/uUlWod2Pq6kP3Zg0WeshefIwgxJP1PUEx A97aLghu5X77SOBjmNuNF9Zno8KfKo0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XuMyw98BBc1i/ocDzpRA4GQMbQA8MGjbmzxVCApHgSM=; b=51JqJ04NNwQ+9Lzj4/YDGU1IF7ajptTDdnaSg+hlnqwnP2MzIh3ojtfJZ35FSkCvSclgHk 1FTyreUz7z++EnBQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D9B703EA69; Mon, 2 Mar 2026 14:13:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id CJH2M+yapWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:00 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 04/13] vt: Calculate font-buffer size with vc_font_size() Date: Mon, 2 Mar 2026 15:08:38 +0100 Message-ID: <20260302141255.518657-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_SEVEN(0.00)[7]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:dkim,suse.de:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 165735BD7A Content-Type: text/plain; charset="utf-8" In fbcon, fbcon_resize() computes the size of the font buffer from the values stored in vc_font. Move these calculations to the dedicated helpers vc_font_pitch() and vc_font_size(). Signed-off-by: Thomas Zimmermann --- drivers/video/fbdev/core/fbcon.c | 9 ++------- include/linux/console_struct.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index 247bb90c08d3..103e91c8d874 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2037,7 +2037,6 @@ static void updatescrollmode(struct fbcon_display *p, } =20 #define PITCH(w) (((w) + 7) >> 3) -#define CALC_FONTSZ(h, p, c) ((h) * (p) * (c)) /* size =3D height * pitch = * charcount */ =20 static int fbcon_resize(struct vc_data *vc, unsigned int width, unsigned int height, bool from_user) @@ -2049,8 +2048,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned = int width, int x_diff, y_diff, virt_w, virt_h, virt_fw, virt_fh; =20 if (p->userfont && FNTSIZE(vc->vc_font.data)) { - int size; - int pitch =3D PITCH(vc->vc_font.width); + unsigned int size =3D vc_font_size(&vc->vc_font); =20 /* * If user font, ensure that a possible change to user font @@ -2059,10 +2057,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned= int width, * charcount can change and cannot be used to determine the * font data allocated size. */ - if (pitch <=3D 0) - return -EINVAL; - size =3D CALC_FONTSZ(vc->vc_font.height, pitch, vc->vc_font.charcount); - if (size > FNTSIZE(vc->vc_font.data)) + if (!size || size > FNTSIZE(vc->vc_font.data)) return -EINVAL; } =20 diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index 7fdcae6ed49c..fbb5dd5f6761 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -83,6 +83,34 @@ struct vc_font { const unsigned char *data; }; =20 +/** + * vc_font_pitch - Calculates the number of bytes between two adjacent sca= nlines + * @font: The VC font + * + * Returns: + * The number of bytes between two adjacent scanlines in the font data + */ +static inline unsigned int vc_font_pitch(const struct vc_font *font) +{ + return DIV_ROUND_UP(font->width, 8); +} + +/** + * vc_font_size - Calculates the size of the font data in bytes + * @font: The VC font + * + * vc_font_size() calculates the number of bytes of font data in the + * font specified by @font. The function calculates the size from the + * font parameters. + * + * Returns: + * The size of the font data in bytes. + */ +static inline unsigned int vc_font_size(const struct vc_font *font) +{ + return font->height * vc_font_pitch(font) * font->charcount; +} + /* * Example: vc_data of a console that was scrolled 3 lines down. * --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 81F3C3FD13D for ; Mon, 2 Mar 2026 14:13:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460789; cv=none; b=YLL7QyyJvtItXkQfb0iBdK4Latd3zSSKHpVSbCOTsNECYjp8nXzGyERUAxWas939zWJ94KWw3tN45LHwPEyB3Hu99VlK9lTdb1vpzf/Z1z+UNVBYRufyl6g2rRY2Q3FWs/FAlVyJC3N0Lg8IoU5xYKgWlkjwkw6N55yP8rNMVdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460789; c=relaxed/simple; bh=y5XmvC6gfj9Y6OOeaLySFj7KBmblfrGrs0BAJ/FBFH4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mzocjIaxx5hK6JSkGwIctztEMm/TQnydZViE/Td6jGP/gDFKM8wWxcAahkPticFAZZgILxyZIgcUYHMM3qzkcRDFmJWwD5/5MhlEvjlvj5mBhZxVdm4Y0cKUqE/vKBXkGZFYoVQs1f7Mu/+N4R1y6/Mqw1Cb+C6VF/A2zdRIKAc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=b/u9Tzrl; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=2bzrEPAw; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=b/u9Tzrl; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=2bzrEPAw; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="b/u9Tzrl"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="2bzrEPAw"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="b/u9Tzrl"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="2bzrEPAw" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 509533F7F5; Mon, 2 Mar 2026 14:13:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qDq/cW2yhQBHf4nLvdY7/6+Jg/oVSc5PEO9Oi8OztLE=; b=b/u9Tzrl23HDfTAr90zvkPHr63R035p7r+FyICMT8ZQumcqWU7eL5ecb8SV9Qj707+IxWd 0mG2lZPPuPv7AWQ+RFmu9jqwilsqx2tnYrQnFQnL3q59u+iJe7RfoxlnjS77aYfgSpilN/ 8F1+6GWa42fXkNqlOaeAtjY0TTco9Tk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qDq/cW2yhQBHf4nLvdY7/6+Jg/oVSc5PEO9Oi8OztLE=; b=2bzrEPAw0didfkJOyLaWaBHQqwWbt6TQuxMZyJFJg7tRuKaPumkoNQnUl9UElDqZMcuxS9 2yJmNa3twN6Rq/Bw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="b/u9Tzrl"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=2bzrEPAw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qDq/cW2yhQBHf4nLvdY7/6+Jg/oVSc5PEO9Oi8OztLE=; b=b/u9Tzrl23HDfTAr90zvkPHr63R035p7r+FyICMT8ZQumcqWU7eL5ecb8SV9Qj707+IxWd 0mG2lZPPuPv7AWQ+RFmu9jqwilsqx2tnYrQnFQnL3q59u+iJe7RfoxlnjS77aYfgSpilN/ 8F1+6GWa42fXkNqlOaeAtjY0TTco9Tk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qDq/cW2yhQBHf4nLvdY7/6+Jg/oVSc5PEO9Oi8OztLE=; b=2bzrEPAw0didfkJOyLaWaBHQqwWbt6TQuxMZyJFJg7tRuKaPumkoNQnUl9UElDqZMcuxS9 2yJmNa3twN6Rq/Bw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 1E39B3EA6C; Mon, 2 Mar 2026 14:13:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id QND9Be2apWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:01 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 05/13] lib/fonts: Remove trailing whitespaces Date: Mon, 2 Mar 2026 15:08:39 +0100 Message-ID: <20260302141255.518657-6-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid,suse.de:email]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_SEVEN(0.00)[7]; R_RATELIMIT(0.00)[to_ip_from(RLf7er7x8tqp4b41gsueb7z9k6)]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Rspamd-Queue-Id: 509533F7F5 X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Fix coding style. No functional changes. Signed-off-by: Thomas Zimmermann --- lib/fonts/font_acorn_8x8.c | 2 +- lib/fonts/font_mini_4x6.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/fonts/font_acorn_8x8.c b/lib/fonts/font_acorn_8x8.c index 18755c33d249..af5fa72aa8b7 100644 --- a/lib/fonts/font_acorn_8x8.c +++ b/lib/fonts/font_acorn_8x8.c @@ -68,7 +68,7 @@ static const struct font_data acorndata_8x8 =3D { /* 3A */ 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, /* : */ /* 3B */ 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x30, /* ; */ /* 3C */ 0x0C, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0C, 0x00, /* < */ -/* 3D */ 0x00, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00, 0x00, /* =3D */=20 +/* 3D */ 0x00, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00, 0x00, /* =3D */ /* 3E */ 0x30, 0x18, 0x0C, 0x06, 0x0C, 0x18, 0x30, 0x00, /* > */ /* 3F */ 0x3C, 0x66, 0x0C, 0x18, 0x18, 0x00, 0x18, 0x00, /* ? */ /* 40 */ 0x3C, 0x66, 0x6E, 0x6A, 0x6E, 0x60, 0x3C, 0x00, /* @ */ diff --git a/lib/fonts/font_mini_4x6.c b/lib/fonts/font_mini_4x6.c index 8d39fd447952..cc21dc70cfd1 100644 --- a/lib/fonts/font_mini_4x6.c +++ b/lib/fonts/font_mini_4x6.c @@ -18,15 +18,15 @@ s{((0x)?[0-9a-fA-F]+)(.*\[([\*\ ]{4})\])}{ =20 ($num,$pat,$bits) =3D ($1,$3,$4); -=09 + $bits =3D~ s/([^\s0])|(.)/ defined($1) + 0 /ge; -=09 + $num =3D ord(pack("B8", $bits)); $num |=3D $num >> 4; $num =3D sprintf("0x%.2x", $num); -=09 + #print "$num,$pat,$bits\n"; -=09 + $num . $pat; }ge; =20 --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 728DF3FFAAD for ; Mon, 2 Mar 2026 14:13:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460807; cv=none; b=m7KZ9Mw83iO5dcX3wtGe0OjwCMM95Fej3x8ercjQSHz3ftkesRT1WXq+d7SoIE1c5wiOj8lo+z+lziAwcdnTZMxccpye0Cqs/2TYXX4oZ7DThpmHKpVcD4PCJrdFxFJn9gcqOgID8J1HUko4qxDk880lAjfpjPkXoJDCfC+Kv+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460807; c=relaxed/simple; bh=KALZsMCqudWuPmvMe0xoKmUA4AsvvKztti4OCOIbY0w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=od5TmsT8YyEid1w6+OK15l4YzJeXYRgQTHdniGkwvAMTJjgBEPzTbZSdO4zYDew0deZ9SZj/bjTB2o/U9kmr11B3oSbyoIKAeYnw84VY0ktr8XIreLwkXhnfp+Zaw3p9a9bQl2nkabH0XIqTvPV1fXTIj6XP/sFKsr9D/1Ej6xQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=XAaE31wT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=RFdY2b3l; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=XAaE31wT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=RFdY2b3l; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="XAaE31wT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="RFdY2b3l"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="XAaE31wT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="RFdY2b3l" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 8A4175BD7E; Mon, 2 Mar 2026 14:13:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AkFX7hcGtwsA7uQ5xnjWz1xBCczQKP2Ld4rm28KaAPI=; b=XAaE31wT4DhiXSycq28gfkv54DPzaq+EKm2HuhDJBzkRo+h2B4qjT76X8b9hIui2vBPAm3 mvJU7i/B+pAd/+JaFawiXZ9XtKvjtsWRNwIcITL/O6aCt+JZwBy6A4iwlELhtVw/5FcCcr ewCm3BN+w+3iX0WuYvC1H3GBaISbBXo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AkFX7hcGtwsA7uQ5xnjWz1xBCczQKP2Ld4rm28KaAPI=; b=RFdY2b3lzMv9ANB3FIPeZhudCEsGPKbLIEqolXZbwvjMH+PvjJ7oOTBur/mDm64MMb3TIw V37y3x4wjeGXWoBg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AkFX7hcGtwsA7uQ5xnjWz1xBCczQKP2Ld4rm28KaAPI=; b=XAaE31wT4DhiXSycq28gfkv54DPzaq+EKm2HuhDJBzkRo+h2B4qjT76X8b9hIui2vBPAm3 mvJU7i/B+pAd/+JaFawiXZ9XtKvjtsWRNwIcITL/O6aCt+JZwBy6A4iwlELhtVw/5FcCcr ewCm3BN+w+3iX0WuYvC1H3GBaISbBXo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AkFX7hcGtwsA7uQ5xnjWz1xBCczQKP2Ld4rm28KaAPI=; b=RFdY2b3lzMv9ANB3FIPeZhudCEsGPKbLIEqolXZbwvjMH+PvjJ7oOTBur/mDm64MMb3TIw V37y3x4wjeGXWoBg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 57DF03EA69; Mon, 2 Mar 2026 14:13:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OM0EFO2apWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:01 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 06/13] lib/fonts: Remove FNTCHARCNT() Date: Mon, 2 Mar 2026 15:08:40 +0100 Message-ID: <20260302141255.518657-7-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.994]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: Content-Type: text/plain; charset="utf-8" The character count in the font data is unused. The internal fonts also do not set it. Remove FNTCHARCNT(). Signed-off-by: Thomas Zimmermann --- drivers/video/console/newport_con.c | 1 - include/linux/font.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/ne= wport_con.c index b178678566e7..e2922caa8685 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c @@ -516,7 +516,6 @@ static int newport_set_font(int unit, const struct cons= ole_font *op, =20 new_data +=3D FONT_EXTRA_WORDS * sizeof(int); FNTSIZE(new_data) =3D size; - FNTCHARCNT(new_data) =3D op->charcount; REFCOUNT(new_data) =3D 0; /* usage counter */ FNTSUM(new_data) =3D 0; =20 diff --git a/include/linux/font.h b/include/linux/font.h index fd8625cd76b2..d929c5fa32ca 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -68,7 +68,6 @@ extern const struct font_desc *get_default_font(int xres,= int yres, /* Extra word getters */ #define REFCOUNT(fd) (((int *)(fd))[-1]) #define FNTSIZE(fd) (((int *)(fd))[-2]) -#define FNTCHARCNT(fd) (((int *)(fd))[-3]) #define FNTSUM(fd) (((int *)(fd))[-4]) =20 #define FONT_EXTRA_WORDS 4 --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 186EB3FD152 for ; Mon, 2 Mar 2026 14:13:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460813; cv=none; b=ejiQ9OhC0nQ9LmO5UBRQD7nggPHQXrJhy6cvdtH/itftR5SQ6dWRAGwuWFZ+wfvacuO2Gg8dq6Q8IkGa78Jvp/VBYI6qcnHzZ3L1M6ZLcakXNbwl7z2o5AASQ3kdoSp/AfNZ1aktIjeUw2aaNktiD8f6aiA1hIZdOEXXJpk7j9k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460813; c=relaxed/simple; bh=E2+YTf+dQX9T5ykJ4yL7BjJV/Fu4I4JQ2WWUfxw6B9U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ub8a0147gEhfN0OQvEMhZDBfURbtshymvPWx+jtMtUhESqQuRBYu0TzIDkak0/ov8T2mcr7TH9q1F7MeV+kVpnd+DjjTz+KiKPNMYfFQloql1Pz3b/e8zuwAP1Hi38mOXSqTRK6jH0JhfzgLcSgwUzNmYwhoaPsnPMf6qlqet98= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=tMs2KyAV; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=zlygyOYu; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=tMs2KyAV; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=zlygyOYu; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="tMs2KyAV"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="zlygyOYu"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="tMs2KyAV"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="zlygyOYu" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C43405BD7F; Mon, 2 Mar 2026 14:13:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s9yo0DGLyYOidfgTubBlJULYFXhNUxAESfFJtfGTtsw=; b=tMs2KyAVehWA+BfhsmM8G/oClihsLGR9ZeNpCV1zbRy5PZ+ha441BGIoDu4P33yY7aZ7JU 8x1SuO2jvlEs3uWFvpbCj/Y3bKh7hsWmH3FfUsCfSW5BmpjCGKNUE+Glvq7yPbWb772qxx C01bD3TqWnfaA2PdZCoIherL8kba+m4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s9yo0DGLyYOidfgTubBlJULYFXhNUxAESfFJtfGTtsw=; b=zlygyOYu3AVEaPIxEbR2SQFw24MgbssfNaTPBQiVqdw713E6WN43GaDzObtlU6UhXOsA5u XcCY6lYRE28mBwDQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s9yo0DGLyYOidfgTubBlJULYFXhNUxAESfFJtfGTtsw=; b=tMs2KyAVehWA+BfhsmM8G/oClihsLGR9ZeNpCV1zbRy5PZ+ha441BGIoDu4P33yY7aZ7JU 8x1SuO2jvlEs3uWFvpbCj/Y3bKh7hsWmH3FfUsCfSW5BmpjCGKNUE+Glvq7yPbWb772qxx C01bD3TqWnfaA2PdZCoIherL8kba+m4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s9yo0DGLyYOidfgTubBlJULYFXhNUxAESfFJtfGTtsw=; b=zlygyOYu3AVEaPIxEbR2SQFw24MgbssfNaTPBQiVqdw713E6WN43GaDzObtlU6UhXOsA5u XcCY6lYRE28mBwDQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 908283EA6C; Mon, 2 Mar 2026 14:13:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id AA0XIu2apWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:01 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 07/13] lib/fonts: Store font data as font_data_t; update consoles Date: Mon, 2 Mar 2026 15:08:41 +0100 Message-ID: <20260302141255.518657-8-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.987]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; RCVD_TLS_ALL(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL4936hw7dbgk3hb39jfn1xy19)]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Store font data as pointer to font_data_t instead of unsigned char. Update consoles. Pointers to font data refer to the raw data. There is a hidden header before the data that contains additional state. Document the existing layout and semantics of font_data_t. The data field in struct vc_font can be used by any console. Therefore it still points to plain data without the additional header. Fbcon sets its value from struct fbcon_display.fontdata. Hence, update the size test in fbcon_resize() to use struct fbcon_display.fontdata instead of struct vc_font.data. v2: - 'Font lookup' -> 'Font description' in Signed-off-by: Thomas Zimmermann --- drivers/video/console/newport_con.c | 17 ++++++----- drivers/video/fbdev/core/fbcon.c | 44 ++++++++++++++++----------- drivers/video/fbdev/core/fbcon.h | 3 +- include/linux/font.h | 47 ++++++++++++++++++++++++++++- 4 files changed, 84 insertions(+), 27 deletions(-) diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/ne= wport_con.c index e2922caa8685..9b9ed1940404 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c @@ -33,9 +33,9 @@ =20 #define NEWPORT_LEN 0x10000 =20 -#define FONT_DATA ((unsigned char *)font_vga_8x16.data) +#define FONT_DATA font_vga_8x16.data =20 -static unsigned char *font_data[MAX_NR_CONSOLES]; +static font_data_t *font_data[MAX_NR_CONSOLES]; =20 static struct newport_regs *npregs; static unsigned long newport_addr; @@ -370,9 +370,9 @@ static void newport_clear(struct vc_data *vc, unsigned = int sy, unsigned int sx, static void newport_putc(struct vc_data *vc, u16 charattr, unsigned int yp= os, unsigned int xpos) { - unsigned char *p; + const unsigned char *p; =20 - p =3D &font_data[vc->vc_num][(charattr & 0xff) << 4]; + p =3D &font_data_buf(font_data[vc->vc_num])[(charattr & 0xff) << 4]; charattr =3D (charattr >> 8) & 0xff; xpos <<=3D 3; ypos <<=3D 4; @@ -400,7 +400,7 @@ static void newport_putcs(struct vc_data *vc, const u16= *s, unsigned int count, unsigned int ypos, unsigned int xpos) { - unsigned char *p; + const unsigned char *p; unsigned int i; u16 charattr; =20 @@ -424,7 +424,7 @@ static void newport_putcs(struct vc_data *vc, const u16= *s, NPORT_DMODE0_L32); =20 for (i =3D 0; i < count; i++, xpos +=3D 8) { - p =3D &font_data[vc->vc_num][(scr_readw(s++) & 0xff) << 4]; + p =3D &font_data_buf(font_data[vc->vc_num])[(scr_readw(s++) & 0xff) << 4= ]; =20 newport_wait(npregs); =20 @@ -503,7 +503,8 @@ static int newport_set_font(int unit, const struct cons= ole_font *op, int h =3D op->height; int size =3D h * op->charcount; int i; - unsigned char *new_data, *data =3D op->data, *p; + font_data_t *new_data; + unsigned char *data =3D op->data, *p; =20 /* ladis: when I grow up, there will be a day... and more sizes will * be supported ;-) */ @@ -519,7 +520,7 @@ static int newport_set_font(int unit, const struct cons= ole_font *op, REFCOUNT(new_data) =3D 0; /* usage counter */ FNTSUM(new_data) =3D 0; =20 - p =3D new_data; + p =3D (unsigned char *)font_data_buf(new_data); for (i =3D 0; i < op->charcount; i++) { memcpy(p, data, h); data +=3D 32; diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index 103e91c8d874..8d7840b9ebad 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1019,8 +1019,10 @@ static const char *fbcon_startup(void) info->pixmap.blit_y); vc->vc_font.width =3D font->width; vc->vc_font.height =3D font->height; - vc->vc_font.data =3D (void *)(p->fontdata =3D font->data); + vc->vc_font.data =3D font_data_buf(font->data); vc->vc_font.charcount =3D font->charcount; + + p->fontdata =3D font->data; } =20 cols =3D FBCON_SWAP(par->rotate, info->var.xres, info->var.yres); @@ -1078,11 +1080,12 @@ static void fbcon_init(struct vc_data *vc, bool ini= t) if (t->fontdata) { struct vc_data *fvc =3D vc_cons[fg_console].d; =20 - vc->vc_font.data =3D (void *)(p->fontdata =3D - fvc->vc_font.data); + vc->vc_font.data =3D fvc->vc_font.data; vc->vc_font.width =3D fvc->vc_font.width; vc->vc_font.height =3D fvc->vc_font.height; vc->vc_font.charcount =3D fvc->vc_font.charcount; + + p->fontdata =3D t->fontdata; p->userfont =3D t->userfont; =20 if (p->userfont) @@ -1097,8 +1100,10 @@ static void fbcon_init(struct vc_data *vc, bool init) info->pixmap.blit_y); vc->vc_font.width =3D font->width; vc->vc_font.height =3D font->height; - vc->vc_font.data =3D (void *)(p->fontdata =3D font->data); + vc->vc_font.data =3D font_data_buf(font->data); vc->vc_font.charcount =3D font->charcount; + + p->fontdata =3D font->data; } } =20 @@ -1409,11 +1414,12 @@ static void fbcon_set_disp(struct fb_info *info, st= ruct fb_var_screeninfo *var, svc =3D *default_mode; t =3D &fb_display[svc->vc_num]; =20 - if (!vc->vc_font.data) { - vc->vc_font.data =3D (void *)(p->fontdata =3D t->fontdata); + if (!p->fontdata) { + vc->vc_font.data =3D font_data_buf(t->fontdata); vc->vc_font.width =3D (*default_mode)->vc_font.width; vc->vc_font.height =3D (*default_mode)->vc_font.height; vc->vc_font.charcount =3D (*default_mode)->vc_font.charcount; + p->fontdata =3D t->fontdata; p->userfont =3D t->userfont; if (p->userfont) REFCOUNT(p->fontdata)++; @@ -2047,7 +2053,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned = int width, struct fb_var_screeninfo var =3D info->var; int x_diff, y_diff, virt_w, virt_h, virt_fw, virt_fh; =20 - if (p->userfont && FNTSIZE(vc->vc_font.data)) { + if (p->userfont && FNTSIZE(p->fontdata)) { unsigned int size =3D vc_font_size(&vc->vc_font); =20 /* @@ -2057,7 +2063,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned = int width, * charcount can change and cannot be used to determine the * font data allocated size. */ - if (!size || size > FNTSIZE(vc->vc_font.data)) + if (!size || size > FNTSIZE(p->fontdata)) return -EINVAL; } =20 @@ -2281,7 +2287,8 @@ static bool fbcon_blank(struct vc_data *vc, enum vesa= _blank_mode blank, =20 static int fbcon_get_font(struct vc_data *vc, struct console_font *font, u= nsigned int vpitch) { - const u8 *fontdata =3D vc->vc_font.data; + struct fbcon_display *p =3D &fb_display[vc->vc_num]; + font_data_t *fontdata =3D p->fontdata; u8 *data =3D font->data; int i, j; =20 @@ -2406,16 +2413,18 @@ static void set_vc_hi_font(struct vc_data *vc, bool= set) } =20 static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcou= nt, - const u8 * data, int userfont) + font_data_t *data, int userfont) { struct fb_info *info =3D fbcon_info_from_console(vc->vc_num); struct fbcon_par *par =3D info->fbcon_par; struct fbcon_display *p =3D &fb_display[vc->vc_num]; int resize, ret, old_userfont, old_width, old_height, old_charcount; + font_data_t *old_fontdata =3D p->fontdata; const u8 *old_data =3D vc->vc_font.data; =20 resize =3D (w !=3D vc->vc_font.width) || (h !=3D vc->vc_font.height); - vc->vc_font.data =3D (void *)(p->fontdata =3D data); + p->fontdata =3D data; + vc->vc_font.data =3D font_data_buf(p->fontdata); old_userfont =3D p->userfont; if ((p->userfont =3D userfont)) REFCOUNT(data)++; @@ -2448,12 +2457,12 @@ static int fbcon_do_set_font(struct vc_data *vc, in= t w, int h, int charcount, update_screen(vc); } =20 - if (old_userfont && (--REFCOUNT(old_data) =3D=3D 0)) - kfree(old_data - FONT_EXTRA_WORDS * sizeof(int)); + if (old_userfont && (--REFCOUNT(old_fontdata) =3D=3D 0)) + kfree(old_fontdata - FONT_EXTRA_WORDS * sizeof(int)); return 0; =20 err_out: - p->fontdata =3D old_data; + p->fontdata =3D old_fontdata; vc->vc_font.data =3D old_data; =20 if (userfont) { @@ -2483,7 +2492,8 @@ static int fbcon_set_font(struct vc_data *vc, const s= truct console_font *font, int h =3D font->height; int size, alloc_size; int i, csum; - u8 *new_data, *data =3D font->data; + font_data_t *new_data; + u8 *data =3D font->data; int pitch =3D PITCH(font->width); =20 /* Is there a reason why fbconsole couldn't handle any charcount >256? @@ -2522,13 +2532,13 @@ static int fbcon_set_font(struct vc_data *vc, const= struct console_font *font, if (!new_data) return -ENOMEM; =20 - memset(new_data, 0, FONT_EXTRA_WORDS * sizeof(int)); + memset((u8 *)new_data, 0, FONT_EXTRA_WORDS * sizeof(int)); =20 new_data +=3D FONT_EXTRA_WORDS * sizeof(int); FNTSIZE(new_data) =3D size; REFCOUNT(new_data) =3D 0; /* usage counter */ for (i=3D0; i< charcount; i++) { - memcpy(new_data + i*h*pitch, data + i*vpitch*pitch, h*pitch); + memcpy((u8 *)new_data + i * h * pitch, data + i * vpitch * pitch, h * pi= tch); } =20 /* Since linux has a nice crc32 function use it for counting font diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fb= con.h index 3f4386a40237..d26ee7860cf5 100644 --- a/drivers/video/fbdev/core/fbcon.h +++ b/drivers/video/fbdev/core/fbcon.h @@ -11,6 +11,7 @@ #ifndef _VIDEO_FBCON_H #define _VIDEO_FBCON_H =20 +#include #include #include #include @@ -25,7 +26,7 @@ =20 struct fbcon_display { /* Filled in by the low-level console driver */ - const u_char *fontdata; + font_data_t *fontdata; int userfont; /* !=3D 0 if fontdata kmalloc()ed */ #ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION u_short scrollmode; /* Scroll Method, use fb_scrollmode() = */ diff --git a/include/linux/font.h b/include/linux/font.h index d929c5fa32ca..f19abd112c18 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -13,12 +13,57 @@ =20 #include =20 +/* + * font_data_t and helpers + */ + +/** + * font_data_t - Raw font data + * + * Values of type font_data_t store a pointer to raw font data. The format + * is monochrome. Each bit sets a pixel of a stored glyph. Font data does + * not store geometry information for the individual glyphs. Users of the + * font have to store glyph size, pitch and characer count separately. + * + * Font data in font_data_t is not equivalent to raw u8. Each pointer stor= es + * an additional hidden header before the fotn data. The layout is + * + * +------+-----------------------------+ + * | -16 | CRC32 Checksum (optional) | + * | -12 | | + * | -8 | Number of data bytes | + * | -4 | Reference count | + * +------+-----------------------------+ + * | 0 | Data buffer | + * | ... | | + * +------+-----------------------------+ + * + * Use helpers to access font_data_t. Use font_data_buf() to get the store= d data. + */ +typedef const unsigned char font_data_t; + +/** + * font_data_buf() - Returns the font data as raw bytes + * @fd: The font data + * + * Returns: + * The raw font data. The provided buffer is read-only. + */ +static inline const unsigned char *font_data_buf(font_data_t *fd) +{ + return (const unsigned char *)fd; +} + +/* + * Font description + */ + struct font_desc { int idx; const char *name; unsigned int width, height; unsigned int charcount; - const void *data; + font_data_t *data; int pref; }; =20 --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 7CA4E3FFAD5 for ; Mon, 2 Mar 2026 14:13:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460794; cv=none; b=jh4FRY6Sn1FycgaPTe/SCu1nt7MPUhJiq2RVy2dJ0gr/5GfT8JthbZQTFe8r5Ekbefpowm5ymkXmjiJv1lXOfSd6s48yQ4qlpW1/s2h6XBQRD2ior3FUY5GSbNPqn+dJM4YRJ51hGg0X36p44So/akCvzY+dJuZVEBJ3C9gPa/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460794; c=relaxed/simple; bh=oh/4830j/unBQATW0IBe5LmKnPMjBn50kYCsTr+Bhug=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JkkTovbLIaiTevOARoKTv0xv3njAn5iC8aM9O7nLKXzbTvnDRZB61oQYWJ0jqZ82vvDhWsybx/K3XKm0OK/k+pLORBOJehJYoyb8BzjWZaqql6GvM+pPGYelq0kMPe043Ks7ZZWJYp03xuZ82P++Vx2CCbBResOehThWwoZqo/g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=FHKrs+b6; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=e1Yojls1; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=FHKrs+b6; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=e1Yojls1; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="FHKrs+b6"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="e1Yojls1"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="FHKrs+b6"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="e1Yojls1" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 088EA3F7FF; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HuOPJLdwL/exynAtq4za/w0ivcdGcqMQCglRysvbQ6M=; b=FHKrs+b6bbjduPx9SMmzk9LNgYbwU62mac4Be3Tfu2ULZId8byyYOtd+jAvlz36X81GF/c SUaZW/RdvIPTGf8f+igVJDQQTL3j4LjTdHbP4wCuE5zD40RgLKQboNX9FVopDonBpnFO3W uE8i0be4jOIiRKcPh26aa2XH88nkbSk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HuOPJLdwL/exynAtq4za/w0ivcdGcqMQCglRysvbQ6M=; b=e1Yojls1FcIm2qP8R7gBfG2I3x1Yem94OyOlAtOrc0S/ZtppwKjmQNRWx0um0j0fR6jRil KIgIKb6Rqyf+pIDw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=FHKrs+b6; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=e1Yojls1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HuOPJLdwL/exynAtq4za/w0ivcdGcqMQCglRysvbQ6M=; b=FHKrs+b6bbjduPx9SMmzk9LNgYbwU62mac4Be3Tfu2ULZId8byyYOtd+jAvlz36X81GF/c SUaZW/RdvIPTGf8f+igVJDQQTL3j4LjTdHbP4wCuE5zD40RgLKQboNX9FVopDonBpnFO3W uE8i0be4jOIiRKcPh26aa2XH88nkbSk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HuOPJLdwL/exynAtq4za/w0ivcdGcqMQCglRysvbQ6M=; b=e1Yojls1FcIm2qP8R7gBfG2I3x1Yem94OyOlAtOrc0S/ZtppwKjmQNRWx0um0j0fR6jRil KIgIKb6Rqyf+pIDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CA1B43EA69; Mon, 2 Mar 2026 14:13:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id AK8lMO2apWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:01 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 08/13] lib/fonts: Read font size with font_data_size() Date: Mon, 2 Mar 2026 15:08:42 +0100 Message-ID: <20260302141255.518657-9-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:dkim,suse.de:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_SEVEN(0.00)[7]; R_RATELIMIT(0.00)[to_ip_from(RLf7er7x8tqp4b41gsueb7z9k6)]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 088EA3F7FF Content-Type: text/plain; charset="utf-8" Add font_data_size() and update consoles to use it. Signed-off-by: Thomas Zimmermann --- drivers/video/console/newport_con.c | 2 +- drivers/video/fbdev/core/fbcon.c | 14 +++++++------- include/linux/font.h | 2 ++ lib/fonts/fonts.c | 21 +++++++++++++++++++++ 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/ne= wport_con.c index 9b9ed1940404..1198c6bc2777 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c @@ -530,7 +530,7 @@ static int newport_set_font(int unit, const struct cons= ole_font *op, /* check if font is already used by other console */ for (i =3D 0; i < MAX_NR_CONSOLES; i++) { if (font_data[i] !=3D FONT_DATA - && FNTSIZE(font_data[i]) =3D=3D size + && font_data_size(font_data[i]) =3D=3D size && !memcmp(font_data[i], new_data, size)) { kfree(new_data - FONT_EXTRA_WORDS * sizeof(int)); /* current font is the same as the new one */ diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index 8d7840b9ebad..fa8f3e4196de 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2053,7 +2053,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned = int width, struct fb_var_screeninfo var =3D info->var; int x_diff, y_diff, virt_w, virt_h, virt_fw, virt_fh; =20 - if (p->userfont && FNTSIZE(p->fontdata)) { + if (p->userfont && font_data_size(p->fontdata)) { unsigned int size =3D vc_font_size(&vc->vc_font); =20 /* @@ -2063,7 +2063,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned = int width, * charcount can change and cannot be used to determine the * font data allocated size. */ - if (!size || size > FNTSIZE(p->fontdata)) + if (!size || size > font_data_size(p->fontdata)) return -EINVAL; } =20 @@ -2302,7 +2302,7 @@ static int fbcon_get_font(struct vc_data *vc, struct = console_font *font, unsigne =20 if (font->width <=3D 8) { j =3D vc->vc_font.height; - if (font->charcount * j > FNTSIZE(fontdata)) + if (font->charcount * j > font_data_size(fontdata)) return -EINVAL; =20 for (i =3D 0; i < font->charcount; i++) { @@ -2313,7 +2313,7 @@ static int fbcon_get_font(struct vc_data *vc, struct = console_font *font, unsigne } } else if (font->width <=3D 16) { j =3D vc->vc_font.height * 2; - if (font->charcount * j > FNTSIZE(fontdata)) + if (font->charcount * j > font_data_size(fontdata)) return -EINVAL; =20 for (i =3D 0; i < font->charcount; i++) { @@ -2323,7 +2323,7 @@ static int fbcon_get_font(struct vc_data *vc, struct = console_font *font, unsigne fontdata +=3D j; } } else if (font->width <=3D 24) { - if (font->charcount * (vc->vc_font.height * sizeof(u32)) > FNTSIZE(fontd= ata)) + if (font->charcount * (vc->vc_font.height * sizeof(u32)) > font_data_siz= e(fontdata)) return -EINVAL; =20 for (i =3D 0; i < font->charcount; i++) { @@ -2338,7 +2338,7 @@ static int fbcon_get_font(struct vc_data *vc, struct = console_font *font, unsigne } } else { j =3D vc->vc_font.height * 4; - if (font->charcount * j > FNTSIZE(fontdata)) + if (font->charcount * j > font_data_size(fontdata)) return -EINVAL; =20 for (i =3D 0; i < font->charcount; i++) { @@ -2553,7 +2553,7 @@ static int fbcon_set_font(struct vc_data *vc, const s= truct console_font *font, if (fb_display[i].userfont && fb_display[i].fontdata && FNTSUM(fb_display[i].fontdata) =3D=3D csum && - FNTSIZE(fb_display[i].fontdata) =3D=3D size && + font_data_size(fb_display[i].fontdata) =3D=3D size && tmp->vc_font.width =3D=3D w && !memcmp(fb_display[i].fontdata, new_data, size)) { kfree(new_data - FONT_EXTRA_WORDS * sizeof(int)); diff --git a/include/linux/font.h b/include/linux/font.h index f19abd112c18..55cc016a9357 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -54,6 +54,8 @@ static inline const unsigned char *font_data_buf(font_dat= a_t *fd) return (const unsigned char *)fd; } =20 +unsigned int font_data_size(font_data_t *fd); + /* * Font description */ diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c index a7f118b30171..8c9a6762061c 100644 --- a/lib/fonts/fonts.c +++ b/lib/fonts/fonts.c @@ -20,6 +20,27 @@ #endif #include =20 +/* + * Helpers for font_data_t + */ + +/** + * font_data_size - Return size of the font data in bytes + * @fd: Font data + * + * Returns: + * The number of bytes in the given font data. + */ +unsigned int font_data_size(font_data_t *fd) +{ + return FNTSIZE(fd); +} +EXPORT_SYMBOL_GPL(font_data_size); + +/* + * Font lookup + */ + static const struct font_desc *fonts[] =3D { #ifdef CONFIG_FONT_8x8 &font_vga_8x8, --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 0B1D73FD13F for ; Mon, 2 Mar 2026 14:13:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460801; cv=none; b=pQ8HF9FaiOzEBh7b56O9FMo6Ybzpv9ZDy0X3dfJ46ofyciaNiEzLLRdIqKVg4u5SPCJ9Vl4zaZcziDhRexv6MzTPjYC2pOM68ZPrLn/qvV1yPwKk1sd3i+Y2lHjwyhYAB7rpwy9qxnLGNT2sh9Y2hogZwK3UfRwDXHlWtStLT2c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460801; c=relaxed/simple; bh=EGWomaBQrqRuANiJpK2ymkXFD1Wa5bf0qEJk2EYmbY8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=judEkMh7HWZb8obq+yBx50XROqL/xycQkiRNJqx93VNEznrJAsjV5WUVxp6jHVBMJXfSaRnBw8K+++F2pybymWe9W0FQ8jsOFVQQ24OXV9dgUJX4BBYMs+5G49NzZF21cOh1FJHrJ9sSHmSNSVZehRQLaLqX/i8x3Vg2HFp1ORk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=w2mQdbtY; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=s1IkJmGt; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=w2mQdbtY; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=s1IkJmGt; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="w2mQdbtY"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="s1IkJmGt"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="w2mQdbtY"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="s1IkJmGt" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 442AC3F808; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o9dyZ1v4fg9qIGmkPCG7W/hdjoJTxQ4ir5vYoatE9GM=; b=w2mQdbtYzPWsrSORp7qf3oHGfCHtY02rpEOXqKW09v4rq4LSYYKDm68y5j6IxU6w0Tb/D0 QeoI2Vmt0PL7yJN4oRAQO/OiBVwKcAqaBTQt4Ogd+cPypLW5eMiIqPjMRTBz74YOcA8ihb 196VecM6/VEcTahGStjOtwMVpZsWQ8M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o9dyZ1v4fg9qIGmkPCG7W/hdjoJTxQ4ir5vYoatE9GM=; b=s1IkJmGt3YmJop2Cr3PTPRA5R4JrpbqqO+RbVXiU+flMUVDdVxfkoVR8dYgmIYkMhG0ddE xQ0H4XfaHJr+flAA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=w2mQdbtY; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=s1IkJmGt DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o9dyZ1v4fg9qIGmkPCG7W/hdjoJTxQ4ir5vYoatE9GM=; b=w2mQdbtYzPWsrSORp7qf3oHGfCHtY02rpEOXqKW09v4rq4LSYYKDm68y5j6IxU6w0Tb/D0 QeoI2Vmt0PL7yJN4oRAQO/OiBVwKcAqaBTQt4Ogd+cPypLW5eMiIqPjMRTBz74YOcA8ihb 196VecM6/VEcTahGStjOtwMVpZsWQ8M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o9dyZ1v4fg9qIGmkPCG7W/hdjoJTxQ4ir5vYoatE9GM=; b=s1IkJmGt3YmJop2Cr3PTPRA5R4JrpbqqO+RbVXiU+flMUVDdVxfkoVR8dYgmIYkMhG0ddE xQ0H4XfaHJr+flAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0F9253EA6C; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id SG+bAu6apWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:02 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 09/13] lib/fonts: Compare font data for equality with font_data_is_equal() Date: Mon, 2 Mar 2026 15:08:43 +0100 Message-ID: <20260302141255.518657-10-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid,suse.de:email]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_SEVEN(0.00)[7]; R_RATELIMIT(0.00)[to_ip_from(RLf7er7x8tqp4b41gsueb7z9k6)]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Rspamd-Queue-Id: 442AC3F808 X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Add font_data_is_equal() and update consoles to use it. Font data is equal if it has the same size and contains the same values on all bytes. Only fbcon uses a crc32 checksum. If set in both operands the checksums have to be equal. The new helper also guarantees to not compare internal fonts against fonts from user space. Internal fonts cannot be ref-counted, so making them equal to user-space fonts with the same byte sequence results in undefined behavior. The test only compares data buffers. Their interpretation is up each console. Therefore remove a width test in fbcon_set_font(). Signed-off-by: Thomas Zimmermann Tested-by: Nathan Chancellor # build --- drivers/video/console/newport_con.c | 3 +-- drivers/video/fbdev/core/fbcon.c | 7 +----- include/linux/font.h | 1 + lib/fonts/fonts.c | 37 +++++++++++++++++++++++++++-- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/ne= wport_con.c index 1198c6bc2777..4db2b901c709 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c @@ -530,8 +530,7 @@ static int newport_set_font(int unit, const struct cons= ole_font *op, /* check if font is already used by other console */ for (i =3D 0; i < MAX_NR_CONSOLES; i++) { if (font_data[i] !=3D FONT_DATA - && font_data_size(font_data[i]) =3D=3D size - && !memcmp(font_data[i], new_data, size)) { + && font_data_is_equal(font_data[i], new_data)) { kfree(new_data - FONT_EXTRA_WORDS * sizeof(int)); /* current font is the same as the new one */ if (i =3D=3D unit) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index fa8f3e4196de..31e812d87d9e 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2548,14 +2548,9 @@ static int fbcon_set_font(struct vc_data *vc, const = struct console_font *font, FNTSUM(new_data) =3D csum; /* Check if the same font is on some other console already */ for (i =3D first_fb_vc; i <=3D last_fb_vc; i++) { - struct vc_data *tmp =3D vc_cons[i].d; - if (fb_display[i].userfont && fb_display[i].fontdata && - FNTSUM(fb_display[i].fontdata) =3D=3D csum && - font_data_size(fb_display[i].fontdata) =3D=3D size && - tmp->vc_font.width =3D=3D w && - !memcmp(fb_display[i].fontdata, new_data, size)) { + font_data_is_equal(fb_display[i].fontdata, new_data)) { kfree(new_data - FONT_EXTRA_WORDS * sizeof(int)); new_data =3D (u8 *)fb_display[i].fontdata; break; diff --git a/include/linux/font.h b/include/linux/font.h index 55cc016a9357..1f5b85601c9b 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -55,6 +55,7 @@ static inline const unsigned char *font_data_buf(font_dat= a_t *fd) } =20 unsigned int font_data_size(font_data_t *fd); +bool font_data_is_equal(font_data_t *lhs, font_data_t *rhs); =20 /* * Font description diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c index 8c9a6762061c..c9f6328d5dda 100644 --- a/lib/fonts/fonts.c +++ b/lib/fonts/fonts.c @@ -12,18 +12,25 @@ * for more details. */ =20 +#include #include -#include #include +#include + +#include #if defined(__mc68000__) #include #endif -#include =20 /* * Helpers for font_data_t */ =20 +static bool font_data_is_internal(font_data_t *fd) +{ + return is_kernel_rodata((unsigned long)fd); +} + /** * font_data_size - Return size of the font data in bytes * @fd: Font data @@ -37,6 +44,32 @@ unsigned int font_data_size(font_data_t *fd) } EXPORT_SYMBOL_GPL(font_data_size); =20 +/** + * font_data_is_equal - Compares font data for equality + * @lhs: Left-hand side font data + * @rhs: Right-hand-size font data + * + * Font data is equal if is constain the same sequence of values. The + * helper also use the checksum, if both arguments contain it. Font data + * coming from different origins, internal or from user space, is never + * equal. Allowing this would break reference counting. + * + * Returns: + * True if the given font data is equal, false otherwise. + */ +bool font_data_is_equal(font_data_t *lhs, font_data_t *rhs) +{ + if (font_data_is_internal(lhs) !=3D font_data_is_internal(rhs)) + return false; + if (font_data_size(lhs) !=3D font_data_size(rhs)) + return false; + if (FNTSUM(lhs) && FNTSUM(rhs) && FNTSUM(lhs) !=3D FNTSUM(rhs)) + return false; + + return !memcmp(lhs, rhs, FNTSIZE(lhs)); +} +EXPORT_SYMBOL_GPL(font_data_is_equal); + /* * Font lookup */ --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 613A340F8D8 for ; Mon, 2 Mar 2026 14:13:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460819; cv=none; b=XfmrcufNbA8q9X0RDeHcWvyZN/OnFD8+qKyOAS0WUm/N/JG1paO3Y4tG9cZdHM9MVz1RV/koYIBLPnPvdtva1UDRTxMtXtMyD3XaJdmSHUpMOXl5HfkUHBayNk4uYWQzFVQVeYTa9400xa1gwEM6P9+RdXnm9bO+gP9kQnK8MF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460819; c=relaxed/simple; bh=AJiOtsg7nnq3VLaY3bGP2UZ5qnuEIsRvyXzfEHYIKdc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YCpbCR33vnB9n+H+15vFvT8QYl9D0ZfZWMYdFLlq+hLCrBJTJJe8oWmxWAOQReThXezpeE+EsO51ihGAM9HkXVjDjNJ1fcSqTt+aaklMRy3NP4f7+jD39pCbumNwZixVvTPedpyje1s07MTRQbv33IOo8+QINjCIvwAxnIzQzSM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=A2cKkN1Q; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=GIFqKDKD; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=A2cKkN1Q; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=GIFqKDKD; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="A2cKkN1Q"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="GIFqKDKD"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="A2cKkN1Q"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="GIFqKDKD" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 811B75BD82; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=agjRYnaBFy0+71cEG6uGc7feK6O1ysmtSNOKfC0/+Yc=; b=A2cKkN1QKWvuhZk03ELBWrioqm5SYhnRRcy8uPOGU/yp4Eu5SkYXjBdyMDhzjGbfnskrrn chx/zxjxif+ysdl4yCDUt/aGQAMpqTbC6y+7lRdTGCi5EQ0CjPabyg2tE4yLJjiFflR0Zs FglOx/MoEBEeAEJOE55b84QTOwbrGa4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=agjRYnaBFy0+71cEG6uGc7feK6O1ysmtSNOKfC0/+Yc=; b=GIFqKDKDyz4m2S4CSNBNKPJr1HQcu5IcRZ1amB/jN3PQrNwAOibz7dF2XzIKe+3dgGuuTo NZN4JD573zA0rXCw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=agjRYnaBFy0+71cEG6uGc7feK6O1ysmtSNOKfC0/+Yc=; b=A2cKkN1QKWvuhZk03ELBWrioqm5SYhnRRcy8uPOGU/yp4Eu5SkYXjBdyMDhzjGbfnskrrn chx/zxjxif+ysdl4yCDUt/aGQAMpqTbC6y+7lRdTGCi5EQ0CjPabyg2tE4yLJjiFflR0Zs FglOx/MoEBEeAEJOE55b84QTOwbrGa4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=agjRYnaBFy0+71cEG6uGc7feK6O1ysmtSNOKfC0/+Yc=; b=GIFqKDKDyz4m2S4CSNBNKPJr1HQcu5IcRZ1amB/jN3PQrNwAOibz7dF2XzIKe+3dgGuuTo NZN4JD573zA0rXCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4A41B3EA69; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id ELjqEO6apWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:02 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 10/13] lib/fonts: Manage font-data lifetime with font_data_get/_put() Date: Mon, 2 Mar 2026 15:08:44 +0100 Message-ID: <20260302141255.518657-11-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.994]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; RCVD_TLS_ALL(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL4936hw7dbgk3hb39jfn1xy19)]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Flag: NO Content-Type: text/plain; charset="utf-8" Add font_data_get() and font_data_put(). Update consoles to use them over REFCOUNT() and plain kfree(). Newly allocated font data starts with a reference count of 1. Loading the font puts the previously loaded font. If the reference count reaches zero, font_data_put() frees the font data. The kernel stores internal font data in a read-only section. Invoking font_data_get() and font_data_put() tests this internally and returns success without further operation. From the caller's perspective, getting and putting works the same for all font data. Fbcon used the userfont flag distinguish between internal fonts and fonts loaded by user space. Only the latter where refcounted. With the new helper's automatic handling of internal font data, remove the userfont flag from fbcon. Newport_con uses a default font, FONT_DATA, until user space loads custom font data. Remove all special cases for FONT_DATA, as the get and put calls' read-only handlign also covers this case. Signed-off-by: Thomas Zimmermann --- drivers/video/console/newport_con.c | 26 ++++------- drivers/video/fbdev/core/fbcon.c | 65 +++++++++++++-------------- drivers/video/fbdev/core/fbcon.h | 1 - include/linux/font.h | 2 + lib/fonts/fonts.c | 70 +++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 53 deletions(-) diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/ne= wport_con.c index 4db2b901c709..1bc3cb1ea116 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c @@ -517,7 +517,7 @@ static int newport_set_font(int unit, const struct cons= ole_font *op, =20 new_data +=3D FONT_EXTRA_WORDS * sizeof(int); FNTSIZE(new_data) =3D size; - REFCOUNT(new_data) =3D 0; /* usage counter */ + REFCOUNT(new_data) =3D 1; /* usage counter */ FNTSUM(new_data) =3D 0; =20 p =3D (unsigned char *)font_data_buf(new_data); @@ -529,23 +529,18 @@ static int newport_set_font(int unit, const struct co= nsole_font *op, =20 /* check if font is already used by other console */ for (i =3D 0; i < MAX_NR_CONSOLES; i++) { - if (font_data[i] !=3D FONT_DATA - && font_data_is_equal(font_data[i], new_data)) { - kfree(new_data - FONT_EXTRA_WORDS * sizeof(int)); + if (font_data_is_equal(font_data[i], new_data)) { + font_data_put(new_data); /* current font is the same as the new one */ if (i =3D=3D unit) return 0; new_data =3D font_data[i]; + font_data_get(new_data); break; } } - /* old font is user font */ - if (font_data[unit] !=3D FONT_DATA) { - if (--REFCOUNT(font_data[unit]) =3D=3D 0) - kfree(font_data[unit] - - FONT_EXTRA_WORDS * sizeof(int)); - } - REFCOUNT(new_data)++; + + font_data_put(font_data[unit]); font_data[unit] =3D new_data; =20 return 0; @@ -553,12 +548,9 @@ static int newport_set_font(int unit, const struct con= sole_font *op, =20 static int newport_set_def_font(int unit, struct console_font *op) { - if (font_data[unit] !=3D FONT_DATA) { - if (--REFCOUNT(font_data[unit]) =3D=3D 0) - kfree(font_data[unit] - - FONT_EXTRA_WORDS * sizeof(int)); - font_data[unit] =3D FONT_DATA; - } + font_data_put(font_data[unit]); + font_data[unit] =3D FONT_DATA; + font_data_get(font_data[unit]); =20 return 0; } diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index 31e812d87d9e..00255ac92e42 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1023,6 +1023,7 @@ static const char *fbcon_startup(void) vc->vc_font.charcount =3D font->charcount; =20 p->fontdata =3D font->data; + font_data_get(p->fontdata); } =20 cols =3D FBCON_SWAP(par->rotate, info->var.xres, info->var.yres); @@ -1086,10 +1087,7 @@ static void fbcon_init(struct vc_data *vc, bool init) vc->vc_font.charcount =3D fvc->vc_font.charcount; =20 p->fontdata =3D t->fontdata; - p->userfont =3D t->userfont; - - if (p->userfont) - REFCOUNT(p->fontdata)++; + font_data_get(p->fontdata); } else { const struct font_desc *font =3D NULL; =20 @@ -1104,6 +1102,7 @@ static void fbcon_init(struct vc_data *vc, bool init) vc->vc_font.charcount =3D font->charcount; =20 p->fontdata =3D font->data; + font_data_get(p->fontdata); } } =20 @@ -1194,10 +1193,10 @@ static void fbcon_init(struct vc_data *vc, bool ini= t) =20 static void fbcon_free_font(struct fbcon_display *p) { - if (p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) =3D=3D 0)) - kfree(p->fontdata - FONT_EXTRA_WORDS * sizeof(int)); - p->fontdata =3D NULL; - p->userfont =3D 0; + if (p->fontdata) { + font_data_put(p->fontdata); + p->fontdata =3D NULL; + } } =20 static void set_vc_hi_font(struct vc_data *vc, bool set); @@ -1420,9 +1419,7 @@ static void fbcon_set_disp(struct fb_info *info, stru= ct fb_var_screeninfo *var, vc->vc_font.height =3D (*default_mode)->vc_font.height; vc->vc_font.charcount =3D (*default_mode)->vc_font.charcount; p->fontdata =3D t->fontdata; - p->userfont =3D t->userfont; - if (p->userfont) - REFCOUNT(p->fontdata)++; + font_data_get(p->fontdata); } =20 var->activate =3D FB_ACTIVATE_NOW; @@ -2053,7 +2050,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned = int width, struct fb_var_screeninfo var =3D info->var; int x_diff, y_diff, virt_w, virt_h, virt_fw, virt_fh; =20 - if (p->userfont && font_data_size(p->fontdata)) { + if (font_data_size(p->fontdata)) { unsigned int size =3D vc_font_size(&vc->vc_font); =20 /* @@ -2413,21 +2410,20 @@ static void set_vc_hi_font(struct vc_data *vc, bool= set) } =20 static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcou= nt, - font_data_t *data, int userfont) + font_data_t *data) { struct fb_info *info =3D fbcon_info_from_console(vc->vc_num); struct fbcon_par *par =3D info->fbcon_par; struct fbcon_display *p =3D &fb_display[vc->vc_num]; - int resize, ret, old_userfont, old_width, old_height, old_charcount; + int resize, ret, old_width, old_height, old_charcount; font_data_t *old_fontdata =3D p->fontdata; const u8 *old_data =3D vc->vc_font.data; =20 + font_data_get(data); + resize =3D (w !=3D vc->vc_font.width) || (h !=3D vc->vc_font.height); p->fontdata =3D data; vc->vc_font.data =3D font_data_buf(p->fontdata); - old_userfont =3D p->userfont; - if ((p->userfont =3D userfont)) - REFCOUNT(data)++; =20 old_width =3D vc->vc_font.width; old_height =3D vc->vc_font.height; @@ -2457,24 +2453,20 @@ static int fbcon_do_set_font(struct vc_data *vc, in= t w, int h, int charcount, update_screen(vc); } =20 - if (old_userfont && (--REFCOUNT(old_fontdata) =3D=3D 0)) - kfree(old_fontdata - FONT_EXTRA_WORDS * sizeof(int)); + if (old_fontdata) + font_data_put(old_fontdata); + return 0; =20 err_out: p->fontdata =3D old_fontdata; vc->vc_font.data =3D old_data; - - if (userfont) { - p->userfont =3D old_userfont; - if (--REFCOUNT(data) =3D=3D 0) - kfree(data - FONT_EXTRA_WORDS * sizeof(int)); - } - vc->vc_font.width =3D old_width; vc->vc_font.height =3D old_height; vc->vc_font.charcount =3D old_charcount; =20 + font_data_put(data); + return ret; } =20 @@ -2491,9 +2483,9 @@ static int fbcon_set_font(struct vc_data *vc, const s= truct console_font *font, int w =3D font->width; int h =3D font->height; int size, alloc_size; - int i, csum; + int i, csum, ret; font_data_t *new_data; - u8 *data =3D font->data; + const u8 *data =3D font->data; int pitch =3D PITCH(font->width); =20 /* Is there a reason why fbconsole couldn't handle any charcount >256? @@ -2536,7 +2528,7 @@ static int fbcon_set_font(struct vc_data *vc, const s= truct console_font *font, =20 new_data +=3D FONT_EXTRA_WORDS * sizeof(int); FNTSIZE(new_data) =3D size; - REFCOUNT(new_data) =3D 0; /* usage counter */ + REFCOUNT(new_data) =3D 1; /* usage counter */ for (i=3D0; i< charcount; i++) { memcpy((u8 *)new_data + i * h * pitch, data + i * vpitch * pitch, h * pi= tch); } @@ -2548,15 +2540,18 @@ static int fbcon_set_font(struct vc_data *vc, const= struct console_font *font, FNTSUM(new_data) =3D csum; /* Check if the same font is on some other console already */ for (i =3D first_fb_vc; i <=3D last_fb_vc; i++) { - if (fb_display[i].userfont && - fb_display[i].fontdata && + if (fb_display[i].fontdata && font_data_is_equal(fb_display[i].fontdata, new_data)) { - kfree(new_data - FONT_EXTRA_WORDS * sizeof(int)); - new_data =3D (u8 *)fb_display[i].fontdata; + font_data_get(fb_display[i].fontdata); + font_data_put(new_data); + new_data =3D fb_display[i].fontdata; break; } } - return fbcon_do_set_font(vc, font->width, font->height, charcount, new_da= ta, 1); + ret =3D fbcon_do_set_font(vc, font->width, font->height, charcount, new_d= ata); + font_data_put(new_data); + + return ret; } =20 static int fbcon_set_def_font(struct vc_data *vc, struct console_font *fon= t, @@ -2573,7 +2568,7 @@ static int fbcon_set_def_font(struct vc_data *vc, str= uct console_font *font, =20 font->width =3D f->width; font->height =3D f->height; - return fbcon_do_set_font(vc, f->width, f->height, f->charcount, f->data, = 0); + return fbcon_do_set_font(vc, f->width, f->height, f->charcount, f->data); } =20 static u16 palette_red[16]; diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fb= con.h index d26ee7860cf5..1e3c1ef84762 100644 --- a/drivers/video/fbdev/core/fbcon.h +++ b/drivers/video/fbdev/core/fbcon.h @@ -27,7 +27,6 @@ struct fbcon_display { /* Filled in by the low-level console driver */ font_data_t *fontdata; - int userfont; /* !=3D 0 if fontdata kmalloc()ed */ #ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION u_short scrollmode; /* Scroll Method, use fb_scrollmode() = */ #endif diff --git a/include/linux/font.h b/include/linux/font.h index 1f5b85601c9b..a8610201afb7 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -54,6 +54,8 @@ static inline const unsigned char *font_data_buf(font_dat= a_t *fd) return (const unsigned char *)fd; } =20 +void font_data_get(font_data_t *fd); +bool font_data_put(font_data_t *fd); unsigned int font_data_size(font_data_t *fd); bool font_data_is_equal(font_data_t *lhs, font_data_t *rhs); =20 diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c index c9f6328d5dda..1da0acdebf53 100644 --- a/lib/fonts/fonts.c +++ b/lib/fonts/fonts.c @@ -12,8 +12,10 @@ * for more details. */ =20 +#include #include #include +#include #include #include =20 @@ -26,11 +28,79 @@ * Helpers for font_data_t */ =20 +static struct font_data *to_font_data_struct(font_data_t *fd) +{ + return container_of(fd, struct font_data, data[0]); +} + static bool font_data_is_internal(font_data_t *fd) { return is_kernel_rodata((unsigned long)fd); } =20 +static void font_data_free(font_data_t *fd) +{ + if (WARN_ON(font_data_is_internal(fd))) + return; + + kfree(to_font_data_struct(fd)); +} + +/** + * font_data_get - Acquires a reference on font data + * @fd: Font data + * + * Font data from user space is reference counted. The helper + * font_data_get() increases the reference counter by one. Invoke + * font_data_put() to release the reference. + * + * Internal font data is located in read-only memory. In this case + * the helper returns success without modifying the counter field. + * It is still required to call font_data_put() on internal font data. + */ +void font_data_get(font_data_t *fd) +{ + if (font_data_is_internal(fd)) + return; /* never ref static data */ + + if (WARN_ON(!REFCOUNT(fd))) + return; /* should never be 0 */ + ++REFCOUNT(fd); +} +EXPORT_SYMBOL_GPL(font_data_get); + +/** + * font_data_put - Release a reference on font data + * @fd: Font data + * + * Font data from user space is reference counted. The helper + * font_data_put() decreases the reference counter by one. If this was + * the final reference, it frees the allocated memory. + * + * Internal font data is located in read-only memory. In this case + * the helper returns success without modifying the counter field. + * + * Returns: + * True if this was the final reference, false otherwise. + */ +bool font_data_put(font_data_t *fd) +{ + unsigned int count; + + if (font_data_is_internal(fd)) + return true; /* never unref static data */ + + if (WARN_ON(!REFCOUNT(fd))) + return true; /* should never be 0 */ + + count =3D --REFCOUNT(fd); + if (!count) + font_data_free(fd); + + return !count; +} +EXPORT_SYMBOL_GPL(font_data_put); + /** * font_data_size - Return size of the font data in bytes * @fd: Font data --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 E4BC33FD13F for ; Mon, 2 Mar 2026 14:13:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460808; cv=none; b=DWwNVpag/DZwLzTSYkq7MLM3PWZlCYKOQiYElCsc2m9q5QmIqL8SHiRuOhPscgVzJcETAMjZ+ftK3i9wS6u2yRQoOP+vNzemGFfH91jJsHL4sWnLTSLU55E3qfkGVAKo9DBpaBLiTrBHLNoeV28cuFu0yXLfy6v/f2oVFtZ4oKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460808; c=relaxed/simple; bh=6f4wTQvuX6ho6vASxCxBAGkuWuxz2okciPAf9Cfe2CI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bWEiQSCdQ4E1L96wtmP1SmFc04SVcffuLTsYCQv+z0DO6TkwA9pxUXIa2JCHAB0g8tqNMc3E7gZ6x8doaKZbKkCF1RdlXFyNdGOZvPjml5u9u7n1L8KKY8FEkVNUPjRy13R8zQyYvOWq9/2iA0KEhS7jDNG6Mk/aBCm5tOB1HS8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=DeNyMevc; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=4zGqFLhq; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=DeNyMevc; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=4zGqFLhq; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="DeNyMevc"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="4zGqFLhq"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="DeNyMevc"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="4zGqFLhq" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B8F6A3F80D; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EwTX7JM5NLj8OZx32vcI/KOQ9vYoguMCLxH2rYrB2a4=; b=DeNyMevcfFN1U7idy4O1FoAsICbVQJPSa1zoAW0BLm7X6Gzb0kvu+m122cCWAOQMEX/BpO T1L/Z6iBuF4+kMSDSVpDR0UY4BuGBcUeYmu22x1zMq+fLLYzOd/hYNqVw/cD3qfnXO8K3d 8w3nLWUoo1bpDqPb2B5w4e7BYDNwkkA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EwTX7JM5NLj8OZx32vcI/KOQ9vYoguMCLxH2rYrB2a4=; b=4zGqFLhqRd+dyhfwQSXnzJZPsCcFlE+4jLJkW8cvF4vJANwnC9LvlFP/a6p/dzh3PIwMoC XJj2YiZFepAYaPCQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=DeNyMevc; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=4zGqFLhq DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EwTX7JM5NLj8OZx32vcI/KOQ9vYoguMCLxH2rYrB2a4=; b=DeNyMevcfFN1U7idy4O1FoAsICbVQJPSa1zoAW0BLm7X6Gzb0kvu+m122cCWAOQMEX/BpO T1L/Z6iBuF4+kMSDSVpDR0UY4BuGBcUeYmu22x1zMq+fLLYzOd/hYNqVw/cD3qfnXO8K3d 8w3nLWUoo1bpDqPb2B5w4e7BYDNwkkA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EwTX7JM5NLj8OZx32vcI/KOQ9vYoguMCLxH2rYrB2a4=; b=4zGqFLhqRd+dyhfwQSXnzJZPsCcFlE+4jLJkW8cvF4vJANwnC9LvlFP/a6p/dzh3PIwMoC XJj2YiZFepAYaPCQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 85BE43EA6C; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 6KF5H+6apWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:02 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 11/13] lib/fonts: Create font_data_t from struct console_font with font_data_import() Date: Mon, 2 Mar 2026 15:08:45 +0100 Message-ID: <20260302141255.518657-12-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid,suse.de:email]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_SEVEN(0.00)[7]; R_RATELIMIT(0.00)[to_ip_from(RLf7er7x8tqp4b41gsueb7z9k6)]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Rspamd-Queue-Id: B8F6A3F80D X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Add font_data_import() and update consoles to use it. The implementation of font_data_import() is based on code from fbcon, which supports overflow checks and crc32 checksums. Fbcon uses the crc32 checksum. Newport_con now implements the same overflow checks as fbcon. As before, this console does not support checksums, which are optional. Newport_con can now also handle input font data with a vertical pitch other than 32 bytes. (The vertical pitch is the offset between two glyphs in the font data.) As an internal change, remove the const qualifier from the data field if struct font_data. This allows font_data_import() to write the data without type casting. For all users of the font data via font_data_t, the stored data is still read only. Signed-off-by: Thomas Zimmermann --- drivers/video/console/newport_con.c | 22 ++-------- drivers/video/fbdev/core/fbcon.c | 38 ++---------------- include/linux/font.h | 6 ++- lib/fonts/fonts.c | 62 +++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 53 deletions(-) diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/ne= wport_con.c index 1bc3cb1ea116..ecbbe2e4e2a6 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c @@ -501,31 +501,17 @@ static int newport_set_font(int unit, const struct co= nsole_font *op, { int w =3D op->width; int h =3D op->height; - int size =3D h * op->charcount; int i; font_data_t *new_data; - unsigned char *data =3D op->data, *p; =20 /* ladis: when I grow up, there will be a day... and more sizes will * be supported ;-) */ - if ((w !=3D 8) || (h !=3D 16) || (vpitch !=3D 32) - || (op->charcount !=3D 256 && op->charcount !=3D 512)) + if (w !=3D 8 || h !=3D 16 || (op->charcount !=3D 256 && op->charcount != =3D 512)) return -EINVAL; =20 - if (!(new_data =3D kmalloc(FONT_EXTRA_WORDS * sizeof(int) + size, - GFP_USER))) return -ENOMEM; - - new_data +=3D FONT_EXTRA_WORDS * sizeof(int); - FNTSIZE(new_data) =3D size; - REFCOUNT(new_data) =3D 1; /* usage counter */ - FNTSUM(new_data) =3D 0; - - p =3D (unsigned char *)font_data_buf(new_data); - for (i =3D 0; i < op->charcount; i++) { - memcpy(p, data, h); - data +=3D 32; - p +=3D h; - } + new_data =3D font_data_import(op, vpitch, NULL); + if (IS_ERR(new_data)) + return PTR_ERR(new_data); =20 /* check if font is already used by other console */ for (i =3D 0; i < MAX_NR_CONSOLES; i++) { diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index 00255ac92e42..53677c09a0ec 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2039,8 +2039,6 @@ static void updatescrollmode(struct fbcon_display *p, updatescrollmode_accel(p, info, vc); } =20 -#define PITCH(w) (((w) + 7) >> 3) - static int fbcon_resize(struct vc_data *vc, unsigned int width, unsigned int height, bool from_user) { @@ -2424,7 +2422,6 @@ static int fbcon_do_set_font(struct vc_data *vc, int = w, int h, int charcount, resize =3D (w !=3D vc->vc_font.width) || (h !=3D vc->vc_font.height); p->fontdata =3D data; vc->vc_font.data =3D font_data_buf(p->fontdata); - old_width =3D vc->vc_font.width; old_height =3D vc->vc_font.height; old_charcount =3D vc->vc_font.charcount; @@ -2482,11 +2479,8 @@ static int fbcon_set_font(struct vc_data *vc, const = struct console_font *font, unsigned charcount =3D font->charcount; int w =3D font->width; int h =3D font->height; - int size, alloc_size; - int i, csum, ret; + int i, ret; font_data_t *new_data; - const u8 *data =3D font->data; - int pitch =3D PITCH(font->width); =20 /* Is there a reason why fbconsole couldn't handle any charcount >256? * If not this check should be changed to charcount < 256 */ @@ -2510,34 +2504,10 @@ static int fbcon_set_font(struct vc_data *vc, const= struct console_font *font, if (fbcon_invalid_charcount(info, charcount)) return -EINVAL; =20 - /* Check for integer overflow in font size calculation */ - if (check_mul_overflow(h, pitch, &size) || - check_mul_overflow(size, charcount, &size)) - return -EINVAL; - - /* Check for overflow in allocation size calculation */ - if (check_add_overflow(FONT_EXTRA_WORDS * sizeof(int), size, &alloc_size)) - return -EINVAL; - - new_data =3D kmalloc(alloc_size, GFP_USER); - - if (!new_data) - return -ENOMEM; - - memset((u8 *)new_data, 0, FONT_EXTRA_WORDS * sizeof(int)); - - new_data +=3D FONT_EXTRA_WORDS * sizeof(int); - FNTSIZE(new_data) =3D size; - REFCOUNT(new_data) =3D 1; /* usage counter */ - for (i=3D0; i< charcount; i++) { - memcpy((u8 *)new_data + i * h * pitch, data + i * vpitch * pitch, h * pi= tch); - } - - /* Since linux has a nice crc32 function use it for counting font - * checksums. */ - csum =3D crc32(0, new_data, size); + new_data =3D font_data_import(font, vpitch, crc32); + if (IS_ERR(new_data)) + return PTR_ERR(new_data); =20 - FNTSUM(new_data) =3D csum; /* Check if the same font is on some other console already */ for (i =3D first_fb_vc; i <=3D last_fb_vc; i++) { if (fb_display[i].fontdata && diff --git a/include/linux/font.h b/include/linux/font.h index a8610201afb7..d3b8ca240152 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -13,6 +13,8 @@ =20 #include =20 +struct console_font; + /* * font_data_t and helpers */ @@ -54,6 +56,8 @@ static inline const unsigned char *font_data_buf(font_dat= a_t *fd) return (const unsigned char *)fd; } =20 +font_data_t *font_data_import(const struct console_font *font, unsigned in= t vpitch, + u32 (*calc_csum)(u32, const void *, size_t)); void font_data_get(font_data_t *fd); bool font_data_put(font_data_t *fd); unsigned int font_data_size(font_data_t *fd); @@ -124,7 +128,7 @@ extern const struct font_desc *get_default_font(int xre= s, int yres, =20 struct font_data { unsigned int extra[FONT_EXTRA_WORDS]; - const unsigned char data[]; + unsigned char data[]; } __packed; =20 #endif /* _VIDEO_FONT_H */ diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c index 1da0acdebf53..9b5355f6d2dc 100644 --- a/lib/fonts/fonts.c +++ b/lib/fonts/fonts.c @@ -14,7 +14,9 @@ =20 #include #include +#include #include +#include #include #include #include @@ -24,6 +26,8 @@ #include #endif =20 +#define console_font_pitch(font) DIV_ROUND_UP((font)->width, 8) + /* * Helpers for font_data_t */ @@ -46,6 +50,64 @@ static void font_data_free(font_data_t *fd) kfree(to_font_data_struct(fd)); } =20 +/** + * font_data_import - Allocates and initializes font data from user space + * @font: A font from user space + * @vpitch: The size of a single glyph in @font in bytes + * @calc_csum: An optional helper to calculate a chechsum + * + * Font data from user space must be translated to the kernel's format. The + * font's glyph geometry and data is provided in @font. The parameter @vpi= tch + * gives the number of bytes per glyph, including trailing bytes. + * + * The parameter @calc_sum is optional. Fbcon passes crc32() to calculate = the + * font data's checksum. + * + * Returns: + * Newly initialized font data on success, or a pointer-encoded errno valu= e otherwise. + */ +font_data_t *font_data_import(const struct console_font *font, unsigned in= t vpitch, + u32 (*calc_csum)(u32, const void *, size_t)) +{ + unsigned int pitch =3D console_font_pitch(font); + unsigned int h =3D font->height; + unsigned int charcount =3D font->charcount; + const unsigned char *data =3D font->data; + u32 csum =3D 0; + struct font_data *font_data; + int size, alloc_size; + unsigned int i; + font_data_t *fd; + + /* Check for integer overflow in font-size calculation */ + if (check_mul_overflow(h, pitch, &size) || + check_mul_overflow(size, charcount, &size)) + return ERR_PTR(-EINVAL); + + /* Check for overflow in allocation size calculation */ + if (check_add_overflow(sizeof(*font_data), size, &alloc_size)) + return ERR_PTR(-EINVAL); + + font_data =3D kmalloc(alloc_size, GFP_USER); + if (!font_data) + return ERR_PTR(-ENOMEM); + memset(font_data->extra, 0, sizeof(font_data->extra)); + + for (i =3D 0; i < charcount; ++i) + memcpy(font_data->data + i * h * pitch, data + i * vpitch * pitch, h * p= itch); + + if (calc_csum) + csum =3D calc_csum(0, font_data->data, size); + + fd =3D font_data->data; + REFCOUNT(fd) =3D 1; /* start with reference acquired */ + FNTSIZE(fd) =3D size; + FNTSUM(fd) =3D csum; + + return fd; +} +EXPORT_SYMBOL_GPL(font_data_import); + /** * font_data_get - Acquires a reference on font data * @fd: Font data --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 7CCBE407573 for ; Mon, 2 Mar 2026 14:13:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460814; cv=none; b=f6apINyDd1kWqyw/K0deyuU2VSWvD+1uhWvhPWrXN8fAlB4twhUW8U8JV/Kt3nzJmF8v1Rz8MP1U62o6COZ+rvLO9uYpFFOP1NDhmLNnIC5i1/HmVvSD7bGE+GDu4WE4Ac4paQzSusUGKIhdg6/fS794fpGEo1sycEHJOSGkGZs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460814; c=relaxed/simple; bh=OTJQLfPrza4wqkpwHtSjOCX1Y66px7hWOW89qqRMwQI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nmoriS8RTLOrL3tpPYthUsZ94qEd+6d0k9u1ikaDmOgspCsfe+e3iBaB7reoJ7zWDiEtjfdvPSG90cF0x486rSKr1CZMAJS4cI+xGUswLdmK4DP0ZRXRpsHnjbGWlOq2ki+EaCrP6ycnvnLq4WRuxhQ7AxQWWrdyVxKlXg4jMlc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=1ow5zg60; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Fc78lAtj; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=fbpyG5b7; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=0CA2bw3J; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="1ow5zg60"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Fc78lAtj"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="fbpyG5b7"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="0CA2bw3J" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id F2F513F80F; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460783; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x9PNnFflHIxZZwVZ+njxnzn40BU+lxAnc9YZVtgeDpY=; b=1ow5zg60/cz7+DECrwN5E5eSFMlXQDAecpNks5TtcOrf4m3w7hyNpMZAQLoNyPC6p+iaZw W6BFsbPuCExbuTgG9OHkuO0EdVGl/iLczp4lMkCGUZZkbfL5uZVtNbghMEOHpbc2v5P9WF CRK7RJVdpv2P5q77QBzvPCEwUw6881s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460783; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x9PNnFflHIxZZwVZ+njxnzn40BU+lxAnc9YZVtgeDpY=; b=Fc78lAtjuzsH+TATjCP9EWQcmXw2kM2EYmqyKLLI+Ln+Gm+0aFljnSEtNxFqAi7+WMZ6q2 8b5G27s6RBW8LcAQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x9PNnFflHIxZZwVZ+njxnzn40BU+lxAnc9YZVtgeDpY=; b=fbpyG5b7bOLRrz9ngJpAWs0G77gDHpi0dwOiua8aPt3B/h30pSxX59BKc7vwtTqf1Pjoqb Qv2rCA5tCfsvVYqvCWM3Z67ZmUGZcMuP/rQMgSs46TbkczIpfrBawn9gYWqdyiO0mqqiG0 Jkis3ZsWUS6SyGWS7btoSkWBl/pY7uk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460782; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x9PNnFflHIxZZwVZ+njxnzn40BU+lxAnc9YZVtgeDpY=; b=0CA2bw3J+2ZQS789DCGmEAO45Np3s2OijRbKwV0tughRRC4wmnO9qeTPCTtnkg2Gs7UeKl SfJCxbngo8ZSlcBg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C05993EA69; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id KP6DLe6apWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:02 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 12/13] lib/fonts: Store font data for user space with font_data_export() Date: Mon, 2 Mar 2026 15:08:46 +0100 Message-ID: <20260302141255.518657-13-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.79 X-Spam-Level: X-Spamd-Result: default: False [-2.79 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.19)[-0.971]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; RCVD_TLS_ALL(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL4936hw7dbgk3hb39jfn1xy19)]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Flag: NO Content-Type: text/plain; charset="utf-8" Add font_data_export() and update consoles to use it. The helper font_data_export() is based on code in fbcon_get_font(). It extends the size of a single glyph to match the requested vpitch, which us usually 32 bytes for fonts from user space. Internal fonts have a pitch according to the glyph's height. The implementation of font_data_export() differs in several ways from the original code. The original implementation distinguished between different pitches of the font data. This is not necessary as the pitch is a parameter in the copying. There was also special handling for a font pitch of 3 bytes, which got expanded to 4 bytes (with trailing bits on each scanline). The logic originated from long before git history exists even in the historical tree. So it is not clear why this was implemented. It is not what user space expects. The setfont utitlity loads font with 3-bytes pitches and expects to read such fonts with a 3-byte pitch. For any font width, the font pitch is always the width extended to the next multiple of 8. See [1] for the user-space font-reading code. With the changes ot handling the font pitches, font_data_export() replaces the original code's various special cases with a single copying logic. Signed-off-by: Thomas Zimmermann Link: https://github.com/legionus/kbd/blob/v2.9.0/src/libkfont/kdfontop.c#L= 73 # [1] --- drivers/video/fbdev/core/fbcon.c | 57 ++------------------------------ include/linux/font.h | 1 + lib/fonts/fonts.c | 40 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 55 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index 53677c09a0ec..8641b0b3edc4 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2282,68 +2282,15 @@ static bool fbcon_blank(struct vc_data *vc, enum ve= sa_blank_mode blank, =20 static int fbcon_get_font(struct vc_data *vc, struct console_font *font, u= nsigned int vpitch) { - struct fbcon_display *p =3D &fb_display[vc->vc_num]; - font_data_t *fontdata =3D p->fontdata; - u8 *data =3D font->data; - int i, j; + const struct fbcon_display *p =3D &fb_display[vc->vc_num]; =20 font->width =3D vc->vc_font.width; font->height =3D vc->vc_font.height; if (font->height > vpitch) return -ENOSPC; font->charcount =3D vc->vc_hi_font_mask ? 512 : 256; - if (!font->data) - return 0; - - if (font->width <=3D 8) { - j =3D vc->vc_font.height; - if (font->charcount * j > font_data_size(fontdata)) - return -EINVAL; =20 - for (i =3D 0; i < font->charcount; i++) { - memcpy(data, fontdata, j); - memset(data + j, 0, vpitch - j); - data +=3D vpitch; - fontdata +=3D j; - } - } else if (font->width <=3D 16) { - j =3D vc->vc_font.height * 2; - if (font->charcount * j > font_data_size(fontdata)) - return -EINVAL; - - for (i =3D 0; i < font->charcount; i++) { - memcpy(data, fontdata, j); - memset(data + j, 0, 2*vpitch - j); - data +=3D 2*vpitch; - fontdata +=3D j; - } - } else if (font->width <=3D 24) { - if (font->charcount * (vc->vc_font.height * sizeof(u32)) > font_data_siz= e(fontdata)) - return -EINVAL; - - for (i =3D 0; i < font->charcount; i++) { - for (j =3D 0; j < vc->vc_font.height; j++) { - *data++ =3D fontdata[0]; - *data++ =3D fontdata[1]; - *data++ =3D fontdata[2]; - fontdata +=3D sizeof(u32); - } - memset(data, 0, 3 * (vpitch - j)); - data +=3D 3 * (vpitch - j); - } - } else { - j =3D vc->vc_font.height * 4; - if (font->charcount * j > font_data_size(fontdata)) - return -EINVAL; - - for (i =3D 0; i < font->charcount; i++) { - memcpy(data, fontdata, j); - memset(data + j, 0, 4 * vpitch - j); - data +=3D 4 * vpitch; - fontdata +=3D j; - } - } - return 0; + return font_data_export(p->fontdata, font, vpitch); } =20 /* set/clear vc_hi_font_mask and update vc attrs accordingly */ diff --git a/include/linux/font.h b/include/linux/font.h index d3b8ca240152..e2e02e40c365 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -62,6 +62,7 @@ void font_data_get(font_data_t *fd); bool font_data_put(font_data_t *fd); unsigned int font_data_size(font_data_t *fd); bool font_data_is_equal(font_data_t *lhs, font_data_t *rhs); +int font_data_export(font_data_t *fd, struct console_font *font, unsigned = int vpitch); =20 /* * Font description diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c index 9b5355f6d2dc..1830e6ae9c87 100644 --- a/lib/fonts/fonts.c +++ b/lib/fonts/fonts.c @@ -202,6 +202,46 @@ bool font_data_is_equal(font_data_t *lhs, font_data_t = *rhs) } EXPORT_SYMBOL_GPL(font_data_is_equal); =20 +/** + * font_data_export - Stores font data for user space + * @fd: Font data + * @font: A font for user space + * @vpitch: The size of a single glyph in @font in bytes + * + * Store the font data given in @fd to the font in @font. Values and + * pointers in @font are pre-initialized. This helper mostly checks some + * corner cases and translates glyph sizes according to the value given + * @vpitch. + * + * Returns: + * 0 on success, or a negative errno code otherwise. + */ +int font_data_export(font_data_t *fd, struct console_font *font, unsigned = int vpitch) +{ + const unsigned char *font_data =3D font_data_buf(fd); + unsigned char *data =3D font->data; + unsigned int pitch =3D console_font_pitch(font); + unsigned int glyphsize, i; + + if (!font->width || !font->height || !font->charcount || !font->data) + return 0; + + glyphsize =3D font->height * pitch; + + if (font->charcount * glyphsize > font_data_size(fd)) + return -EINVAL; + + for (i =3D 0; i < font->charcount; i++) { + memcpy(data, font_data, glyphsize); + memset(data + glyphsize, 0, pitch * vpitch - glyphsize); + data +=3D pitch * vpitch; + font_data +=3D glyphsize; + } + + return 0; +} +EXPORT_SYMBOL_GPL(font_data_export); + /* * Font lookup */ --=20 2.53.0 From nobody Thu Apr 16 05:13:17 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 611C13FD152 for ; Mon, 2 Mar 2026 14:13:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460821; cv=none; b=aR9jEz4BHVWNB5pmx+BteNHh6c/KeYT3cmwZukHIwxUtRdGwSAQ64kW8NYV/5rA5g10GQB4QnhDHQssJKQC1Q4dC/mGDnlWPhjj6BNAzhx1cMZ9pyUNaDEnrPpmPPpA5OBL+XKyUsDSkSxz754K/TKZvP3M9TxulwMTz2NHQhDM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460821; c=relaxed/simple; bh=e4IseE41Vz2p60ASapOMgFeDHtB+1J0L3H4THKnZ3wg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VdioJCWe4KQb0mVRG73uMigDWHNhO5/4K1yPQ+HlU/lGzo3P6Gjv3h6ybtQ6QW84AwcOSqhuDJpaXMgJh0SYRu8DIMgA3Y1yN7ueHp2aFqr52+NTXEDAUWHnjs6o4ETjANaLs4iAfMfXTeTY3aswuRJtnXNQi4mS8rzmHv9SX0U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=F/11/uhU; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=LI+K6+iy; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=F/11/uhU; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=LI+K6+iy; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="F/11/uhU"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="LI+K6+iy"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="F/11/uhU"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="LI+K6+iy" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 38AB93F812; Mon, 2 Mar 2026 14:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460783; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A5hPkjRRQj03uZeGeu+2LED9SBQXZFUCWYWsHStO0+w=; b=F/11/uhUNcpJkUG4WjnB7QIE4htOWml6rycUZmK3GsGgVzHdBE2l2eIp2GuhNqmfO8Anor v0V2YlLO3/r4bEwVb383uFeCp4aAh+i7XAjuWpQvGxqqI96S4ax5QtfiXX5A3H1RGSGHyR 9+QOGNdbxIKgpSNv9f4BJggjfEycbto= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460783; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A5hPkjRRQj03uZeGeu+2LED9SBQXZFUCWYWsHStO0+w=; b=LI+K6+iyytwoOkPhAxezkZlgfzOUdFKBc0vsuSJkOC8sK75z79D879jVXmGrUIZJjwpVYE toBFflCgINcyTVBQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772460783; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A5hPkjRRQj03uZeGeu+2LED9SBQXZFUCWYWsHStO0+w=; b=F/11/uhUNcpJkUG4WjnB7QIE4htOWml6rycUZmK3GsGgVzHdBE2l2eIp2GuhNqmfO8Anor v0V2YlLO3/r4bEwVb383uFeCp4aAh+i7XAjuWpQvGxqqI96S4ax5QtfiXX5A3H1RGSGHyR 9+QOGNdbxIKgpSNv9f4BJggjfEycbto= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772460783; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A5hPkjRRQj03uZeGeu+2LED9SBQXZFUCWYWsHStO0+w=; b=LI+K6+iyytwoOkPhAxezkZlgfzOUdFKBc0vsuSJkOC8sK75z79D879jVXmGrUIZJjwpVYE toBFflCgINcyTVBQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 05DC43EA6C; Mon, 2 Mar 2026 14:13:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 6HoBAO+apWleKQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 14:13:02 +0000 From: Thomas Zimmermann To: gregkh@linuxfoundation.org, deller@gmx.de, sam@ravnborg.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 13/13] lib/fonts: Remove internal symbols and macros from public header file Date: Mon, 2 Mar 2026 15:08:47 +0100 Message-ID: <20260302141255.518657-14-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302141255.518657-1-tzimmermann@suse.de> References: <20260302141255.518657-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.994]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[linuxfoundation.org,gmx.de,ravnborg.org]; RCVD_TLS_ALL(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL4936hw7dbgk3hb39jfn1xy19)]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Define access macros for font_data_t in fonts.c. Define struct font_data and declare most of the font symbols in the internal header font.h, where they can only be seen by the font code. Also move font indices into internal font.h. They appear to be unused though. There is m86k assembly code that operates on the idx field, so leave them in place for now. List all built-in fonts in a separate section in the public header file. v2: - do not add config guards around font symbols (Helge) - keep declaration of built-in fonts in public header Signed-off-by: Thomas Zimmermann --- include/linux/font.h | 57 ++++++++++++-------------------------- lib/fonts/font.h | 38 +++++++++++++++++++++++++ lib/fonts/font_10x18.c | 2 +- lib/fonts/font_6x10.c | 3 +- lib/fonts/font_6x11.c | 2 +- lib/fonts/font_6x8.c | 3 +- lib/fonts/font_7x14.c | 2 +- lib/fonts/font_8x16.c | 3 +- lib/fonts/font_8x8.c | 2 +- lib/fonts/font_acorn_8x8.c | 2 +- lib/fonts/font_mini_4x6.c | 2 +- lib/fonts/font_pearl_8x8.c | 2 +- lib/fonts/font_sun12x22.c | 3 +- lib/fonts/font_sun8x16.c | 3 +- lib/fonts/font_ter10x18.c | 4 ++- lib/fonts/font_ter16x32.c | 4 ++- lib/fonts/fonts.c | 8 +++++- 17 files changed, 85 insertions(+), 55 deletions(-) create mode 100644 lib/fonts/font.h diff --git a/include/linux/font.h b/include/linux/font.h index e2e02e40c365..63a8aee8e37d 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -77,36 +77,6 @@ struct font_desc { int pref; }; =20 -#define VGA8x8_IDX 0 -#define VGA8x16_IDX 1 -#define PEARL8x8_IDX 2 -#define VGA6x11_IDX 3 -#define FONT7x14_IDX 4 -#define FONT10x18_IDX 5 -#define SUN8x16_IDX 6 -#define SUN12x22_IDX 7 -#define ACORN8x8_IDX 8 -#define MINI4x6_IDX 9 -#define FONT6x10_IDX 10 -#define TER16x32_IDX 11 -#define FONT6x8_IDX 12 -#define TER10x18_IDX 13 - -extern const struct font_desc font_vga_8x8, - font_vga_8x16, - font_pearl_8x8, - font_vga_6x11, - font_7x14, - font_10x18, - font_sun_8x16, - font_sun_12x22, - font_acorn_8x8, - font_mini_4x6, - font_6x10, - font_ter_16x32, - font_6x8, - font_ter_10x18; - /* Find a font with a specific name */ =20 extern const struct font_desc *find_font(const char *name); @@ -120,16 +90,23 @@ extern const struct font_desc *get_default_font(int xr= es, int yres, /* Max. length for the name of a predefined font */ #define MAX_FONT_NAME 32 =20 -/* Extra word getters */ -#define REFCOUNT(fd) (((int *)(fd))[-1]) -#define FNTSIZE(fd) (((int *)(fd))[-2]) -#define FNTSUM(fd) (((int *)(fd))[-4]) - -#define FONT_EXTRA_WORDS 4 +/* + * Built-in fonts + */ =20 -struct font_data { - unsigned int extra[FONT_EXTRA_WORDS]; - unsigned char data[]; -} __packed; +extern const struct font_desc font_10x18; +extern const struct font_desc font_6x10; +extern const struct font_desc font_6x8; +extern const struct font_desc font_7x14; +extern const struct font_desc font_acorn_8x8; +extern const struct font_desc font_mini_4x6; +extern const struct font_desc font_pearl_8x8; +extern const struct font_desc font_sun_12x22; +extern const struct font_desc font_sun_8x16; +extern const struct font_desc font_ter_10x18; +extern const struct font_desc font_ter_16x32; +extern const struct font_desc font_vga_6x11; +extern const struct font_desc font_vga_8x16; +extern const struct font_desc font_vga_8x8; =20 #endif /* _VIDEO_FONT_H */ diff --git a/lib/fonts/font.h b/lib/fonts/font.h new file mode 100644 index 000000000000..4f1adf0b6b54 --- /dev/null +++ b/lib/fonts/font.h @@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LIB_FONTS_FONT_H +#define _LIB_FONTS_FONT_H + +#include + +/* + * Font data + */ + +#define FONT_EXTRA_WORDS 4 + +struct font_data { + unsigned int extra[FONT_EXTRA_WORDS]; + unsigned char data[]; +} __packed; + +/* + * Built-in fonts + */ + +#define VGA8x8_IDX 0 +#define VGA8x16_IDX 1 +#define PEARL8x8_IDX 2 +#define VGA6x11_IDX 3 +#define FONT7x14_IDX 4 +#define FONT10x18_IDX 5 +#define SUN8x16_IDX 6 +#define SUN12x22_IDX 7 +#define ACORN8x8_IDX 8 +#define MINI4x6_IDX 9 +#define FONT6x10_IDX 10 +#define TER16x32_IDX 11 +#define FONT6x8_IDX 12 +#define TER10x18_IDX 13 + +#endif diff --git a/lib/fonts/font_10x18.c b/lib/fonts/font_10x18.c index 5d940db626e7..10edebc4bb74 100644 --- a/lib/fonts/font_10x18.c +++ b/lib/fonts/font_10x18.c @@ -4,7 +4,7 @@ * by Jurriaan Kalkman 06-2005 * ********************************/ =20 -#include +#include "font.h" =20 #define FONTDATAMAX 9216 =20 diff --git a/lib/fonts/font_6x10.c b/lib/fonts/font_6x10.c index e65df019e0d2..660d3a371b30 100644 --- a/lib/fonts/font_6x10.c +++ b/lib/fonts/font_6x10.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 -#include + +#include "font.h" =20 #define FONTDATAMAX 2560 =20 diff --git a/lib/fonts/font_6x11.c b/lib/fonts/font_6x11.c index bd76b3f6b635..671487ccc172 100644 --- a/lib/fonts/font_6x11.c +++ b/lib/fonts/font_6x11.c @@ -5,7 +5,7 @@ /* */ /**********************************************/ =20 -#include +#include "font.h" =20 #define FONTDATAMAX (11*256) =20 diff --git a/lib/fonts/font_6x8.c b/lib/fonts/font_6x8.c index 06ace7792521..5811ee07f4d8 100644 --- a/lib/fonts/font_6x8.c +++ b/lib/fonts/font_6x8.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 -#include + +#include "font.h" =20 #define FONTDATAMAX 2048 =20 diff --git a/lib/fonts/font_7x14.c b/lib/fonts/font_7x14.c index a2f561c9fa04..0c7475d643c8 100644 --- a/lib/fonts/font_7x14.c +++ b/lib/fonts/font_7x14.c @@ -4,7 +4,7 @@ /* by Jurriaan Kalkman 05-2005 */ /**************************************/ =20 -#include +#include "font.h" =20 #define FONTDATAMAX 3584 =20 diff --git a/lib/fonts/font_8x16.c b/lib/fonts/font_8x16.c index 06ae14088514..523e95c75569 100644 --- a/lib/fonts/font_8x16.c +++ b/lib/fonts/font_8x16.c @@ -5,9 +5,10 @@ /* */ /**********************************************/ =20 -#include #include =20 +#include "font.h" + #define FONTDATAMAX 4096 =20 static const struct font_data fontdata_8x16 =3D { diff --git a/lib/fonts/font_8x8.c b/lib/fonts/font_8x8.c index 69570b8c31af..e5b697fc9675 100644 --- a/lib/fonts/font_8x8.c +++ b/lib/fonts/font_8x8.c @@ -5,7 +5,7 @@ /* */ /**********************************************/ =20 -#include +#include "font.h" =20 #define FONTDATAMAX 2048 =20 diff --git a/lib/fonts/font_acorn_8x8.c b/lib/fonts/font_acorn_8x8.c index af5fa72aa8b7..36c51016769d 100644 --- a/lib/fonts/font_acorn_8x8.c +++ b/lib/fonts/font_acorn_8x8.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Acorn-like font definition, with PC graphics characters */ =20 -#include +#include "font.h" =20 #define FONTDATAMAX 2048 =20 diff --git a/lib/fonts/font_mini_4x6.c b/lib/fonts/font_mini_4x6.c index cc21dc70cfd1..dc919c160dde 100644 --- a/lib/fonts/font_mini_4x6.c +++ b/lib/fonts/font_mini_4x6.c @@ -39,7 +39,7 @@ __END__; MSBit to LSBit =3D left to right. */ =20 -#include +#include "font.h" =20 #define FONTDATAMAX 1536 =20 diff --git a/lib/fonts/font_pearl_8x8.c b/lib/fonts/font_pearl_8x8.c index ae98ca17982e..2438b374acea 100644 --- a/lib/fonts/font_pearl_8x8.c +++ b/lib/fonts/font_pearl_8x8.c @@ -10,7 +10,7 @@ /* */ /**********************************************/ =20 -#include +#include "font.h" =20 #define FONTDATAMAX 2048 =20 diff --git a/lib/fonts/font_sun12x22.c b/lib/fonts/font_sun12x22.c index 91daf5ab8b6b..2afbc144bea8 100644 --- a/lib/fonts/font_sun12x22.c +++ b/lib/fonts/font_sun12x22.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 -#include + +#include "font.h" =20 #define FONTDATAMAX 11264 =20 diff --git a/lib/fonts/font_sun8x16.c b/lib/fonts/font_sun8x16.c index 81bb4eeae04e..2b7b2d8e548a 100644 --- a/lib/fonts/font_sun8x16.c +++ b/lib/fonts/font_sun8x16.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 -#include + +#include "font.h" =20 #define FONTDATAMAX 4096 =20 diff --git a/lib/fonts/font_ter10x18.c b/lib/fonts/font_ter10x18.c index 80356e9d56c7..3f30b4a211ab 100644 --- a/lib/fonts/font_ter10x18.c +++ b/lib/fonts/font_ter10x18.c @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 -#include + #include =20 +#include "font.h" + #define FONTDATAMAX 9216 =20 static const struct font_data fontdata_ter10x18 =3D { diff --git a/lib/fonts/font_ter16x32.c b/lib/fonts/font_ter16x32.c index 5baedc573dd6..93616cffe642 100644 --- a/lib/fonts/font_ter16x32.c +++ b/lib/fonts/font_ter16x32.c @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 -#include + #include =20 +#include "font.h" + #define FONTDATAMAX 16384 =20 static const struct font_data fontdata_ter16x32 =3D { diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c index 1830e6ae9c87..198aae869be2 100644 --- a/lib/fonts/fonts.c +++ b/lib/fonts/fonts.c @@ -13,7 +13,6 @@ */ =20 #include -#include #include #include #include @@ -26,12 +25,19 @@ #include #endif =20 +#include "font.h" + #define console_font_pitch(font) DIV_ROUND_UP((font)->width, 8) =20 /* * Helpers for font_data_t */ =20 +/* Extra word getters */ +#define REFCOUNT(fd) (((int *)(fd))[-1]) +#define FNTSIZE(fd) (((int *)(fd))[-2]) +#define FNTSUM(fd) (((int *)(fd))[-4]) + static struct font_data *to_font_data_struct(font_data_t *fd) { return container_of(fd, struct font_data, data[0]); --=20 2.53.0