From patchwork Thu Feb 15 18:27:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lokesh Gidra X-Patchwork-Id: 201698 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp41288dyb; Thu, 15 Feb 2024 10:33:43 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU1B7bBJWzhCuWzG9QtpojcG5atbY1tHjlkJJSvSuBB+P7S3LJWaDcAH9C19Q7QbYB2VGz8yyXE9PPCa81fzyegzadAKg== X-Google-Smtp-Source: AGHT+IHK3EIN+0dnsM5z+YI+YGvwky5H++JC9tJqhvS1dftlqiUi0PNXYCy1ByZubcymD20ruy8G X-Received: by 2002:a05:620a:5653:b0:785:b189:c13c with SMTP id vw19-20020a05620a565300b00785b189c13cmr3168987qkn.5.1708022023268; Thu, 15 Feb 2024 10:33:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708022023; cv=pass; d=google.com; s=arc-20160816; b=muYkWAaQeXUv692wslq+QBj9X+T8ZIQ59zgtuiXVs6pfbqCSzdBp1xk/o7/KeMh338 1rNmskcgCGHdUpw+vXACLjDe/kkrjAe3nc0b5HETqTYaEk5RRrdLj11zaJv5/rcGqkL6 vaEyhjYLluBGXDxpPP/zVKRoj2KQRMkmINfXHF2z9O/t2kMVVUVDsUm8EhVgCyAezjB7 XaEx8xzDWJXuddAHLpUIAbDeb5Cqn8fSaxRtbcds0SuZxpZBuyMDfVk1j0fiIU1hzSxx DzZptLgujSdS46v1WyhQL9Q5sIzaIf5Jbf28P4yKvf2UMbojKqBWr4bfbmQjuEINkXOe vAHQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:message-id:references:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:in-reply-to:date :dkim-signature; bh=5jFzOipv9bDJZnpb7UwZ8Eham/ShclgiDNDH7Ow4z+0=; fh=r7wm7hikLaFd0rNoyeIUOqIRLXcoKJfcsm8LL/y9w+A=; b=eWYdikJfIOvjfJEpralq+CUvVkoh3wNXcrLbMwr2xzV8Sg2fOhxbt6AkLGUgr5QLaI JIobv0x1qHnvHYL9UFcoTlgtgfJPp0lrRNAkaWBepiNfJMqwvIj/chHN76Gdut+N88uM Rwh4/22iDryfCW3NaP8z2Z3F+taOoCV8SlRJdCbLl8u2ws0221jUkoyHxEKETXfINkg/ 5M2UTpgk4CrZ0mLRrXs+zWUDJmGTiwabJiux6/lT7l/pzNyKdNbwxNgp4NJMR1Z9ii4I tgPz0ndN3QKoaVGCsmdcXNq+ZC8gZeIyhOjpzYrnkB7Tx4UHg9ygvfJT7f8AdQrbkUfH 4R/Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=JdeZASRb; arc=pass (i=1 spf=pass spfdomain=flex--lokeshgidra.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-67511-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67511-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id x24-20020ae9f818000000b007872f05c78fsi1984558qkh.60.2024.02.15.10.33.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 10:33:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67511-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=JdeZASRb; arc=pass (i=1 spf=pass spfdomain=flex--lokeshgidra.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-67511-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67511-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 063F81C22F4C for ; Thu, 15 Feb 2024 18:33:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0D77413B7A2; Thu, 15 Feb 2024 18:28:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JdeZASRb" Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 1B2C613B784 for ; Thu, 15 Feb 2024 18:28:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708021692; cv=none; b=V5AtTFOZRJKzzJcFsF+8fDa+DsjznhairWZS3HUm2ug0zlysDX01cquHlnVM5Ma78NJ7l3tMr1A8d+vYKf8ljGhHShZoYmQ1pjEOxMsTT5eiMOCpoak650he3JNGb1K9Qwth1mDry67mo1gg18uA6awbg8M8eJS03+VDbwhd2E4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708021692; c=relaxed/simple; bh=APdeBRsHAtrJONBAc4fOC4nb+0sbyGbwGk53lr6VS2s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=A4Yxo+le9A75RHq0pcryW/nbxuPtYwQHleXf6sfXTMtCndxLEOF0uxIfHRTrJy0VEAeTK+jiCW0RUY0LooE+sYMsLB7kuhJrUVXtqWvXJZveSGobrsgYdrJNpdZb4A2BltttxHebSmoGpsDIlV7daLqBkYmsK2+1zqL82uG7JpE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--lokeshgidra.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=JdeZASRb; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--lokeshgidra.bounces.google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-607e56f7200so5668257b3.2 for ; Thu, 15 Feb 2024 10:28:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708021690; x=1708626490; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5jFzOipv9bDJZnpb7UwZ8Eham/ShclgiDNDH7Ow4z+0=; b=JdeZASRbYGYpemdfvKlLncp+bu5y5SrC9zBhw3hUislOcnKDtb8Maj+MENxMnDBGz8 +3+LGzuHYoaPV80kNhyGPR6dW+5DIgB174pmMlT50p+5WRL2ss/TbnVO3KmYW4UGLC1C Pc3y7YAVoZuz8OXIY6UpTFVcJAtbc9PRkn7gWSmEUBpN6BZWyb0PEdX/dMmEFEZUJSlD WPnKXbD+FKcDG8HqwxgEm1RLg4m1NuD7NMH459wax33b81DplHbFcTxGtOdGCxRHeKky JR8swyaRs+ap5hHtKe+Js63RVYTgDPAxkQn0Bgt0gSmpb4GXwd3VnhB1WqxM2VvDwnO0 QbGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708021690; x=1708626490; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5jFzOipv9bDJZnpb7UwZ8Eham/ShclgiDNDH7Ow4z+0=; b=fgwo8Ao04d18Jve2bZ3PbdCyfJqYNML+WGDSZ82t7axkPue/miI8/hgivrGsYKMhFm 11dHMpVxQdljfg35RNtnMBtJ66SNSfK36rxN63UX6rDSCPynde6jVBXZ310xuIiQnegQ 0xORtjOo4KXvxZz3M/kziKJxJHbnmHnqEr1Y4EdnRsA9cP7FROawdnL/4N0frj33ABG/ Ma4seYSZi8281bWxfKRs7yqQF+fqbqcecoOaG86cYqPUIredTwHyIH4EOrz0j5gS7rPO ZkourNeXSVBdkrTHzKJ3ugvF1lUOdWBZa5Qdg1olUWnPOlyv+U7QR55RBsF38fCE6dRH SWog== X-Forwarded-Encrypted: i=1; AJvYcCXnqqJ9DgedqiUP0P/kQURmzgefYhwssq88LJsF0+BYdRh2prvno+Cl+m9gAghZJPLhRwaOKWxSbJDqd7SW5P3DE+O4+99FSW5NKNQ3 X-Gm-Message-State: AOJu0YxMhsCmo34ejy1Xt3Rbrlg6HEp1E4d4KZuozclkynbfkkBGzas/ /iOTQjuotLy6mSXfJpiZcDlHrZzlzTa0rFo5ZIra045BGgBq5yGLO5Twdh46s9ObuQszJpLrvpg oRDJzuv79c996BBQM5tIDyw== X-Received: from lg.mtv.corp.google.com ([2620:15c:211:202:6186:87a3:6b94:9b81]) (user=lokeshgidra job=sendgmr) by 2002:a05:6902:f11:b0:dc6:db9b:7a6d with SMTP id et17-20020a0569020f1100b00dc6db9b7a6dmr83663ybb.13.1708021690138; Thu, 15 Feb 2024 10:28:10 -0800 (PST) Date: Thu, 15 Feb 2024 10:27:53 -0800 In-Reply-To: <20240215182756.3448972-1-lokeshgidra@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240215182756.3448972-1-lokeshgidra@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240215182756.3448972-2-lokeshgidra@google.com> Subject: [PATCH v7 1/4] userfaultfd: move userfaultfd_ctx struct to header file From: Lokesh Gidra To: akpm@linux-foundation.org Cc: lokeshgidra@google.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, selinux@vger.kernel.org, surenb@google.com, kernel-team@android.com, aarcange@redhat.com, peterx@redhat.com, david@redhat.com, axelrasmussen@google.com, bgeffon@google.com, willy@infradead.org, jannh@google.com, kaleshsingh@google.com, ngeoffray@google.com, timmurray@google.com, rppt@kernel.org, Liam.Howlett@oracle.com, ryan.roberts@arm.com X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790990901189293163 X-GMAIL-MSGID: 1790990901189293163 Moving the struct to userfaultfd_k.h to be accessible from mm/userfaultfd.c. There are no other changes in the struct. This is required to prepare for using per-vma locks in userfaultfd operations. Signed-off-by: Lokesh Gidra Reviewed-by: Mike Rapoport (IBM) Reviewed-by: Liam R. Howlett --- fs/userfaultfd.c | 39 ----------------------------------- include/linux/userfaultfd_k.h | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 05c8e8a05427..58331b83d648 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -50,45 +50,6 @@ static struct ctl_table vm_userfaultfd_table[] = { static struct kmem_cache *userfaultfd_ctx_cachep __ro_after_init; -/* - * Start with fault_pending_wqh and fault_wqh so they're more likely - * to be in the same cacheline. - * - * Locking order: - * fd_wqh.lock - * fault_pending_wqh.lock - * fault_wqh.lock - * event_wqh.lock - * - * To avoid deadlocks, IRQs must be disabled when taking any of the above locks, - * since fd_wqh.lock is taken by aio_poll() while it's holding a lock that's - * also taken in IRQ context. - */ -struct userfaultfd_ctx { - /* waitqueue head for the pending (i.e. not read) userfaults */ - wait_queue_head_t fault_pending_wqh; - /* waitqueue head for the userfaults */ - wait_queue_head_t fault_wqh; - /* waitqueue head for the pseudo fd to wakeup poll/read */ - wait_queue_head_t fd_wqh; - /* waitqueue head for events */ - wait_queue_head_t event_wqh; - /* a refile sequence protected by fault_pending_wqh lock */ - seqcount_spinlock_t refile_seq; - /* pseudo fd refcounting */ - refcount_t refcount; - /* userfaultfd syscall flags */ - unsigned int flags; - /* features requested from the userspace */ - unsigned int features; - /* released */ - bool released; - /* memory mappings are changing because of non-cooperative event */ - atomic_t mmap_changing; - /* mm with one ore more vmas attached to this userfaultfd_ctx */ - struct mm_struct *mm; -}; - struct userfaultfd_fork_ctx { struct userfaultfd_ctx *orig; struct userfaultfd_ctx *new; diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index e4056547fbe6..691d928ee864 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -36,6 +36,45 @@ #define UFFD_SHARED_FCNTL_FLAGS (O_CLOEXEC | O_NONBLOCK) #define UFFD_FLAGS_SET (EFD_SHARED_FCNTL_FLAGS) +/* + * Start with fault_pending_wqh and fault_wqh so they're more likely + * to be in the same cacheline. + * + * Locking order: + * fd_wqh.lock + * fault_pending_wqh.lock + * fault_wqh.lock + * event_wqh.lock + * + * To avoid deadlocks, IRQs must be disabled when taking any of the above locks, + * since fd_wqh.lock is taken by aio_poll() while it's holding a lock that's + * also taken in IRQ context. + */ +struct userfaultfd_ctx { + /* waitqueue head for the pending (i.e. not read) userfaults */ + wait_queue_head_t fault_pending_wqh; + /* waitqueue head for the userfaults */ + wait_queue_head_t fault_wqh; + /* waitqueue head for the pseudo fd to wakeup poll/read */ + wait_queue_head_t fd_wqh; + /* waitqueue head for events */ + wait_queue_head_t event_wqh; + /* a refile sequence protected by fault_pending_wqh lock */ + seqcount_spinlock_t refile_seq; + /* pseudo fd refcounting */ + refcount_t refcount; + /* userfaultfd syscall flags */ + unsigned int flags; + /* features requested from the userspace */ + unsigned int features; + /* released */ + bool released; + /* memory mappings are changing because of non-cooperative event */ + atomic_t mmap_changing; + /* mm with one ore more vmas attached to this userfaultfd_ctx */ + struct mm_struct *mm; +}; + extern vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason); /* A combined operation mode + behavior flags. */