From patchwork Wed Feb 12 16:43:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13972109 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) (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 9A603244E8F for ; Wed, 12 Feb 2025 16:43:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739378609; cv=none; b=BQRh6FtBjjetfIIrnk/w4WvH6ONWg5iCXey9IE8s5yn9o7z/DuzCMOfxDzDUTqbPjPjUEmsEJbvnosfzPKEgXpG+ywl0XdhcIqv/QffKVzk1nwc1CE2YKMm7cfdM1JtKpLGOSAVf4aJLrGBYytepZ1QXtUwC+XiqFmvtrvyDse0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739378609; c=relaxed/simple; bh=G/a8NyO5AHywpcFHLuNQpoO7JJ9ufPIHBMOF+2eAtV4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oy8+JkVpnS69lrBRrz40B94I2tU/54vXn/EjHZ+WaPD7XF/eul0Fou3B3MHQrGHWvDdv0LRlO1x66l+CxkrWtdSimwhlXYD4aRKKqgqMZtmRAFekvL/7XOlTtg/mgUk3S1dqKZzRY/3mUReRapzHkT7FSVP73/4/384BQF8QKd8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=wFII7u2F; arc=none smtp.client-ip=209.85.219.73 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--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wFII7u2F" Received: by mail-qv1-f73.google.com with SMTP id 6a1803df08f44-6e4565be110so44383896d6.2 for ; Wed, 12 Feb 2025 08:43:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739378606; x=1739983406; 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=ynBPjyNEjOvJrhbUFXKOP9BPboykJwFZaKw/XSCCEQ8=; b=wFII7u2FPyWTweAcmvfHFR3MVtDB7aefJ7m4riQqZ9sf04kIbvG3HRuwKX0Irh+PKk zexZiBA0b6GNNR5yIeQkkq1MBDt4GhEfFV09KfxtL2wo/o7bDMCmDLmxI8EgMltyys1a X6Pc+tbJB/xBOxvqI4aov8BK+0gQvgND4DPPur7rgK4OS7cyIcXbGmAx9YVnP80p23lb TjboWKOLbZbU1hMB9WqHGlFS+0g6r+HotLB01vYQcXRLq3iCjcS+UOb3Ds3Xdj5Nb9K/ i3XRwvBTrPgHcWLWnvg1GGjKsUCm7tz9AUgZHBkC+I6TuBo3yLQtNW0KaQMNCzVJyZ3f i0Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739378606; x=1739983406; 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=ynBPjyNEjOvJrhbUFXKOP9BPboykJwFZaKw/XSCCEQ8=; b=T2FpNTtbXMVt+ZCOGEjS89G5QP2ES52QZ1v5bbreBfJ5bYRIODCkp37JpimfI7d9r5 gTIfZ2TzAtVBktZomQqBJ52m8RTWcHdhjzUG58cADgIiNr4YbnGEaY/PDDIKofHKGzdy /mgyCVU0hcmhDpMfRkDYnMl5XusM4GBg10j3h3qUsbDrWgyY2Xx9A1ceoVv30P5wZL9W XBqcO+Vr9CdZB5LVA5Ot78fO78dwmeuNwiTGSm0ojxjQUPwnrYuZG+F33Vo16we/GCAO guP+yzAvrB+VQzdfiUz+w5AZBHue7brEJ0wEHTh6IBCIT1N9AQmQd2FAmNp2doIOL/x3 xFCg== X-Gm-Message-State: AOJu0YzvhDnW8iYv95TAMgKSFdVD5CV9jgfF2X5BNN87K51IeyZlVEx+ muyM/jthM63OBuYfrQUyH/GeYgTvApeEyGysuh8e3h+Y3qpU/+7hOcwtjeYn3eW8jqyYG0S3Lw5 mdeUgmbGOpw== X-Google-Smtp-Source: AGHT+IGORnI4rAKBoEnUFIzhtTB0Z4URJ6XWddodDhFw5R7oOnUsizOtkEzGjBSTD2pGcWW7KUp8N1GjqEGEDQ== X-Received: from qvbpi8.prod.google.com ([2002:a05:6214:4a88:b0:6e4:2648:496e]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6214:2683:b0:6e4:2d22:a566 with SMTP id 6a1803df08f44-6e46ed82877mr56209456d6.12.1739378606433; Wed, 12 Feb 2025 08:43:26 -0800 (PST) Date: Wed, 12 Feb 2025 16:43:22 +0000 In-Reply-To: <20250212164323.2183023-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250212164323.2183023-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250212164323.2183023-2-edumazet@google.com> Subject: [PATCH net-next 1/2] net: dropreason: add SKB_DROP_REASON_BLACKHOLE From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, David Ahern , Paul Ripke , Simon Horman , eric.dumazet@gmail.com, Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org Use this new drop reason from dst_discard_out(). Signed-off-by: Eric Dumazet Reviewed-by: David Ahern --- include/net/dropreason-core.h | 5 +++++ net/core/dst.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/net/dropreason-core.h b/include/net/dropreason-core.h index 32a34dfe8cc58fb1afda8922a52249080f1183b5..de42577f16dd199790cea9ac07b326864f2103e3 100644 --- a/include/net/dropreason-core.h +++ b/include/net/dropreason-core.h @@ -117,6 +117,7 @@ FN(ARP_PVLAN_DISABLE) \ FN(MAC_IEEE_MAC_CONTROL) \ FN(BRIDGE_INGRESS_STP_STATE) \ + FN(BLACKHOLE) \ FNe(MAX) /** @@ -554,6 +555,10 @@ enum skb_drop_reason { * ingress bridge port does not allow frames to be forwarded. */ SKB_DROP_REASON_BRIDGE_INGRESS_STP_STATE, + /** + * @SKB_DROP_REASON_BLACKHOLE: blackhole route. + */ + SKB_DROP_REASON_BLACKHOLE, /** * @SKB_DROP_REASON_MAX: the maximum of core drop reasons, which * shouldn't be used as a real 'reason' - only for tracing code gen diff --git a/net/core/dst.c b/net/core/dst.c index 9552a90d4772dce49b5fe94d2f1d8da6979d9908..0cbbad4d7c07fa397f66a2d252a636f90dafddee 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -29,7 +29,7 @@ int dst_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb) { - kfree_skb(skb); + kfree_skb_reason(skb, SKB_DROP_REASON_BLACKHOLE); return 0; } EXPORT_SYMBOL(dst_discard_out); From patchwork Wed Feb 12 16:43:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13972110 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) (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 08269250C13 for ; Wed, 12 Feb 2025 16:43:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739378610; cv=none; b=oxPJowxGnyua3jupTIsNfkzxmqY+ReYyB+wuCIX8FOBYoxtylwRKU08tTVtoAyJxi+HZcss41UEe+AEIoOs+GxTDQQRNZQRTBDLd/IpWkzvAspnwe0EOQb7GY5uuDpGFLoNleGbo3Z7YSzIcUy4hrLpwUDRbn3TDEVpQVvKjY+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739378610; c=relaxed/simple; bh=+R+gsNAZJIFoPS+flzYsNbvb+00SPyBGEUfa6OYni80=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jGlwc6KY5jxvC8lbdpj3WWfR32fPSKpUD0bBegcnrNwIkgbyiwnyNdnyFLtAgwmdYDKCiFb9U9BEF6Xw2xaBy5Cgmp8w4nD2ui5r52QFbhjBJwKiVF1WGme+nv7GMWsAywMOQAjtoqBDl3Al53AWHvosP9rUcE2A5ggxU1Cvsbo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=dXNR2TcO; arc=none smtp.client-ip=209.85.160.202 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--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dXNR2TcO" Received: by mail-qt1-f202.google.com with SMTP id d75a77b69052e-4719a88385cso50032601cf.2 for ; Wed, 12 Feb 2025 08:43:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739378608; x=1739983408; 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=bc1KT6XJD9YQspXpLj+QAwa1Bq9Wsx7vCh0osrKULQE=; b=dXNR2TcOaih9Q2sIflI8FYXBJDLEJ9/35IMZm/rGxajjBDPOfC78Ad6FLdRFcvcqSl ohYAJSal7iF/eqyd5zwmPGL7v0rsR9Ua80UGmDPXF1L9qN+S5fC+h1rDRw/4/fKHM8aP 8EhA0SVKFgd2aRRIOiYjNkHdrDhlZ0idfGVpg4kaiXITYmn0xYcskqY3IApZoBqOCg4r lWsTC/Npr5m3IdJc8bdccpRjoj+Khefu+DfwYpmut8Ras4e7BPHjUXayyKiv9FH8mJQ9 3PveRVbFQprHvEkAcD2GoPiTW2ju+oyqcwcZjd39aUL9+Ri18tXrfSFz19sVdAq6n7Fl kfGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739378608; x=1739983408; 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=bc1KT6XJD9YQspXpLj+QAwa1Bq9Wsx7vCh0osrKULQE=; b=w41YHOin6RKpVnYCuHuTF+4Gpn7Vrqgg6maGmWSeZTb87jNLROETDZpMmAMeYWC1Bp SKrzNyxs2pH2y+PgBEtXwan0doVS7XYub5ZDXpbps/P624AKaT/Al+H+5bMZcOjpPGSb WFkmB4Pcg6LtyqUHRLqTANsErnzVUBq77kpdUrf+Kdow7q+cz04jdvReuoWEryIQJa7H jA5QKohTVGvH8rQrjiynaIYO6xQ8T4fP/IGWlG+R0ebgB3EfGQDfNoOPJSWl8r3y/UgV 2AN9vvFkGLva3wlAEEkd6GmdgQoayQGctNKR2zlAeu2ta2ig66vcU0VBeJarUSiScj/n mRGg== X-Gm-Message-State: AOJu0Yx3NJVMFuwHr3dfMh0WEm11nlqHWdFN34DJpUPHAxl5bQNLiBOR P63iBzU35yaVUrZfkfMF6sdR7bc4ipX1zpW1PNdRCFqausawA0OKVOspbv1Q9TZLuKYqlIDsAku CvkHxNAmUqQ== X-Google-Smtp-Source: AGHT+IEDqFXKNfPtsIkTGqPTI3vPASKrvRFwb9Oy0GfyaN1unvx8Mc4ze88HHpMQsKQH4Yc4yydUFWU5ji7ERw== X-Received: from qtbfb16.prod.google.com ([2002:a05:622a:4810:b0:471:919a:e569]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:622a:1214:b0:471:b4b9:e6fc with SMTP id d75a77b69052e-471beda6de9mr863121cf.40.1739378607961; Wed, 12 Feb 2025 08:43:27 -0800 (PST) Date: Wed, 12 Feb 2025 16:43:23 +0000 In-Reply-To: <20250212164323.2183023-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250212164323.2183023-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250212164323.2183023-3-edumazet@google.com> Subject: [PATCH net-next 2/2] ipv6: fix blackhole routes From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, David Ahern , Paul Ripke , Simon Horman , eric.dumazet@gmail.com, Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org For some reason, linux does not really act as a blackhole for local processes: ip route add blackhole 100::/64 # RFC 6666 ip route get 100:: RTNETLINK answers: Invalid argument ping6 -c2 100:: ping6: connect: Invalid argument ip route del 100::/64 After this patch, a local process no longer has an immediate error, the blackhole is simply eating the packets as intended. Also the "route get" command does not fail anymore. ip route add blackhole 100::/64 ip route get 100:: blackhole 100:: dev lo src ::1 metric 1024 pref medium ping6 -c2 100:: PING 100:: (100::) 56 data bytes --- 100:: ping statistics --- 2 packets transmitted, 0 received, 100% packet loss, time 1019ms ip route del 100::/64 Reported-by: Paul Ripke Signed-off-by: Eric Dumazet --- net/ipv6/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 78362822b9070df138a0724dc76003b63026f9e2..335cdbfe621e2fc4a71badf4ff834870638d5e13 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1048,7 +1048,7 @@ static const int fib6_prop[RTN_MAX + 1] = { [RTN_BROADCAST] = 0, [RTN_ANYCAST] = 0, [RTN_MULTICAST] = 0, - [RTN_BLACKHOLE] = -EINVAL, + [RTN_BLACKHOLE] = 0, [RTN_UNREACHABLE] = -EHOSTUNREACH, [RTN_PROHIBIT] = -EACCES, [RTN_THROW] = -EAGAIN,