From patchwork Tue Nov 28 11:52:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 13471072 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20230601.gappssmtp.com header.i=@resnulli-us.20230601.gappssmtp.com header.b="AWwnA3sv" Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0952D59 for ; Tue, 28 Nov 2023 03:53:00 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-54b7ef7f4d5so2348529a12.1 for ; Tue, 28 Nov 2023 03:53:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20230601.gappssmtp.com; s=20230601; t=1701172379; x=1701777179; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Qw+m6CFKiuP2LUdst29B2QrGUSKYe0PfmKWYdtVxuZI=; b=AWwnA3sv5kMbRt+do9FmPRyMCMnYQremLEyvgQNNIrCau3E5srBDYTj7CocNb8Pqlj YB1UyAIi9fS+wmz4X9Ha/eLifMsQwYY/YPrTsquAh8XxkGLXCxSH+VOSxZwOK0V1RP6l 5XG2ESZADXDEMpvKr8RpmmYVEeGVBFsV6UcYVA9cAWrMKZmI4N2la5GXS30gbG19eCKT 518Em8znyvfteuik3Do/wnNzb7s+dCSpEm5N89wqAlu0qU3SlPL1M1h5bb2MK6UwhFX3 H2eTVQaqdE46WEy9nn7tOSwhC8Vj3kJSUx0n3W33zZZ0/5sBQ3CYASuJ85g+DqLu04ZI Jyag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701172379; x=1701777179; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qw+m6CFKiuP2LUdst29B2QrGUSKYe0PfmKWYdtVxuZI=; b=NxsYvLfZGzoFu1LaFWHO8tadnlAFUR4eqXB+ZnkxtfDQdOqChVuiOsLcxHpgWfPAB5 4wdrqhumAfLahkpec6FkYK72otghBSWvSRAq1SvvnGp1gzO67egBekDvUjHlq0kFLByT VlUGzHYZd85wDeSTPWlkCM3i2nOzOJO0n4pE8Db7d7pWqIQRjbW/00tzcu825c+hqb+P 9CbPl5dX3JcZOhFQdtkBRME3qhph6jsqAkHabeaVadPAzBGRtvuO8K5kttPlfgFmvAC4 aGRQH9PIRzyfJzn7UUMAFQFT1TnfRfm92nlzgrmCZJL9aYPYC5rC2szo2eiGIOhzNwOJ V4KQ== X-Gm-Message-State: AOJu0Yx+Ak/dlUfhGsH4tqgf4eQls+Xq32LE7ihCzRrgoGegiP0Pwqg5 dey/FLbsmVyRuVhPbScmokUtA/xNnQBF6tTCtmyz7g== X-Google-Smtp-Source: AGHT+IFzlVdU3T4UMtg9tMWkCt8o8bpI+xqIeawq8azmYeVdyrdDyiyZmUzGbRkFRK6r5mau+ZcleA== X-Received: by 2002:a17:906:5299:b0:a00:8706:c82e with SMTP id c25-20020a170906529900b00a008706c82emr11714351ejm.18.1701172379066; Tue, 28 Nov 2023 03:52:59 -0800 (PST) Received: from localhost (host-213-179-129-39.customer.m-online.net. [213.179.129.39]) by smtp.gmail.com with ESMTPSA id j24-20020a170906411800b009a193a5acffsm6743485ejk.121.2023.11.28.03.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 03:52:58 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net, edumazet@google.com, jacob.e.keller@intel.com, corbet@lwn.net, sachin.bahadur@intel.com, przemyslaw.kitszel@intel.com Subject: [patch net-next 1/2] Documentation: devlink: extend reload-reinit description Date: Tue, 28 Nov 2023 12:52:54 +0100 Message-ID: <20231128115255.773377-2-jiri@resnulli.us> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231128115255.773377-1-jiri@resnulli.us> References: <20231128115255.773377-1-jiri@resnulli.us> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jiri Pirko Be more explicit about devlink entities that may stay and that have to be removed during reload reinit action. Signed-off-by: Jiri Pirko Reviewed-by: Przemek Kitszel --- Documentation/networking/devlink/devlink-reload.rst | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Documentation/networking/devlink/devlink-reload.rst b/Documentation/networking/devlink/devlink-reload.rst index 505d22da027d..2fb0269b2054 100644 --- a/Documentation/networking/devlink/devlink-reload.rst +++ b/Documentation/networking/devlink/devlink-reload.rst @@ -22,8 +22,17 @@ By default ``driver_reinit`` action is selected. * - ``driver-reinit`` - Devlink driver entities re-initialization, including applying new values to devlink entities which are used during driver - load such as ``devlink-params`` in configuration mode - ``driverinit`` or ``devlink-resources`` + load which are: + + * ``devlink-params`` in configuration mode ``driverinit`` + * ``devlink-resources`` + + Other devlink entities may stay over the re-initialization: + + * ``devlink-health-reporter`` + * ``devlink-region`` + + The rest of the devlink entities have to be removed and readded. * - ``fw_activate`` - Firmware activate. Activates new firmware if such image is stored and pending activation. If no limitation specified this action may involve From patchwork Tue Nov 28 11:52:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 13471073 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20230601.gappssmtp.com header.i=@resnulli-us.20230601.gappssmtp.com header.b="R6E/oGoc" Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 518ADD60 for ; Tue, 28 Nov 2023 03:53:02 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-9fffa4c4f43so731880266b.3 for ; Tue, 28 Nov 2023 03:53:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20230601.gappssmtp.com; s=20230601; t=1701172381; x=1701777181; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sTqLOoB/X20UDRbJ/vv+HE4al8Wf7NOyuxIi0HLABdM=; b=R6E/oGoc7HQGCITT/2/TBOPsCsy4tNBUzqeM7agojDFkdqQGb7mPKsgLpD9TX9jRiL uWtSvMl9o9bd8RTQyBHy+0XivPVQ+LOBKcj0EdMtVGu6kkA9rmkurmsL0QRv3ATLBaKo YwdKfoCXUfhDD3/sGdnlOf7lftLgU9jzIcKOECAma5oxfSj9sylz+sGPEi+uewGBJUR4 NbCgyYDzkBuvnnDGjq4pnAZmDnTakfEfGkt51dxUU7f6fEEGsKuPv1Prs7EXmirVn9ob 0YQqyJKX730iw0b6g1tmXgwBxBHtvRW4iiBPT5lvhuCg7Mrys8i9KrcgJ9KuWBazeQFo GB9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701172381; x=1701777181; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sTqLOoB/X20UDRbJ/vv+HE4al8Wf7NOyuxIi0HLABdM=; b=fdIaLVlCFEz9nW80xlKVOuxMQXnZe3Cw2aJqouLCE3LpwNXDWtVSa7BHKPUAhxd9pn mSL7kiYje3i1PRoZFSWhJ220QkPt5jiJy9bXGnyXKiMzODkWiFxSJxshZ0gDvMdiihXC VPRp12xWIVa2Rb7V1PDbhuWu8IrkuYd+uCoa/afmXE1w8F6pX6tnDMNruOItSemvnH0f 1yQf0C4b1sBMIE6Ta6mpIun3dBrViPnUWX5ACf68KSSMosK60AOOGmF9BJRyMMTatO9e k+Vxm4KXPL10qJ+14Ln4xiQxRtSuFb3JfYs1cCcyWWAdkEmttYIrY10aeyfxQz7L6iwW WlHw== X-Gm-Message-State: AOJu0YyWAZz4tjjv7Hwe5IddIszimDwhEAqx2iaB7Hl9tvoMseVus2Mr /+XtU3Ay41BixaVSRkWOLyQvGlpYVzKeSyvRv9fCVg== X-Google-Smtp-Source: AGHT+IHdjij2YYNGFBnf+yUh3ieZAYufEwmpUl2a0id1QZ/ZNciUjvuvuwlBdIA8LS45lRPexuj84g== X-Received: by 2002:a17:906:73dc:b0:a0e:d2d:2f1c with SMTP id n28-20020a17090673dc00b00a0e0d2d2f1cmr4983905ejl.2.1701172380802; Tue, 28 Nov 2023 03:53:00 -0800 (PST) Received: from localhost (host-213-179-129-39.customer.m-online.net. [213.179.129.39]) by smtp.gmail.com with ESMTPSA id jt13-20020a170906ca0d00b0099c53c4407dsm6682949ejb.78.2023.11.28.03.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 03:53:00 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net, edumazet@google.com, jacob.e.keller@intel.com, corbet@lwn.net, sachin.bahadur@intel.com, przemyslaw.kitszel@intel.com Subject: [patch net-next 2/2] devlink: warn about existing entities during reload-reinit Date: Tue, 28 Nov 2023 12:52:55 +0100 Message-ID: <20231128115255.773377-3-jiri@resnulli.us> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231128115255.773377-1-jiri@resnulli.us> References: <20231128115255.773377-1-jiri@resnulli.us> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jiri Pirko During reload-reinit, all entities except for params, resources, regions and health reporter should be removed and re-added. Add a warning to be triggered in case the driver behaves differently. Signed-off-by: Jiri Pirko Reviewed-by: Przemek Kitszel --- net/devlink/dev.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/net/devlink/dev.c b/net/devlink/dev.c index ea6a92f2e6a2..918a0395b03e 100644 --- a/net/devlink/dev.c +++ b/net/devlink/dev.c @@ -425,6 +425,18 @@ static void devlink_reload_netns_change(struct devlink *devlink, devlink_rel_nested_in_notify(devlink); } +static void devlink_reload_reinit_sanity_check(struct devlink *devlink) +{ + WARN_ON(!list_empty(&devlink->trap_policer_list)); + WARN_ON(!list_empty(&devlink->trap_group_list)); + WARN_ON(!list_empty(&devlink->trap_list)); + WARN_ON(!list_empty(&devlink->dpipe_table_list)); + WARN_ON(!list_empty(&devlink->sb_list)); + WARN_ON(!list_empty(&devlink->rate_list)); + WARN_ON(!list_empty(&devlink->linecard_list)); + WARN_ON(!xa_empty(&devlink->ports)); +} + int devlink_reload(struct devlink *devlink, struct net *dest_net, enum devlink_reload_action action, enum devlink_reload_limit limit, @@ -452,8 +464,10 @@ int devlink_reload(struct devlink *devlink, struct net *dest_net, if (dest_net && !net_eq(dest_net, curr_net)) devlink_reload_netns_change(devlink, curr_net, dest_net); - if (action == DEVLINK_RELOAD_ACTION_DRIVER_REINIT) + if (action == DEVLINK_RELOAD_ACTION_DRIVER_REINIT) { devlink_params_driverinit_load_new(devlink); + devlink_reload_reinit_sanity_check(devlink); + } err = devlink->ops->reload_up(devlink, action, limit, actions_performed, extack); devlink_reload_failed_set(devlink, !!err);