system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

kboot: Implement write support for hostdisk

Browse source 
Don't assume that strategy is only called for read. Check the passed
flag for F_READ or F_WRITE and fail if it is neither. Open the disks for
writing and call host_read/host_write depending on that flag.

Sponsored by:		Netflix
Reviewed by:		kevans, gallatin
Differential Revision:	https://reviews.freebsd.org/D44016
This commit is contained in:
Warner Losh 2024-02-22 08:17:48 -07:00
parent e68136d363
commit b3e76e3d9e
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
stand/kboot/kboot/hostdisk.c
View file

@ -305,7 +305,6 @@ hostdisk_strategy(void *devdata, int flag, daddr_t dblk, size_t size,
struct devdesc *desc = devdata;
daddr_t pos;
int n;
int64_t off;
uint64_t res;
uint32_t posl, posh;
@ -313,12 +312,14 @@ hostdisk_strategy(void *devdata, int flag, daddr_t dblk, size_t size,
posl = pos & 0xffffffffu;
posh = (pos >> 32) & 0xffffffffu;
if ((off = host_llseek(desc->d_unit, posh, posl, &res, 0)) < 0) {
printf("Seek error on fd %d to %ju (dblk %ju) returns %jd\n",
desc->d_unit, (uintmax_t)pos, (uintmax_t)dblk, (intmax_t)off);
if (host_llseek(desc->d_unit, posh, posl, &res, 0) < 0)
return (EIO);
}
n = host_read(desc->d_unit, buf, size);
if (flag & F_READ)
n = host_read(desc->d_unit, buf, size);
else if (flag & F_WRITE)
n = host_write(desc->d_unit, buf, size);
else
return (EINVAL);
if (n < 0)
return (EIO);
@ -339,7 +340,7 @@ hostdisk_open(struct open_file *f, ...)
va_end(vl);
fn = dev2hd(desc)->hd_dev;
desc->d_unit = host_open(fn, O_RDONLY, 0);
desc->d_unit = host_open(fn, O_RDWR, 0);
if (desc->d_unit <= 0) {
printf("hostdisk_open: couldn't open %s: %d\n", fn, errno);
return (ENOENT);