From nobody Mon Dec 1 21:30:41 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36A263009DA for ; Mon, 1 Dec 2025 09:33:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581613; cv=none; b=adZy48NvCkYBmRRtw654g6vrAqrOSdGdky4Y8C3pM47d+1tDTDaLs0CykaHhF2Xgr9LnZzwLNDU4GiXLgDUY7StzdztzWwqyTWGTj3135zVBLmREeE6bCfpq/gJvtE95c1Cz+DrmIvAW+TajMXqzGxvfpAZs2Bt13BHZIGzTbBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581613; c=relaxed/simple; bh=BidZ//3QtMfU86Ob65UNf2tBPu4j0g1ruYdm5SKevM8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PneS3omp4Zk61ZhAjxuiB2ZET5McFzFzL6wDM7l5zTOv/dconB2pGy9w9nZYm8XyIOzMb/+ECbwu2qaeKs1s1Qe+l6nLc9uzrHSCPl81E/SbsLglk10tIRT9g/BdFHOqp9BdHSBILIrdW7Esmr4Shz0r5QdrfzuwzBJKtARajlE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=WddiyLdc; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="WddiyLdc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764581612; x=1796117612; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=BidZ//3QtMfU86Ob65UNf2tBPu4j0g1ruYdm5SKevM8=; b=WddiyLdcEvyUrVJRJtjmD4xpSit0uFdgXqyS/jVa4AGG/P2Cip6jZsze /Pk8ZRXkLSRE18aQXKkVVx10WUhZcbJvRJzlUznvPUOR2l+vmw3QT6QWo LE7KllWCGrqGBphXjDhHFaraBHUDHuj3O9PVqvJaQnNOCMvkQNk/rw6hx OsGrA4l8bTQHjI+T/gOP6BVXlQRDe0UwDLwmy3Lu0Bp4r6aNuLAETkBGG 3/aqCWHhTc65R48y09xpVGeE9so3aVk9eJlYh7xSKcekxVIc8xjFMcGIO Gy4bABDLtDgSHFeK4ZyQ4GHTXnIAXZfWN3QgdhCtfe7PS/AyIOvPORaKQ g==; X-CSE-ConnectionGUID: CYNkpsalQFebHiFYc9eGAg== X-CSE-MsgGUID: m9s6rX85Qe2koSDrthAaTQ== X-IronPort-AV: E=McAfee;i="6800,10657,11629"; a="66586436" X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="66586436" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:07 -0800 X-CSE-ConnectionGUID: +J98+KRZSvm7YE8YjCy+CQ== X-CSE-MsgGUID: L6Caq9yqTHCBLTiQiLwuTA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="194014735" Received: from lab-ah.igk.intel.com (HELO [127.0.1.1]) ([10.211.135.228]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:00 -0800 From: Andrzej Hajda Date: Mon, 01 Dec 2025 10:31:22 +0100 Subject: [PATCH v2 1/5] printk: add macros to simplify handling struct va_format Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251201-va_format_call-v2-1-2906f3093b60@intel.com> References: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> In-Reply-To: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> To: Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrzej Hajda X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1947; i=andrzej.hajda@intel.com; h=from:subject:message-id; bh=BidZ//3QtMfU86Ob65UNf2tBPu4j0g1ruYdm5SKevM8=; b=owEB7QES/pANAwAKASNispPeEP3XAcsmYgBpLWCCqgrlEBLHWYOOFjlFGD6Tu10XWZeK7VfDi s7v0zzoNeGJAbMEAAEKAB0WIQT8qEQxNN2/XeF/A00jYrKT3hD91wUCaS1gggAKCRAjYrKT3hD9 15gVDAClfsOsq5oWz8xyehgotr2qX0EkmLOP4SHstCcoZwpFPmgVpFXJZsbrEQq61BdxV34LMGS RUseDWoRcuoe+E01xsLw/6ML5YqOYeBYhebiw4yLIi+rSgnLkfa3SIiSMxlYvqwTqL7StV50nBy /1Ig+eXoLoOddJtC+dsWQmbBagt97nH1D10ROZ621wfpQ4GV4BuOXk2xt0g0qnpnJarOFtZx5aa UeKzZQC8rzlcODyO9v4NlizeITJjxeF+FGCVP0mTHPRoZmGfOilPj70Ow+35ufdkEvCZw7QZHIY 5eePg5IfX5fJbtnx4rBVUfU2xReXZgRVFQNuc+QXIdHA7jcwMYPp7tjSIFxGRIYJfqCqZNOhBv4 dP5JfXLQbmtf3UyTztapg8k4Hh/PV7DCptMswCWa6jlDQfO5nW8Y0gBg9xgicCOJIzQzseOr1Nn PH45VkUjdFzO5bmNCnLNzdg/t6SYU0oYSUeVCmq6ETxynodehHR6UD/Erlg+kq10ezhVE= X-Developer-Key: i=andrzej.hajda@intel.com; a=openpgp; fpr=FCA8443134DDBF5DE17F034D2362B293DE10FDD7 struct va_format is used to facilitate implementation of variadic functions. Most of variadic users do not parse arguments one by one, they just forward them to some helper via va_format pointer. Introduced helpers simplifies it more. Signed-off-by: Andrzej Hajda --- include/linux/printk.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/linux/printk.h b/include/linux/printk.h index 45c663124c9b..6fd817ce29a6 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -87,6 +87,36 @@ struct va_format { va_list *va; }; =20 +/* Special macro used only by callers of va_format_call to position va_for= mat argument */ +#define va_format_arg (&vaf) + +/** + * va_format_call() - forward variable arguments to va_format aware functi= on + * @_fmt: format used by @_func function + * @_func: function which should be called + * @_args: arguments passed to @_func. Exactly one of them must be va_form= at_arg, + * to indicate position of *va_format type arg in arguments of @_f= unc. + * + * Many variadic functions just forwards their variadic arguments to some = helper + * function via va_format pointer. It involves few common steps encapsulat= ed in + * this macro. The macro is accompanied by va_format_arg macro, described = above. + * Sample implementation of common helper: + * void dev_err(struct device *dev, const char* fmt, ...) + * { + * va_format_call(fmt, pr_err, "%s %s: %pV", dev_driver_string(dev), + * dev_name(dev), va_format_arg); + * } + */ +#define va_format_call(_fmt, _func, _args...) \ +({ \ + va_list ap; \ + struct va_format vaf =3D { .fmt =3D _fmt, .va =3D &ap }; \ + \ + va_start(ap, _fmt); \ + _func(_args); \ + va_end(ap); \ +}) + /* * FW_BUG * Add this to a message where you are sure the firmware is buggy or behav= es --=20 2.43.0 From nobody Mon Dec 1 21:30:41 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1948301475 for ; Mon, 1 Dec 2025 09:33:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581615; cv=none; b=J8lsOjrmvdhaNju3zRzH4lkvHjNNlBzFIKn07zzSvBsrl3Srza+gRcZnI/FENLEke7lHwLpGBoRbboze4fP7s4RuuVdWaCSyFo9D4RySI5nKnkQJBKnRPVXqsBCFCE1MzQilY5Xudy7LEKNGdsSvoGZAM1c4pTyeN/n+72Yi784= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581615; c=relaxed/simple; bh=lGrs1BxIQfKUnVh49VAGVD/M+EcaVQqWiEREPf8/PlQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CsubYsfkKGtzp1oFiSytjZACK3/I6tVTRL0iE65kej0x7gxQId8Ft4lyBY7RFYhl8nHInq3PMTvpJ234sN8+9z7bGsLa4p6cWwuEHXokLfkCzIJ2zwBxmxXtQDJFVO/fp42ZVC/YH42Ewsrrj588DI0pYpyEHtvEkFNfiVQe3d4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=iDsRFHYr; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="iDsRFHYr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764581613; x=1796117613; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=lGrs1BxIQfKUnVh49VAGVD/M+EcaVQqWiEREPf8/PlQ=; b=iDsRFHYrE8nmGrv2idOVxTlKLUmsQR47Xdgx8uCdXJBEhmpyROobGsfP DT7sMPxdWeIzrhXW4T19miEUy0kNC/nmT+bZkxE2pu4c6weAoibzVLurR dC62bUUPlz8ckh8O0uGsdlv8WQGEWFtggOFXLq51tvDYAt+h9pRcr+py/ tiVpi6gcy88hb3zOEipyyFfAZoszpQ20LnF6ZSZcRwY2/k0oo7PpbvPHV GkIgvXM7wmK0Fss+ehSF91+vFZvNdGrUxb3rEFZSr8J0EwzGsunmd8K0w oBLmBLW96seUz+WctJVD+DvNmKIycuGY8CnE0V+GXOdkaV9gWWHWikc1f Q==; X-CSE-ConnectionGUID: 6xeipOdyQf+MPRW91YZvIQ== X-CSE-MsgGUID: YqAEbEZcTc+pAGsibMDIYA== X-IronPort-AV: E=McAfee;i="6800,10657,11629"; a="66586477" X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="66586477" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:12 -0800 X-CSE-ConnectionGUID: GjiwUtuZQGKic3JOiUCruw== X-CSE-MsgGUID: +AuekXMBS1GGKGZl5pIHnQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="194014751" Received: from lab-ah.igk.intel.com (HELO [127.0.1.1]) ([10.211.135.228]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:05 -0800 From: Andrzej Hajda Date: Mon, 01 Dec 2025 10:31:23 +0100 Subject: [PATCH v2 2/5] drivers/core: use va_format_call helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251201-va_format_call-v2-2-2906f3093b60@intel.com> References: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> In-Reply-To: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> To: Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrzej Hajda X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1545; i=andrzej.hajda@intel.com; h=from:subject:message-id; bh=lGrs1BxIQfKUnVh49VAGVD/M+EcaVQqWiEREPf8/PlQ=; b=owEB7QES/pANAwAKASNispPeEP3XAcsmYgBpLWCC14IdpQZIWRFY8uWJDaJFNym4gRmOg382V oQ+7qlcRaaJAbMEAAEKAB0WIQT8qEQxNN2/XeF/A00jYrKT3hD91wUCaS1gggAKCRAjYrKT3hD9 10S7C/9MjmVyix6rLwBRYAldSB+2C97nOdpnVN91fDdTqin21RsGU1uxg3gUy3RnXTNJBFn/vYs 9tvKoynVYQIQ9s564i8Y0ueEAyVmjAs7VlNcnH2VVzhgxgLHcNubC0cJ36JFjYcXzHhPZ5PkVTd IYjwlOjlreQA2mAOm/a+28e75wn3dh8YT22wVJWdG7edkJOAaDG2v7i2W20sITdE+ACiG5+OX7m YKiBjeWP/sDeb1fOxGxUPuNcPR07xMapOC4Cb/UZxhENi5Ut9zl5LdNIGsWemQVqWkFRafI1bjT lU8mVjvqZtGC81bHUQgGHbPKqCK7t4QydTr0TPyk/m+7Qc9CKPOpKVpy38M/Blp3iEa5/OWUl4/ 2ptm+FVMKtRCqWsW0eqwlhpAZh/CoPDjmu7+yt0cyqC1pDQCycZsEvHFJyfs8dwuvZfSZndBo3l bF4XJ9CMMZpM6Rb7jeQofa3Mm7mg6KLovot8iYJnDWwGyjkJfyd7Vk8Wg8SBw7UAkx/u4= X-Developer-Key: i=andrzej.hajda@intel.com; a=openpgp; fpr=FCA8443134DDBF5DE17F034D2362B293DE10FDD7 It simplifies the code and makes it more clear. Signed-off-by: Andrzej Hajda --- drivers/base/core.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index f69dc9c85954..513e5ef8a6da 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4943,35 +4943,15 @@ static void __dev_printk(const char *level, const s= truct device *dev, void _dev_printk(const char *level, const struct device *dev, const char *fmt, ...) { - struct va_format vaf; - va_list args; - - va_start(args, fmt); - - vaf.fmt =3D fmt; - vaf.va =3D &args; - - __dev_printk(level, dev, &vaf); - - va_end(args); + va_format_call(fmt, __dev_printk, level, dev, va_format_arg); } EXPORT_SYMBOL(_dev_printk); =20 -#define define_dev_printk_level(func, kern_level) \ -void func(const struct device *dev, const char *fmt, ...) \ -{ \ - struct va_format vaf; \ - va_list args; \ - \ - va_start(args, fmt); \ - \ - vaf.fmt =3D fmt; \ - vaf.va =3D &args; \ - \ - __dev_printk(kern_level, dev, &vaf); \ - \ - va_end(args); \ -} \ +#define define_dev_printk_level(func, kern_level) \ +void func(const struct device *dev, const char *fmt, ...) \ +{ \ + va_format_call(fmt, __dev_printk, kern_level, dev, va_format_arg); \ +} \ EXPORT_SYMBOL(func); =20 define_dev_printk_level(_dev_emerg, KERN_EMERG); --=20 2.43.0 From nobody Mon Dec 1 21:30:41 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 811B52E54DE for ; Mon, 1 Dec 2025 09:33:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581617; cv=none; b=YfCFp1oKBgZbbQo6eca+/AsJuVERRfVyEtKLMMnihUNza33gXjfsHs/7Z3j9KSlH2Uf12oBCB6y2eJcpWtShswb8voyUI/aYVnAmEbVXNzEEuOK/DH64I5XReNanoaPMm0h25low/xmY6TTyMDmX+69DxI4x3DttleSt0T/VET0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581617; c=relaxed/simple; bh=aLe4KcA4NSXkuz6n3mPRoFlQksa7NsVPK3f3ZLIZZ90=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ovb6ItMVsBkoY8dT2Fu5IrXa31/zf5K94qs1Gn9Csjwrvl4JWXD7FRET2QXuu6ktONwLjtj3BlUJOAz1bzxvpM51zVtfJblB2MGZ2V0L67wOlYWF4cZZ1kEXJZYvoofO7mg5Tp/UpWSXQ3Jt3wF9kEE1o2Pd51ulO7uqrShH1AQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=afx9xJCM; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="afx9xJCM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764581615; x=1796117615; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=aLe4KcA4NSXkuz6n3mPRoFlQksa7NsVPK3f3ZLIZZ90=; b=afx9xJCMPF5YCC7nsn+MUT9iTC2Az54+lxzIdMthn9aEmxYmCqwbAY3n v6UbAGguwrw1MRcpO2W2jyhfhp0TtsQvTIemh+e5Cb4BSUF5YDq/c3TWV 3bvwCS1788QAeVLeIoCKDgbdutlURxbA9ULXTZ1GjFI3xQlHad7DbA5aZ BKa4/caBIBZqCoJav51Ap/wSNp3vc2LufHOeazrBFadQ4UpMb5VTAqSlu iw8yC1b4v/sIGjk2HdGyVS0+vbvoSCWiV6ZStZCFPpW2b7iF9deXQk+Vm fRP01uBL8fKURweeg5WcH0W8D30Qx1NEf+RrNDSGwMxY6kjBtrKynsIfk g==; X-CSE-ConnectionGUID: kApuN9KRR9y40drWbw4aLQ== X-CSE-MsgGUID: eq9JbPWsSYm7u4ixwdQrGw== X-IronPort-AV: E=McAfee;i="6800,10657,11629"; a="66586490" X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="66586490" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:16 -0800 X-CSE-ConnectionGUID: PTLk49HIQ42h8lk9mJqShg== X-CSE-MsgGUID: 7rzMsVPWTW+JaOplq6fONg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="194014762" Received: from lab-ah.igk.intel.com (HELO [127.0.1.1]) ([10.211.135.228]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:09 -0800 From: Andrzej Hajda Date: Mon, 01 Dec 2025 10:31:24 +0100 Subject: [PATCH v2 3/5] drivers/core: simplify variadic args handling Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251201-va_format_call-v2-3-2906f3093b60@intel.com> References: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> In-Reply-To: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> To: Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrzej Hajda X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=3161; i=andrzej.hajda@intel.com; h=from:subject:message-id; bh=aLe4KcA4NSXkuz6n3mPRoFlQksa7NsVPK3f3ZLIZZ90=; b=owEB7QES/pANAwAKASNispPeEP3XAcsmYgBpLWCDrFS81p5xl7Y4ta+Lv+9MYmMyR7mYdfpHU VNBnvpCZwGJAbMEAAEKAB0WIQT8qEQxNN2/XeF/A00jYrKT3hD91wUCaS1ggwAKCRAjYrKT3hD9 16TtDACXjKOhA8ukJfEVaatD9RMTdXDzxWSTE6JGwiD22eMpKA/P+LbxSVg+iwrqFKUMSMygpBV 2VwVLP/IB/zRqeWCM5tDojIojNiN4zbx3a/HHcC57d2oaqUI9YXv0h1akeLjnMXGl2fA9rfYsAi ZFzaIW1XZrtJdYdfixg6SP8ImWc4+6RHl4msn8b9Morrng5z+Zx1kuvpzXlsnwtksY/V7ZyS+uH 8QW3QlSFYonKXmV73Bx8rJBTB/omNDf28xYE8iL01En+tR9fjVGwebrgXAq8Abw0rgp1i3c0XBx DC8bBFh4JEOnAqmovMoDdRSA5VMq3YEljX6dEGflJz17FyJltOP2YBGmAqjhqi7u+rtFbpvCGxq Z9Xy3bkn/u2gUyviBU3+X3N32zVoO95dimpNz8rYrV8q+edG486ULFyqxaanGq+U9mnAK1ntaxs 64td9HywJS68L+44/YSRu08Dsi5n3hKfetqYPKHGx1OWQbYBYnqvcYvgSGbb9KjspwWGM= X-Developer-Key: i=andrzej.hajda@intel.com; a=openpgp; fpr=FCA8443134DDBF5DE17F034D2362B293DE10FDD7 Changing argument type from va_list to struct va_format * allows to simplify variadic argument handling with va_format_call helper. Signed-off-by: Andrzej Hajda --- drivers/base/core.c | 50 +++++++------------------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 513e5ef8a6da..4d76b67a87e3 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4965,30 +4965,12 @@ define_dev_printk_level(_dev_info, KERN_INFO); #endif =20 static void __dev_probe_failed(const struct device *dev, int err, bool fat= al, - const char *fmt, va_list vargsp) + const char *fmt, struct va_format *vaf) { - struct va_format vaf; - va_list vargs; - - /* - * On x86_64 and possibly on other architectures, va_list is actually a - * size-1 array containing a structure. As a result, function parameter - * vargsp decays from T[1] to T*, and &vargsp has type T** rather than - * T(*)[1], which is expected by its assignment to vaf.va below. - * - * One standard way to solve this mess is by creating a copy in a local - * variable of type va_list and then using a pointer to that local copy - * instead, which is the approach employed here. - */ - va_copy(vargs, vargsp); - - vaf.fmt =3D fmt; - vaf.va =3D &vargs; - switch (err) { case -EPROBE_DEFER: - device_set_deferred_probe_reason(dev, &vaf); - dev_dbg(dev, "error %pe: %pV", ERR_PTR(err), &vaf); + device_set_deferred_probe_reason(dev, vaf); + dev_dbg(dev, "error %pe: %pV", ERR_PTR(err), vaf); break; =20 case -ENOMEM: @@ -4998,13 +4980,11 @@ static void __dev_probe_failed(const struct device = *dev, int err, bool fatal, default: /* Log fatal final failures as errors, otherwise produce warnings */ if (fatal) - dev_err(dev, "error %pe: %pV", ERR_PTR(err), &vaf); + dev_err(dev, "error %pe: %pV", ERR_PTR(err), vaf); else - dev_warn(dev, "error %pe: %pV", ERR_PTR(err), &vaf); + dev_warn(dev, "error %pe: %pV", ERR_PTR(err), vaf); break; } - - va_end(vargs); } =20 /** @@ -5042,15 +5022,7 @@ static void __dev_probe_failed(const struct device *= dev, int err, bool fatal, */ int dev_err_probe(const struct device *dev, int err, const char *fmt, ...) { - va_list vargs; - - va_start(vargs, fmt); - - /* Use dev_err() for logging when err doesn't equal -EPROBE_DEFER */ - __dev_probe_failed(dev, err, true, fmt, vargs); - - va_end(vargs); - + va_format_call(fmt, __dev_probe_failed, dev, err, true, fmt, va_format_ar= g); return err; } EXPORT_SYMBOL_GPL(dev_err_probe); @@ -5090,15 +5062,7 @@ EXPORT_SYMBOL_GPL(dev_err_probe); */ int dev_warn_probe(const struct device *dev, int err, const char *fmt, ...) { - va_list vargs; - - va_start(vargs, fmt); - - /* Use dev_warn() for logging when err doesn't equal -EPROBE_DEFER */ - __dev_probe_failed(dev, err, false, fmt, vargs); - - va_end(vargs); - + va_format_call(fmt, __dev_probe_failed, dev, err, false, fmt, va_format_a= rg); return err; } EXPORT_SYMBOL_GPL(dev_warn_probe); --=20 2.43.0 From nobody Mon Dec 1 21:30:41 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24C24301701 for ; Mon, 1 Dec 2025 09:33:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581617; cv=none; b=uTHpelVM3WokLiOkndqPEu1OZH0jPloxQA/g/T+5qM2d/p+9lQVEAg5h8JZcVL4p/D/gfSg9bgmEVwa3lM39Fb0B+T5yVitijz4I3F1/SDoHshpQaH+xEaYzVRqVLLXqMXvjh/DBbP/SQ2ymHTUV52D+Q4CGrQXkREqhN2WUR20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581617; c=relaxed/simple; bh=YczG0pLDYiEdMJk14SHF4xJmNNuo3F25zh2TrGVWcRw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gpuNc5Chr95y64V0A5l7wl9R3/I/Uovbt0vdm2s8qndm+fNcO+uw/J+KLx6FCuxj/a6mOOB0pEq/8H02TGXpYoxrnuuQ5UVclfiLFa552+2MOYiSU0a0EDy/K1JAuYLYrib2GrDhGGi/WdmTb1B8/7wj59Sfcc0WfqgI82kBjH8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=FqYTFKF6; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FqYTFKF6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764581616; x=1796117616; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=YczG0pLDYiEdMJk14SHF4xJmNNuo3F25zh2TrGVWcRw=; b=FqYTFKF6fg0JMTBYte4kzfQAihITmlMTPV23l1PrtbPN4BDkVOTpOW/R sDtbTJUFCi5To2piLg+83L0FA97CR6oKh42dNdB01XoiD9UYM2gGcKF60 bKdr/4eXx3KZ6IQbYp5agTvTbkISpydz7brNGtsCWfM+KPS1jVjk7L5po lsztKnlrciI0Y4MwQb89P5OLIT0NU0V+4vxvySZglzVpdAjjyHugi3Ha8 6Tf5/AZCAHoSTpAgQ64XqvvfTEkGSsRhY10bJ9dHx305t3UIymtOLNPc+ UF2GcmE0Vf1ecZhmqN6wvhh+edfE7XVY2pRGHa+rS0idunp3l7Lm+zdtw w==; X-CSE-ConnectionGUID: egsqB6OoR0yhkUvBfl5Qcw== X-CSE-MsgGUID: F5hMnNU2QWq7QItV45TcXQ== X-IronPort-AV: E=McAfee;i="6800,10657,11629"; a="66586508" X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="66586508" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:19 -0800 X-CSE-ConnectionGUID: zd4+EoNNSpuRB2cD/CPatA== X-CSE-MsgGUID: JF39Mmk8RS6NbLfNcBE8rg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="194014774" Received: from lab-ah.igk.intel.com (HELO [127.0.1.1]) ([10.211.135.228]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:14 -0800 From: Andrzej Hajda Date: Mon, 01 Dec 2025 10:31:25 +0100 Subject: [PATCH v2 4/5] mm: use va_format_call helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251201-va_format_call-v2-4-2906f3093b60@intel.com> References: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> In-Reply-To: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> To: Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrzej Hajda X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1930; i=andrzej.hajda@intel.com; h=from:subject:message-id; bh=YczG0pLDYiEdMJk14SHF4xJmNNuo3F25zh2TrGVWcRw=; b=owEB7QES/pANAwAKASNispPeEP3XAcsmYgBpLWCDBdzFMEbv9il+/ZP56YrIY2JKu7pYw36o7 Q73w7a7LLuJAbMEAAEKAB0WIQT8qEQxNN2/XeF/A00jYrKT3hD91wUCaS1ggwAKCRAjYrKT3hD9 15BOC/4n+qzjz6UOABhwlcO/wB7+6977X1yi9kKQ77MSaMWPblDviLXjg78spMbak97KvbyeUKK EOYMfpbzmJuJPIzPL6bi2A/O47E/5wiejBNLd8+g7/VdOMGettNh936pWeWVtwhLlBek+yqdIbF qIcJZURUOsy+w9Ltw6/HQJRFxZoUuwfW1a5M68jYewOu/WQk2vWTIRk88jbb7vhy6qlVoWSSHVU pBBAWK5L2aeZlG4RqjXI0dJ69ODy09IZ2JOifzmFzxSMXSA4bN/mOKeFZ9arAu3iEc6rz7BDhf7 qGjA8kXetf5V2qcYZoa+WVzdubGkhVkioJgEeKFJvgMbwEDSenPqCDFbsUMP/AEi6yfSJygu0Er FRjuS12OVywZmBp3L9XpxcSqLeoVk03AfBadaB8lhEkDBv1tSPIV6nAGb60jtoXR5MdwWlZnbMc qVjO6wuheKfnmPXHGY9hCl+X5AngljUIZDtb+b91PB4UdM+MfgrOqwsD5gI1KTj0rXwvw= X-Developer-Key: i=andrzej.hajda@intel.com; a=openpgp; fpr=FCA8443134DDBF5DE17F034D2362B293DE10FDD7 It simplifies the code and makes it more clear. Signed-off-by: Andrzej Hajda --- mm/page_alloc.c | 14 ++++---------- mm/slub.c | 10 +--------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ed82ee55e66a..cd0b17ea4de0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3940,22 +3940,16 @@ static void warn_alloc_show_mem(gfp_t gfp_mask, nod= emask_t *nodemask) =20 void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...) { - struct va_format vaf; - va_list args; static DEFINE_RATELIMIT_STATE(nopage_rs, 10*HZ, 1); =20 if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs) || ((gfp_mask & __GFP_DMA) && !has_managed_dma())) return; - - va_start(args, fmt); - vaf.fmt =3D fmt; - vaf.va =3D &args; - pr_warn("%s: %pV, mode:%#x(%pGg), nodemask=3D%*pbl", - current->comm, &vaf, gfp_mask, &gfp_mask, - nodemask_pr_args(nodemask)); - va_end(args); + va_format_call(fmt, pr_warn, + "%s: %pV, mode:%#x(%pGg), nodemask=3D%*pbl", + current->comm, va_format_arg, gfp_mask, &gfp_mask, + nodemask_pr_args(nodemask)); =20 cpuset_print_current_mems_allowed(); pr_cont("\n"); diff --git a/mm/slub.c b/mm/slub.c index 1a5fc3429042..786c5a4195d4 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1161,17 +1161,9 @@ static void slab_bug(struct kmem_cache *s, const cha= r *fmt, ...) __printf(2, 3) static void slab_fix(struct kmem_cache *s, const char *fmt, ...) { - struct va_format vaf; - va_list args; - if (slab_add_kunit_errors()) return; - - va_start(args, fmt); - vaf.fmt =3D fmt; - vaf.va =3D &args; - pr_err("FIX %s: %pV\n", s->name, &vaf); - va_end(args); + va_format_call(fmt, pr_err, "FIX %s: %pV\n", s->name, va_format_arg); } =20 static void print_trailer(struct kmem_cache *s, struct slab *slab, u8 *p) --=20 2.43.0 From nobody Mon Dec 1 21:30:41 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 393C230146B for ; Mon, 1 Dec 2025 09:33:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581618; cv=none; b=i1NC1qgEkmo27zTlVLUFwr1+pltzBeUloRNKlVcAgGp159Cl5vH+nXnLJJU44RHweZB1gxP/mjqICAQYaFjojVRI4rBTKixkTux7quRDKM4EtB7/0wu/hT40xIwplzaqTVpWLz57k35Pt4YnjgutujdRvxV7HWCUkDUATyWzHEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764581618; c=relaxed/simple; bh=gvSVxoCm7+LJlnSucQTnrfYh5mL799iZd5hm2jd1smU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Zw7Z8UJHiw13fF2uHwzFR1S97SABNsbIZbhiXWfWuEE9C+LgvW3aijStdmnJ3thrqS9i3IWVZucLTLA9sIPrBnynMIv59rpevEHXtoUVebPJTHX7m6rE1zCeg2/4adMA0fQuRfRbq9KgFA6tIeAwIfpkiMJZI01DIBQtB3SWE/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=YB8IFaZw; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="YB8IFaZw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764581617; x=1796117617; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=gvSVxoCm7+LJlnSucQTnrfYh5mL799iZd5hm2jd1smU=; b=YB8IFaZwzp9hN6JvaRfySozqyAzy+Bx+iIp8r5LgFkyw0LwlavwCFFRc c9QppfyVLGCYJDrnTsw8Bnox138az0NOQB0gT4dWq2hfQhkhGpoGpZILL IEznmN6TACMIsGU2SWdrvDzkSty9p8FKW3CAsdxWdvN9YPCVbLMfY1pR0 zxLxebKjUY3Q9S5CsPL6ZKhUQJrsMrZpX9C2eduaLnTl+0Kkf+9Y9AXyW XZQpRVAnOlQyYfpUMhqWHKpHP6sca+CYHHaefId7RS/1uAoJc8ZCKWIL+ hLQ281fBMiRqKqNgiR5nT389FLPyoHptp0BS0tHxgNX51CoNVeEwrD+9f g==; X-CSE-ConnectionGUID: MjiNPazyTreYIMUJ/ArO4w== X-CSE-MsgGUID: 9AkU81hgTt2GKxQYURXkrw== X-IronPort-AV: E=McAfee;i="6800,10657,11629"; a="66586550" X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="66586550" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:24 -0800 X-CSE-ConnectionGUID: N8mdau3KR5OeSw/UqSSocw== X-CSE-MsgGUID: uME5QcErRLC8jfCFrU+FLw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,240,1758610800"; d="scan'208";a="194014784" Received: from lab-ah.igk.intel.com (HELO [127.0.1.1]) ([10.211.135.228]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 01:33:19 -0800 From: Andrzej Hajda Date: Mon, 01 Dec 2025 10:31:26 +0100 Subject: [PATCH v2 5/5] mm: simplify variadic args handling Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251201-va_format_call-v2-5-2906f3093b60@intel.com> References: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> In-Reply-To: <20251201-va_format_call-v2-0-2906f3093b60@intel.com> To: Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrzej Hajda X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1871; i=andrzej.hajda@intel.com; h=from:subject:message-id; bh=gvSVxoCm7+LJlnSucQTnrfYh5mL799iZd5hm2jd1smU=; b=owEB7QES/pANAwAKASNispPeEP3XAcsmYgBpLWCDqiBXNy04SmJYV2im6OViRn+7iKSUqg00o 2dytiZ+4vqJAbMEAAEKAB0WIQT8qEQxNN2/XeF/A00jYrKT3hD91wUCaS1ggwAKCRAjYrKT3hD9 16atC/9VGz30NkzaVRwueNj4Ef8JUWpVlZNPb00u0k0MtZw6cY1kXOptb37F+QHud4kZ3UoJZqg hp16GX/CAdaa36gRLKN64PBnfs9vZYlOuhMQG1dIXVlmsQKi0Z1Fmm0D5/sp1nWK1wG5g/EJwuz S0xv/dnBhfWkRo4mVZrqEhYJOSt66RQJgJRGJnvGX1E9KEmJkxiKf6qlBve9XEJSvdB8p+czrSb VRhXgCYIrVrRdNzcNa05vPCJeOzpY4kJTtO2VPki7fTJHayThLv5UTE/yjXymc/hAAOkgyQA/Xd fDs4ylTcQx3Ple6Wgm+yTBk8rdJRbL2wUenTSMYfxJYpTmnhzLOYTx9jpcTQq4hU0XX2bwKOR0+ AMOBRHQ+HwexKeuHPNTfjUbSWxd+ZUGAwoDOIH51phixPrnraGnCs7ERdZ2UFzUbQ/UKob6BGEx 0vMt/TTQLENVACk/3lNHo63MrbIwSKP90CP7tEmPGRboyMu+/NB8oigad3jKB4TlNNLuk= X-Developer-Key: i=andrzej.hajda@intel.com; a=openpgp; fpr=FCA8443134DDBF5DE17F034D2362B293DE10FDD7 Changing argument type from va_list to struct va_format * allows to simplify variadic argument handling with va_format_call helper. Signed-off-by: Andrzej Hajda --- mm/slub.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 786c5a4195d4..12d8ec97eac5 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1135,27 +1135,16 @@ void skip_orig_size_check(struct kmem_cache *s, con= st void *object) set_orig_size(s, (void *)object, s->object_size); } =20 -static void __slab_bug(struct kmem_cache *s, const char *fmt, va_list args= p) +static void __slab_bug(struct kmem_cache *s, const char *fmt, struct va_fo= rmat *vaf) { - struct va_format vaf; - va_list args; - - va_copy(args, argsp); - vaf.fmt =3D fmt; - vaf.va =3D &args; pr_err("=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D\n"); - pr_err("BUG %s (%s): %pV\n", s ? s->name : "", print_tainted(), = &vaf); + pr_err("BUG %s (%s): %pV\n", s ? s->name : "", print_tainted(), = vaf); pr_err("-----------------------------------------------------------------= ------------\n\n"); - va_end(args); } =20 static void slab_bug(struct kmem_cache *s, const char *fmt, ...) { - va_list args; - - va_start(args, fmt); - __slab_bug(s, fmt, args); - va_end(args); + va_format_call(fmt, __slab_bug, s, fmt, va_format_arg); } =20 __printf(2, 3) @@ -1252,14 +1241,10 @@ static void __slab_err(struct slab *slab) static __printf(3, 4) void slab_err(struct kmem_cache *s, struct slab *sla= b, const char *fmt, ...) { - va_list args; - if (slab_add_kunit_errors()) return; =20 - va_start(args, fmt); - __slab_bug(s, fmt, args); - va_end(args); + va_format_call(fmt, __slab_bug, s, fmt, va_format_arg); =20 __slab_err(slab); } --=20 2.43.0