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 Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 35EE9C48BC1 for ; Tue, 13 Feb 2024 11:35:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D300C40C28; Tue, 13 Feb 2024 11:35:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gIWoMpGFREYo; Tue, 13 Feb 2024 11:35:12 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 0C3EE40BDD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1707824112; bh=DQ8bp23+ggv8wr3fBlwZDd44tUu1TI0wSokojBTeNU8=; h=Date:From:To:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=F8FRMDpUX/oh12fS0e+A0cpZ6QbaEq9i6dUCewfMY+ezl7LKWWolRQDtGH3DanO+q 9ZRnwcUiK3d6q56XLGqlhBAy6AwyQOiE6QH1aA24sMqMhtPF2LfFDbhe6G8Ly4Jp/L Zovz0QVVkxdaHbU/bKcvMHvMrufGKHW896JZwvwSUK9wt8TuYUrVbYjcP7PNpUSYoD /31CX+PUpmJEbmg/2UUI9xdguZg6fJ4oq7rDllagl2TLyCvxLqD/BFawtybnwCd4H9 tha9V9aqJN7ANI/3MvsG6BHcdgbpJEoaM2g9j32HiWN5SPs4JN1YP92oqi+B4uEy6l +94JkGE9P+jIw== Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 0C3EE40BDD; Tue, 13 Feb 2024 11:35:12 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 620341BF421 for ; Tue, 13 Feb 2024 11:35:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5B21C40673 for ; Tue, 13 Feb 2024 11:35:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B0a3twt-ySrq for ; Tue, 13 Feb 2024 11:35:09 +0000 (UTC) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::231; helo=mail-lj1-x231.google.com; envelope-from=jiri@resnulli.us; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org ED4CD40655 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org ED4CD40655 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by smtp4.osuosl.org (Postfix) with ESMTPS id ED4CD40655 for ; Tue, 13 Feb 2024 11:35:08 +0000 (UTC) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2d10d2da73dso4179781fa.1 for ; Tue, 13 Feb 2024 03:35:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707824107; x=1708428907; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DQ8bp23+ggv8wr3fBlwZDd44tUu1TI0wSokojBTeNU8=; b=l9GyG0il/Xk6voQJDQaZxATuMwDpqeY2d0+ONYtYNaZKvpVYO4AGRnpkCi19aPXbpc OmSGGxQap9vV+oCne3O7hldWsm72nQUjWD1BXhzr6dmCFu9+z1JVrZ+kots7yBPXqCaR Fk+9UA8x8vGMSU/DNFlqDZ2/SN+id4zHZ86orOs9nJhnTHk2wtSRXxY45fnPTfn/0AH4 vRmlss4GbL6QvjMHObCTcK9B6uIdHUKvCaK7ygovZh0xhLIEAVvSyuVLPH5oJG4tpk7R K6k/exG33+DDkMR/febrZ3u8Hsct2ZTNaw1ekTH0X6ttHzoR35fx3D7RTBzYwPRU3Glh sDYg== X-Forwarded-Encrypted: i=1; AJvYcCWeH0mSo3ZGscl1Kt7jLi1yfMTIH7V2xMZa5NdKL5BA/O130u7KJDKJWBNFUtJi7mAGr8zS1gCvE3Yl29MC/EcttZOsUk+Mp1u3g37d1zvuIQ== X-Gm-Message-State: AOJu0YzEVCzC5z1smgav3be1ROov709QaEZssPqzplv6m1d+W33XQUC1 XZTRJqLcy25rTz+Kahld9NB44wySAq1ZYYWELXe5bxQL+NpGQ5tbwRGIhOPOa3k= X-Google-Smtp-Source: AGHT+IGZNa4xV9rDYQSuFFlBbPC6+OB2Cxc6GrXsRPziFgnG3taFMBKsuDpM/LyVZs/3XMa8oKuWPg== X-Received: by 2002:a2e:7d03:0:b0:2d0:e666:5b4d with SMTP id y3-20020a2e7d03000000b002d0e6665b4dmr6816611ljc.21.1707824106579; Tue, 13 Feb 2024 03:35:06 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXUwBsGYhH5jC4Cf+AVJ4WELV1Q/TjcJnUZUT7GClfYev4BcDvOGRziDsBQPtWlEuFhQqpbJezZjRumdeZTZKWJl0IfQjMvMucXw8BpGbXWoeTxW2oxfSoziG69Jl3VK0rSxftDGOzgMlsTqekZ6BsJbH3ag81Pu7lihsp2n5K+xSXZ/rX1BVj+yl253CSB6UE2sn/7zG6wEVCsdswJI7LJ2NTHdGC+MJfkFsPLtNHoubvQTOJcIwps5bTyv1A7BBQwOpORY0maPvLmkia9sSr2Z9UlLc6C2oJ4F5hqjOHOMek4cUuM2ahyfW8jirx7z1nuRejPB5tV0ySAFzXdKME+kaTgpwSHfCE0CDLPf0C/28jvhmw84hNrIn5f1cF8GEZXnvNebZWsMEQMrZUPHBxzsf4irCnRUxwbG84OAHUMj80QIBKU1cYPhHCU/VnqyTLSuehAskci8weaY1KmfL3zBYJzt0BkutVA9GEkHBI4BySdiiCE Received: from localhost ([193.47.165.251]) by smtp.gmail.com with ESMTPSA id c6-20020a05600c0a4600b004117e45f12esm3640188wmq.22.2024.02.13.03.35.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 03:35:06 -0800 (PST) Date: Tue, 13 Feb 2024 12:35:02 +0100 From: Jiri Pirko To: Wojciech Drewek Message-ID: References: <20240213073509.77622-1-michal.swiatkowski@linux.intel.com> <20240213073509.77622-7-michal.swiatkowski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20230601.gappssmtp.com; s=20230601; t=1707824107; x=1708428907; darn=lists.osuosl.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=DQ8bp23+ggv8wr3fBlwZDd44tUu1TI0wSokojBTeNU8=; b=gTb3Uy/u5cxpXoeXLah8TzSIOXUDrVr9pM4rc2Z8LLr36U9H5riWOc22Jh07U+ls1v V8IzBbUPrKsSlpggiGYDrtrWBB5Hl7PC7nWxBemC6nMuP7buF4ZdqBZKBkvxW5FE4d0c cRCi+Grfa4nqlB0syeJ95i0VQ/OP597WQrEDffuKSh92IONp33WdbdU1+O7Ttkna2n0L SGHwLwD5RHEZo2e/oQ53gh3+UcTXIcNR31SEdGmIxiDbnMFe2s77nFPW5u4UpDxjQETA 05a1tCOMRN6MfxNYam80pUMvMKP+iYNVSCe1hQLZim3jLPqWOqhBChCczdYfvMDhdejP Afsw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=none (p=none dis=none) header.from=resnulli.us X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=resnulli-us.20230601.gappssmtp.com header.i=@resnulli-us.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=gTb3Uy/u Subject: Re: [Intel-wired-lan] [iwl-next v1 6/7] ice: enable_rdma devlink param X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jan Sokolowski , marcin.szycik@intel.com, sridhar.samudrala@intel.com, konrad.knitter@intel.com, pawel.chmielewski@intel.com, intel-wired-lan@lists.osuosl.org, nex.sw.ncis.nat.hpm.dev@intel.com, pio.raczynski@gmail.com, netdev@vger.kernel.org, jacob.e.keller@intel.com, Michal Swiatkowski , przemyslaw.kitszel@intel.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Tue, Feb 13, 2024 at 11:19:49AM CET, wojciech.drewek@intel.com wrote: > > >On 13.02.2024 10:58, Michal Swiatkowski wrote: >> On Tue, Feb 13, 2024 at 10:07:17AM +0100, Jiri Pirko wrote: >>> Tue, Feb 13, 2024 at 08:35:08AM CET, michal.swiatkowski@linux.intel.com wrote: >>>> Implement enable_rdma devlink parameter to allow user to turn RDMA >>>> feature on and off. >>>> >>>> It is useful when there is no enough interrupts and user doesn't need >>>> RDMA feature. >>>> >>>> Reviewed-by: Jan Sokolowski >>>> Reviewed-by: Przemek Kitszel >>>> Signed-off-by: Michal Swiatkowski >>>> --- >>>> drivers/net/ethernet/intel/ice/ice_devlink.c | 32 ++++++++++++++++++-- >>>> drivers/net/ethernet/intel/ice/ice_lib.c | 8 ++++- >>>> drivers/net/ethernet/intel/ice/ice_main.c | 18 +++++------ >>>> 3 files changed, 45 insertions(+), 13 deletions(-) >>>> >>>> diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c >>>> index b82ff9556a4b..4f048268db72 100644 >>>> --- a/drivers/net/ethernet/intel/ice/ice_devlink.c >>>> +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c >>>> @@ -1675,6 +1675,19 @@ ice_devlink_msix_min_pf_validate(struct devlink *devlink, u32 id, >>>> return 0; >>>> } >>>> >>>> +static int ice_devlink_enable_rdma_validate(struct devlink *devlink, u32 id, >>>> + union devlink_param_value val, >>>> + struct netlink_ext_ack *extack) >>>> +{ >>>> + struct ice_pf *pf = devlink_priv(devlink); >>>> + bool new_state = val.vbool; >>>> + >>>> + if (new_state && !test_bit(ICE_FLAG_RDMA_ENA, pf->flags)) >>>> + return -EOPNOTSUPP; >>>> + >>>> + return 0; >>>> +} >>>> + >>>> static const struct devlink_param ice_devlink_params[] = { >>>> DEVLINK_PARAM_GENERIC(ENABLE_ROCE, BIT(DEVLINK_PARAM_CMODE_RUNTIME), >>>> ice_devlink_enable_roce_get, >>>> @@ -1700,6 +1713,8 @@ static const struct devlink_param ice_devlink_params[] = { >>>> ice_devlink_msix_min_pf_get, >>>> ice_devlink_msix_min_pf_set, >>>> ice_devlink_msix_min_pf_validate), >>>> + DEVLINK_PARAM_GENERIC(ENABLE_RDMA, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT), >>>> + NULL, NULL, ice_devlink_enable_rdma_validate), >>>> }; >>>> >>>> static void ice_devlink_free(void *devlink_ptr) >>>> @@ -1776,9 +1791,22 @@ ice_devlink_set_switch_id(struct ice_pf *pf, struct netdev_phys_item_id *ppid) >>>> int ice_devlink_register_params(struct ice_pf *pf) >>>> { >>>> struct devlink *devlink = priv_to_devlink(pf); >>>> + union devlink_param_value value; >>>> + int err; >>>> + >>>> + err = devlink_params_register(devlink, ice_devlink_params, >>> >>> Interesting, can't you just take the lock before this and call >>> devl_params_register()? >>> >> I mess up a locking here and also in subfunction patchset. I will follow >> you suggestion and take lock for whole init/cleanup. Thanks. >> >>> Moreover, could you please fix your init/cleanup paths for hold devlink >>> instance lock the whole time? >>> >> You right, I will prepare patch for it. > >I think my patch implements your suggestion Jiri: >https://lore.kernel.org/netdev/20240212211202.1051990-5-anthony.l.nguyen@intel.com/ This patch is based on the one in your link apparently. I think it is incomplete. Idk > >> >>> >>> pw-bot: cr >>> >>> >>>> + ARRAY_SIZE(ice_devlink_params)); >>>> + if (err) >>>> + return err; >>>> >>>> - return devlink_params_register(devlink, ice_devlink_params, >>>> - ARRAY_SIZE(ice_devlink_params)); >>>> + devl_lock(devlink); >>>> + value.vbool = test_bit(ICE_FLAG_RDMA_ENA, pf->flags); >>>> + devl_param_driverinit_value_set(devlink, >>>> + DEVLINK_PARAM_GENERIC_ID_ENABLE_RDMA, >>>> + value); >>>> + devl_unlock(devlink); >>>> + >>>> + return 0; >>>> } >>>> >>>> void ice_devlink_unregister_params(struct ice_pf *pf) >>>> diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c >>>> index a30d2d2b51c1..4d5c3d699044 100644 >>>> --- a/drivers/net/ethernet/intel/ice/ice_lib.c >>>> +++ b/drivers/net/ethernet/intel/ice/ice_lib.c >>>> @@ -829,7 +829,13 @@ bool ice_is_safe_mode(struct ice_pf *pf) >>>> */ >>>> bool ice_is_rdma_ena(struct ice_pf *pf) >>>> { >>>> - return test_bit(ICE_FLAG_RDMA_ENA, pf->flags); >>>> + union devlink_param_value value; >>>> + int err; >>>> + >>>> + err = devl_param_driverinit_value_get(priv_to_devlink(pf), >>>> + DEVLINK_PARAM_GENERIC_ID_ENABLE_RDMA, >>>> + &value); >>>> + return err ? false : value.vbool; >>>> } >>>> >>>> /** >>>> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c >>>> index 824732f16112..4dd59d888ec7 100644 >>>> --- a/drivers/net/ethernet/intel/ice/ice_main.c >>>> +++ b/drivers/net/ethernet/intel/ice/ice_main.c >>>> @@ -5177,23 +5177,21 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) >>>> if (err) >>>> goto err_init; >>>> >>>> + err = ice_init_devlink(pf); >>>> + if (err) >>>> + goto err_init_devlink; >>>> + >>>> devl_lock(priv_to_devlink(pf)); >>>> err = ice_load(pf); >>>> devl_unlock(priv_to_devlink(pf)); >>>> if (err) >>>> goto err_load; >>>> >>>> - err = ice_init_devlink(pf); >>>> - if (err) >>>> - goto err_init_devlink; >>>> - >>>> return 0; >>>> >>>> -err_init_devlink: >>>> - devl_lock(priv_to_devlink(pf)); >>>> - ice_unload(pf); >>>> - devl_unlock(priv_to_devlink(pf)); >>>> err_load: >>>> + ice_deinit_devlink(pf); >>>> +err_init_devlink: >>>> ice_deinit(pf); >>>> err_init: >>>> pci_disable_device(pdev); >>>> @@ -5290,12 +5288,12 @@ static void ice_remove(struct pci_dev *pdev) >>>> if (!ice_is_safe_mode(pf)) >>>> ice_remove_arfs(pf); >>>> >>>> - ice_deinit_devlink(pf); >>>> - >>>> devl_lock(priv_to_devlink(pf)); >>>> ice_unload(pf); >>>> devl_unlock(priv_to_devlink(pf)); >>>> >>>> + ice_deinit_devlink(pf); >>>> + >>>> ice_deinit(pf); >>>> ice_vsi_release_all(pf); >>>> >>>> -- >>>> 2.42.0 >>>> >>>>