Re: [PATCH 3/3] efi/libstub: consider CONFIG_CMDLINE for initrd= and dtb= options
From: kernel test robot
Date: Mon Oct 14 2024 - 22:09:32 EST
Hi Jonathan,
kernel test robot noticed the following build errors:
[auto build test ERROR on efi/next]
[also build test ERROR on linus/master v6.12-rc3 next-20241014]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jonathan-Marek/efi-libstub-remove-uneccessary-cmdline_size-init-check/20241012-065337
base: https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git next
patch link: https://lore.kernel.org/r/20241011224812.25763-3-jonathan%40marek.ca
patch subject: [PATCH 3/3] efi/libstub: consider CONFIG_CMDLINE for initrd= and dtb= options
config: i386-defconfig (https://download.01.org/0day-ci/archive/20241015/202410150919.kDUQQNyF-lkp@xxxxxxxxx/config)
compiler: clang version 18.1.8 (https://github.com/llvm/llvm-project 3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241015/202410150919.kDUQQNyF-lkp@xxxxxxxxx/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@xxxxxxxxx>
| Closes: https://lore.kernel.org/oe-kbuild-all/202410150919.kDUQQNyF-lkp@xxxxxxxxx/
All errors (new ones prefixed by >>):
>> drivers/firmware/efi/libstub/file.c:218:17: error: expected ';' after expression
218 | cmdline = L"" CONFIG_CMDLINE;
| ^
| ;
>> drivers/firmware/efi/libstub/file.c:218:18: error: use of undeclared identifier 'CONFIG_CMDLINE'
218 | cmdline = L"" CONFIG_CMDLINE;
| ^
>> drivers/firmware/efi/libstub/file.c:219:33: error: expected ')'
219 | cmdline_len = ARRAY_SIZE(L"" CONFIG_CMDLINE) - 1;
| ^
drivers/firmware/efi/libstub/file.c:219:18: note: to match this '('
219 | cmdline_len = ARRAY_SIZE(L"" CONFIG_CMDLINE) - 1;
| ^
include/linux/array_size.h:11:32: note: expanded from macro 'ARRAY_SIZE'
11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
| ^
>> drivers/firmware/efi/libstub/file.c:219:33: error: expected ')'
219 | cmdline_len = ARRAY_SIZE(L"" CONFIG_CMDLINE) - 1;
| ^
drivers/firmware/efi/libstub/file.c:219:18: note: to match this '('
219 | cmdline_len = ARRAY_SIZE(L"" CONFIG_CMDLINE) - 1;
| ^
include/linux/array_size.h:11:47: note: expanded from macro 'ARRAY_SIZE'
11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
| ^
>> drivers/firmware/efi/libstub/file.c:219:33: error: expected ')'
219 | cmdline_len = ARRAY_SIZE(L"" CONFIG_CMDLINE) - 1;
| ^
drivers/firmware/efi/libstub/file.c:219:18: note: to match this '('
219 | cmdline_len = ARRAY_SIZE(L"" CONFIG_CMDLINE) - 1;
| ^
include/linux/array_size.h:11:59: note: expanded from macro 'ARRAY_SIZE'
11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
| ^
include/linux/compiler.h:243:58: note: expanded from macro '__must_be_array'
243 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^
>> drivers/firmware/efi/libstub/file.c:219:33: error: expected ')'
219 | cmdline_len = ARRAY_SIZE(L"" CONFIG_CMDLINE) - 1;
| ^
drivers/firmware/efi/libstub/file.c:219:18: note: to match this '('
219 | cmdline_len = ARRAY_SIZE(L"" CONFIG_CMDLINE) - 1;
| ^
include/linux/array_size.h:11:59: note: expanded from macro 'ARRAY_SIZE'
11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
| ^
include/linux/compiler.h:243:64: note: expanded from macro '__must_be_array'
243 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^
6 errors generated.
vim +218 drivers/firmware/efi/libstub/file.c
177
178 /*
179 * Check the cmdline for a LILO-style file= arguments.
180 *
181 * We only support loading a file from the same filesystem as
182 * the kernel image.
183 */
184 efi_status_t handle_cmdline_files(efi_loaded_image_t *image,
185 const efi_char16_t *optstr,
186 int optstr_size,
187 unsigned long soft_limit,
188 unsigned long hard_limit,
189 unsigned long *load_addr,
190 unsigned long *load_size)
191 {
192 const efi_char16_t *cmdline = efi_table_attr(image, load_options);
193 u32 cmdline_len = efi_table_attr(image, load_options_size);
194 unsigned long efi_chunk_size = ULONG_MAX;
195 efi_file_protocol_t *volume = NULL;
196 efi_file_protocol_t *file;
197 unsigned long alloc_addr;
198 unsigned long alloc_size;
199 efi_status_t status;
200 int offset;
201
202 if (!load_addr || !load_size)
203 return EFI_INVALID_PARAMETER;
204
205 efi_apply_loadoptions_quirk((const void **)&cmdline, &cmdline_len);
206 cmdline_len /= sizeof(*cmdline);
207
208 if (IS_ENABLED(CONFIG_X86) && !efi_nochunk)
209 efi_chunk_size = EFI_READ_CHUNK_SIZE;
210
211 if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) ||
212 IS_ENABLED(CONFIG_CMDLINE_FORCE) ||
213 cmdline_len == 0) {
214 if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && cmdline_len > 0) {
215 /* both CONFIG_CMDLINE and load_options should be used */
216 efi_warn("ignoring %ls from CONFIG_CMDLINE\n", optstr);
217 } else {
> 218 cmdline = L"" CONFIG_CMDLINE;
> 219 cmdline_len = ARRAY_SIZE(L"" CONFIG_CMDLINE) - 1;
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki