1. 23 Aug, 2024 2 commits
    • Jakub Kicinski's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 761d527d
      Jakub Kicinski authored
      Cross-merge networking fixes after downstream PR.
      
      No conflicts.
      
      Adjacent changes:
      
      drivers/net/ethernet/broadcom/bnxt/bnxt.h
        c948c097 ("bnxt_en: Don't clear ntuple filters and rss contexts during ethtool ops")
        f2878cde ("bnxt_en: Add support to call FW to update a VNIC")
      
      Link: https://patch.msgid.link/20240822210125.1542769-1-kuba@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      761d527d
    • Jakub Kicinski's avatar
      Merge branch 'unmask-upper-dscp-bits-part-1' · bfc52dee
      Jakub Kicinski authored
      Ido Schimmel says:
      
      ====================
      Unmask upper DSCP bits - part 1
      
      tl;dr - This patchset starts to unmask the upper DSCP bits in the IPv4
      flow key in preparation for allowing IPv4 FIB rules to match on DSCP.
      No functional changes are expected.
      
      The TOS field in the IPv4 flow key ('flowi4_tos') is used during FIB
      lookup to match against the TOS selector in FIB rules and routes.
      
      It is currently impossible for user space to configure FIB rules that
      match on the DSCP value as the upper DSCP bits are either masked in the
      various call sites that initialize the IPv4 flow key or along the path
      to the FIB core.
      
      In preparation for adding a DSCP selector to IPv4 and IPv6 FIB rules, we
      need to make sure the entire DSCP value is present in the IPv4 flow key.
      This patchset starts to unmask the upper DSCP bits in the various places
      that invoke the core FIB lookup functions directly (patches #1-#7) and
      in the input route path (patches #8-#12). Future patchsets will do the
      same in the output route path.
      
      No functional changes are expected as commit 1fa3314c ("ipv4:
      Centralize TOS matching") moved the masking of the upper DSCP bits to
      the core where 'flowi4_tos' is matched against the TOS selector.
      ====================
      
      Link: https://patch.msgid.link/20240821125251.1571445-1-idosch@nvidia.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      bfc52dee
  2. 22 Aug, 2024 38 commits