From patchwork Tue May 30 18:32:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Segall X-Patchwork-Id: 101073 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2387070vqr; Tue, 30 May 2023 11:43:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ593O7D+OgTVO+6ndXCqsVSHvpK6ApMEcMtkVZEOVImJZf/MC4cHJIVtpVLqMq+3jzXR8Mv X-Received: by 2002:aa7:88c3:0:b0:64c:aa98:a69f with SMTP id k3-20020aa788c3000000b0064caa98a69fmr3986084pff.1.1685472238207; Tue, 30 May 2023 11:43:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685472238; cv=none; d=google.com; s=arc-20160816; b=sVdVs6fGkjT1IcfOwhx9oLmk4m4yOHnHVrRCyZ8W4ISydhZfYV3TEzpma9U55WE67b /Fg0ZrkXkRH7GFNVWHWqWYB6lysP2TyBn7kD/uagS/RjOWyNi92XfVP5JhudTIsn8bpi /DpI94TLvAyr7PvEO7AJBBzI333ehqr2n3tY4ym7T8hDYGmZ26JrgWBTz8lFJ3sBXK06 LRFWS5WUWwpWLfuzXpNXpbOc/R8Ud37qN3GKSAXuJOqYWxj89es4V40INZ7qcQHPQVF1 alA7V3tnuhEqkygFh/gbmV6vl6AJ5gTA9HPcRWezDYGptJuLSAnPcQ+zegFMmqlFz+zW fvHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent:message-id:date:subject :cc:to:from:dkim-signature; bh=4sS3/Bfwt7TvEDXuu7/He/mgRn4IfxDIex6g4PACeMk=; b=mY9Lxzwjk7VxppFUObH5SN9zJc+HTOpsN6FJdTGWju8FH3sSmlF2NqT4nl2m/dqVnH KqsnK7iBRhTZEjEDgKGyHIKpuuMslwrZF1nWLfW0dZvS//dNXThIuFzpi5alvQqN1mbn xEecNaREWZ8g3Mql7KbRJQPD0tgXPeGs3AcvSOAi2IUz4kIeQTBATMSPM8bsWFW3Zaaw PNxEwmVhhkLVJLpF3ecHHo41B+8SeyF18w3ixUIZQgdVBFq0Pi2tOHoO5IPX7ay/b7Ta abXm8mSh29z2Cuuhq9KQySktJwHpwjbFP4meJIXeqkOgPVp2qGblyH/DBWk+j55rVDa9 DgQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=TPlFY3sS; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f9-20020aa79d89000000b0064f6c2c05besi2161461pfq.108.2023.05.30.11.43.43; Tue, 30 May 2023 11:43:58 -0700 (PDT) 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=@google.com header.s=20221208 header.b=TPlFY3sS; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233446AbjE3Scf (ORCPT + 99 others); Tue, 30 May 2023 14:32:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233482AbjE3Scc (ORCPT ); Tue, 30 May 2023 14:32:32 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99EEF106 for ; Tue, 30 May 2023 11:32:30 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1ae64580e9fso20295ad.1 for ; Tue, 30 May 2023 11:32:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685471550; x=1688063550; h=mime-version:user-agent:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=4sS3/Bfwt7TvEDXuu7/He/mgRn4IfxDIex6g4PACeMk=; b=TPlFY3sS6/OYtQC0ozjQX0WNPBenow76gDcaot3VOPiWXJp28K8qANb2lorHHtNNpe OmtD1fp6f3trSbPERXJVMI/JYQmYvk6JPsUNupn5kYtCjZR5e6eS9J8TzEOG0AmtGQ1e yyVO9HnELsEW83+88u52R4bXnAWQycG2VTbZVwjXDSNt83eF/qpiN5Bz93q9I+IoqrJG z3JwVOX7gveo2e/bH5IEkwLNevMcT6oP9+XU8mETg+JoYfQSpJAD0AQj2xbc9LRGFwK6 b9oqbdNxSEwS3kX+R+iVX21hha4GenbVQO+ulbb5gGIpfSbiKyQVCd52vDppNuaYs4RK Flxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685471550; x=1688063550; h=mime-version:user-agent:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4sS3/Bfwt7TvEDXuu7/He/mgRn4IfxDIex6g4PACeMk=; b=KOELlmHdHZBKKi0wmGbxMTmihcwXLVwM5mLX92CpLsitiFlZljasjpPMcEBYwtbyXP oO1hFaL1XjK5DQG2uk/QNI8krblOaWlLpojp2zKomd9cKZEOPMfqenp2Twy7SM7UFa6Z UR4VtTJMdqN3pa7Q5BW+6Ji6ydZ8sJd1TMykoPrmAXdboZJDhbbkHxoj8OMIpOrCzlQy vzqYJy/gdtT3pUdAMfI1daIQFWEYSPJUn4NLpQVT0QV1/nqt2l4RkSpvxeNmF6Y0WHJq BVTRV1M2A35bC4NJmqDg2wXfbJWcNafUsayncuP4RvN65U/P23eCcS32UKhvwH7qmjSH Yyag== X-Gm-Message-State: AC+VfDw81DtxcLBqe4/x3/8OF4w7sDXOuoM8W5bIEByxC9CXr3qgw0Yq +vEebCYS/mFEq2sraSO6xIj6uQ== X-Received: by 2002:a17:902:dac2:b0:19f:3c83:e9fe with SMTP id q2-20020a170902dac200b0019f3c83e9femr223100plx.14.1685471549929; Tue, 30 May 2023 11:32:29 -0700 (PDT) Received: from bsegall-glaptop.localhost (c-73-158-249-138.hsd1.ca.comcast.net. [73.158.249.138]) by smtp.gmail.com with ESMTPSA id w21-20020aa78595000000b0064d47cd117esm1972236pfn.39.2023.05.30.11.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 11:32:29 -0700 (PDT) From: Benjamin Segall To: Alexander Viro , Christian Brauner Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Andrew Morton Subject: [PATCH RESEND] epoll: ep_autoremove_wake_function should use list_del_init_careful Date: Tue, 30 May 2023 11:32:28 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-17.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL 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?1767345737870535776?= X-GMAIL-MSGID: =?utf-8?q?1767345737870535776?= autoremove_wake_function uses list_del_init_careful, so should epoll's more aggressive variant. It only doesn't because it was copied from an older wait.c rather than the most recent. Fixes: a16ceb139610 ("epoll: autoremove wakers even more aggressively") Signed-off-by: Ben Segall Cc: stable@vger.kernel.org --- fs/eventpoll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 52954d4637b5..081df056398a 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1756,11 +1756,11 @@ static struct timespec64 *ep_timeout_to_timespec(struct timespec64 *to, long ms) static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned int mode, int sync, void *key) { int ret = default_wake_function(wq_entry, mode, sync, key); - list_del_init(&wq_entry->entry); + list_del_init_careful(&wq_entry->entry); return ret; } /** * ep_poll - Retrieves ready events, and delivers them to the caller-supplied