Bug 1810831: Handle detached ArrayBuffers in GPUQueue.writeBuffer and writeTexture. r=nical

Calling mozilla::dom::TypedArray_base::Data on a detached ArrayBuffer
returns null, so GPUQueue.writeBuffer or GPUQueue.writeTexture need to
be prepared for this case.

Consolidate validation code from mozilla::webgpu::Queue::WriteBuffer
and WriteTexture into a new function, GetBufferSourceDataAndSize, and
use that in both cases.

Differential Revision: https://phabricator.services.mozilla.com/D169117
This commit is contained in:
Jim Blandy 2023-02-08 20:31:08 +00:00
Родитель f75b3e5136
Коммит ca2aa52edc
1 изменённых файлов: 104 добавлений и 56 удалений

Просмотреть файл

@ -44,48 +44,108 @@ void Queue::Submit(
mBridge->SendQueueSubmit(mId, mParent->mId, list); mBridge->SendQueueSubmit(mId, mParent->mId, list);
} }
// Get the base address and length of part of a `BufferSource`.
//
// Given `aBufferSource` and an offset `aDataOffset` and optional length
// `aSizeOrRemainder` describing the range of its contents we want to see, check
// all arguments and set `aDataContents` and `aContentsSize` to a pointer to the
// bytes and a length. Report errors in `aRv`.
//
// If `ASizeOrRemainder` was not passed, return a view from the starting offset
// to the end of `aBufferSource`.
//
// On success, the returned `aDataContents` is never `nullptr`. If the
// `ArrayBuffer` is detached, return a pointer to a dummy buffer and set
// `aContentsSize` to zero.
//
// The `aBufferSource` argument is a WebIDL `BufferSource`, which WebGPU methods
// use anywhere they accept a block of raw bytes. WebIDL defines `BufferSource`
// as:
//
// typedef (ArrayBufferView or ArrayBuffer) BufferSource;
//
// This appears in Gecko code as `dom::ArrayBufferViewOrArrayBuffer`.
static void GetBufferSourceDataAndSize(
const dom::ArrayBufferViewOrArrayBuffer& aBufferSource,
uint64_t aDataOffset, const dom::Optional<uint64_t>& aSizeOrRemainder,
uint8_t*& aDataContents, uint64_t& aContentsSize, const char* aOffsetName,
ErrorResult& aRv) {
uint64_t dataSize = 0;
uint8_t* dataContents = nullptr;
if (aBufferSource.IsArrayBufferView()) {
const auto& view = aBufferSource.GetAsArrayBufferView();
view.ComputeState();
dataSize = view.Length();
dataContents = view.Data();
}
if (aBufferSource.IsArrayBuffer()) {
const auto& ab = aBufferSource.GetAsArrayBuffer();
ab.ComputeState();
dataSize = ab.Length();
dataContents = ab.Data();
}
if (aDataOffset > dataSize) {
aRv.ThrowOperationError(
nsPrintfCString("%s is greater than data length", aOffsetName));
return;
}
uint64_t contentsSize = 0;
if (aSizeOrRemainder.WasPassed()) {
contentsSize = aSizeOrRemainder.Value();
} else {
// We already know that aDataOffset <= length, so this cannot underflow.
contentsSize = dataSize - aDataOffset;
}
// This could be folded into the if above, but it's nice to make it
// obvious that the check always occurs.
// We already know that aDataOffset <= length, so this cannot underflow.
if (contentsSize > dataSize - aDataOffset) {
aRv.ThrowOperationError(
nsPrintfCString("%s + size is greater than data length", aOffsetName));
return;
}
if (!dataContents) {
// Passing `nullptr` as either the source or destination to
// `memcpy` is undefined behavior, even when the count is zero:
//
// https://en.cppreference.com/w/cpp/string/byte/memcpy
//
// We can either make callers responsible for checking the pointer
// before calling `memcpy`, or we can have it point to a
// permanently-live `static` dummy byte, so that the copies are
// harmless. The latter seems less error-prone.
static uint8_t dummy;
dataContents = &dummy;
MOZ_RELEASE_ASSERT(contentsSize == 0);
}
aDataContents = dataContents;
aContentsSize = contentsSize;
}
void Queue::WriteBuffer(const Buffer& aBuffer, uint64_t aBufferOffset, void Queue::WriteBuffer(const Buffer& aBuffer, uint64_t aBufferOffset,
const dom::ArrayBufferViewOrArrayBuffer& aData, const dom::ArrayBufferViewOrArrayBuffer& aData,
uint64_t aDataOffset, uint64_t aDataOffset,
const dom::Optional<uint64_t>& aSize, const dom::Optional<uint64_t>& aSize,
ErrorResult& aRv) { ErrorResult& aRv) {
uint64_t length = 0; uint8_t* dataContents = nullptr;
uint8_t* data = nullptr; uint64_t contentsSize = 0;
if (aData.IsArrayBufferView()) { GetBufferSourceDataAndSize(aData, aDataOffset, aSize, dataContents,
const auto& view = aData.GetAsArrayBufferView(); contentsSize, "dataOffset", aRv);
view.ComputeState(); if (aRv.Failed()) {
length = view.Length();
data = view.Data();
}
if (aData.IsArrayBuffer()) {
const auto& ab = aData.GetAsArrayBuffer();
ab.ComputeState();
length = ab.Length();
data = ab.Data();
}
MOZ_ASSERT(data != nullptr);
const auto checkedSize = aSize.WasPassed()
? CheckedInt<size_t>(aSize.Value())
: CheckedInt<size_t>(length) - aDataOffset;
if (!checkedSize.isValid()) {
aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
return; return;
} }
const auto& size = checkedSize.value(); if (contentsSize % 4 != 0) {
if (aDataOffset + size > length) {
aRv.ThrowAbortError(nsPrintfCString("Wrong data size %" PRIuPTR, size));
return;
}
if (size % 4 != 0) {
aRv.ThrowAbortError("Byte size must be a multiple of 4"); aRv.ThrowAbortError("Byte size must be a multiple of 4");
return; return;
} }
auto alloc = mozilla::ipc::UnsafeSharedMemoryHandle::CreateAndMap(size); auto alloc =
mozilla::ipc::UnsafeSharedMemoryHandle::CreateAndMap(contentsSize);
if (alloc.isNothing()) { if (alloc.isNothing()) {
aRv.Throw(NS_ERROR_OUT_OF_MEMORY); aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
return; return;
@ -94,7 +154,7 @@ void Queue::WriteBuffer(const Buffer& aBuffer, uint64_t aBufferOffset,
auto handle = std::move(alloc.ref().first); auto handle = std::move(alloc.ref().first);
auto mapping = std::move(alloc.ref().second); auto mapping = std::move(alloc.ref().second);
memcpy(mapping.Bytes().data(), data + aDataOffset, size); memcpy(mapping.Bytes().data(), dataContents + aDataOffset, contentsSize);
ipc::ByteBuf bb; ipc::ByteBuf bb;
ffi::wgpu_queue_write_buffer(aBuffer.mId, aBufferOffset, ToFFI(&bb)); ffi::wgpu_queue_write_buffer(aBuffer.mId, aBufferOffset, ToFFI(&bb));
if (!mBridge->SendQueueWriteAction(mId, mParent->mId, std::move(bb), if (!mBridge->SendQueueWriteAction(mId, mParent->mId, std::move(bb),
@ -115,36 +175,23 @@ void Queue::WriteTexture(const dom::GPUImageCopyTexture& aDestination,
ffi::WGPUExtent3d extent = {}; ffi::WGPUExtent3d extent = {};
CommandEncoder::ConvertExtent3DToFFI(aSize, &extent); CommandEncoder::ConvertExtent3DToFFI(aSize, &extent);
uint64_t availableSize = 0; uint8_t* dataContents = nullptr;
uint8_t* data = nullptr; uint64_t contentsSize = 0;
if (aData.IsArrayBufferView()) { GetBufferSourceDataAndSize(aData, aDataLayout.mOffset,
const auto& view = aData.GetAsArrayBufferView(); dom::Optional<uint64_t>(), dataContents,
view.ComputeState(); contentsSize, "dataLayout.offset", aRv);
availableSize = view.Length(); if (aRv.Failed()) {
data = view.Data(); return;
}
if (aData.IsArrayBuffer()) {
const auto& ab = aData.GetAsArrayBuffer();
ab.ComputeState();
availableSize = ab.Length();
data = ab.Data();
} }
if (!availableSize) { if (!contentsSize) {
aRv.ThrowAbortError("Input size cannot be zero."); aRv.ThrowAbortError("Input size cannot be zero.");
return; return;
} }
MOZ_ASSERT(data != nullptr); MOZ_ASSERT(dataContents != nullptr);
const auto checkedSize = auto alloc =
CheckedInt<size_t>(availableSize) - aDataLayout.mOffset; mozilla::ipc::UnsafeSharedMemoryHandle::CreateAndMap(contentsSize);
if (!checkedSize.isValid()) {
aRv.ThrowAbortError(nsPrintfCString("Offset is higher than the size"));
return;
}
const auto size = checkedSize.value();
auto alloc = mozilla::ipc::UnsafeSharedMemoryHandle::CreateAndMap(size);
if (alloc.isNothing()) { if (alloc.isNothing()) {
aRv.Throw(NS_ERROR_OUT_OF_MEMORY); aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
return; return;
@ -153,7 +200,8 @@ void Queue::WriteTexture(const dom::GPUImageCopyTexture& aDestination,
auto handle = std::move(alloc.ref().first); auto handle = std::move(alloc.ref().first);
auto mapping = std::move(alloc.ref().second); auto mapping = std::move(alloc.ref().second);
memcpy(mapping.Bytes().data(), data + aDataLayout.mOffset, size); memcpy(mapping.Bytes().data(), dataContents + aDataLayout.mOffset,
contentsSize);
ipc::ByteBuf bb; ipc::ByteBuf bb;
ffi::wgpu_queue_write_texture(copyView, dataLayout, extent, ToFFI(&bb)); ffi::wgpu_queue_write_texture(copyView, dataLayout, extent, ToFFI(&bb));