diff options
| author | Randall Spangler <rspangler@chromium.org> | 2018-01-03 15:34:03 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-05 21:14:12 -0800 |
| commit | 1a5e02c7a9ca66fb20f6752225903aa7a4dd0f70 (patch) | |
| tree | 00f79930ba040eb8e660b04a88553cd68108fc75 /firmware/2lib/2misc.c | |
| parent | de818cc08fab92ad389dc92f31687f3314a1a03a (diff) | |
| download | vboot-1a5e02c7a9ca66fb20f6752225903aa7a4dd0f70.tar.gz | |
firmware: Align workbuf used size
Previously, workbuf used was not rounded up to a multiple of
VB2_WORKBUF_ALIGN. The next allocation would be aligned, but not
until it was made.
Change this to round up used size when more workbuf is used. This
provides better predictability of where the next allocation will be
placed.
Uncovered this problem when I added a new member to vb2_shared_data
which changed its size so it wasn't a multiple of VB2_WORKBUF_ALIGN,
and the vb20 and vb21 unit tests which tried to simulate not enough
buffer broke in strange ways.
BUG=chromium:611535
BRANCH=none
TEST=make -j runtests; build bob firmware and boot it
Change-Id: I0157a1c96326f7fce6be6efbd74d90c3d2942268
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/852488
Reviewed-by: Shelley Chen <shchen@chromium.org>
Diffstat (limited to 'firmware/2lib/2misc.c')
| -rw-r--r-- | firmware/2lib/2misc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c index a955f536..9e4d3297 100644 --- a/firmware/2lib/2misc.c +++ b/firmware/2lib/2misc.c @@ -31,6 +31,11 @@ void vb2_workbuf_from_ctx(struct vb2_context *ctx, struct vb2_workbuf *wb) ctx->workbuf_size - ctx->workbuf_used); } +void vb2_set_workbuf_used(struct vb2_context *ctx, uint32_t used) +{ + ctx->workbuf_used = vb2_wb_round_up(used); +} + int vb2_read_gbb_header(struct vb2_context *ctx, struct vb2_gbb_header *gbb) { int rv; @@ -132,7 +137,7 @@ int vb2_init_context(struct vb2_context *ctx) /* Initialize the shared data at the start of the work buffer */ memset(sd, 0, sizeof(*sd)); - ctx->workbuf_used = sizeof(*sd); + ctx->workbuf_used = vb2_wb_round_up(sizeof(*sd)); return VB2_SUCCESS; } |