Re: [PATCH 1/3] block: use int64_t as bytes type in tracked requests

[Kevin Wolf]

Am 30.03.2020 um 16:18 hat Vladimir Sementsov-Ogievskiy geschrieben:
> We are generally moving to int64_t for both offset and bytes paramaters
> on all io paths. Convert tracked requests now.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy 
> ---
>  include/block/block_int.h |  4 ++--
>  block/io.c| 11 ++-
>  2 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/include/block/block_int.h b/include/block/block_int.h
> index 4c3587ea19..c8daba608b 100644
> --- a/include/block/block_int.h
> +++ b/include/block/block_int.h
> @@ -70,12 +70,12 @@ enum BdrvTrackedRequestType {
>  typedef struct BdrvTrackedRequest {
>  BlockDriverState *bs;
>  int64_t offset;
> -uint64_t bytes;
> +int64_t bytes;
>  enum BdrvTrackedRequestType type;
>  
>  bool serialising;
>  int64_t overlap_offset;
> -uint64_t overlap_bytes;
> +int64_t overlap_bytes;
>  
>  QLIST_ENTRY(BdrvTrackedRequest) list;
>  Coroutine *co; /* owner, used for deadlock detection */
> diff --git a/block/io.c b/block/io.c
> index aba67f66b9..7cbb80bd24 100644
> --- a/block/io.c
> +++ b/block/io.c
> @@ -692,10 +692,11 @@ static void tracked_request_end(BdrvTrackedRequest *req)
>  static void tracked_request_begin(BdrvTrackedRequest *req,
>BlockDriverState *bs,
>int64_t offset,
> -  uint64_t bytes,
> +  int64_t bytes,
>enum BdrvTrackedRequestType type)
>  {
> -assert(bytes <= INT64_MAX && offset <= INT64_MAX - bytes);
> +assert(offset >= 0 && bytes >= 0 &&
> +   bytes <= INT64_MAX && offset <= INT64_MAX - bytes);
>  
>  *req = (BdrvTrackedRequest){
>  .bs = bs,
> @@ -716,7 +717,7 @@ static void tracked_request_begin(BdrvTrackedRequest *req,
>  }
>  
>  static bool tracked_request_overlaps(BdrvTrackedRequest *req,
> - int64_t offset, uint64_t bytes)
> + int64_t offset, int64_t bytes)
>  {
>  /*    */
>  if (offset >= req->overlap_offset + req->overlap_bytes) {
> @@ -773,8 +774,8 @@ bool bdrv_mark_request_serialising(BdrvTrackedRequest 
> *req, uint64_t align)
>  {
>  BlockDriverState *bs = req->bs;
>  int64_t overlap_offset = req->offset & ~(align - 1);
> -uint64_t overlap_bytes = ROUND_UP(req->offset + req->bytes, align)
> -   - overlap_offset;
> +int64_t overlap_bytes =
> +ROUND_UP(req->offset + req->bytes, align) - overlap_offset;

An indentation with 8 spaces is unconventional in QEMU.

Kevin

Re: [PATCH 1/3] block: use int64_t as bytes type in tracked requests

[Stefan Hajnoczi]

On Mon, Mar 30, 2020 at 05:18:16PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> We are generally moving to int64_t for both offset and bytes paramaters
> on all io paths. Convert tracked requests now.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy 
> ---
>  include/block/block_int.h |  4 ++--
>  block/io.c| 11 ++-
>  2 files changed, 8 insertions(+), 7 deletions(-)

Reviewed-by: Stefan Hajnoczi 


signature.asc
Description: PGP signature

[PATCH 1/3] block: use int64_t as bytes type in tracked requests

[Vladimir Sementsov-Ogievskiy]

We are generally moving to int64_t for both offset and bytes paramaters
on all io paths. Convert tracked requests now.

Signed-off-by: Vladimir Sementsov-Ogievskiy 
---
 include/block/block_int.h |  4 ++--
 block/io.c| 11 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/block/block_int.h b/include/block/block_int.h
index 4c3587ea19..c8daba608b 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -70,12 +70,12 @@ enum BdrvTrackedRequestType {
 typedef struct BdrvTrackedRequest {
 BlockDriverState *bs;
 int64_t offset;
-uint64_t bytes;
+int64_t bytes;
 enum BdrvTrackedRequestType type;
 
 bool serialising;
 int64_t overlap_offset;
-uint64_t overlap_bytes;
+int64_t overlap_bytes;
 
 QLIST_ENTRY(BdrvTrackedRequest) list;
 Coroutine *co; /* owner, used for deadlock detection */
diff --git a/block/io.c b/block/io.c
index aba67f66b9..7cbb80bd24 100644
--- a/block/io.c
+++ b/block/io.c
@@ -692,10 +692,11 @@ static void tracked_request_end(BdrvTrackedRequest *req)
 static void tracked_request_begin(BdrvTrackedRequest *req,
   BlockDriverState *bs,
   int64_t offset,
-  uint64_t bytes,
+  int64_t bytes,
   enum BdrvTrackedRequestType type)
 {
-assert(bytes <= INT64_MAX && offset <= INT64_MAX - bytes);
+assert(offset >= 0 && bytes >= 0 &&
+   bytes <= INT64_MAX && offset <= INT64_MAX - bytes);
 
 *req = (BdrvTrackedRequest){
 .bs = bs,
@@ -716,7 +717,7 @@ static void tracked_request_begin(BdrvTrackedRequest *req,
 }
 
 static bool tracked_request_overlaps(BdrvTrackedRequest *req,
- int64_t offset, uint64_t bytes)
+ int64_t offset, int64_t bytes)
 {
 /*    */
 if (offset >= req->overlap_offset + req->overlap_bytes) {
@@ -773,8 +774,8 @@ bool bdrv_mark_request_serialising(BdrvTrackedRequest *req, 
uint64_t align)
 {
 BlockDriverState *bs = req->bs;
 int64_t overlap_offset = req->offset & ~(align - 1);
-uint64_t overlap_bytes = ROUND_UP(req->offset + req->bytes, align)
-   - overlap_offset;
+int64_t overlap_bytes =
+ROUND_UP(req->offset + req->bytes, align) - overlap_offset;
 bool waited;
 
 qemu_co_mutex_lock(>reqs_lock);
-- 
2.21.0