From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5291CC4742C for ; Wed, 4 Nov 2020 18:58:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EFF6A2080D for ; Wed, 4 Nov 2020 18:58:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ziepe.ca header.i=@ziepe.ca header.b="RNbUm2hE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730143AbgKDS6t (ORCPT ); Wed, 4 Nov 2020 13:58:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729783AbgKDS6r (ORCPT ); Wed, 4 Nov 2020 13:58:47 -0500 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE6DEC0613D3 for ; Wed, 4 Nov 2020 10:58:46 -0800 (PST) Received: by mail-qk1-x741.google.com with SMTP id i21so19592242qka.12 for ; Wed, 04 Nov 2020 10:58:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=hfB0DSWTLiTu8ZzC419NNWd9j2K1BmkAw+YsWu6FT5A=; b=RNbUm2hENFioEkGFyvhGl4z7H4Vbv6KrXU6WwkrMbBOu1gGR1SwFiubCu9ZB0YbxS1 gmpqjTll241CLMxfv/pLmDwOmxTsvvyENXz7I/JltjEIlXCEjt3BeZk7rjzH33Y/nIDh 5ysoN1BDI1mQ49jqGKuZ/k4Pv9/XbMa/1rFZuEl4vIbkI1N7OVPZHLrtaO0AH7VMXygG Wt0W7EheNsOl2Ow/G5Kb4fww/7Tt/OYCOXodQt9tg1Gq8EefG0W3yXMFrHhIillsliIz 0OHLCvlWOoiufhGxpxfHOBEHd2O7Pl8APUr1S0djaRQC18NCYyXb+mdYSeCKDdYrDDR6 plDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=hfB0DSWTLiTu8ZzC419NNWd9j2K1BmkAw+YsWu6FT5A=; b=f+WPG3mX1mHF0uEQY6aij+XL9LU/Cy8rgw7cDiVa72mV2e6GtsFSrFOsb0RIGlifd/ bUR3jEtGXr2dG1cl/xieXRVOaiETBL/lhgc2G4HIaoh9C2ip9LZsdo9x38hiaGq2TBq6 EG4cZVtO5oP0fqVkjit3kO1cnHHKyns9jldC7Qv5ims9VHlT0dUFEj4104d/p22q2miv DoAv6kVo81yDECDyMFLJf1ChtVbi4zpN0aWLtxvqa+Y+cNVX3XxThZbk/CNclFy5cV2w VceFDXn03IBcSSXpalA//2cqq7uQnqpgM8Bdj6F1weVn1R/jHtTY3HkucrQANs2lHaAL g4SA== X-Gm-Message-State: AOAM533pbXFJwKamdPE9Y+MEPL2Rj6kG39jeMG2vJwLX0y5YRTbCkVrd 9uTlezt/6WgID69YhmsZxycDpwq5KYbDytRg X-Google-Smtp-Source: ABdhPJxsj/V64EaBSstAvLnvJThz7y9TKfysQWt5ygzqa77aglKGjn2z+mKuwKrbY6r7b5RQX+ZpSg== X-Received: by 2002:ac8:588d:: with SMTP id t13mr21443413qta.380.1604516325038; Wed, 04 Nov 2020 10:58:45 -0800 (PST) Received: from ziepe.ca (hlfxns017vw-156-34-48-30.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.48.30]) by smtp.gmail.com with ESMTPSA id b14sm3000314qkn.123.2020.11.04.10.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 10:58:44 -0800 (PST) Received: from jgg by mlx with local (Exim 4.94) (envelope-from ) id 1kaNzX-00GbZ5-Mo; Wed, 04 Nov 2020 14:58:43 -0400 Date: Wed, 4 Nov 2020 14:58:43 -0400 From: Jason Gunthorpe To: "xiaofeng.yan" Cc: willy@infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, dledford@redhat.com, oulijun@huawei.com, yanxiaofeng7@jd.com Subject: Re: [PATCH 2/2] infiniband: Modify the reference to xa_store_irq() because the parameter of this function has changed Message-ID: <20201104185843.GV36674@ziepe.ca> References: <20201104023213.760-1-xiaofeng.yan2012@gmail.com> <20201104023213.760-2-xiaofeng.yan2012@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201104023213.760-2-xiaofeng.yan2012@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Wed, Nov 04, 2020 at 10:32:13AM +0800, xiaofeng.yan wrote: > From: "xiaofeng.yan" > > function xa_store_irq() has three parameters because of removing > patameter "gfp_t gfp" > > Signed-off-by: xiaofeng.yan > drivers/infiniband/core/cm.c | 2 +- > drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- > drivers/infiniband/hw/mlx5/srq_cmd.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c > index 5740d1ba3568..afcb5711270b 100644 > +++ b/drivers/infiniband/core/cm.c > @@ -879,7 +879,7 @@ static struct cm_id_private *cm_alloc_id_priv(struct ib_device *device, > static void cm_finalize_id(struct cm_id_private *cm_id_priv) > { > xa_store_irq(&cm.local_id_table, cm_local_id(cm_id_priv->id.local_id), > - cm_id_priv, GFP_KERNEL); > + cm_id_priv); > } This one is almost a bug, the entry is preallocated with NULL though: ret = xa_alloc_cyclic_irq(&cm.local_id_table, &id, NULL, xa_limit_32b, &cm.local_id_next, GFP_KERNEL); so it should never allocate here: static int cm_req_handler(struct cm_work *work) { spin_lock_irq(&cm_id_priv->lock); cm_finalize_id(cm_id_priv); Still, woops. Matt, maybe a might_sleep is deserved in here someplace? @@ -1534,6 +1534,8 @@ void *__xa_store(struct xarray *xa, unsigned long index, void *entry, gfp_t gfp) XA_STATE(xas, xa, index); void *curr; + might_sleep_if(gfpflags_allow_blocking(gfp)); + if (WARN_ON_ONCE(xa_is_advanced(entry))) return XA_ERROR(-EINVAL); if (xa_track_free(xa) && !entry) And similar in the other places that conditionally call __xas_nomem() ? I also still wish there was a proper 'xa store in already allocated but null' idiom - I remember you thought about using gfp flags == 0 at one point. Jason