From patchwork Mon Oct 7 08:27:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1172657 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="hP9FUCvm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46mtrN6LW8z9sN1 for ; Mon, 7 Oct 2019 19:27:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727327AbfJGI1P (ORCPT ); Mon, 7 Oct 2019 04:27:15 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53118 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727224AbfJGI1O (ORCPT ); Mon, 7 Oct 2019 04:27:14 -0400 Received: by mail-wm1-f65.google.com with SMTP id r19so11596194wmh.2 for ; Mon, 07 Oct 2019 01:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aFxghCC7lJcVNGs+prYpp4IgWbv1PLO1TgGqm+F6wIU=; b=hP9FUCvmuXWzOSb/yhX8Wki8wHXHwgZ/Z31A/3xHYMngFfYa8D9pq5pZdfm7grPd0n 98UeEniK2TWJYjlngqyYNQdE5y4mm029ccHDO3SzJIdNlfGJOpXlhhLtSVbii1H4MB/q Fb2r98xgp0moOcwWEk86hY8gc8ba5Djjzl+4A4gZYWVuQhl8/wEDDW6aIfbuN+76Uf/Y NEepeC88pe5bOqnLwPXA3MEIyAn8GiwZUVnFpIODJfwS4QFAhFUcJKBIXpPx0CmRz64t Ljx3S0HFmFWhSidamV2WSJyqjAUtnc7//eqAoHcUq5PiYVdpxkUCSx8lROEDuwMFVUwf VTpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aFxghCC7lJcVNGs+prYpp4IgWbv1PLO1TgGqm+F6wIU=; b=VBzfLqbzN9sOCmz9LnnKK2k+eE1/I9g18Pm4nuQC0DjuiHcXcorvNUF5crVeO1hboN kWXjk9d+KUFm2wsKjsrswl7V4Wmv6SCPmroo5wDXe53PHLMTWx/Stgib9c3fmKZcJScQ TxqCPDfftViIM7c2N8kkqmRjxEMNagfKWrSWeAFcOqdlfcvQ0XYEe+l2N1YoS/HN4Ed1 D5V2MFjjhElQ4BsPWcBVtOljXgPtR98+aO3PdP3DkMZyniWFVaBdfESYvo4dj5LV9YnT gDOBhDYRbuptoK1MoFDyluLhhCCGt8naP7zzn84WD+ojgyrDUoWfG9JIw5CY9Uj0ixpB 7zcg== X-Gm-Message-State: APjAAAVL4PkL/euFD9RROcUCvGBl6lgwQ+cMDFPGaFFflHbT4YiqBBFN d4Xq9/FRZwU0FrKU+4LsftOsBQQuEnU= X-Google-Smtp-Source: APXvYqwLx7VdeHq+bj8VyZU9u0cBZt//k/2NfX5iAO/VW+vSs8ImmQfbgQSzx3ADTlchjAAwW4/7nQ== X-Received: by 2002:a05:600c:2410:: with SMTP id 16mr14570535wmp.125.1570436832179; Mon, 07 Oct 2019 01:27:12 -0700 (PDT) Received: from localhost (ip-213-220-235-50.net.upcbroadband.cz. [213.220.235.50]) by smtp.gmail.com with ESMTPSA id a204sm23761678wmh.21.2019.10.07.01.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 01:27:11 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, jakub.kicinski@netronome.com, mlxsw@mellanox.com, shuah@kernel.org Subject: [patch net-next 1/2] netdevsim: implement devlink dev_info op Date: Mon, 7 Oct 2019 10:27:08 +0200 Message-Id: <20191007082709.13158-2-jiri@resnulli.us> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191007082709.13158-1-jiri@resnulli.us> References: <20191007082709.13158-1-jiri@resnulli.us> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Do simple dev_info devlink operation implementation which only fills up the driver name. Signed-off-by: Jiri Pirko --- drivers/net/netdevsim/dev.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c index 31d1752c703a..a3d7d39f231a 100644 --- a/drivers/net/netdevsim/dev.c +++ b/drivers/net/netdevsim/dev.c @@ -510,6 +510,13 @@ static int nsim_dev_reload_up(struct devlink *devlink, return nsim_dev_reload_create(nsim_dev, extack); } +static int nsim_dev_info_get(struct devlink *devlink, + struct devlink_info_req *req, + struct netlink_ext_ack *extack) +{ + return devlink_info_driver_name_put(req, DRV_NAME); +} + #define NSIM_DEV_FLASH_SIZE 500000 #define NSIM_DEV_FLASH_CHUNK_SIZE 1000 #define NSIM_DEV_FLASH_CHUNK_TIME_MS 10 @@ -603,6 +610,7 @@ nsim_dev_devlink_trap_action_set(struct devlink *devlink, static const struct devlink_ops nsim_dev_devlink_ops = { .reload_down = nsim_dev_reload_down, .reload_up = nsim_dev_reload_up, + .info_get = nsim_dev_info_get, .flash_update = nsim_dev_flash_update, .trap_init = nsim_dev_devlink_trap_init, .trap_action_set = nsim_dev_devlink_trap_action_set, From patchwork Mon Oct 7 08:27:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1172658 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="Hy6DTkSU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46mtrQ5JLXz9sN1 for ; Mon, 7 Oct 2019 19:27:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727345AbfJGI1R (ORCPT ); Mon, 7 Oct 2019 04:27:17 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:45526 "EHLO mail-wr1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727103AbfJGI1P (ORCPT ); Mon, 7 Oct 2019 04:27:15 -0400 Received: by mail-wr1-f48.google.com with SMTP id r5so14043675wrm.12 for ; Mon, 07 Oct 2019 01:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J4CsrjtlU0SWDUjEQj9Vv0VfFqOqYEFCIhHKnhR6AGg=; b=Hy6DTkSUW9FGNrUoRVzGwXKrRAKhyyX9cJlQiaM/HbX2g3BE2b8Ja1XfGk90DrX1xg bIGXwlIBMRVS7wH7JyvZ1vZjKA+EAN/SV2cdqf71kOxKSWpLp5m+WiY85Vib+32wKVuZ 7987fCuqVTlBlmczMhsnUuJSYAMnBsUr2MpdS3Vxyu6SYsN2F+Z+JniD1WjnKgxiKYiQ E/h2NQoHrQMMSrOoU28bIWQimQEX+ja5pIA1bzig06mtxHSnYRHaNYRiCl+u0XkKLExw H4oFfcr88EbzZGE956ReIW1llF+SVN26FWx/zz3FxlcyPnZrE9nTRHRX94AvZLPsJ+Y/ 3yTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J4CsrjtlU0SWDUjEQj9Vv0VfFqOqYEFCIhHKnhR6AGg=; b=qygCgtH6wnGAfiUncuBloKYvTXcBmrH3tJrTlTn7w9iC8j/IK/LggbSvTwt0zUHiRb Tza5pDEAmFif3OCwqqSNB5umjQM0WfpkQHQNPvwpRO7ir73wMXe1Y4SE6G11/FSZBBX7 EDf8dGYt2eK5rizfG+0Id4Xz8tmrfakKs9cYrLg7FrtAnRoio6/2MDM8WeqMZUCE61Jt g2u+MaTtEGhrQ3ojnmt4PRHmnobFmxj+OOZN7cvUAQUwqVk8ekZEOvgrC6aBCwaM+Ke2 jkGHPcAFT24kq+Yzerxq15XRyVpjObIgIGbmezz5xwRloOPyL3T9rZvUvIhH+CJlRU1b 3j0A== X-Gm-Message-State: APjAAAVpojaWZ7zP7z7MhiNBb+J3veYAjphnVk2MTADZzhHdPkKsL0In TmJyecn5vECisvs9h6uwsLNVcMuXVeU= X-Google-Smtp-Source: APXvYqw2wqP9PO5ygn6TDy2MtiLOF1fy7fwkugOWRpy+x+fc8cvLp+Pxk+HaO3TKbDk3/8NpseLSjg== X-Received: by 2002:adf:efcb:: with SMTP id i11mr21837226wrp.69.1570436833293; Mon, 07 Oct 2019 01:27:13 -0700 (PDT) Received: from localhost (ip-213-220-235-50.net.upcbroadband.cz. [213.220.235.50]) by smtp.gmail.com with ESMTPSA id q22sm13245025wmj.5.2019.10.07.01.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 01:27:12 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, jakub.kicinski@netronome.com, mlxsw@mellanox.com, shuah@kernel.org Subject: [patch net-next 2/2] selftests: add netdevsim devlink dev info test Date: Mon, 7 Oct 2019 10:27:09 +0200 Message-Id: <20191007082709.13158-3-jiri@resnulli.us> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191007082709.13158-1-jiri@resnulli.us> References: <20191007082709.13158-1-jiri@resnulli.us> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Add test to verify netdevsim driver name returned by devlink dev info. Signed-off-by: Jiri Pirko --- .../drivers/net/netdevsim/devlink.sh | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh index de3174431b8e..cb0f17e17abc 100755 --- a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh +++ b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh @@ -4,7 +4,7 @@ lib_dir=$(dirname $0)/../../../net/forwarding ALL_TESTS="fw_flash_test params_test regions_test reload_test \ - netns_reload_test resource_test" + netns_reload_test resource_test dev_info_test" NUM_NETIFS=0 source $lib_dir/lib.sh @@ -284,6 +284,25 @@ resource_test() log_test "resource test" } +info_get() +{ + local name=$1 + + cmd_jq "devlink dev info $DL_HANDLE -j" ".[][][\"$name\"]" "-e" +} + +dev_info_test() +{ + RET=0 + + driver=$(info_get "driver") + check_err $? "Failed to get driver name" + [ "$driver" == "netdevsim" ] + check_err $? "Unexpected driver name $driver" + + log_test "dev_info test" +} + setup_prepare() { modprobe netdevsim