From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9CCBC369CB for ; Wed, 23 Apr 2025 22:58:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49DB86B0005; Wed, 23 Apr 2025 18:58:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 431AF6B0007; Wed, 23 Apr 2025 18:58:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C6CA6B0008; Wed, 23 Apr 2025 18:58:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0C8E46B0005 for ; Wed, 23 Apr 2025 18:58:03 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5B895C0628 for ; Wed, 23 Apr 2025 22:58:03 +0000 (UTC) X-FDA: 83366823246.17.9A09858 Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) by imf26.hostedemail.com (Postfix) with ESMTP id 23E22140006 for ; Wed, 23 Apr 2025 22:58:00 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=00zqXtwh; spf=pass (imf26.hostedemail.com: domain of axboe@kernel.dk designates 209.85.166.180 as permitted sender) smtp.mailfrom=axboe@kernel.dk; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745449081; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nEu7FtyxOTjoxH8k/xvlBTXItgCBkcLdRHMwp3SvrfA=; b=uUCEY9HBlrjAP7UuRRRM22ckVzqWbbVQHBi7RATh4AxPmttCqXZuqjrklUZiA8JPEkam8z bJPh1QraZntDH5Hq2A9liAQVYYW2DtXrOYJjyfLstcfB3K2yLcySclrAVJe2R3A3Nv5sX3 9AmtxxdraajZyfmffyIPxlSRsR6zkxE= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=00zqXtwh; spf=pass (imf26.hostedemail.com: domain of axboe@kernel.dk designates 209.85.166.180 as permitted sender) smtp.mailfrom=axboe@kernel.dk; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745449081; a=rsa-sha256; cv=none; b=hcMQZKuxLogRo+mbwZxlwhSIM3/04DdUL1soTMP+Uxd23xnvd5RTysecu+V5oY4W+udJnd ZBgJHdeEvvDw0RXbw1tjidIy36+8aT1/qxGqGblHElVJIdA6AstTY4hF/kSddX37I/uFDI osAFzU0WK8uqs215PQC1Bvxt+Ie8fNM= Received: by mail-il1-f180.google.com with SMTP id e9e14a558f8ab-3d91b55bd39so2359635ab.0 for ; Wed, 23 Apr 2025 15:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1745449080; x=1746053880; darn=kvack.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=nEu7FtyxOTjoxH8k/xvlBTXItgCBkcLdRHMwp3SvrfA=; b=00zqXtwhlKFemvOGtKxn6SclNlLVLKdPJAxfQ+8arR/hN00sHWSr1wb/NE5hlKxywC f5Zh9BzyGHbEFYOxC5T2tVL0G0pm1pjtohXE2bE1EJMY1z6dzM+fUdpQqchob+4JxpeX vwCmeVjRoCLCxNzMqjkuKhseVnnJX2be8AUOb8odLSc+c82jIgdzo+2fiyy26JRXYvVr fz2b6dD3OIfQOQU1OLfQR2vZ44a+L21AwUhvQq/GemoDr7dwMjJy/N0BprNIVFLDZye6 HW1POI2IXdUZrwMq1kVvOyxFmLCFO4Tkn/rBf5MZvHhyvny8V0zH4+aj8YHZA8QZfmRN ni8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745449080; x=1746053880; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nEu7FtyxOTjoxH8k/xvlBTXItgCBkcLdRHMwp3SvrfA=; b=cc7ONNPZOcjimrbplKutRr2IAG5nudfw/NVGaslBJdV7VfRgVGlxymivRnfcyHWqg1 uGRmQMfIxh6EMNFg6MPARLE/T+C4aGJzZR/xtySbUqLXdL8QIloIfDGtSEvdjkikjb5u XlURhwfGi3Z2m4VzYIg7/7Ix4TM39MAXsHBX/2wjDhBFRyzV4BAp2l0aYK+NOIHp3XMJ hNb8eXnmoDnU2DvHanO0qHI5wpmNoBRucQqPDEFb+ZBmbTqYShstYiN3m4+p51nbvSKI 3xTB0ICBSGtD1N7U6fQxGRGw3lC7k8ZoT8JOvmYdK1CEWEYNtY945zEuaUbLr/6NkXAE phzw== X-Forwarded-Encrypted: i=1; AJvYcCVY2E+nVSgJFDt6WO20knZg3eLwccBFHmqxIb4RizC7NEVxbyZXQ60mwfBCu9wt0cboS7jl1B9SwA==@kvack.org X-Gm-Message-State: AOJu0YxLb/sed6Y2jqFothaBLQLqYrYQborGnqjAr5/Yrku+iPlvwbsC CBUSCnwSSF6f5LpBmTvHtOW6OxqvK/EcVOBdFttxKoE/pyM0jtrPP5DNXsQMqGo= X-Gm-Gg: ASbGncvSIF8p8MLR2jdEbFfoaj1AwogoOL9Z1f9ZrWRU30bEn4rZXNbeRFgp9J28yV2 krBae2fOdfQr0d7ZWm/pPu8aWGOFmTyqTcrbIrsc6rYFf4njApfHG63AQSWL4sUKzldblCOyfAk 58aWtdwYjQWHnH/rpFVGxobM9w2Wo3/5c7SoS4Y9v62pywhNQhM2LMnPh9A2kldEI47UsSRyF+o kc5R9XgoWaD0w7VExxBv5nD7wqK2uXns32Z7uR86l+LAJ47eDzVCbpI02Z2soRiageZs+EbETR5 dQS8dJxpStWFXqW0bz0vgl4cU3dunq1/DlLxKJjyI1xb32ec X-Google-Smtp-Source: AGHT+IH1BGArJHSmQ1z4igvxLHm34FM/Kao2fQH/vkfme/lYyWZaPS1lcFv9aGEXqQEZu1RKSF8Qag== X-Received: by 2002:a05:6e02:1a25:b0:3d8:975:b825 with SMTP id e9e14a558f8ab-3d93038f94bmr5164455ab.5.1745449079826; Wed, 23 Apr 2025 15:57:59 -0700 (PDT) Received: from [192.168.1.150] ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d9314b05a0sm191505ab.4.2025.04.23.15.57.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Apr 2025 15:57:59 -0700 (PDT) Message-ID: Date: Wed, 23 Apr 2025 16:57:58 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 1/2] io_uring: Add new functions to handle user fault scenarios From: Jens Axboe 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> Content-Language: en-US In-Reply-To: <52d55891-36e3-43e7-9726-a2cd113f5327@kernel.dk> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: uimixe4iupa4hdx69n3u58etw3t71dix X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 23E22140006 X-Rspam-User: X-HE-Tag: 1745449080-669848 X-HE-Meta: U2FsdGVkX1940LCM5Dqhd1bsl3kCHn8jZ5RZAgCDE955MdcnRLyaT+vgrG4nLESVsj6aw2dbOcrtQbO2seYkZs35TBCWDriwgnAC0OwIPVl3A5KH1sw7b63IWphI6OvcN9Gjw20KROa4pz1Al7UDuQN89kL8WNLriA0Pu/n2CTnBeVqOwRwXJAHHUE4r7Yz/JuEPP4Ii9rh7vBbFx9/B1IpwE08Hzly/mSZUGE57xIUW1CcZD3b2gjGByQGY++1JnP2RhVSgraKp0L4mgzLCHDcAn5PudHnCXhNB0fZk0adpupqBS+UiDnUEXa16mTu3DMINk2sP8G1Za+kYtv7dXSGjdkJGYQaeBYrIpyxefH+lk+1VjXv2EzF1puCeU1VGvTQ8Pd3L+XVr2W+0CQ82ng1aFxK28SBIYhoGs90sMswcv4XIEuX+9KtLi3TgxNHkIP0MY4gc2JXO0iU3H4swlV3FtnWzpheRX6/ilB2U+8J5mWsba19wRPZDDRIRs6eLOh+Bs4WNbfHV7si+E2J9yKdWfqJJvoJ6aGKdZN6xC11TROJjsVC4SJlUyvj06nVXzzW2Sc4gY9F1MkV4XuAuPJ05SuZTwxmzrTKNHfa9/6mRdHa6E8GJv1abHMi1aVfpXUj8KDKrjW8pCO8/JA914mKyW3xl6boQKbWhRhhVcjKB4MVNRDEovuhQv3SLENHiWUgGt4pN2Iw/cpMGSSzO8x6DtFP9XEUOV5SFW7STbGSKrN0OyzSZAnfdrUqmfNqKFQLEhTGJwFPGy4hWKAhkBwQOXX6Lg+Axit+R+LV1u1985dvtE/S0UK0tAPAQtTcqOC5F+0/ukpy0PPdMM3lTPUFZC42OAM5HwANugQCIhES/3eSTuJyumfIN98fNGYOedwMCwekfvV+maXAQ+3oTG2+uKW8/8vn4Ql8iIvqCoDOufpBZTmLQDb8ww7kS233faQMqU8NwFo04hZlT3O4 74r02mEY MReFJ7jrbKxc57I6DqObMaDJjGMpziBNSlXFjydlNGtbIml0xEMrIkZge7RCtvHFdl9BAI0wsQkKRYeiKWdIeIs2v339hP4YugS5uNaZH0UwwHkBsyZwjmP/ydgrQ7sYJfGxWKEQ1RXISde3QCl6Gl+vj3lB/ouylxTxVTQiyE6pkOYhjocgez7lKWJp4HZp4CvMSH21biDqcX6kCqtmfn4Lc4nwheRxLUr2Ai6GpsLV8qorw+eJGUr/K0P76sExpBR/dmkO4WoYW0fap8K75jzx+nksUSRrgzDYAewKcUAP2oW60IYTJSDPOTpqKi+PRth+VEz1fM/wqnBho6KhL31fOqR9gzsmyZOj4goqdEUZH2KMrsvSEKcFUmqy+zx6dfXF0pfg0kZnPxHe3wFtAjEfeVuBoOsIQEPybR9fcqQxLJyECrajzTXwxoMbB5PI0DdSCnNrL4kqS3I5EMHlQdjP6XVMylHmpYtFg X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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