From patchwork Fri Nov 17 16:48:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Nesterov X-Patchwork-Id: 166269 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp664632vqn; Fri, 17 Nov 2023 08:50:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEMNg+sN4hSKL5wHSFEI18NFJwgWaOI0PfOJv3lw6pRlFv1M/HE3oYj9AJkCOu1UbjvhfFL X-Received: by 2002:a17:90b:8cd:b0:280:c98f:2092 with SMTP id ds13-20020a17090b08cd00b00280c98f2092mr14618pjb.33.1700239802422; Fri, 17 Nov 2023 08:50:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700239802; cv=none; d=google.com; s=arc-20160816; b=LZwlChE7n4TFxQ6xJwo9PDEsequF0PfueMgVguYsatl5eEksD4ofyoSWeCqG7QcWxH lg4xZbA3Pyhm63GvhM44Izbw3aA4QJ1UVMXDnuVasD2+BEqkmPPkMwJKxe57UFlVFxbi 6hp4j67QPgxSGU2E9f/Ni6wyhYXNUDtKUZt/qigeXA0+TyHuD4NkpFurarvxIf4LpUaG nsDh9cNEeseQ9T1iZqxNDsH0oGGZYNIbXIW5h7ERd9TDB6vBdUpPnDvu/zZ7V66IzMg4 g0YBSBBS6ht8bQEJ49iZmJ2ktxF86BSnJRZW41P4lKZzBWbavbRUUOKMZ9j+DT1L8FHB vR2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:content-disposition:mime-version :message-id:subject:cc:to:from:date:dkim-signature; bh=2xHmGuoMtPQwOYwidrVH9fzqJ2yR9Z3MUz8VIv42SVo=; fh=g+Tfql8AU8O4AJ+axZVRcstFW8sMQHHAjEtvlpawKxs=; b=nTIuX7MR1+sGFtErQ7X/TYebX82eOF+w/G3xzg5Yfy7KpEl92oRKCcYCbaWsBfTEmQ S3Y4zRBC89PtLGsuh0n3qVPq/vJvkzMYouzZZSk1bcH0pAyjBeHpwk7axCZoKk/LUZ3G 3aeZejpiOy0o0vdtxZPwVacquUYu1a8TtKNcyp/L2K+LONMLuk7OGXGvakNTfxQSmVqT WXv99Htt5dSiL01JrKjiHK4M8JNLSmt4fYBpdXi/FqbPZ90QgQlRzRg3xmMCe0T/647A M42VuPCkhadQsbqgRxCfOm4V1qUQcL6HWRiOTSkmieHH2OLP0u14itmANo/X2yVQvmK4 d19w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=frwBsBWn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id ok8-20020a17090b1d4800b00280352e52dcsi2411013pjb.119.2023.11.17.08.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 08:50:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=frwBsBWn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 9468182915AF; Fri, 17 Nov 2023 08:50:01 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231693AbjKQQuA (ORCPT + 30 others); Fri, 17 Nov 2023 11:50:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230383AbjKQQt7 (ORCPT ); Fri, 17 Nov 2023 11:49:59 -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 8C5D583 for ; Fri, 17 Nov 2023 08:49:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700239795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=2xHmGuoMtPQwOYwidrVH9fzqJ2yR9Z3MUz8VIv42SVo=; b=frwBsBWnm2L/BWNduqEpW9YD/2DRrP1iVbTwMnavAlI5VhcrWnygLtPc+/ACa3rnZzjGSU kq65FJYAd60a85JHWN0DoaPnTaNnuSfs77A4LQcm/QyutOrYk9snCyXqJDYPI2siJ+XWOl DeMutp0XBNIoHSbihM0XCveV2T4B4ME= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-549-eX82f_qrP5Kokjcude60UQ-1; Fri, 17 Nov 2023 11:49:52 -0500 X-MC-Unique: eX82f_qrP5Kokjcude60UQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B205185A781; Fri, 17 Nov 2023 16:49:52 +0000 (UTC) Received: from dhcp-27-174.brq.redhat.com (unknown [10.45.224.123]) by smtp.corp.redhat.com (Postfix) with SMTP id 0EE7B2166B27; Fri, 17 Nov 2023 16:49:50 +0000 (UTC) Received: by dhcp-27-174.brq.redhat.com (nbSMTP-1.00) for uid 1000 oleg@redhat.com; Fri, 17 Nov 2023 17:48:48 +0100 (CET) Date: Fri, 17 Nov 2023 17:48:46 +0100 From: Oleg Nesterov To: David Howells Cc: Al Viro , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] rxrpc_find_service_conn_rcu: fix the usage of read_seqbegin_or_lock() Message-ID: <20231117164846.GA10410@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 08:50:01 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782830651111984973 X-GMAIL-MSGID: 1782830651111984973 rxrpc_find_service_conn_rcu() should make the "seq" counter odd on the second pass, otherwise read_seqbegin_or_lock() never takes the lock. Signed-off-by: Oleg Nesterov --- net/rxrpc/conn_service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/rxrpc/conn_service.c b/net/rxrpc/conn_service.c index 89ac05a711a4..39c908a3ca6e 100644 --- a/net/rxrpc/conn_service.c +++ b/net/rxrpc/conn_service.c @@ -25,7 +25,7 @@ struct rxrpc_connection *rxrpc_find_service_conn_rcu(struct rxrpc_peer *peer, struct rxrpc_conn_proto k; struct rxrpc_skb_priv *sp = rxrpc_skb(skb); struct rb_node *p; - unsigned int seq = 0; + unsigned int seq = 1; k.epoch = sp->hdr.epoch; k.cid = sp->hdr.cid & RXRPC_CIDMASK; @@ -35,6 +35,7 @@ struct rxrpc_connection *rxrpc_find_service_conn_rcu(struct rxrpc_peer *peer, * under just the RCU read lock, so we have to check for * changes. */ + seq++; /* 2 on the 1st/lockless path, otherwise odd */ read_seqbegin_or_lock(&peer->service_conn_lock, &seq); p = rcu_dereference_raw(peer->service_conns.rb_node);