Use leftovers
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
91b58e6b74
commit
6d6f55c557
|
|
@ -66,8 +66,10 @@ struct grub_relocator_mmap_event
|
|||
/* To track the regions already in heap. */
|
||||
FIRMWARE_BLOCK_START = 6,
|
||||
FIRMWARE_BLOCK_END = FIRMWARE_BLOCK_START | 1,
|
||||
REG_LEFTOVER_START = 8,
|
||||
REG_LEFTOVER_END = REG_LEFTOVER_START | 1,
|
||||
#endif
|
||||
COLLISION_START = 8,
|
||||
COLLISION_START = 10,
|
||||
COLLISION_END = COLLISION_START | 1
|
||||
} type;
|
||||
grub_addr_t pos;
|
||||
|
|
@ -80,6 +82,9 @@ struct grub_relocator_mmap_event
|
|||
grub_mm_region_t *regancestor;
|
||||
grub_mm_header_t head;
|
||||
};
|
||||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
struct grub_relocator_fw_leftover *leftover;
|
||||
#endif
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
119
lib/relocator.c
119
lib/relocator.c
|
|
@ -35,7 +35,7 @@ struct grub_relocator_subchunk
|
|||
{
|
||||
enum {CHUNK_TYPE_IN_REGION, CHUNK_TYPE_REGION_START,
|
||||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
CHUNK_TYPE_FIRMWARE
|
||||
CHUNK_TYPE_FIRMWARE, CHUNK_TYPE_LEFTOVER
|
||||
#endif
|
||||
} type;
|
||||
grub_addr_t host_start;
|
||||
|
|
@ -334,6 +334,7 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
|
|||
}
|
||||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
case CHUNK_TYPE_FIRMWARE:
|
||||
case CHUNK_TYPE_LEFTOVER:
|
||||
{
|
||||
grub_addr_t fstart, fend;
|
||||
fstart = ALIGN_UP (subchu->start,
|
||||
|
|
@ -375,11 +376,12 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
{
|
||||
grub_mm_region_t r, *ra, base_saved;
|
||||
struct grub_relocator_mmap_event *events = NULL, *eventt = NULL, *t;
|
||||
unsigned maxevents = 2;
|
||||
/* 128 is just in case of additional malloc (shouldn't happen). */
|
||||
unsigned maxevents = 2 + 128;
|
||||
grub_mm_header_t p, pa;
|
||||
unsigned *counter;
|
||||
int nallocs = 0;
|
||||
unsigned i, j, N = 0;
|
||||
unsigned j, N = 0;
|
||||
grub_addr_t target = 0;
|
||||
|
||||
grub_dprintf ("relocator",
|
||||
|
|
@ -422,6 +424,23 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
}
|
||||
|
||||
maxevents += grub_relocator_firmware_get_max_events ();
|
||||
|
||||
{
|
||||
struct grub_relocator_fw_leftover *cur;
|
||||
for (cur = leftovers; cur; cur = cur->next)
|
||||
{
|
||||
int l = 0;
|
||||
unsigned i;
|
||||
for (i = 0; i < GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT; i++)
|
||||
{
|
||||
if (l != ((cur->freebytes[i / 8] >> (i % 8)) & 1))
|
||||
maxevents++;
|
||||
l = ((cur->freebytes[i / 8] >> (i % 8)) & 1);
|
||||
}
|
||||
if (l)
|
||||
maxevents++;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
events = grub_malloc (maxevents * sizeof (events[0]));
|
||||
|
|
@ -478,10 +497,35 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
N++;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
N += grub_relocator_firmware_fill_events (events + N);
|
||||
|
||||
{
|
||||
struct grub_relocator_fw_leftover *cur;
|
||||
for (cur = leftovers; cur; cur = cur->next)
|
||||
{
|
||||
unsigned i;
|
||||
int l = 0;
|
||||
for (i = 0; i < GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT; i++)
|
||||
{
|
||||
if (l != ((cur->freebytes[i / 8] >> (i % 8)) & 1))
|
||||
{
|
||||
events[N].type = l ? REG_LEFTOVER_END : REG_LEFTOVER_START;
|
||||
events[N].pos = cur->quantstart + i;
|
||||
events[N].leftover = cur;
|
||||
N++;
|
||||
}
|
||||
l = ((cur->freebytes[i / 8] >> (i % 8)) & 1);
|
||||
}
|
||||
if (l)
|
||||
{
|
||||
events[N].type = REG_LEFTOVER_END;
|
||||
events[N].pos = cur->quantstart + i;
|
||||
events[N].leftover = cur;
|
||||
N++;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* No malloc from this point. */
|
||||
|
|
@ -539,6 +583,8 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
eventt = events;
|
||||
events = t;
|
||||
}
|
||||
{
|
||||
unsigned i;
|
||||
for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS);
|
||||
i++)
|
||||
{
|
||||
|
|
@ -555,6 +601,7 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
eventt = events;
|
||||
events = t;
|
||||
}
|
||||
}
|
||||
|
||||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
retry:
|
||||
|
|
@ -563,14 +610,15 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
/* Now events are nicely sorted. */
|
||||
{
|
||||
int nstarted = 0, ncollisions = 0, nstartedfw = 0, nblockfw = 0;
|
||||
int nlefto = 0;
|
||||
grub_addr_t starta = 0;
|
||||
int numstarted;
|
||||
for (j = from_low_priv ? 0 : N - 1; from_low_priv ? j < N : (j + 1);
|
||||
from_low_priv ? j++ : j--)
|
||||
{
|
||||
int isinsidebefore, isinsideafter;
|
||||
isinsidebefore = (!ncollisions
|
||||
&& (nstarted || (nstartedfw && !nblockfw)));
|
||||
isinsidebefore = (!ncollisions && (nstarted || (((nlefto || nstartedfw)
|
||||
&& !nblockfw))));
|
||||
switch (events[j].type)
|
||||
{
|
||||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
|
|
@ -589,6 +637,13 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
case FIRMWARE_BLOCK_END:
|
||||
nblockfw--;
|
||||
break;
|
||||
case REG_LEFTOVER_START:
|
||||
nlefto++;
|
||||
break;
|
||||
|
||||
case REG_LEFTOVER_END:
|
||||
nlefto--;
|
||||
break;
|
||||
#endif
|
||||
|
||||
case COLLISION_START:
|
||||
|
|
@ -609,8 +664,8 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
nstarted--;
|
||||
break;
|
||||
}
|
||||
isinsideafter = (!ncollisions
|
||||
&& (nstarted || (nstartedfw && !nblockfw)));
|
||||
isinsideafter = (!ncollisions && (nstarted || ((nlefto || nstartedfw)
|
||||
&& !nblockfw)));
|
||||
if (!isinsidebefore && isinsideafter)
|
||||
{
|
||||
starta = from_low_priv ? ALIGN_UP (events[j].pos, align)
|
||||
|
|
@ -647,7 +702,7 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
{
|
||||
int inreg = 0, regbeg = 0, ncol = 0;
|
||||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
int fwin = 0, fwb = 0;
|
||||
int fwin = 0, fwb = 0, fwlefto = 0;
|
||||
#endif
|
||||
int last_start = 0;
|
||||
for (j = 0; j < N; j++)
|
||||
|
|
@ -662,6 +717,8 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
else if (fwin && !fwb)
|
||||
typepre = CHUNK_TYPE_FIRMWARE;
|
||||
else if (fwlefto && !fwb)
|
||||
typepre = CHUNK_TYPE_LEFTOVER;
|
||||
#endif
|
||||
else
|
||||
typepre = -1;
|
||||
|
|
@ -722,6 +779,21 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
}
|
||||
break;
|
||||
}
|
||||
case CHUNK_TYPE_LEFTOVER:
|
||||
{
|
||||
unsigned offstart = alloc_start
|
||||
% GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
|
||||
unsigned offend = alloc_end
|
||||
% GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
|
||||
struct grub_relocator_fw_leftover *lo
|
||||
= events[last_start].leftover;
|
||||
lo->freebytes[offstart / 8]
|
||||
&= ((1 << (8 - (start % 8))) - 1);
|
||||
grub_memset (lo->freebytes + (offstart + 7) / 8, 0,
|
||||
offend / 8 - (offstart + 7) / 8);
|
||||
lo->freebytes[offend / 8] &= ~((1 << (offend % 8)) - 1);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
nallocs++;
|
||||
|
|
@ -757,6 +829,14 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
fwin--;
|
||||
break;
|
||||
|
||||
case REG_LEFTOVER_START:
|
||||
fwlefto++;
|
||||
break;
|
||||
|
||||
case REG_LEFTOVER_END:
|
||||
fwlefto--;
|
||||
break;
|
||||
|
||||
case FIRMWARE_BLOCK_START:
|
||||
fwb++;
|
||||
break;
|
||||
|
|
@ -797,7 +877,7 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
int last_start = 0;
|
||||
int inreg = 0, regbeg = 0, ncol = 0;
|
||||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
int fwin = 0, fwb = 0;
|
||||
int fwin = 0, fwlefto = 0, fwb = 0;
|
||||
#endif
|
||||
unsigned cural = 0;
|
||||
int oom = 0;
|
||||
|
|
@ -818,6 +898,8 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
|
||||
else if (fwin && !fwb)
|
||||
typepre = CHUNK_TYPE_FIRMWARE;
|
||||
else if (fwlefto && !fwb)
|
||||
typepre = CHUNK_TYPE_LEFTOVER;
|
||||
#endif
|
||||
else
|
||||
typepre = -1;
|
||||
|
|
@ -931,6 +1013,12 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
curschu->pre = lo1;
|
||||
curschu->post = lo2;
|
||||
}
|
||||
|
||||
if (typepre == CHUNK_TYPE_LEFTOVER)
|
||||
{
|
||||
curschu->pre = events[last_start].leftover;
|
||||
curschu->post = events[last_start].leftover;
|
||||
}
|
||||
#endif
|
||||
if (!oom)
|
||||
cural++;
|
||||
|
|
@ -965,6 +1053,14 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
fwin--;
|
||||
break;
|
||||
|
||||
case REG_LEFTOVER_START:
|
||||
fwlefto++;
|
||||
break;
|
||||
|
||||
case REG_LEFTOVER_END:
|
||||
fwlefto--;
|
||||
break;
|
||||
|
||||
case FIRMWARE_BLOCK_START:
|
||||
fwb++;
|
||||
break;
|
||||
|
|
@ -983,6 +1079,7 @@ malloc_in_range (struct grub_relocator *rel,
|
|||
}
|
||||
if (oom)
|
||||
{
|
||||
unsigned i;
|
||||
for (i = 0; i < cural; i++)
|
||||
free_subchunk (&res->subchunks[i]);
|
||||
grub_free (res->subchunks);
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ pkglib_DATA="@pkglib_DATA@"
|
|||
|
||||
coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot
|
||||
pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
|
||||
efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi
|
||||
efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi
|
||||
|
||||
# Usage: usage
|
||||
# Print the usage.
|
||||
|
|
@ -128,13 +130,23 @@ if [ "${override_dir}" = "" ] ; then
|
|||
if test -e "${pc_dir}" ; then
|
||||
process_input_dir ${pc_dir} pc
|
||||
fi
|
||||
if test -e "${efi32_dir}" ; then
|
||||
process_input_dir ${efi32_dir} efi32
|
||||
fi
|
||||
if test -e "${efi64_dir}" ; then
|
||||
process_input_dir ${efi64_dir} efi64
|
||||
fi
|
||||
else
|
||||
process_input_dir ${override_dir} ${native_platform}
|
||||
coreboot_dir=
|
||||
pc_dir=
|
||||
case "${native_platform}" in
|
||||
coreboot) coreboot_dir=${override_dir} ;;
|
||||
pc) pc_dir=${override_dir} ;;
|
||||
efi32_dir=
|
||||
efi64_dir=
|
||||
case "${target_cpu}-${native_platform}" in
|
||||
i386-coreboot) coreboot_dir=${override_dir} ;;
|
||||
i386-pc) pc_dir=${override_dir} ;;
|
||||
i386-efi) efi32_dir=${override_dir} ;;
|
||||
x86_64-efi) efi64_dir=${override_dir} ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
|
@ -191,6 +203,33 @@ if test -e "${pc_dir}" ; then
|
|||
--embedded-boot ${embed_img}"
|
||||
fi
|
||||
|
||||
if test -e "${efi64_dir}" || test -e "${efi32_dir}"; then
|
||||
efi_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
|
||||
mkdir -p "${efi_dir}/efi/boot"
|
||||
else
|
||||
efi_dir=
|
||||
fi
|
||||
|
||||
# build bootx64.efi
|
||||
if test -e "${efi64_dir}" ; then
|
||||
echo "Generates bootx64.efi"
|
||||
grub-mkimage -d "${efi64_dir}" -o "${efi_dir}"/efi/boot/bootx64.efi --prefix=/boot/grub/x86_64-efi \
|
||||
search iso9660 configfile sh
|
||||
|
||||
modules="$(cat "${efi64_dir}"/partmap.lst) ${modules}"
|
||||
(for i in ${modules} ; do
|
||||
echo "insmod $i"
|
||||
done ; \
|
||||
echo "source /boot/grub/grub.cfg") \
|
||||
> "${iso9660_dir}"/boot/grub/x86_64-efi/grub.cfg
|
||||
fi
|
||||
|
||||
if test x"${efi_dir}" != x; then
|
||||
mformat -C -f 2880 -L 16 -i "${iso9660_dir}"/efi.img ::
|
||||
mcopy -s -i "${iso9660_dir}"/efi.img ${efi_dir}/efi ::/
|
||||
grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img"
|
||||
fi
|
||||
|
||||
# build iso image
|
||||
grub-mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
|
||||
rm -rf ${iso9660_dir}
|
||||
|
|
|
|||
Loading…
Reference in New Issue