>
> - MapEntry = __GnttabAllocate(FIELD_OFFSET(XENBUS_GNTTAB_MAP_ENTRY,
> - MapHandles) +
> - (NumberPages * sizeof (ULONG)));
> + Status = STATUS_NO_MEMORY;
> + Mdl = FdoHoleAllocate(Context->Fdo, NumberPages);
> + if (Mdl == NULL)
> + goto fail2;
>
> - status = STATUS_NO_MEMORY;
> + MapEntry = __GnttabAllocate(FIELD_OFFSET(XENBUS_GNTTAB_MAP_ENTRY, MapHandles)
> + + NumberPages * sizeof (ULONG));
> if (MapEntry == NULL)
> - goto fail2;
> + goto fail3;
>
> MapEntry->Mdl = Mdl;
> -
> - Address->QuadPart = MmGetMdlPfnArray(Mdl)[0] << PAGE_SHIFT;
> - PageAddress.QuadPart = Address->QuadPart;
> -
> - for (PageIndex = 0; PageIndex < (LONG)NumberPages; PageIndex++) {
> - status = GrantTableMapForeignPage(Domain,
> - References[PageIndex],
> - PageAddress,
> - ReadOnly,
> - &MapEntry->MapHandles[PageIndex]);
> - if (!NT_SUCCESS(status))
> - goto fail3;
> -
> - PageAddress.QuadPart += PAGE_SIZE;
> + for (Index = 0; Index < NumberPages; Index++)
> + MapEntry->MapHandles[Index] = XEN_GNTTAB_INVALID_HANDLE;
> +
> + Address.QuadPart = MmGetMdlPfnArray(Mdl)[0] << PAGE_SHIFT;
> +
> + *StartAddress = Address;
> +
> + for (Offset = 0; Offset < NumberPages; Offset += Count) {
> + Count = __min(NumberPages - Offset, XEN_GNTTAB_MAP_BATCH_MAX);
> + Address.QuadPart = StartAddress->QuadPart + ((ULONGLONG)Offset << PAGE_SHIFT);
> +
> + Status = GrantTableMapForeignPages(Domain,
> + Count,
> + &References[Offset],
> + Address,
> + ReadOnly,
> + &MapEntry->MapHandles[Offset],
> + Results);
> + if (NT_SUCCESS(Status)) {
> + for (Index = 0; Index < Count; Index++) {
> + if (!NT_SUCCESS(Results[Index])) {
> + Status = Results[Index];
> + break;
> + }
> + }
> + }
> +
> + if (!NT_SUCCESS(Status))
> + goto fail4;
> }
>
> - status = HashTableAdd(Context->MapTable,
> - (ULONG_PTR)Address->QuadPart,
> - (ULONG_PTR)MapEntry);
> - if (!NT_SUCCESS(status))
> + Status = HashTableAdd(Context->MapTable, (ULONG_PTR)StartAddress->QuadPart, (ULONG_PTR)MapEntry);
> + if (!NT_SUCCESS(Status))
> goto fail4;
>
> return STATUS_SUCCESS;
> @@ -713,70 +733,90 @@ GnttabMapForeignPages(
> fail4:
> Error("fail4\n");
>
> -fail3:
> - Error("fail3\n");
> + // Legacy rollback behavior: ignore unmap failures, preserve the map error.
> + for (Index = NumberPages; Index != 0; Index--) {
> + if (MapEntry->MapHandles[Index - 1] == XEN_GNTTAB_INVALID_HANDLE)
> + continue;
>
> - while (--PageIndex >= 0) {
> - PageAddress.QuadPart -= PAGE_SIZE;
> - (VOID) GrantTableUnmapForeignPage(MapEntry->MapHandles[PageIndex],
> - PageAddress);
> + Address.QuadPart = StartAddress->QuadPart + ((ULONGLONG)(Index - 1) << PAGE_SHIFT);
> + (VOID) GrantTableUnmapForeignPage(MapEntry->MapHandles[Index - 1], Address);
> }
>
> - Address->QuadPart = 0;
> -
> + StartAddress->QuadPart = 0;
> __GnttabFree(MapEntry);
>
> -fail2:
> - Error("fail2\n");
> +fail3:
> + Error("fail3\n");
>
> FdoHoleFree(Context->Fdo, Mdl);
>
> +fail2:
> + Error("fail2\n");
> +
> fail1:
> - Error("fail1: (%08x)\n", status);
> + Error("fail1 (%08x)\n", Status);
>
> - return status;
> + return Status;
> }
>
> static NTSTATUS
> GnttabUnmapForeignPages(
> - _In_ PINTERFACE Interface,
> - _In_ PHYSICAL_ADDRESS Address
> + _In_ PINTERFACE Interface,
> + _In_ PHYSICAL_ADDRESS StartAddress
> )
> {
> - PXENBUS_GNTTAB_CONTEXT Context = Interface->Context;
> - ULONG NumberPages;
> - PHYSICAL_ADDRESS PageAddress;
> - ULONG PageIndex;
> - PXENBUS_GNTTAB_MAP_ENTRY MapEntry;
> - PMDL Mdl;
> - NTSTATUS status;
> -
> - status = HashTableLookup(Context->MapTable,
> - (ULONG_PTR)Address.QuadPart,
> - (PULONG_PTR)&MapEntry);
> - if (!NT_SUCCESS(status))
> + PXENBUS_GNTTAB_CONTEXT Context = Interface->Context;
> + PXENBUS_GNTTAB_MAP_ENTRY MapEntry;
> + PMDL Mdl;
> + NTSTATUS Results[XEN_GNTTAB_MAP_BATCH_MAX];
> + PHYSICAL_ADDRESS Address;
> + ULONG NumberPages;
> + ULONG Offset;
> + ULONG Count;
> + ULONG Index;
> + NTSTATUS Status;
> + NTSTATUS BatchStatus;
> +
> + Status = HashTableLookup(Context->MapTable,
> + (ULONG_PTR)StartAddress.QuadPart,
> + (PULONG_PTR)&MapEntry);
> + if (!NT_SUCCESS(Status))
> goto fail1;
>
> - status = HashTableRemove(Context->MapTable,
> - (ULONG_PTR)Address.QuadPart);
> - if (!NT_SUCCESS(status))
> - goto fail2;
> -
> - PageAddress.QuadPart = Address.QuadPart;
> -
> Mdl = MapEntry->Mdl;
> NumberPages = Mdl->ByteCount >> PAGE_SHIFT;
> + Status = STATUS_SUCCESS;
> +
> + for (Offset = 0; Offset < NumberPages; Offset += Count) {
> + Count = __min(NumberPages - Offset, XEN_GNTTAB_MAP_BATCH_MAX);
> + Address.QuadPart = StartAddress.QuadPart + ((ULONGLONG)Offset << PAGE_SHIFT);
> +
> + BatchStatus = GrantTableUnmapForeignPages(Count,
> + &MapEntry->MapHandles[Offset],
> + Address,
> + Results);
> +
> + if (NT_SUCCESS(BatchStatus)) {
> + for (Index = 0; Index < Count; Index++) {
> + if (!NT_SUCCESS(Results[Index])) {
> + BatchStatus = Results[Index];
> + break;
> + }
> + }
> + }
> +
> + if (!NT_SUCCESS(BatchStatus) && NT_SUCCESS(Status))
> + Status = BatchStatus;
> + }
>
> - for (PageIndex = 0; PageIndex < NumberPages; PageIndex++) {
> - status = GrantTableUnmapForeignPage(MapEntry->MapHandles[PageIndex],
> - PageAddress);
> - BUG_ON(!NT_SUCCESS(status));
> + // Legacy behavior: failures are fatal.
> + BUG_ON(!NT_SUCCESS(Status));
>
> - PageAddress.QuadPart += PAGE_SIZE;
> - }
> + Status = HashTableRemove(Context->MapTable, (ULONG_PTR)StartAddress.QuadPart);
> + if (!NT_SUCCESS(Status))
> + goto fail2;
>
> __GnttabFree(MapEntry);
> -
> FdoHoleFree(Context->Fdo, Mdl);
>
> return STATUS_SUCCESS;
> @@ -785,9 +825,9 @@ fail2:
> Error("fail2\n");
>
> fail1:
> - Error("fail1: (%08x)\n", status);
> + Error("fail1 (%08x)\n", Status);
>
> - return status;
> + return Status;
> }
>
> static VOID