From patchwork Sun Oct 8 09:48:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 149669 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1177075vqo; Sat, 7 Oct 2023 18:48:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEH//g1lvQrXr2HIkZqLGWpdJFX6TzjSrFgDvErjjy7tSlTkbt5jtdE4qlr4+BnUhZlVvY1 X-Received: by 2002:a54:478d:0:b0:3ae:5e7:6e89 with SMTP id o13-20020a54478d000000b003ae05e76e89mr12052048oic.2.1696729729688; Sat, 07 Oct 2023 18:48:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696729729; cv=none; d=google.com; s=arc-20160816; b=fDw5CLxPfXB3oDWwQTq8ENfUpm4/zmyAwgn2r6FyQKHn4U09Mtkca9W1fYKkCq1cS4 sX9cIuan9XFd7o6WwkVNGkgxrlEVVPaJTXK0u8M7/2W12Q6M7Ukftu3QACIYCEYFUCID 4qoq8umsV/TXagW626kZljGk2mm6Ye4tHcv087o+tn8KWqly3SidUPZSHi4maOMWanxb NCo4kkpXP82bBkXBFuXjqtpNbAfabrlmBuradjpjCWjAalK2Igk4edgtvN0I6Pd3N1lH jVAZeIrVaxgiBxgvU8YuWuLMQKBhoYAoy6wJ6djWojPJlCHRlBSknysYacpG07AajqAY qBXg== 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; bh=vwbBA1BJuyLwNvFcOc3pD0Uw5qE3TLWcglXed98JqCU=; fh=sVO6dZaz2MjOMYYQUXK0Jk+arht08gyUXlIvEKWSH7U=; b=KJmUqsFaZy+kFdeRFaHNtSNVhPQIxzX5qx8sY345IS5fjvVT3/CqWwhkauLr+LgMwX RNtiV5iGG+JEeGugszzlyo/+C8xcJWIfy+iY9+cCK/IJzcT0gCnUSfp0xaGXy7kJIwHy daSy1H+KUyR9Qxs+VljLsJ8qYnsnmjGr1dIj2DnIU2RcI0pOqS/qiwXm++UsAgf4VSg+ zwAfdh7hxs3GVdeiue4uScUB1UKn8iM5w32GIC5Nn/xztALAngqqWG1eCZkldBQwUhbO 1Rz1ztqLmJQG1wKsN9DeKAEYu3t0+uLmH8jucUyeTShxverCqnVvhBa6Y5e3oPPGeif1 /Aog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id b15-20020a6567cf000000b00577fc59373fsi6864694pgs.296.2023.10.07.18.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 18:48:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id F09FA803426C; Sat, 7 Oct 2023 18:48:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344334AbjJHBsV (ORCPT + 17 others); Sat, 7 Oct 2023 21:48:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344279AbjJHBsP (ORCPT ); Sat, 7 Oct 2023 21:48:15 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01B3199; Sat, 7 Oct 2023 18:48:14 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4S34n60pFDz4f3jqt; Sun, 8 Oct 2023 09:48:10 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgBH0bFZCiJl7zQbCQ--.22902S4; Sun, 08 Oct 2023 09:48:11 +0800 (CST) From: Kemeng Shi To: viro@zeniv.linux.org.uk, brauner@kernel.org, dhowells@redhat.com Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] pipe: avoid repeat check of pipe->readers with pipe lock held Date: Sun, 8 Oct 2023 17:48:01 +0800 Message-Id: <20231008094801.354312-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20231008094801.354312-1-shikemeng@huaweicloud.com> References: <20231008094801.354312-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgBH0bFZCiJl7zQbCQ--.22902S4 X-Coremail-Antispam: 1UD129KBjvdXoW7GFyDJF1xZrWxCw18WFyxuFg_yoWDtwbEk3 92yF1rWr1fJrWxXa17CF1ayr4UuryDAr17Zr1Yyr9rGF18WryDu3Z5ZFy8AryUXan8GF9x Ca9Fyr9rJr1xCjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfxYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUCVW8JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jTQ6JUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=2.8 required=5.0 tests=DATE_IN_FUTURE_06_12, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sat, 07 Oct 2023 18:48:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779150072916697927 X-GMAIL-MSGID: 1779150072916697927 Change to pipe->readers is protected by pipe_lock. Only recheck pipe->reader after relock to avoid repeat check of pipe->readers with pipe lock held. Signed-off-by: Kemeng Shi --- fs/pipe.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/pipe.c b/fs/pipe.c index b19875720ff1..e9c63f66d1c7 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -479,13 +479,6 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from) } for (;;) { - if (!pipe->readers) { - send_sig(SIGPIPE, current, 0); - if (!ret) - ret = -EPIPE; - break; - } - head = pipe->head; if (!pipe_full(head, pipe->tail, pipe->max_usage)) { unsigned int mask = pipe->ring_size - 1; @@ -573,6 +566,12 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from) __pipe_lock(pipe); was_empty = pipe_empty(pipe->head, pipe->tail); wake_next_writer = true; + if (!pipe->readers) { + send_sig(SIGPIPE, current, 0); + if (!ret) + ret = -EPIPE; + break; + } } out: if (pipe_full(pipe->head, pipe->tail, pipe->max_usage))