From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Max Reitz <mreitz@redhat.com>
Cc: kwolf@redhat.com, Peter Maydell <peter.maydell@linaro.org>,
qemu-block@nongnu.org, qemu-devel@nongnu.org,
Joelle van Dyne <j@getutm.app>,
Paolo Bonzini <pbonzini@redhat.com>, Warner Losh <imp@bsdimp.com>
Subject: Re: [PATCH v3 7/7] block: detect DKIOCGETBLOCKCOUNT/SIZE before use
Date: Tue, 15 Jun 2021 17:57:49 +0100 [thread overview]
Message-ID: <YMjcDS5wWclfrQTx@redhat.com> (raw)
In-Reply-To: <f3a13026-8542-ef8f-c95d-c01698ce86d7@redhat.com>
On Tue, Jun 15, 2021 at 06:50:57PM +0200, Max Reitz wrote:
> On 03.06.21 15:37, Paolo Bonzini wrote:
> > From: Joelle van Dyne <j@getutm.app>
> >
> > iOS hosts do not have these defined so we fallback to the
> > default behaviour.
> >
> > Co-authored-by: Warner Losh <imp@bsdimp.com>
> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> > Signed-off-by: Joelle van Dyne <j@getutm.app>
> > Message-Id: <20210315180341.31638-4-j@getutm.app>
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> > block/file-posix.c | 21 +++++++++------------
> > 1 file changed, 9 insertions(+), 12 deletions(-)
> >
> > diff --git a/block/file-posix.c b/block/file-posix.c
> > index 5821e1afed..4e2f7cf508 100644
> > --- a/block/file-posix.c
> > +++ b/block/file-posix.c
> > @@ -2322,8 +2322,11 @@ static int64_t raw_getlength(BlockDriverState *bs)
> > again:
> > #endif
> > if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) {
> > + size = 0;
> > #ifdef DIOCGMEDIASIZE
> > - if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
> > + if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) {
>
> Pre-existing, but I feel compelled to express my unease about this cast.
We set -D_FILE_OFFSET_BITS=64, so IIUC, off_t should be 64-bits
on both 32 and 64 bit build hosts. IIUC, it is defined to be a
signed integer. So while off_t may not have the same typedef
as int64_t, it should be the same size and signedness. I expect
we have other code with this same assumption about off-t/int64_t
interchangeability.
We could assert sizeof(int64_t) == sizeof(off_t) in a header
somewhere if we want to be super paranoid.
>
> > + size = 0;
> > + }
> > #elif defined(DIOCGPART)
> > {
> > struct partinfo pi;
> > @@ -2332,9 +2335,7 @@ again:
> > else
> > size = 0;
> > }
> > - if (size == 0)
> > -#endif
> > -#if defined(__APPLE__) && defined(__MACH__)
> > +#elif defined(DKIOCGETBLOCKCOUNT) && defined(DKIOCGETBLOCKSIZE)
>
> As far a I can tell, before this patch, if the DIOCGMEDIASIZE ioctl failed,
> we fell back to this DKIOCGETBLOCKCOUNT/SIZE block (if compiled in). Now
> this is an #elif and so will not be used if DIOCGMEDIASIZE was defined. Is
> that intentional?
>
> This may be fine, and apart from that, this patch looks good to me, but this
> change in behavior wasn’t mentioned in the commit message, hence me asking.
>
> > {
> > uint64_t sectors = 0;
> > uint32_t sector_size = 0;
> > @@ -2342,19 +2343,15 @@ again:
> > if (ioctl(fd, DKIOCGETBLOCKCOUNT, §ors) == 0
> > && ioctl(fd, DKIOCGETBLOCKSIZE, §or_size) == 0) {
> > size = sectors * sector_size;
> > - } else {
> > - size = lseek(fd, 0LL, SEEK_END);
> > - if (size < 0) {
> > - return -errno;
> > - }
> > }
> > }
> > -#else
> > - size = lseek(fd, 0LL, SEEK_END);
> > +#endif
> > + if (size == 0) {
> > + size = lseek(fd, 0LL, SEEK_END);
> > + }
> > if (size < 0) {
> > return -errno;
> > }
> > -#endif
> > #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
> > switch(s->type) {
> > case FTYPE_CD:
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
next prev parent reply other threads:[~2021-06-15 16:59 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-03 13:37 [PATCH v3 0/7] block: file-posix queue Paolo Bonzini
2021-06-03 13:37 ` [PATCH v3 1/7] file-posix: fix max_iov for /dev/sg devices Paolo Bonzini
2021-06-07 5:39 ` Vladimir Sementsov-Ogievskiy
2021-06-07 6:16 ` Vladimir Sementsov-Ogievskiy
2021-06-07 7:23 ` Vladimir Sementsov-Ogievskiy
2021-06-15 15:58 ` Max Reitz
2021-06-03 13:37 ` [PATCH v3 2/7] scsi-generic: pass max_segments via max_iov field in BlockLimits Paolo Bonzini
2021-06-15 16:06 ` Max Reitz
2021-06-15 16:20 ` Max Reitz
2021-06-15 17:41 ` Paolo Bonzini
2021-06-03 13:37 ` [PATCH v3 3/7] block: add max_hw_transfer to BlockLimits Paolo Bonzini
2021-06-03 17:33 ` Eric Blake
2021-06-04 7:21 ` Paolo Bonzini
2021-06-15 16:18 ` Max Reitz
2021-06-16 13:18 ` Paolo Bonzini
2021-06-16 13:46 ` Max Reitz
2021-06-17 9:59 ` Paolo Bonzini
2021-06-03 13:37 ` [PATCH v3 4/7] file-posix: try BLKSECTGET on block devices too, do not round to power of 2 Paolo Bonzini
2021-06-15 16:32 ` Max Reitz
2021-06-03 13:37 ` [PATCH v3 5/7] block: feature detection for host block support Paolo Bonzini
2021-06-15 16:40 ` Max Reitz
2021-06-03 13:37 ` [PATCH v3 6/7] block: check for sys/disk.h Paolo Bonzini
2021-06-15 16:42 ` Max Reitz
2021-06-03 13:37 ` [PATCH v3 7/7] block: detect DKIOCGETBLOCKCOUNT/SIZE before use Paolo Bonzini
2021-06-15 16:50 ` Max Reitz
2021-06-15 16:57 ` Daniel P. Berrangé [this message]
2021-06-07 13:52 ` [PATCH v3 0/7] block: file-posix queue Maxim Levitsky
2021-06-10 13:40 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YMjcDS5wWclfrQTx@redhat.com \
--to=berrange@redhat.com \
--cc=imp@bsdimp.com \
--cc=j@getutm.app \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).