From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 325021A3ABF for ; Mon, 2 Sep 2024 18:52:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.193 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725303142; cv=none; b=NETua6tm/CMXUP9Y0xphlNS20wB0G1nNUwMC1r39ZE+4ql7lexN55TZ2nZvwfoK+y24N1sHfh124K0HW+Z3XdCE2K/Wdj6eY05V76qDMQ6Sx5iazpjKlL2r5yA6QYaZXAS8PwMbjgga3dKzn2cma166C3vnchjrmiyIpWzePOjs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725303142; c=relaxed/simple; bh=WkWUcNb9O/mWuTBarjMXFJ/9aZOBmOFHrhoO/w7H52E=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=LQuTbPoqcIU6gsK57xeagHsFdPc0joT0YJGhTL9ltKD0FOV5kliXSbItEbIYYmaV7SvEWzCUm9OIretFJASkDEpY4x1zPSGfMq8MEiDu0XoqcTp5i/29D8CAKOU9bX1WYgysQbJHcZ4R/0TJY60vRqJahf4Ep5cbazaTk6EVrk8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=dM/7OZi5; arc=none smtp.client-ip=209.85.208.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="dM/7OZi5" Received: by mail-lj1-f193.google.com with SMTP id 38308e7fff4ca-2f4f24263acso68071021fa.0 for ; Mon, 02 Sep 2024 11:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1725303138; x=1725907938; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=c0crOABu0R7IrVV27OIoda++f/q2NKplaU9Cdp2ZiLQ=; b=dM/7OZi5c2dhrGCIWEjs9/Fryhf+HwUKaa7U+32L5PQ7ZkgQRvZU/YExmoGl30cS9W Dp5aLOIfMHKNTJA+SN3RYsMmgpHql+YnYKOVwT4nC6kduAkYhkLseutg3y+hLP81wlgl ul637p8ANq/R8UGn0ApYk6n55pdE8yyQ8UfVI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725303138; x=1725907938; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=c0crOABu0R7IrVV27OIoda++f/q2NKplaU9Cdp2ZiLQ=; b=mBhGfMTnVc5LXmn3cEeGnS9f3Z0hZbyxWvcgXMLvfb161pU1N+GUt57Ae7MwFl7SLW iDiLXzlQ8IMdWXdNu7ke/RB8xqlZJMSTvzKHus8ZpwXhtthMgKqtRh8EYMOssxhBLyMC AkVA3ymf420esi+HgBeDwEyUKaR2cHgJP3Uscb2u/MlO2/w0mtOLGETWZCc+StLsas7t QNUmmLN/bdM7alSGe71X6VBxQ9XEOMy4U6enkGdjzqPring05ckI3ZOC4nVUkA8bo2gR 3zKExLLsjWcPw7TnUI1YbIIuOWgg7qvf5yocmK2Vw3UPLRtZk8yDFZqMPBUSRVt73G0U cNSw== X-Forwarded-Encrypted: i=1; AJvYcCUU9lOWGdjF9I3oZLV+Fsu7USWPz1rp90uv2jntQwUBmSQ4stc+Rw22y3dqVaRX1vb+t/skMnogHZaV2r0=@vger.kernel.org X-Gm-Message-State: AOJu0YyCwQXVE3laIZkE9e2PgaSgYCwN85TH0UWvx5x9GZSzYyEh0H0N lhQ/GnjSCXOIpvFVNlz22Q9oCw3VqzSdVH/1iVx6p6Ere6N7NVv/uyAYEg24Ca4= X-Google-Smtp-Source: AGHT+IF2/e+8ropXwn8w9YMdE52Fig93BA5UowbDTdE0PxoacKlavN6KCGsHdXUWCim0+AY59xsHog== X-Received: by 2002:a05:6512:31cf:b0:52c:e119:7f1 with SMTP id 2adb3069b0e04-53546bfcc07mr9989504e87.51.1725303137478; Mon, 02 Sep 2024 11:52:17 -0700 (PDT) Received: from LQ3V64L9R2.station (net-2-42-195-208.cust.vodafonedsl.it. [2.42.195.208]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8988feb05csm591769866b.6.2024.09.02.11.52.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 11:52:17 -0700 (PDT) Date: Mon, 2 Sep 2024 20:52:15 +0200 From: Joe Damato To: netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, Amritha Nambiar , stable@kernel.org, Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Sridhar Samudrala , Stanislav Fomichev , Daniel Jurgens , open list Subject: Re: [PATCH net] netdev-genl: Set extack and fix error on napi-get Message-ID: Mail-Followup-To: Joe Damato , netdev@vger.kernel.org, mkarsten@uwaterloo.ca, Amritha Nambiar , stable@kernel.org, Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Sridhar Samudrala , Stanislav Fomichev , Daniel Jurgens , open list References: <20240831121707.17562-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240831121707.17562-1-jdamato@fastly.com> On Sat, Aug 31, 2024 at 12:17:04PM +0000, Joe Damato wrote: > In commit 27f91aaf49b3 ("netdev-genl: Add netlink framework functions > for napi"), when an invalid NAPI ID is specified the return value > -EINVAL is used and no extack is set. > > Change the return value to -ENOENT and set the extack. > > Before this commit: > > $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \ > --do napi-get --json='{"id": 451}' > Netlink error: Invalid argument > nl_len = 36 (20) nl_flags = 0x100 nl_type = 2 > error: -22 > > After this commit: > > $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \ > --do napi-get --json='{"id": 451}' > Netlink error: No such file or directory > nl_len = 44 (28) nl_flags = 0x300 nl_type = 2 > error: -2 > extack: {'bad-attr': '.id'} > > Cc: Amritha Nambiar > Cc: stable@kernel.org > Suggested-by: Jakub Kicinski > Fixes: 27f91aaf49b3 ("netdev-genl: Add netlink framework functions for napi") > Signed-off-by: Joe Damato > --- > net/core/netdev-genl.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c > index 05f9515d2c05..a17d7eaeb001 100644 > --- a/net/core/netdev-genl.c > +++ b/net/core/netdev-genl.c > @@ -216,10 +216,12 @@ int netdev_nl_napi_get_doit(struct sk_buff *skb, struct genl_info *info) > rtnl_lock(); > > napi = napi_by_id(napi_id); > - if (napi) > + if (napi) { > err = netdev_nl_napi_fill_one(rsp, napi, info); > - else > - err = -EINVAL; > + } else { > + NL_SET_BAD_ATTR(info->extack, info->attrs[NETDEV_A_NAPI_ID]); > + err = -ENOENT; > + } > > rtnl_unlock(); > > -- > 2.25.1 Based on Eric's comment regarding my other patch [1], I should probably re-submit this against net-next instead of net. It's been over 48 hours, but I'll wait a bit longer before resubmitting. [1]: https://lore.kernel.org/all/CANn89iLhrKyFKf9DpJSSM9CZ9sgoRo7jovg2GhjsJABoqzzVsQ@mail.gmail.com/