From patchwork Fri Feb 17 20:22:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 58768 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp53238wrn; Fri, 17 Feb 2023 12:27:40 -0800 (PST) X-Google-Smtp-Source: AK7set+CjmVnVQp/cKWcC5z8WNtrGtX9KFxsTSziiL6jQQZFHqLqYKWJTBOn8UUeQZ4cn2TJeAlA X-Received: by 2002:a05:6a20:914d:b0:c6:babf:e49a with SMTP id x13-20020a056a20914d00b000c6babfe49amr2044787pzc.48.1676665659921; Fri, 17 Feb 2023 12:27:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676665659; cv=none; d=google.com; s=arc-20160816; b=iio28kx3Wb3enCo1Q7X21z8MH5KWXpbKxuKwOvX3WCmQ2MtEJ05pqThqp+hTA5b2yC V/eunLxyGtUqWkjoRW+h7/010jL+PhcOfRWrYN7RKWsL7qc6qWkNIGQanTOYXPdUKQR+ v225jEtBWEGwBcA3sHl/+WlxEUzkOU/VKxy8t9GLOL31ozOpMDXaXPSV64w+oM0Awr2Q 9ydexp/XmtYLqZeT8+3/jqtUo991VTtM4n8sr/xXmEoozOOh/eKsw5khy2O5Pi91ESJG Q+JqUT2sb5zI4bX8kqii3kh0Q2c6knTrvT1x52hXLJwOzHsXxRvTeYuHSjACxNIjnCFb mmFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0Vkw80Lh2WZ1pgTqp4QzUJ+bx7WsMyBCfB53lcaCvBU=; b=KWyq5VvrGY+iYzIvavErGxtcdoKn5WMFdeWvyEtEi3uQ3goR3cGWRw0dvZR4IdADSM lF82VMeSEpL4qdLVaTGggRfdMWH8zVMv3VAVXp5a1j7bgGLi2lcGLzsFvYbEEmVFBeQr 2GnUZV9cO51lHdaWKHbwfoVVc9Lvf5tsYAGqm4HzLFvyjsHKXCC+3dbBWO9xxxmfYz/r CONUja9S51R5XgC5/iDQYJFb+qYU/C4CYs5csQKJVBKnSvp+UUvXEuZcu5tWHBwdgQzQ WymjqB88bGQW6ewWZVOpyk/7HNIUV58fjx7Dh26yRe/Io+Y1BJjWUbVzq98zmHlCBpf/ po6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Y0ojCTrI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x17-20020a056a00189100b005a8b3c6b5c1si6428934pfh.245.2023.02.17.12.27.27; Fri, 17 Feb 2023 12:27:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Y0ojCTrI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229760AbjBQUYr (ORCPT + 99 others); Fri, 17 Feb 2023 15:24:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229761AbjBQUYj (ORCPT ); Fri, 17 Feb 2023 15:24:39 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8774160FBB for ; Fri, 17 Feb 2023 12:23:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676665408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Vkw80Lh2WZ1pgTqp4QzUJ+bx7WsMyBCfB53lcaCvBU=; b=Y0ojCTrI4Gzi1vCd1WtRpJ/kQxHIFgyZ8+FqxzlDp+4aLb9HJpKlPckU+XoAYkZoslF3Oz IsggM+eMvTUsGoERxZTV5U4w0/qZeekBdMuWu2Cb87g8sBImHpcg1H68lYCXDoJMAVABdD fnCxjg9X1HIXJ1OpnRJnHy3sbS5Ak7s= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-599-NbWsCke6M9-NvswkNOAIJQ-1; Fri, 17 Feb 2023 15:23:25 -0500 X-MC-Unique: NbWsCke6M9-NvswkNOAIJQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C4FD085A5A3; Fri, 17 Feb 2023 20:23:24 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46E71C15BA0; Fri, 17 Feb 2023 20:23:21 +0000 (UTC) From: Thomas Huth To: linux-kernel@vger.kernel.org, Arnd Bergmann Cc: linux-arch@vger.kernel.org, Chas Williams <3chas3@gmail.com>, Palmer Dabbelt , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, Andrew Waterman , Albert Ou Subject: [PATCH 2/4] Move ep_take_care_of_epollwakeup() to fs/eventpoll.c Date: Fri, 17 Feb 2023 21:22:59 +0100 Message-Id: <20230217202301.436895-3-thuth@redhat.com> In-Reply-To: <20230217202301.436895-1-thuth@redhat.com> References: <20230217202301.436895-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758111370814134354?= X-GMAIL-MSGID: =?utf-8?q?1758111370814134354?= From: Palmer Dabbelt This doesn't make any sense to expose to userspace, so it's been moved to the one user. This was introduced by commit 95f19f658ce1 ("epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled"). Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou Message-Id: <1447119071-19392-7-git-send-email-palmer@dabbelt.com> [thuth: Rebased to fix contextual conflicts] Signed-off-by: Thomas Huth Reviewed-by: Arnd Bergmann Reviewed-by: Christoph Hellwig --- fs/eventpoll.c | 13 +++++++++++++ include/uapi/linux/eventpoll.h | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 64659b110973..e2a5d2cc9051 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -2042,6 +2042,19 @@ SYSCALL_DEFINE1(epoll_create, int, size) return do_epoll_create(0); } +#ifdef CONFIG_PM_SLEEP +static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) +{ + if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND)) + epev->events &= ~EPOLLWAKEUP; +} +#else +static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) +{ + epev->events &= ~EPOLLWAKEUP; +} +#endif + static inline int epoll_mutex_lock(struct mutex *mutex, int depth, bool nonblock) { diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h index e687658843b1..cfbcc4cc49ac 100644 --- a/include/uapi/linux/eventpoll.h +++ b/include/uapi/linux/eventpoll.h @@ -85,16 +85,4 @@ struct epoll_event { __u64 data; } EPOLL_PACKED; -#ifdef CONFIG_PM_SLEEP -static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) -{ - if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND)) - epev->events &= ~EPOLLWAKEUP; -} -#else -static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) -{ - epev->events &= ~EPOLLWAKEUP; -} -#endif #endif /* _UAPI_LINUX_EVENTPOLL_H */