From nobody Mon Feb 9 17:21:59 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 6B129276027 for ; Tue, 29 Apr 2025 03:27:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745897224; cv=none; b=kRI0scYoCCRyNCYcWJJQGSaJb32CYbO+gYurOEa88+JieOf6qiUgYCCauB33Ds3cO/X93LzzazcX+zR+JSd3qTZe/TQ+5RotFyTUCf+YkAs0qqby75qW48gQNimxip9hY0Crv0uZTFdhvAtS4URDEjfBsBr6X5hvxmpO7prX6Go= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745897224; c=relaxed/simple; bh=A7Gqoe2REliQn3D8I8ViowlNgFS3gK0zrYxlmzIFsP0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RK/pZKuhEfC6joEmXA+igKLgjkVicpViFrhhEUC10ZMOKwR+pL+AMLNh3uwNjhvTr4TMCPi64XsRKpXOO5eVOqZvOstnwnaqpL5wI6MC4epVBj3lW6gwBqOQ4GuqtZpowPl+gwB/JB+mro+i2iwgZ0w5eNveg4En5ZAB2mPLjVk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Q3os2TqV; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Q3os2TqV" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-736a7d0b82fso5644420b3a.1 for ; Mon, 28 Apr 2025 20:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745897222; x=1746502022; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=e1032nSfcUejN3wnyduYVEgTSlMhJTQ/ggAvfPEjRBQ=; b=Q3os2TqVlL+qYULQ4sS+ZyR0q7ABt95gyDwsqItLaFSVM9u3woxI57CpI5+36agj+w Mp1sNhZvkiQ2Sa915ciHGtwVfNGcktOPb1ZwuqiE0Ta0N2fBF1XbpVOnAdTsloI6TkYv c53730JQCTlwUzM5HY8i3LQP/Y/gFZNhnqJL47g6NTRsZ29NfqMYEocnq9b/2ceCY+rg pobsDG4UngnRNOMcggS0ddZE5B5SgRwtptaBtu9REYO25dQxTLQemCNKSlYFVYcIKDhx TOH9VHuff5e/n5yA1bFNIw2IvGr5dLgWBXELg9IhPHiWPFXiFD+om1MJOnU7oNWU3r6y KgFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745897222; x=1746502022; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=e1032nSfcUejN3wnyduYVEgTSlMhJTQ/ggAvfPEjRBQ=; b=lua0gpygdmcxUzmhrhmh31wfv7X//s65sDbbyLWZHOFyoBkqVY6PYMn1TQqd2n6gIx sKyvoOqTQkOV8IqRT3AGQv4mJm8v7KJ3Jdm8hFkX3YmMnZ5Xv9jEqUk+u1qUUK6fMr19 rHcc+7Y6SpHoCcmRtNGzHNAL9jSVeeafLG5mjkidGUvPdT3DnbrNKv7bxQEYKli9JwSG QHChvlohBYk88rvE6hsgCMeNU7GD0BU4GsknhNoGGDZYFy419fuC/St1LA2MUbNDAJ2v fQO5C9h+BDg0mm4/OYM+cfkkbRDEh1AwquzVoAIlEA+ZvhGRm3rodxLMvp+hphx7noVl o2Cg== X-Forwarded-Encrypted: i=1; AJvYcCWhHb5IV709KOgW57tbdCyuEEaL6MhIrNavl2JrwsbmqfDmOwBMSaDVvklICty1tc3JhrPSFqA0kNZZEBw=@vger.kernel.org X-Gm-Message-State: AOJu0YxhSmLJf0jMYHhyZuK3kXAhZGgMwB70Huv3joak8/fG6syj1dCl /q9ySdxqXXyRe2VwrE9rV2HH/SwV2+quuAgrZyFEPRaP4KBc/HDjcC2rS+To2ZyXzbPxfbUYfCS R1ymVNpEq9s+zEfUgU6wUGg== X-Google-Smtp-Source: AGHT+IFmVM3YrkOhLWbCT7+b8wtIRcYElhCtGh67rI6iSh5PAx3yi8oyEgSS83P+VHq5mzTmEXYtXAkmX8xqOcB1vg== X-Received: from pgbdo9.prod.google.com ([2002:a05:6a02:e89:b0:b0d:967f:2404]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:cfa4:b0:1f5:58b9:6d97 with SMTP id adf61e73a8af0-2093e52803amr2977856637.35.1745897221928; Mon, 28 Apr 2025 20:27:01 -0700 (PDT) Date: Tue, 29 Apr 2025 03:26:44 +0000 In-Reply-To: <20250429032645.363766-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250429032645.363766-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.901.g37484f566f-goog Message-ID: <20250429032645.363766-9-almasrymina@google.com> Subject: [PATCH net-next v13 8/9] net: check for driver support in netmem TX From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, io-uring@vger.kernel.org, virtualization@lists.linux.dev, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Mina Almasry , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Donald Hunter , Jonathan Corbet , Andrew Lunn , Jeroen de Borst , Harshitha Ramamurthy , Kuniyuki Iwashima , Willem de Bruijn , Jens Axboe , Pavel Begunkov , David Ahern , Neal Cardwell , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , "=?UTF-8?q?Eugenio=20P=C3=A9rez?=" , Stefan Hajnoczi , Stefano Garzarella , Shuah Khan , sdf@fomichev.me, dw@davidwei.uk, Jamal Hadi Salim , Victor Nogueira , Pedro Tammela , Samiullah Khawaja Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We should not enable netmem TX for drivers that don't declare support. Check for driver netmem TX support during devmem TX binding and fail if the driver does not have the functionality. Check for driver support in validate_xmit_skb as well. Signed-off-by: Mina Almasry Acked-by: Stanislav Fomichev --- v8: - Rebase on latest net-next and resolve conflict. - Remove likely (Paolo) v5: https://lore.kernel.org/netdev/20250227041209.2031104-8-almasrymina@goo= gle.com/ - Check that the dmabuf mappings belongs to the specific device the TX is being sent from (Jakub) v4: - New patch --- net/core/dev.c | 34 ++++++++++++++++++++++++++++++++-- net/core/devmem.h | 6 ++++++ net/core/netdev-genl.c | 7 +++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index d1a8cad0c99c4..66f0c122de80e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3896,12 +3896,42 @@ int skb_csum_hwoffload_help(struct sk_buff *skb, } EXPORT_SYMBOL(skb_csum_hwoffload_help); =20 +static struct sk_buff *validate_xmit_unreadable_skb(struct sk_buff *skb, + struct net_device *dev) +{ + struct skb_shared_info *shinfo; + struct net_iov *niov; + + if (likely(skb_frags_readable(skb))) + goto out; + + if (!dev->netmem_tx) + goto out_free; + + shinfo =3D skb_shinfo(skb); + + if (shinfo->nr_frags > 0) { + niov =3D netmem_to_net_iov(skb_frag_netmem(&shinfo->frags[0])); + if (net_is_devmem_iov(niov) && + net_devmem_iov_binding(niov)->dev !=3D dev) + goto out_free; + } + +out: + return skb; + +out_free: + kfree_skb(skb); + return NULL; +} + static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_d= evice *dev, bool *again) { netdev_features_t features; =20 - if (!skb_frags_readable(skb)) - goto out_kfree_skb; + skb =3D validate_xmit_unreadable_skb(skb, dev); + if (unlikely(!skb)) + goto out_null; =20 features =3D netif_skb_features(skb); skb =3D validate_xmit_vlan(skb, features); diff --git a/net/core/devmem.h b/net/core/devmem.h index 67168aae5e5b3..919e6ed28fdcd 100644 --- a/net/core/devmem.h +++ b/net/core/devmem.h @@ -229,6 +229,12 @@ net_devmem_get_niov_at(struct net_devmem_dmabuf_bindin= g *binding, size_t addr, { return NULL; } + +static inline struct net_devmem_dmabuf_binding * +net_devmem_iov_binding(const struct net_iov *niov) +{ + return NULL; +} #endif =20 #endif /* _NET_DEVMEM_H */ diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c index db0e9a6a4badc..119f4fbc0c944 100644 --- a/net/core/netdev-genl.c +++ b/net/core/netdev-genl.c @@ -982,6 +982,13 @@ int netdev_nl_bind_tx_doit(struct sk_buff *skb, struct= genl_info *info) goto err_unlock_netdev; } =20 + if (!netdev->netmem_tx) { + err =3D -EOPNOTSUPP; + NL_SET_ERR_MSG(info->extack, + "Driver does not support netmem TX"); + goto err_unlock_netdev; + } + binding =3D net_devmem_bind_dmabuf(netdev, DMA_TO_DEVICE, dmabuf_fd, info->extack); if (IS_ERR(binding)) { --=20 2.49.0.901.g37484f566f-goog