From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DD8438DEC for ; Thu, 24 Apr 2025 14:13:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745504000; cv=none; b=VSGWqRRxLMUlb+M9lxtWlkr8kMO3Tcyv3Mkw3D/5NmuZjZfoglk2/JcIg6v2V4CTChHo1+TPj/0oYgA1iaCMIwfcUVjiilFZTd/PBFULilnkf07gLDU8YGa4QeJdBVYWgdhEjU1V8He1mbqZqyLAMAqOE3ant9nFKSwv9f6TMww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745504000; c=relaxed/simple; bh=B6M0blk0x7gzQfl4V7yoC30BjjphrqR3MjZWIhAuJas=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=VGmhgv4MXvJ1GutofZBX9H85zGIE1mJ2jRZE6eLSxX06/Xo9/Elmv6/qHRDDC+1gPGTE5jn0dJJ35JgRMNCdioSVI0kuYQNJYHjZTTZLarp5PfU7CQgw0gNbrz+LOOnCJTfyTv0gH5OLaqiKCXd0s0I8dBzKkRwUATLOc3cgIuk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=XEfSe3KG; arc=none smtp.client-ip=209.85.166.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="XEfSe3KG" Received: by mail-io1-f44.google.com with SMTP id ca18e2360f4ac-86135ae2a29so101162139f.2 for ; Thu, 24 Apr 2025 07:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1745503995; x=1746108795; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=fd31tuMqcDYEf3YOh3nb9hbCE7tpXTrqaGBK0QTTKgc=; b=XEfSe3KGOCFk6l5PBeKbt0O2X2WLtsG1UaosHB04azCWOeO/k/rPQBYjttuJq4yip1 8e8lVxvR4qVFxLObQ9e4DLxjDhPU6ug/X+fE9HKgFcKoWLB9+7sgqKMwN+dh18hobw8s jwEDqB9tiY/w82MTuQcF19y5AhLYO9+TviSK+ZBt1qUxuMXZB2YM7YxNfMbnddq7NlzF Bn8Q+N2BI/ROlsnvsfwY/FqFU4iqOdtrIVrd32dzwEjK2by5PUQVERTLeh+10FByH/uS aNj6UAcc8wwhR5MNMaFZyGrQMMb0GhXYk0kqP25acAccKNr3J7men7uyHXpdv3DC7y1A L6sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745503995; x=1746108795; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fd31tuMqcDYEf3YOh3nb9hbCE7tpXTrqaGBK0QTTKgc=; b=Gg8D+3oNvu3gAWbtqyxS19qzdspB4Xkk3k9Yk58iFv/Ndc01cqzecEpT65/aoOBmEn 7b65Atr5NIjn2pvuCvZqLxD2IRHhu3RGhTwaGunDmULKgFaD0NU1r8EbJLzIES3/Nufl 6HUzuQ6+G8jT7baatLa4IidrYgQHchJo2SqlGICxWXt4uV1ylIkX3KvSgoXNz8+gBodc DYcumH/npN8dbIIYwJQtY0xky5omJJenNMZn2bQaxi9ADqWzB6Iuj05aKa+PGq7grEBD FqlxGoaA20VlQ6CGgyennc149UphRPIw0G4mw5+Wle7gR6Qj9paD8rHxsiiGOuRiKtMR WLfg== X-Forwarded-Encrypted: i=1; AJvYcCUMTCX7mWrFYHz2q+CSDPedTYh+7z8CQ4MGjQGGp/Bv+odPnVvcZYCyW7K2VskV7S/exg0ovhLuWw==@vger.kernel.org X-Gm-Message-State: AOJu0YzoR7PntZuhMLfmjRNcL5gdi8THBN4S04pHw9AN2pb63Nf7k7CZ qIHQ9t5onswW9GjtIWCaCZhdbdbwaDFRBXzvIozZdPcZ0JhnyRC8DG4OPt+gy9g= X-Gm-Gg: ASbGncuAxpSpmI22QFb/UOP518Hlh8vyuuJjBYOUTNuzZ7W3Il75nJbDBbQQaKSfgPZ YkJZFylf9COBE+wwwB5jM30oq0gL1gw/n1C+6abOlpQKJJ93xE8pq/d+tta4yXmbIH/MYrBU/rC 175MtX0pWDICPPoOTye6APKSuspCzyb+MOj5DtHEEPzHl4Wd4bXd4aodnqQL0B8oHlA9U8P/bZX AZEUHTTsV80PHk9DRb/4u3swvPjlz1Q2nUi48UyMVhZZbaABq8I55Cp5WA7moTMY4EnqSvkt8QK MqCnMKpUVM8pwp895jy9CGe8y8VlFpJx5mwt X-Google-Smtp-Source: AGHT+IEYHzLjHult/C3OCAnnN70ZyOtQR7NOtOT3xPstQU442NKdq7lUb6GFqX933ULAUPG/kkbK/w== X-Received: by 2002:a05:6602:6d07:b0:861:c4cf:cae8 with SMTP id ca18e2360f4ac-8644f99fbe6mr297485339f.2.1745503995399; Thu, 24 Apr 2025 07:13:15 -0700 (PDT) Received: from [192.168.1.116] ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-864518de4e9sm20913439f.16.2025.04.24.07.13.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Apr 2025 07:13:14 -0700 (PDT) Message-ID: <5c20b5ca-ce41-43c4-870a-c50206ab058d@kernel.dk> Date: Thu, 24 Apr 2025 08:13:13 -0600 Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 1/2] io_uring: Add new functions to handle user fault scenarios To: =?UTF-8?B?5aec5pm65Lyf?= Cc: viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, akpm@linux-foundation.org, peterx@redhat.com, asml.silence@gmail.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, io-uring@vger.kernel.org References: <20250422162913.1242057-1-qq282012236@gmail.com> <20250422162913.1242057-2-qq282012236@gmail.com> <14195206-47b1-4483-996d-3315aa7c33aa@kernel.dk> <7bea9c74-7551-4312-bece-86c4ad5c982f@kernel.dk> <52d55891-36e3-43e7-9726-a2cd113f5327@kernel.dk> From: Jens Axboe Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 4/24/25 8:08 AM, ??? wrote: > Jens Axboe ?2025?4?24??? 06:58??? >> >> On 4/23/25 9:55 AM, Jens Axboe wrote: >>> Something like this, perhaps - it'll ensure that io-wq workers get a >>> chance to flush out pending work, which should prevent the looping. I've >>> attached a basic test case. It'll issue a write that will fault, and >>> then try and cancel that as a way to trigger the TIF_NOTIFY_SIGNAL based >>> looping. >> >> Something that may actually work - use TASK_UNINTERRUPTIBLE IFF >> signal_pending() is true AND the fault has already been tried once >> before. If that's the case, rather than just call schedule() with >> TASK_INTERRUPTIBLE, use TASK_UNINTERRUPTIBLE and schedule_timeout() with >> a suitable timeout length that prevents the annoying parts busy looping. >> I used HZ / 10. >> >> I don't see how to fix userfaultfd for this case, either using io_uring >> or normal write(2). Normal syscalls can pass back -ERESTARTSYS and get >> it retried, but there's no way to do that from inside fault handling. So >> I think we just have to be nicer about it. >> >> Andrew, as the userfaultfd maintainer, what do you think? >> >> diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c >> index d80f94346199..1016268c7b51 100644 >> --- a/fs/userfaultfd.c >> +++ b/fs/userfaultfd.c >> @@ -334,15 +334,29 @@ static inline bool userfaultfd_must_wait(struct userfaultfd_ctx *ctx, >> return ret; >> } >> >> -static inline unsigned int userfaultfd_get_blocking_state(unsigned int flags) >> +struct userfault_wait { >> + unsigned int task_state; >> + bool timeout; >> +}; >> + >> +static struct userfault_wait userfaultfd_get_blocking_state(unsigned int flags) >> { >> + /* >> + * If the fault has already been tried AND there's a signal pending >> + * for this task, use TASK_UNINTERRUPTIBLE with a small timeout. >> + * This prevents busy looping where schedule() otherwise does nothing >> + * for TASK_INTERRUPTIBLE when the task has a signal pending. >> + */ >> + if ((flags & FAULT_FLAG_TRIED) && signal_pending(current)) >> + return (struct userfault_wait) { TASK_UNINTERRUPTIBLE, true }; >> + >> if (flags & FAULT_FLAG_INTERRUPTIBLE) >> - return TASK_INTERRUPTIBLE; >> + return (struct userfault_wait) { TASK_INTERRUPTIBLE, false }; >> >> if (flags & FAULT_FLAG_KILLABLE) >> - return TASK_KILLABLE; >> + return (struct userfault_wait) { TASK_KILLABLE, false }; >> >> - return TASK_UNINTERRUPTIBLE; >> + return (struct userfault_wait) { TASK_UNINTERRUPTIBLE, false }; >> } >> >> /* >> @@ -368,7 +382,7 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) >> struct userfaultfd_wait_queue uwq; >> vm_fault_t ret = VM_FAULT_SIGBUS; >> bool must_wait; >> - unsigned int blocking_state; >> + struct userfault_wait wait_mode; >> >> /* >> * We don't do userfault handling for the final child pid update >> @@ -466,7 +480,7 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) >> uwq.ctx = ctx; >> uwq.waken = false; >> >> - blocking_state = userfaultfd_get_blocking_state(vmf->flags); >> + wait_mode = userfaultfd_get_blocking_state(vmf->flags); >> >> /* >> * Take the vma lock now, in order to safely call >> @@ -488,7 +502,7 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) >> * following the spin_unlock to happen before the list_add in >> * __add_wait_queue. >> */ >> - set_current_state(blocking_state); >> + set_current_state(wait_mode.task_state); >> spin_unlock_irq(&ctx->fault_pending_wqh.lock); >> >> if (!is_vm_hugetlb_page(vma)) >> @@ -501,7 +515,11 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) >> >> if (likely(must_wait && !READ_ONCE(ctx->released))) { >> wake_up_poll(&ctx->fd_wqh, EPOLLIN); >> - schedule(); >> + /* See comment in userfaultfd_get_blocking_state() */ >> + if (!wait_mode.timeout) >> + schedule(); >> + else >> + schedule_timeout(HZ / 10); >> } >> >> __set_current_state(TASK_RUNNING); >> >> -- >> Jens Axboe > I guess the previous io_work_fault patch might have already addressed > the issue sufficiently. The later patch that adds a timeout for > userfaultfd might That one isn't guaranteed to be safe, as it's not necessarily a safe context to prune the conditions that lead to a busy loop rather than the normal "schedule until the condition is resolved". Running task_work should only be done at the outermost point in the kernel, where the task state is known sane in terms of what locks etc are being held. For some conditions the patch will work just fine, but it's not guaranteed to be the case. > not be necessary wouldn?t returning after a timeout just cause the > same fault to repeat indefinitely again? Regardless of whether the > thread is in UN or IN state, the expected behavior should be to wait > until the page is filled or the uffd resource is released to be woken > up, which seems like the correct logic. Right, it'll just sleep timeout for a bit as not to be a 100% busy loop. That's unfortunately the best we can do for this case... The expected behavior is indeed to schedule until we get woken, however that just doesn't work if there are signals pending, or other conditions that lead to TASK_INTERRUPTIBLE + schedule() being a no-op. -- Jens Axboe