From patchwork Tue Sep 1 00:06:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Minchan Kim X-Patchwork-Id: 11747131 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AA30C109B for ; Tue, 1 Sep 2020 00:07:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 75FD92078B for ; Tue, 1 Sep 2020 00:07:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e7ZLBG31" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75FD92078B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1C1566B0055; Mon, 31 Aug 2020 20:07:54 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 174696B005A; Mon, 31 Aug 2020 20:07:54 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 011246B005C; Mon, 31 Aug 2020 20:07:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id D98B96B0055 for ; Mon, 31 Aug 2020 20:07:53 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id A67B2180AD804 for ; Tue, 1 Sep 2020 00:07:53 +0000 (UTC) X-FDA: 77212554426.15.gun44_280860427093 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 724891814B0C1 for ; Tue, 1 Sep 2020 00:07:53 +0000 (UTC) X-Spam-Summary: 1,0,0,e30b4a51298fe288,d41d8cd98f00b204,minchan.kim@gmail.com,,RULES_HIT:41:69:355:379:541:800:960:967:973:982:988:989:1260:1263:1311:1314:1345:1359:1431:1437:1515:1535:1543:1711:1730:1747:1777:1792:2198:2199:2393:2525:2559:2564:2682:2685:2859:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3354:3865:3867:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4118:4321:4605:5007:6261:6653:6742:6743:7514:7875:7903:8599:8957:9025:9592:10004:10913:11026:11658:11914:12043:12296:12297:12517:12519:12555:12679:12783:12895:12986:13846:13894:14096:14181:14394:14721:14849:21080:21094:21323:21324:21444:21451:21611:21627:21939:21990:30054:30062:30064,0,RBL:209.85.216.66:@gmail.com:.lbl8.mailshell.net-62.50.0.100 66.100.201.100;04yrfep8kkyxwi7a4fqug89bpsfxgocsgb4zb188gehot6jcheqrtjzmetp85jm.6gauef4uizxqxbfomjt4t35re1kexsobyyazohuhjy1a3iae93etxg6tjegohm8.s-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0, MSF:not X-HE-Tag: gun44_280860427093 X-Filterd-Recvd-Size: 7113 Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Tue, 1 Sep 2020 00:07:52 +0000 (UTC) Received: by mail-pj1-f66.google.com with SMTP id q1so766210pjd.1 for ; Mon, 31 Aug 2020 17:07:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DLrWB5wvlVoAHy2euEKq1/3sc+u67i1HMsT7/g7abhI=; b=e7ZLBG31SV7c0gtn6AOaBNrUKcsq5hL42yheyfoeAR9hyarTJ+VUPrehun41ljsLg9 4Tpl4o5uuXxH8bEqTgjS3qV4+7MlVUbhR3YDQojiszl5v5/0FB3KuFWnc5ut6mQ1zmBr TllJQEmbFX4u29FNsBl+OnFi8+6ToXEhYp+GolAG7n773KJi5O7g97DUg5/OWebgpRtN 1wXxR/kmTGNhdLgCupP9oN9a/0aetpbM0z6rKChNJhIzfrGuR/oJcnwhnCrBOG2fotVo O2qziM/71jC+T7i2rp5oKekaFUecZGj6lfYIUnfOApdsLiCk1Sw2yXfdfwQ5/krt5FkM Z4pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DLrWB5wvlVoAHy2euEKq1/3sc+u67i1HMsT7/g7abhI=; b=Qqpn8TvX8MXGkyS2p+CWiFPspVSOSWUTzG+sWBKzcYf+MX8k9uoIxee15qYFO+LEAo cfG4FPBh1aE35FzXJQ+2/UBLUyV0D+xermPZvpNch3LeRSGks7ZTV+3ssOmzkwmMnrcq 8nHU9ZJqVrXJ46uLCyMEL/hp3/iDHKNxukAnxkZVHmjVgk77xlzJRawuLgO2NBhLmcUy +c8MpIc3oD0MiwjqRQfeyQ5s2XLSw9sPd2E7MLWRKQRSFmsJIAewI0oGhvUOhJrpv8jK pisFBdMOZS0LYW/pqG9+mLHdN6fQxDKWAoiqFmpi+Q9cWQo8R3XY6Rna+KWLb5nE5Drj kq/g== X-Gm-Message-State: AOAM531aocwCAfgY4U9qGDRk9iO4o13+UtvZfEY6xlTZbnwhcHojLiAa CZsHipZoZHLcYafnxRYE8Xc= X-Google-Smtp-Source: ABdhPJw2+WxtE41OsXoPEhJhRlvcrNZ9QSecDn4o5oJjldeazK7KiDpmQOeo4Dv4MTpUiQRZkG7bLA== X-Received: by 2002:a17:90a:5a48:: with SMTP id m8mr1659813pji.181.1598918872055; Mon, 31 Aug 2020 17:07:52 -0700 (PDT) Received: from bbox-1.mtv.corp.google.com ([2620:15c:211:1:7220:84ff:fe09:5e58]) by smtp.gmail.com with ESMTPSA id k5sm769777pjq.5.2020.08.31.17.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 17:07:50 -0700 (PDT) From: Minchan Kim To: Andrew Morton Cc: LKML , Christian Brauner , linux-mm , linux-api@vger.kernel.org, oleksandr@redhat.com, Suren Baghdasaryan , Tim Murray , Sandeep Patil , Sonny Rao , Brian Geffon , Michal Hocko , Johannes Weiner , Shakeel Butt , John Dias , Joel Fernandes , Jann Horn , alexander.h.duyck@linux.intel.com, sj38.park@gmail.com, David Rientjes , Arjun Roy , Linus Torvalds , Minchan Kim , Vlastimil Babka , Jens Axboe , Daniel Colascione , Kirill Tkhai , SeongJae Park , linux-man@vger.kernel.org Subject: [PATCH v9 2/3] pid: move pidfd_get_pid() to pid.c Date: Mon, 31 Aug 2020 17:06:32 -0700 Message-Id: <20200901000633.1920247-3-minchan@kernel.org> X-Mailer: git-send-email 2.28.0.402.g5ffc5be6b7-goog In-Reply-To: <20200901000633.1920247-1-minchan@kernel.org> References: <20200901000633.1920247-1-minchan@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 724891814B0C1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: process_madvise syscall needs pidfd_get_pid function to translate pidfd to pid so this patch move the function to kernel/pid.c. Link: http://lkml.kernel.org/r/20200302193630.68771-5-minchan@kernel.org Link: http://lkml.kernel.org/r/20200622192900.22757-3-minchan@kernel.org Reviewed-by: Suren Baghdasaryan Suggested-by: Alexander Duyck Reviewed-by: Alexander Duyck Acked-by: Christian Brauner Reviewed-by: Vlastimil Babka Acked-by: David Rientjes Signed-off-by: Minchan Kim Cc: Jens Axboe Cc: Jann Horn Cc: Brian Geffon Cc: Daniel Colascione Cc: Joel Fernandes Cc: Johannes Weiner Cc: John Dias Cc: Kirill Tkhai Cc: Michal Hocko Cc: Oleksandr Natalenko Cc: Sandeep Patil Cc: SeongJae Park Cc: SeongJae Park Cc: Shakeel Butt Cc: Sonny Rao Cc: Tim Murray Cc: Christian Brauner Cc: --- include/linux/pid.h | 1 + kernel/exit.c | 17 ----------------- kernel/pid.c | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/include/linux/pid.h b/include/linux/pid.h index 176d6cf80e7c..86e0e7cb7872 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h @@ -77,6 +77,7 @@ extern const struct file_operations pidfd_fops; struct file; extern struct pid *pidfd_pid(const struct file *file); +struct pid *pidfd_get_pid(unsigned int fd); static inline struct pid *get_pid(struct pid *pid) { diff --git a/kernel/exit.c b/kernel/exit.c index 733e80f334e7..62912406d74a 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1474,23 +1474,6 @@ static long do_wait(struct wait_opts *wo) return retval; } -static struct pid *pidfd_get_pid(unsigned int fd) -{ - struct fd f; - struct pid *pid; - - f = fdget(fd); - if (!f.file) - return ERR_PTR(-EBADF); - - pid = pidfd_pid(f.file); - if (!IS_ERR(pid)) - get_pid(pid); - - fdput(f); - return pid; -} - static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop, int options, struct rusage *ru) { diff --git a/kernel/pid.c b/kernel/pid.c index 2b97bedc1d9f..54e153ec6b74 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -519,6 +519,23 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns) return idr_get_next(&ns->idr, &nr); } +struct pid *pidfd_get_pid(unsigned int fd) +{ + struct fd f; + struct pid *pid; + + f = fdget(fd); + if (!f.file) + return ERR_PTR(-EBADF); + + pid = pidfd_pid(f.file); + if (!IS_ERR(pid)) + get_pid(pid); + + fdput(f); + return pid; +} + /** * pidfd_create() - Create a new pid file descriptor. *