diff --git a/src/amd/vulkan/radv_constants.h b/src/amd/vulkan/radv_constants.h
index de72665b19c..95351035041 100644
--- a/src/amd/vulkan/radv_constants.h
+++ b/src/amd/vulkan/radv_constants.h
@@ -154,4 +154,6 @@
 /* Number of descriptor heaps */
 #define RADV_MAX_HEAPS (RADV_HEAP_SAMPLER + 1)
 
+#define RADV_MAX_SHADER_ABORT_MESSAGE_SIZE 65536
+
 #endif /* RADV_CONSTANTS_H */
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 2e7f81d6dc5..a19e3e65508 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -659,6 +659,36 @@ radv_device_finish_device_fault_detection(struct radv_device *device)
    ralloc_free(device->gpu_hang_report);
 }
 
+static VkResult
+radv_shader_abort_data_init(struct radv_device *device)
+{
+   struct radv_shader_abort_data *shader_abort = &device->shader_abort;
+
+   shader_abort->buffer_size = sizeof(uint32_t) + sizeof(uint64_t) + RADV_MAX_SHADER_ABORT_MESSAGE_SIZE;
+
+   VkResult result =
+      radv_backed_buffer_init(device, &shader_abort->buffer, shader_abort->buffer_size, radv_memory_type_visible_vram,
+                              VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT, true);
+   if (result != VK_SUCCESS)
+      return result;
+
+   shader_abort->buffer_addr = radv_backed_buffer_get_va(device, &shader_abort->buffer);
+
+   /* Initialize the offset to write in the buffer header. */
+   uint32_t *data = shader_abort->buffer.map;
+   data[0] = sizeof(uint32_t);
+
+   return VK_SUCCESS;
+}
+
+static void
+radv_shader_abort_data_finish(struct radv_device *device)
+{
+   struct radv_shader_abort_data *shader_abort = &device->shader_abort;
+
+   radv_backed_buffer_finish(device, &shader_abort->buffer);
+}
+
 static VkResult
 radv_device_init_tools(struct radv_device *device)
 {
@@ -696,12 +726,19 @@ radv_device_init_tools(struct radv_device *device)
    if (result != VK_SUCCESS)
       return result;
 
+   if (device->vk.enabled_features.shaderAbort) {
+      result = radv_shader_abort_data_init(device);
+      if (result != VK_SUCCESS)
+         return result;
+   }
+
    return VK_SUCCESS;
 }
 
 static void
 radv_device_finish_tools(struct radv_device *device)
 {
+   radv_shader_abort_data_finish(device);
    radv_printf_data_finish(device);
    radv_rra_trace_finish(radv_device_to_handle(device), &device->rra_trace);
    radv_trap_handler_finish(device);
@@ -1067,6 +1104,10 @@ radv_device_is_cache_disabled(const struct radv_device *device)
    if (device->debug_nir.valid_va.buffer_addr)
       return true;
 
+   /* The buffer address used for shader abort is hardcoded. */
+   if (device->shader_abort.buffer_addr)
+      return true;
+
    /* Pipeline caches can be disabled with RADV_DEBUG=nocache, with MESA_GLSL_CACHE_DISABLE=1 and
     * when ACO_DEBUG is used. MESA_GLSL_CACHE_DISABLE is done elsewhere.
     */
@@ -1201,6 +1242,7 @@ radv_device_init_compiler_info(struct radv_device *device)
             .trap_excp_flags = instance->trap_excp_flags,
             .debug_report = &instance->vk.debug_report,
             .debug_nir = &device->debug_nir,
+            .shader_abort = &device->shader_abort,
             .shader_dump_mtx = &instance->shader_dump_mtx,
             .keep_shader_info = device->keep_shader_info,
             .capture_shaders = (instance->debug_flags & RADV_DEBUG_DUMP_SHADERS) || device->keep_shader_info,
@@ -1965,6 +2007,25 @@ radv_GetDeviceFaultInfoEXT(VkDevice _device, VkDeviceFaultCountsEXT *pFaultCount
 }
 
 /* VK_KHR_device_fault */
+static void
+radv_shader_abort_get_data(struct radv_device *device, uint64_t *msg_data_size, uint8_t **msg_data)
+{
+   struct radv_shader_abort_data *shader_abort = &device->shader_abort;
+
+   *msg_data_size = 0;
+   *msg_data = NULL;
+
+   if (!shader_abort->buffer.map)
+      return;
+
+   device->vk.dispatch_table.DeviceWaitIdle(radv_device_to_handle(device));
+
+   uint32_t *data = shader_abort->buffer.map;
+
+   *msg_data_size = data[0] - sizeof(uint32_t); /* substract original offset */
+   *msg_data = (uint8_t *)shader_abort->buffer.map + sizeof(uint32_t);
+}
+
 VKAPI_ATTR VkResult VKAPI_CALL
 radv_GetDeviceFaultDebugInfoKHR(VkDevice _device, VkDeviceFaultDebugInfoKHR *pDebugInfo)
 {
@@ -1972,6 +2033,19 @@ radv_GetDeviceFaultDebugInfoKHR(VkDevice _device, VkDeviceFaultDebugInfoKHR *pDe
 
    pDebugInfo->vendorBinarySize = 0;
 
+   VkDeviceFaultShaderAbortMessageInfoKHR *abort_msg_info =
+      vk_find_struct(pDebugInfo->pNext, DEVICE_FAULT_SHADER_ABORT_MESSAGE_INFO_KHR);
+   if (abort_msg_info) {
+      uint64_t msg_data_size;
+      uint8_t *msg_data;
+
+      radv_shader_abort_get_data(device, &msg_data_size, &msg_data);
+
+      abort_msg_info->messageDataSize = msg_data_size;
+      if (abort_msg_info->pMessageData && msg_data && msg_data_size > 0)
+         memcpy((uint8_t *)abort_msg_info->pMessageData, msg_data, msg_data_size);
+   }
+
    if (device->gpu_hang_report) {
       VkDeviceFaultVendorBinaryHeaderVersionOneKHR hdr = radv_get_device_fault_vendor_binary_header(device);
 
diff --git a/src/amd/vulkan/radv_device.h b/src/amd/vulkan/radv_device.h
index 80fc8377e7f..b812b0147ce 100644
--- a/src/amd/vulkan/radv_device.h
+++ b/src/amd/vulkan/radv_device.h
@@ -131,6 +131,12 @@ struct radv_pso_cache_stats {
    uint32_t misses;
 };
 
+struct radv_shader_abort_data {
+   uint32_t buffer_size;
+   struct radv_backed_buffer buffer;
+   VkDeviceAddress buffer_addr;
+};
+
 struct radv_device {
    struct vk_device vk;
 
@@ -313,6 +319,8 @@ struct radv_device {
    struct radv_address_binding_tracker *addr_binding_tracker;
 
    struct radv_compiler_info compiler_info;
+
+   struct radv_shader_abort_data shader_abort;
 };
 
 VK_DEFINE_HANDLE_CASTS(radv_device, vk.base, VkDevice, VK_OBJECT_TYPE_DEVICE)
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 6a9e66e745d..bfb67525ebd 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -635,6 +635,16 @@ radv_shader_spirv_to_nir(const struct radv_compiler_info *compiler_info, struct
    if (nir->info.uses_printf)
       NIR_PASS(_, nir, radv_nir_lower_printf, compiler_info->debug.debug_nir);
 
+   if (nir->info.uses_abort) {
+      nir_lower_abort_options abort_options = {
+         .buffer_addr = compiler_info->debug.shader_abort->buffer_addr,
+         .max_buffer_size = compiler_info->debug.shader_abort->buffer_size,
+         .ptr_bit_size = 64,
+      };
+
+      NIR_PASS(_, nir, nir_lower_abort, &abort_options);
+   }
+
    if (options && options->lower_view_index_to_device_index)
       NIR_PASS(_, nir, nir_lower_view_index_to_device_index);
 
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index dc3b70de1f9..b5299fa9a54 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -33,6 +33,7 @@ struct radv_physical_device;
 struct radv_device;
 struct radv_pipeline;
 struct radv_ray_tracing_pipeline;
+struct radv_shader_abort_data;
 struct radv_shader_args;
 struct radv_shader_args;
 struct radv_serialized_shader_arena_block;
@@ -585,6 +586,7 @@ struct radv_compiler_info {
       uint64_t trap_excp_flags;
       struct vk_debug_report *debug_report;
       struct radv_debug_nir *debug_nir;
+      struct radv_shader_abort_data *shader_abort;
       simple_mtx_t *shader_dump_mtx;
       bool keep_shader_info;
       bool capture_shaders;